Add Copilot Setup Steps action (#1419 )

Update aspire to 13.1 (examples + code) (#1417 )
Allows usage of aspire CLI which is very useful for dev in codespaces (for my next PR).
2026-01-11 21:10:32 +01:00 · 2026-01-09 18:20:12 +01:00 · 2026-01-09 18:01:45 +01:00 · 2026-01-05 21:34:11 +01:00 · 2026-01-05 21:24:48 +01:00 · 2026-01-04 08:03:19 +01:00
116 changed files with 4130 additions and 8331 deletions
--- a/.github/workflows/copilot-setup-steps.yml
+++ b/.github/workflows/copilot-setup-steps.yml
@@ -0,0 +1,36 @@
+name: "Copilot Setup Steps"
+
+# Automatically run the setup steps when they are changed to allow for easy validation, and
+# allow manual testing through the repository's "Actions" tab
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+  pull_request:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+
+jobs:
+  # The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
+  copilot-setup-steps:
+    runs-on: ubuntu-latest
+
+    # Set the permissions to the lowest permissions possible needed for your steps.
+    # Copilot will be given its own token for its operations.
+    permissions:
+      # If you want to clone the repository as part of your setup steps, for example to install dependencies, you'll need the `contents: read` permission. If you don't clone the repository in your setup steps, Copilot will do this for you automatically after the steps complete.
+      contents: read
+
+    # You can define any steps you want, and they will run before the agent starts.
+    # If you do not check out your code, Copilot will do this for you.
+    steps:
+      - name: Install .NET 10.x
+        uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: |
+            10.x
+          dotnet-quality: preview
+
+      - name: dotnet --info
+        run: dotnet --info
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,64 @@
+# 1.23.0 (05 January 2026)
+- [#1414](https://github.com/wiremock/WireMock.Net/pull/1414) - Pass the parameter matchOperator in Request.WithPath to its inner calls [bug] contributed by [gbamqzkdyg](https://github.com/gbamqzkdyg)
+- [#1416](https://github.com/wiremock/WireMock.Net/pull/1416) - Fix: Pass AllowedHandlebarsHelpers configuration to Handlebars.Net.Helpers library contributed by [samlatham](https://github.com/samlatham)
+- [#1413](https://github.com/wiremock/WireMock.Net/issues/1413) - Parameter `matchOperator` is not respected in the method Request.WithPath [bug]
+- [#1415](https://github.com/wiremock/WireMock.Net/issues/1415) - HandlebarsSettings AllowedHandlebarsHelpers Configuration Not Applied [bug]
+
+# 1.22.0 (02 January 2026)
+- [#1412](https://github.com/wiremock/WireMock.Net/pull/1412) - chore(testcontainers): bump up Testcontainers to version 4.10.0 [feature] contributed by [vhatsura](https://github.com/vhatsura)
+- [#1411](https://github.com/wiremock/WireMock.Net/issues/1411) - WireMock.Net.Testcontainers isn't compatible with Testcontainers 4.10.0 [bug]
+
+# 1.21.0 (25 December 2025)
+- [#1408](https://github.com/wiremock/WireMock.Net/pull/1408) - Fix readyness-check for Testcontainers [bug] contributed by [StefH](https://github.com/StefH)
+
+# 1.20.0 (24 December 2025)
+- [#1399](https://github.com/wiremock/WireMock.Net/pull/1399) - Upgrade RamlToOpenApiConverter and YamlDotNet [feature] contributed by [StefH](https://github.com/StefH)
+- [#1400](https://github.com/wiremock/WireMock.Net/pull/1400) - Add WireMock.Net.NUnit project [feature] contributed by [StefH](https://github.com/StefH)
+- [#1405](https://github.com/wiremock/WireMock.Net/pull/1405) - Fix Testcontainers AddProtoDefinition [bug] contributed by [StefH](https://github.com/StefH)
+- [#1398](https://github.com/wiremock/WireMock.Net/issues/1398) - Upgrade YamlDotNet dependency [feature]
+- [#1404](https://github.com/wiremock/WireMock.Net/issues/1404) - An exception occurs when adding multiple proto definitions in the TestContainer. [bug]
+
+# 1.19.0 (12 December 2025)
+- [#1391](https://github.com/wiremock/WireMock.Net/pull/1391) - Update WireMockContainerBuilder (WithImage and WithCustomImage) [feature] contributed by [StefH](https://github.com/StefH)
+- [#1392](https://github.com/wiremock/WireMock.Net/pull/1392) - WireMockContainerBuilder: allow all docker images named wiremock [feature] contributed by [StefH](https://github.com/StefH)
+- [#1390](https://github.com/wiremock/WireMock.Net/issues/1390) - Unable to build WireMockContainerBuilder with custom image [feature]
+
+# 1.18.0 (09 December 2025)
+- [#1388](https://github.com/wiremock/WireMock.Net/pull/1388) - Add WithBodyAsType to RequestMatcher [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.17.0 (07 December 2025)
+- [#1383](https://github.com/wiremock/WireMock.Net/pull/1383) - Aspire: Add WithProtoDefinition to support proto definition at server level [feature] contributed by [StefH](https://github.com/StefH)
+- [#1386](https://github.com/wiremock/WireMock.Net/pull/1386) - Fix random delay in mapping json file [bug] contributed by [StefH](https://github.com/StefH)
+- [#1274](https://github.com/wiremock/WireMock.Net/issues/1274) - .WithMappings to mount volume is not working for GRPC [bug]
+- [#1381](https://github.com/wiremock/WireMock.Net/issues/1381) - Downstream dependencies missing after 1.16.0 release [bug]
+- [#1382](https://github.com/wiremock/WireMock.Net/issues/1382) - Does Aspire support enabling HTTP/2? [feature]
+- [#1385](https://github.com/wiremock/WireMock.Net/issues/1385) - Do delays and probabilities show in saved static mappings? [bug]
+- [#1387](https://github.com/wiremock/WireMock.Net/issues/1387) - Tests failing with TaskCanceledException on Windows Server 2025 Build 7171 [bug]
+
+# 1.16.0 (18 November 2025)
+- [#1366](https://github.com/wiremock/WireMock.Net/pull/1366) - WireMock.Net.OpenApiParser : support Examples [feature] contributed by [StefH](https://github.com/StefH)
+- [#1375](https://github.com/wiremock/WireMock.Net/pull/1375) - Add WireMockHealthCheck in WireMock.Net.Aspire [feature] contributed by [Zguy](https://github.com/Zguy)
+- [#1377](https://github.com/wiremock/WireMock.Net/pull/1377) - Check if the path is valid when using WithPath(...) [feature] contributed by [StefH](https://github.com/StefH)
+- [#1380](https://github.com/wiremock/WireMock.Net/pull/1380) - Add WireMock.Net.xUnit.v3 project [feature] contributed by [StefH](https://github.com/StefH)
+- [#1364](https://github.com/wiremock/WireMock.Net/issues/1364) - Choosing examples from open api specification for responses. [feature]
+- [#1376](https://github.com/wiremock/WireMock.Net/issues/1376) - AdminApiMappingBuilder `WithPath` should add the starting `/` if missing [feature]
+- [#1379](https://github.com/wiremock/WireMock.Net/issues/1379) - xUnit v3 [feature]
+
+# 1.15.0 (22 October 2025)
+- [#1367](https://github.com/wiremock/WireMock.Net/pull/1367) - Fix WithProbability logic [bug] contributed by [StefH](https://github.com/StefH)
+- [#1370](https://github.com/wiremock/WireMock.Net/pull/1370) - Support Testcontainers 4.8.0 [bug] contributed by [MD-V](https://github.com/MD-V)
+- [#1126](https://github.com/wiremock/WireMock.Net/issues/1126) - Request matching WithProbability strange behaviour [bug]
+
+# 1.14.0 (06 October 2025)
+- [#1362](https://github.com/wiremock/WireMock.Net/pull/1362) - Update ProxyUrlReplaceSettingsModel with TransformTemplate property [feature] contributed by [StefH](https://github.com/StefH)
+- [#1363](https://github.com/wiremock/WireMock.Net/pull/1363) - Add Tls13 [bug] contributed by [StefH](https://github.com/StefH)
+- [#1342](https://github.com/wiremock/WireMock.Net/issues/1342) - Facing SSL certificate validation error when using .NET 5 and above framework for some http services during recording [bug]
+- [#1360](https://github.com/wiremock/WireMock.Net/issues/1360) - ProxyURL path configuration [feature]
+
+# 1.13.0 (28 September 2025)
+- [#1358](https://github.com/wiremock/WireMock.Net/pull/1358) - TypeLoader: implement Try methods [feature] contributed by [StefH](https://github.com/StefH)
+- [#1361](https://github.com/wiremock/WireMock.Net/pull/1361) - ProxyUrlTransformer [feature] contributed by [StefH](https://github.com/StefH)
+
 # 1.12.0 (30 August 2025)
 - [#1357](https://github.com/wiremock/WireMock.Net/pull/1357) - Upgrade Testcontainers to 4.7.0 [feature] contributed by [StefH](https://github.com/StefH)
 - [#1356](https://github.com/wiremock/WireMock.Net/issues/1356) - WireMock.Net 1.11.2 is not compatible with TestContainers 4.7.0 [bug]
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
    </PropertyGroup>

    <PropertyGroup>
-        <Version>1.12.0</Version>
+        <VersionPrefix>1.23.0</VersionPrefix>
        <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
        <PackageProjectUrl>https://github.com/wiremock/WireMock.Net</PackageProjectUrl>
        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
--- a/Generate-ReleaseNotes.cmd
+++ b/Generate-ReleaseNotes.cmd
@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes

-SET version=1.12.0
+SET version=1.23.0

 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels wontfix test question invalid doc duplicate example environment --version %version% --token %GH_TOKEN%

--- a/PackageReadme.md
+++ b/PackageReadme.md
@@ -15,48 +15,48 @@ Lightweight Http Mocking Server for .NET, inspired by WireMock.org (from the Jav

 ### :star: Stubbing
 A core feature of WireMock.Net is the ability to return predefined HTTP responses for requests matching criteria.
-See [Wiki : Stubbing](https://github.com/wiremock/WireMock.Net/wiki/Stubbing).
+See [Stubbing](https://wiremock.org/dotnet/stubbing).

 ### :star: Request Matching
-WireMock.Net support advanced request-matching logic, see [Wiki : Request Matching](https://github.com/wiremock/WireMock.Net/wiki/Request-Matching).
+WireMock.Net support advanced request-matching logic, see [Request Matching](https://wiremock.org/dotnet/request-matching).

 ### :star: Response Templating
-The response which is returned WireMock.Net can be changed using templating. This is described here [Wiki : Response Templating](https://github.com/wiremock/WireMock.Net/wiki/Response-Templating).
+The response which is returned WireMock.Net can be changed using templating. This is described here [Response Templating](https://wiremock.org/dotnet/response-templating).

 ### :star: Admin API Reference
-The WireMock admin API provides functionality to define the mappings via a http interface see [Wiki : Admin API Reference](https://github.com/StefH/WireMock.Net/wiki/Admin-API-Reference).
+The WireMock admin API provides functionality to define the mappings via a http interface see [Admin API Reference](https://wiremock.org/dotnet/admin-api-reference).

 ### :star: Using
 WireMock.Net can be used in several ways:

 #### UnitTesting
 You can use your favorite test framework and use WireMock within your tests, see
-[Wiki : UnitTesting](https://github.com/StefH/WireMock.Net/wiki/Using-WireMock-in-UnitTests).
+[UnitTesting](https://wiremock.org/dotnet/using-wiremock-in-unittests).

 ### Unit/Integration Testing using Testcontainers.DotNet
-See [Wiki : WireMock.Net.Testcontainers](https://github.com/wiremock/WireMock.Net/wiki/Using-WireMock.Net.Testcontainers) on how to build a WireMock.Net Docker container which can be used in Unit/Integration testing.
+See [WireMock.Net.Testcontainers](https://wiremock.org/dotnet/using-wiremock-net-testcontainers/) on how to build a WireMock.Net Docker container which can be used in Unit/Integration testing.

 ### Unit/Integration Testing using an an Aspire Distributed Application
-See [Wiki : WireMock.Net.Aspire](https://github.com/wiremock/WireMock.Net/wiki/Using-WireMock.Net.Aspire) on how to use WireMock.Net as an Aspire Hosted application to do Unit/Integration testing.
+See [WireMock.Net.Aspire](https://wiremock.org/dotnet/using-wiremock-net-Aspire) on how to use WireMock.Net as an Aspire Hosted application to do Unit/Integration testing.

 #### As a dotnet tool
-It's simple to install WireMock.Net as (global) dotnet tool, see [Wiki : dotnet tool](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-dotnet-tool).
+It's simple to install WireMock.Net as (global) dotnet tool, see [dotnet tool](https://wiremock.org/dotnet/wiremock-as-dotnet-tool).

 #### As standalone process / console application
-This is quite straight forward to launch a mock server within a console application, see [Wiki : Standalone Process](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-a-standalone-process).
+This is quite straight forward to launch a mock server within a console application, see [Standalone Process](https://wiremock.org/dotnet/wiremock-as-a-standalone-process).

 #### As a Windows Service
-You can also run WireMock.Net as a Windows Service, follow this [WireMock-as-a-Windows-Service](https://github.com/wiremock/WireMock.Net/wiki/WireMock-as-a-Windows-Service).
+You can also run WireMock.Net as a Windows Service, follow this [Windows Service](https://wiremock.org/dotnet/wiremock-as-a-windows-service).

 #### As a Web Job in Azure or application in IIS
-See this link [WireMock-as-a-(Azure)-Web-App](https://github.com/wiremock/WireMock.Net/wiki/WireMock-as-a-(Azure)-Web-App)
+See this link [WireMock-as-a-(Azure)-Web-App](https://wiremock.org/dotnet/wiremock-as-a-azure-web-app/)

 #### In a docker container
 There is also a Linux and Windows-Nano container available at [hub.docker.com](https://hub.docker.com/r/sheyenrath).
 For more details see also [Docker](https://github.com/wiremock/WireMock.Net-docker).

 #### HTTPS / SSL
-More details on using HTTPS (SSL) can be found here [Wiki : HTTPS](https://github.com/wiremock/WireMock.Net/wiki/Using-HTTPS-(SSL))
+More details on using HTTPS (SSL) can be found here [HTTPS](https://wiremock.org/dotnet/using-https-ssl/)

 ## :books: Documentation
-For more info, see also this WIKI page: [What is WireMock.Net](https://github.com/wiremock/WireMock.Net/wiki/What-Is-WireMock.Net).
+For more info, see also this documentation page: [What is WireMock.Net](https://wiremock.org/dotnet/what-is-wiremock-net/).
--- a/PackageReleaseNotes.txt
+++ b/PackageReleaseNotes.txt
@@ -1,5 +1,7 @@
-# 1.12.0 (30 August 2025)
- #1357 Upgrade Testcontainers to 4.7.0 [feature]
- #1356 WireMock.Net 1.11.2 is not compatible with TestContainers 4.7.0 [bug]
+# 1.23.0 (05 January 2026)
+- #1414 Pass the parameter matchOperator in Request.WithPath to its inner calls [bug]
+- #1416 Fix: Pass AllowedHandlebarsHelpers configuration to Handlebars.Net.Helpers library
+- #1413 Parameter `matchOperator` is not respected in the method Request.WithPath [bug]
+- #1415 HandlebarsSettings AllowedHandlebarsHelpers Configuration Not Applied [bug]

 The full release notes can be found here: https://github.com/wiremock/WireMock.Net/blob/master/CHANGELOG.md
--- a/README.md
+++ b/README.md
@@ -1,7 +1,11 @@
 # ![Project Icon](./resources/logo_32x32.png) WireMock.Net
-A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) which mimics the functionality from the JAVA based [WireMock](http://wiremock.org).
+A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) which mimics functionality from the original Java based WireMock.

-For more info, see also this WIKI page: [What is WireMock.Net](https://github.com/wiremock/WireMock.Net/wiki/What-Is-WireMock.Net).
+---
+
+### :books: Full documentation can now be found at [wiremock.org](https://wiremock.org/dotnet)
+
+---

 ## :star: Key Features
 * HTTP response stubbing, matchable on URL/Path, headers, cookies and body content patterns
@@ -29,7 +33,7 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 | &nbsp;&nbsp;**Issues** | [![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/wiremock/WireMock.Net/issues) |
 | | |
 | ***Quality*** | &nbsp; |
-| &nbsp;&nbsp;**Build Azure** | [![Build Status Azure](https://stef.visualstudio.com/WireMock.Net/_apis/build/status/WireMock.Net)](https://stef.visualstudio.com/WireMock.Net/_build/latest?definitionId=7) |
+| &nbsp;&nbsp;**Build Azure** | [![Build Status Azure](https://stef.visualstudio.com/WireMock.Net/_apis/build/status/WireMock.Net)](https://stef.visualstudio.com/WireMock.Net/_build/latest?definitionId=61) |
 | &nbsp;&nbsp;**Quality** | [![Sonar Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=alert_status)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net) [![CodeFactor](https://www.codefactor.io/repository/github/wiremock/wiremock.net/badge)](https://www.codefactor.io/repository/github/wiremock/wiremock.net) |
 | &nbsp;&nbsp;**Sonar Bugs** | [![Sonar Bugs](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=bugs)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net&resolved=false&types=BUG) [![Sonar Code Smells](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=code_smells)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net&resolved=false&types=CODE_SMELL) |
 | &nbsp;&nbsp;**Coverage** | [![Sonar Coverage](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=coverage)](https://sonarcloud.io/component_measures?id=WireMock-Net_WireMock.Net&metric=coverage) [![codecov](https://codecov.io/gh/wiremock/WireMock.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/wiremock/WireMock.Net)|
@@ -37,7 +41,7 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co

 ### :package: NuGet packages

-| | Official | Preview [:information_source:](https://github.com/wiremock/WireMock.Net/wiki/MyGet-preview-versions) |
+| | Official | Preview [:information_source:](https://wiremock.org/dotnet/MyGet-preview-versions) |
 | - | - | - |
 | &nbsp;&nbsp;**WireMock.Net** | [![NuGet Badge WireMock.Net](https://img.shields.io/nuget/v/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |  [![MyGet Badge WireMock.Net](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net)
 | &nbsp;&nbsp;**WireMock.Net.Minimal** 🔺| [![NuGet Badge WireMock.Net.Minimal](https://img.shields.io/nuget/v/WireMock.Net.Minimal)](https://www.nuget.org/packages/WireMock.Net.Minimal) |  [![MyGet Badge WireMock.Net](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Minimal?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Minimal)
@@ -49,7 +53,9 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 | &nbsp;&nbsp;**WireMock.Net.AwesomeAssertions** | [![NuGet Badge WireMock.Net.AwesomeAssertions](https://img.shields.io/nuget/v/WireMock.Net.AwesomeAssertions)](https://www.nuget.org/packages/WireMock.Net.AwesomeAssertions) | [![MyGet Badge WireMock.Net.AwesomeAssertions](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.AwesomeAssertions?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.AwesomeAssertions)
 | &nbsp;&nbsp;**WireMock.Net.FluentAssertions** | [![NuGet Badge WireMock.Net.FluentAssertions](https://img.shields.io/nuget/v/WireMock.Net.FluentAssertions)](https://www.nuget.org/packages/WireMock.Net.FluentAssertions) | [![MyGet Badge WireMock.Net.FluentAssertions](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.FluentAssertions?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.FluentAssertions)
 | &nbsp;&nbsp;**WireMock.Net.xUnit** | [![NuGet Badge WireMock.Net.xUnit](https://img.shields.io/nuget/v/WireMock.Net.xUnit)](https://www.nuget.org/packages/WireMock.Net.xUnit) | [![MyGet Badge WireMock.Net.xUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.xUnit?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.xUnit)
+| &nbsp;&nbsp;**WireMock.Net.xUnit.v3** | [![NuGet Badge WireMock.Net.xUnit](https://img.shields.io/nuget/v/WireMock.Net.xUnit.v3)](https://www.nuget.org/packages/WireMock.Net.xUnit.v3) | [![MyGet Badge WireMock.Net.xUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.xUnit.v3?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.xUnit.v3)
 | &nbsp;&nbsp;**WireMock.Net.TUnit** | [![NuGet Badge WireMock.Net.TUnit](https://img.shields.io/nuget/v/WireMock.Net.TUnit)](https://www.nuget.org/packages/WireMock.Net.TUnit) | [![MyGet Badge WireMock.Net.TUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.TUnit?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.TUnit)
+| &nbsp;&nbsp;**WireMock.Net.NUnit** | [![NuGet Badge WireMock.Net.NUnit](https://img.shields.io/nuget/v/WireMock.Net.NUnit)](https://www.nuget.org/packages/WireMock.Net.NUnit) | [![MyGet Badge WireMock.Net.TUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.NUnit?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.NUnit)
 | | | |
 | &nbsp;&nbsp;**WireMock.Net.Extensions.Routing** | [![NuGet Badge WireMock.Net.Extensions.Routing](https://img.shields.io/nuget/v/WireMock.Net.Extensions.Routing)](https://www.nuget.org/packages/WireMock.Net.Extensions.Routing) | [![MyGet Badge WireMock.Net.Extensions.Routing](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Extensions.Routing?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Extensions.Routing)
 | &nbsp;&nbsp;**WireMock.Net.Matchers.CSharpCode** | [![NuGet Badge WireMock.Net.Matchers.CSharpCode](https://img.shields.io/nuget/v/WireMock.Net.Matchers.CSharpCode)](https://www.nuget.org/packages/WireMock.Net.Matchers.CSharpCode) | [![MyGet Badge WireMock.Net.Matchers.CSharpCode](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Matchers.CSharpCode?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Matchers.CSharpCode)
@@ -89,52 +95,55 @@ To still enable this feature, you need to add the `Environment` category to the
 ---

 ## :memo: Development
-For the supported frameworks and build information, see [this](https://github.com/wiremock/WireMock.Net/wiki/Development-Information) page.
+For the supported frameworks and build information, see [this](https://wiremock.org/dotnet/development-information) page.

 ## :star: Stubbing
 A core feature of WireMock.Net is the ability to return predefined HTTP responses for requests matching criteria.
-See [Wiki : Stubbing](https://github.com/wiremock/WireMock.Net/wiki/Stubbing).
+See [Stubbing](https://wiremock.org/dotnet/stubbing).

 ## :star: Request Matching
-WireMock.Net support advanced request-matching logic, see [Wiki : Request Matching](https://github.com/wiremock/WireMock.Net/wiki/Request-Matching).
+WireMock.Net support advanced request-matching logic, see [Request Matching](https://wiremock.org/dotnet/request-matching).

 ## :star: Response Templating
-The response which is returned WireMock.Net can be changed using templating. This is described here [Wiki : Response Templating](https://github.com/wiremock/WireMock.Net/wiki/Response-Templating).
+The response which is returned WireMock.Net can be changed using templating. This is described here [Response Templating](https://wiremock.org/dotnet/response-templating).

 ## :star: Admin API Reference
-The WireMock admin API provides functionality to define the mappings via a http interface see [Wiki : Admin API Reference](https://github.com/StefH/WireMock.Net/wiki/Admin-API-Reference).
+The WireMock admin API provides functionality to define the mappings via a http interface see [Admin API Reference](https://wiremock.org/dotnet/admin-api-reference).

 ## :star: Using
 WireMock.Net can be used in several ways:

 ### UnitTesting
 You can use your favorite test framework and use WireMock within your tests, see
-[Wiki : UnitTesting](https://github.com/StefH/WireMock.Net/wiki/Using-WireMock-in-UnitTests).
+[UnitTesting](https://wiremock.org/dotnet/using-wiremock-in-unittests).

 ### Unit/Integration Testing using Testcontainers.DotNet
-See [Wiki : WireMock.Net.Testcontainers](https://github.com/wiremock/WireMock.Net/wiki/Using-WireMock.Net.Testcontainers) on how to build a WireMock.Net Docker container which can be used in Unit/Integration testing.
+See [WireMock.Net.Testcontainers](https://wiremock.org/dotnet/using-wiremock-net-testcontainers/) on how to build a WireMock.Net Docker container which can be used in Unit/Integration testing.

 ### Unit/Integration Testing using an an Aspire Distributed Application
-See [Wiki : WireMock.Net.Aspire](https://github.com/wiremock/WireMock.Net/wiki/Using-WireMock.Net.Aspire) on how to use WireMock.Net as an Aspire Hosted application to do Unit/Integration testing.
+See [WireMock.Net.Aspire](https://wiremock.org/dotnet/using-wiremock-net-Aspire) on how to use WireMock.Net as an Aspire Hosted application to do Unit/Integration testing.

 ### As a dotnet tool
-It's simple to install WireMock.Net as (global) dotnet tool, see [Wiki : dotnet tool](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-dotnet-tool).
+It's simple to install WireMock.Net as (global) dotnet tool, see [dotnet tool](https://wiremock.org/dotnet/wiremock-as-dotnet-tool).

 ### As standalone process / console application
-This is quite straight forward to launch a mock server within a console application, see [Wiki : Standalone Process](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-a-standalone-process).
+This is quite straight forward to launch a mock server within a console application, see [Standalone Process](https://wiremock.org/dotnet/wiremock-as-a-standalone-process).

 ### As a Windows Service
-You can also run WireMock.Net as a Windows Service, follow this [WireMock-as-a-Windows-Service](https://github.com/wiremock/WireMock.Net/wiki/WireMock-as-a-Windows-Service).
+You can also run WireMock.Net as a Windows Service, follow this [Windows Service](https://wiremock.org/dotnet/wiremock-as-a-windows-service).

 ### As a Web Job in Azure or application in IIS
-See this link [WireMock-as-a-(Azure)-Web-App](https://github.com/wiremock/WireMock.Net/wiki/WireMock-as-a-(Azure)-Web-App)
+See this link [WireMock-as-a-(Azure)-Web-App](https://wiremock.org/dotnet/wiremock-as-a-azure-web-app/)

 ### In a docker container
 There is also a Linux and Windows-Nano container available at [hub.docker.com](https://hub.docker.com/r/sheyenrath).
 For more details see also [Docker](https://github.com/wiremock/WireMock.Net-docker).

-#### HTTPS / SSL
-More details on using HTTPS (SSL) can be found here [Wiki : HTTPS](https://github.com/wiremock/WireMock.Net/wiki/Using-HTTPS-(SSL))
+### HTTPS / SSL
+More details on using HTTPS (SSL) can be found here [HTTPS](https://wiremock.org/dotnet/using-https-ssl/)
+
+## :books: Documentation
+For more info, see also this documentation page: [What is WireMock.Net](https://wiremock.org/dotnet/what-is-wiremock-net/).

 ---

--- a/Solution.sln
+++ b/Solution.sln
@@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31521.260
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11205.157
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8F890C6F-9ACC-438D-928A-AD61CDA862F2}"
 EndProject
@@ -144,6 +144,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Extensions.Rou
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.ProtoBuf", "src\WireMock.Net.ProtoBuf\WireMock.Net.ProtoBuf.csproj", "{B47413AA-55D3-49A7-896A-17ADBFF72407}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.xUnit.v3", "src\WireMock.Net.xUnit.v3\WireMock.Net.xUnit.v3.csproj", "{4F46BD02-BEBC-4B2D-B857-4169AD1FB067}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.NUnit", "src\WireMock.Net.NUnit\WireMock.Net.NUnit.csproj", "{2DBBD70D-8051-441F-92BB-FF9B8B4B4982}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -350,6 +354,14 @@ Global
 		{B47413AA-55D3-49A7-896A-17ADBFF72407}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B47413AA-55D3-49A7-896A-17ADBFF72407}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B47413AA-55D3-49A7-896A-17ADBFF72407}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F46BD02-BEBC-4B2D-B857-4169AD1FB067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F46BD02-BEBC-4B2D-B857-4169AD1FB067}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F46BD02-BEBC-4B2D-B857-4169AD1FB067}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F46BD02-BEBC-4B2D-B857-4169AD1FB067}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2DBBD70D-8051-441F-92BB-FF9B8B4B4982}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2DBBD70D-8051-441F-92BB-FF9B8B4B4982}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2DBBD70D-8051-441F-92BB-FF9B8B4B4982}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2DBBD70D-8051-441F-92BB-FF9B8B4B4982}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -407,6 +419,8 @@ Global
 		{3FCBCA9C-9DB0-4A96-B47E-30470764CC9C} = {0BB8B634-407A-4610-A91F-11586990767A}
 		{1E874C8F-08A2-493B-8421-619F9A6E9E77} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{B47413AA-55D3-49A7-896A-17ADBFF72407} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{4F46BD02-BEBC-4B2D-B857-4169AD1FB067} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{2DBBD70D-8051-441F-92BB-FF9B8B4B4982} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}
--- a/azure-pipelines-ci.yml
+++ b/azure-pipelines-ci.yml
@@ -100,7 +100,7 @@ jobs:
 - job: Windows_Build_Test

  pool:
-    vmImage: 'windows-2022'
+    vmImage: 'windows-2025'

  steps:
  - task: UseDotNet@2
@@ -141,9 +141,13 @@ jobs:
  dependsOn: Windows_Build_Test

  pool:
-    vmImage: 'windows-2022'
+    vmImage: 'windows-2025'

  steps:
+  - script: |
+      echo "BuildId = $(buildId)"
+    displayName: 'Print buildId'
+
  - task: UseDotNet@2
    displayName: Use .NET 8.0
    inputs:
--- a/azure-pipelines-nuget.yml
+++ b/azure-pipelines-nuget.yml
@@ -1,5 +1,5 @@
 pool:
-  vmImage: 'windows-2022'
+  vmImage: 'windows-2025'

 variables:
  Prerelease: ''
--- a/examples-Aspire/AspireApp1.AppHost/AspireApp1.AppHost.csproj
+++ b/examples-Aspire/AspireApp1.AppHost/AspireApp1.AppHost.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">

-    <Sdk Name="Aspire.AppHost.Sdk" Version="9.2.0" />
+    <Sdk Name="Aspire.AppHost.Sdk" Version="13.1.0" />

    <PropertyGroup>
        <OutputType>Exe</OutputType>
@@ -18,7 +18,16 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.AppHost" Version="9.2.0" />
+        <PackageReference Include="Aspire.Hosting.AppHost" Version="13.1.0" />
    </ItemGroup>

-</Project>
+    <ItemGroup>
+        <None Update="__admin\mappings\*.proto">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="__admin\mappings\*.json">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
+
+</Project>
--- a/examples-Aspire/AspireApp1.AppHost/Program.cs
+++ b/examples-Aspire/AspireApp1.AppHost/Program.cs
@@ -4,12 +4,25 @@ var builder = DistributedApplication.CreateBuilder(args);

 // IResourceBuilder<ProjectResource> apiService = builder.AddProject<Projects.AspireApp1_ApiService>("apiservice");

-var mappingsPath = Path.Combine(Directory.GetCurrentDirectory(), "WireMockMappings");
+var mappingsPath = Path.Combine(Directory.GetCurrentDirectory(), "__admin", "mappings");

-IResourceBuilder<WireMockServerResource> apiService = builder
-    .AddWireMock("apiservice", WireMockServerArguments.DefaultPort)
+//IResourceBuilder<WireMockServerResource> apiService1 = builder
+//    //.AddWireMock("apiservice", WireMockServerArguments.DefaultPort)
+//    .AddWireMock("apiservice1", "http://*:8081", "grpc://*:9091")
+//    .AsHttp2Service()
+//    .WithMappingsPath(mappingsPath)
+//    .WithReadStaticMappings()
+//    .WithWatchStaticMappings()
+//    .WithApiMappingBuilder(WeatherForecastApiMock.BuildAsync);
+
+IResourceBuilder<WireMockServerResource> apiService2 = builder
+    .AddWireMock("apiservice", async args =>
+    {
+        args.WithAdditionalUrls("http://*:8081", "grpc://*:9093");
+        args.WithProtoDefinition("my-greeter", await File.ReadAllTextAsync(Path.Combine(mappingsPath, "greet.proto")));
+    })
+    .AsHttp2Service()
    .WithMappingsPath(mappingsPath)
-    .WithReadStaticMappings()
    .WithWatchStaticMappings()
    .WithApiMappingBuilder(WeatherForecastApiMock.BuildAsync);

@@ -45,6 +58,7 @@ IResourceBuilder<WireMockServerResource> apiService = builder

 builder.AddProject<Projects.AspireApp1_Web>("webfrontend")
    .WithExternalHttpEndpoints()
-    .WithReference(apiService);
+    .WithReference(apiService2)
+    .WaitFor(apiService2);

-builder.Build().Run();
+await builder.Build().RunAsync();
--- a/examples-Aspire/AspireApp1.AppHost/__admin/mappings/873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json
+++ b/examples-Aspire/AspireApp1.AppHost/__admin/mappings/873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json
--- a/examples-Aspire/AspireApp1.AppHost/__admin/mappings/greet.proto
+++ b/examples-Aspire/AspireApp1.AppHost/__admin/mappings/greet.proto
@@ -0,0 +1,21 @@
+syntax = "proto3";
+
+package greet;
+
+service Greeter {
+  rpc SayHello (HelloRequest) returns (HelloReply);
+}
+
+message HelloRequest {
+  string name = 1;
+}
+
+message HelloReply {
+  string message = 1;
+  enum PhoneType {
+    none = 0;
+    mobile = 1;
+    home = 2;
+  }
+  PhoneType phoneType = 2;
+}
--- a/examples-Aspire/AspireApp1.AppHost/__admin/mappings/protobuf-mapping-4.json
+++ b/examples-Aspire/AspireApp1.AppHost/__admin/mappings/protobuf-mapping-4.json
@@ -0,0 +1,40 @@
+{
+  "Guid": "351f0240-bba0-4bcb-93c6-1feba0fe0004",
+  "Title": "ProtoBuf Mapping 4",
+  "Request": {
+    "Path": {
+      "Matchers": [
+        {
+          "Name": "WildcardMatcher",
+          "Pattern": "/greet.Greeter/SayHello",
+          "IgnoreCase": false
+        }
+      ]
+    },
+    "Methods": [
+      "POST"
+    ],
+    "Body": {
+      "Matcher": {
+        "Name": "ProtoBufMatcher",
+        "ProtoBufMessageType": "greet.HelloRequest"
+      }
+    }
+  },
+  "Response": {
+    "BodyAsJson": {
+      "message": "hello {{request.BodyAsJson.name}} {{request.method}}"
+    },
+    "UseTransformer": true,
+    "TransformerType": "Handlebars",
+    "TransformerReplaceNodeOptions": "EvaluateAndTryToConvert",
+    "Headers": {
+      "Content-Type": "application/grpc"
+    },
+    "TrailingHeaders": {
+      "grpc-status": "0"
+    },
+    "ProtoBufMessageType": "greet.HelloReply"
+  },
+  "ProtoDefinition": "my-greeter"
+}
--- a/examples-Aspire/AspireApp1.AppHostOriginal/AspireApp1.AppHostOriginal.csproj
+++ b/examples-Aspire/AspireApp1.AppHostOriginal/AspireApp1.AppHostOriginal.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">

-    <Sdk Name="Aspire.AppHost.Sdk" Version="9.2.0" />
+    <Sdk Name="Aspire.AppHost.Sdk" Version="13.1.0" />

    <PropertyGroup>
        <OutputType>Exe</OutputType>
@@ -15,7 +15,7 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.AppHost" Version="9.2.0" />
+        <PackageReference Include="Aspire.Hosting.AppHost" Version="13.1.0" />
    </ItemGroup>

 </Project>
--- a/examples-Aspire/AspireApp1.Tests/AspireApp1.Tests.csproj
+++ b/examples-Aspire/AspireApp1.Tests/AspireApp1.Tests.csproj
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Aspire.Hosting.Testing" Version="8.0.0" />
+    <PackageReference Include="Aspire.Hosting.Testing" Version="13.1.0" />
    <PackageReference Include="coverlet.collector" Version="6.0.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
    <PackageReference Include="xunit" Version="2.5.3" />
--- a/examples/WireMock.Net.Console.NET8/MainApp.cs
+++ b/examples/WireMock.Net.Console.NET8/MainApp.cs
@@ -267,7 +267,7 @@ namespace WireMock.Net.ConsoleApplication
            }
        }

-        public static void Run()
+        public static async Task RunAsync()
        {
            //RunSse();
            //RunOnLocal();
@@ -290,25 +290,56 @@ namespace WireMock.Net.ConsoleApplication

            var server = WireMockServer.Start();

+            //server
+            //    .Given(Request.Create()
+            //        .WithPath("todos")
+            //        .UsingGet()
+            //    )
+            //    .RespondWith(Response.Create()
+            //        .WithBodyAsJson(todos.Values)
+            //    );
+
+            //server
+            //    .Given(Request.Create()
+            //        .UsingGet()
+            //        .WithPath("todos")
+            //        .WithParam("id")
+            //    )
+            //    .RespondWith(Response.Create()
+            //        .WithBodyAsJson(rm => todos[int.Parse(rm.Query!["id"].ToString())])
+            //    );
+
+            var pX = 0.80;
            server
-                .Given(Request.Create()
-                    .WithPath("todos")
-                    .UsingGet()
-                )
-                .RespondWith(Response.Create()
-                    .WithBodyAsJson(todos.Values)
-                );
+                .Given(Request.Create().UsingGet().WithPath("/p"))
+                .WithProbability(pX)
+                .RespondWith(Response.Create().WithStatusCode(200).WithBody("X"));

            server
-                .Given(Request.Create()
-                    .UsingGet()
-                    .WithPath("todos")
-                    .WithParam("id")
-                )
-                .RespondWith(Response.Create()
-                    .WithBodyAsJson(rm => todos[int.Parse(rm.Query!["id"].ToString())])
-                );
+                .Given(Request.Create().UsingGet().WithPath("/p"))
+                .RespondWith(Response.Create().WithStatusCode(200).WithBody("default"));

+            // Act
+            var requestUri = new Uri($"http://localhost:{server.Port}/p");
+            var c = server.CreateClient();
+            var xCount = 0;
+            var defaultCount = 0;
+            var tot = 1000;
+            for (var i = 0; i < tot; i++)
+            {
+                var response = await c.GetAsync(requestUri);
+                var value = await response.Content.ReadAsStringAsync();
+                if (value == "X")
+                {
+                    xCount++;
+                }
+                else if (value == "default")
+                {
+                    defaultCount++;
+                }
+            }
+            System.Console.WriteLine("X = {0} ; default = {1} ; pX = {2:0.00} ; valueX = {3:0.00}", xCount, defaultCount, pX, 1.0 * xCount / tot);
+            return;
            using var httpAndHttpsWithPort = WireMockServer.Start(new WireMockServerSettings
            {
                HostingScheme = HostingScheme.HttpAndHttps,
--- a/examples/WireMock.Net.Console.NET8/Program.cs
+++ b/examples/WireMock.Net.Console.NET8/Program.cs
@@ -2,6 +2,7 @@

 using System.IO;
 using System.Reflection;
+using System.Threading.Tasks;
 using log4net;
 using log4net.Config;
 using log4net.Repository;
@@ -14,10 +15,10 @@ static class Program
    private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
    private static readonly ILog Log = LogManager.GetLogger(typeof(Program));

-    static void Main(params string[] args)
+    static async Task Main(params string[] args)
    {
        XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));

-        MainApp.Run();
+        await MainApp.RunAsync();
    }
 }
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/MatcherModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/MatcherModel.cs
@@ -22,7 +22,7 @@ public class MatcherModel
    public object? Pattern { get; set; }

    /// <summary>
-    /// Gets or sets the patterns. Can be array of strings (default) or an array of objects.
+    /// Gets or sets the patterns. Can be an array of strings (default) or an array of objects.
    /// </summary>
    public object[]? Patterns { get; set; }

--- a/src/WireMock.Net.Abstractions/Admin/Mappings/StatusModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/StatusModel.cs
@@ -24,4 +24,13 @@ public class StatusModel
    /// The error message.
    /// </summary>
    public string? Error { get; set; }
+
+    /// <summary>
+    /// Returns a string that represents the current status model, including its unique identifier, status, and error information.
+    /// </summary>
+    /// <returns>A string containing the values of the Guid, Status, and Error properties formatted for display.</returns>
+    public override string ToString()
+    {
+        return $"StatusModel [Guid={Guid}, Status={Status}, Error={Error}]";
+    }
 }
--- a/src/WireMock.Net.Abstractions/Admin/Settings/ProxyUrlReplaceSettingsModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Settings/ProxyUrlReplaceSettingsModel.cs
@@ -1,5 +1,7 @@
 // Copyright © WireMock.Net

+using WireMock.Types;
+
 namespace WireMock.Admin.Settings;

 /// <summary>
@@ -11,15 +13,25 @@ public class ProxyUrlReplaceSettingsModel
    /// <summary>
    /// The old path value to be replaced by the new path value
    /// </summary>
-    public string OldValue { get; set; } = null!;
+    public string? OldValue { get; set; }

    /// <summary>
    /// The new path value to replace the old value with
    /// </summary>
-    public string NewValue { get; set; } = null!;
+    public string? NewValue { get; set; }

    /// <summary>
-    /// Defines if the case should be ignore when replacing.
+    /// Defines if the case should be ignored when replacing.
    /// </summary>
    public bool IgnoreCase { get; set; }
+
+    /// <summary>
+    /// Holds the transformation template.
+    /// </summary>
+    public string? TransformTemplate { get; set; }
+
+    /// <summary>
+    /// The transformer type.
+    /// </summary>
+    public TransformerType TransformerType { get; set; } = TransformerType.Handlebars;
 }
--- a/src/WireMock.Net.Abstractions/BuilderExtensions/RequestModelBuilder.cs
+++ b/src/WireMock.Net.Abstractions/BuilderExtensions/RequestModelBuilder.cs
@@ -1,6 +1,7 @@
 // Copyright © WireMock.Net

 using System;
+using WireMock.Validators;

 // ReSharper disable once CheckNamespace
 namespace WireMock.Admin.Mappings;
@@ -94,9 +95,14 @@ public partial class RequestModelBuilder
    }

    /// <summary>
-    /// Set the Path.
+    /// Set the Path. Must start with a forward slash (/).
    /// </summary>
-    public RequestModelBuilder WithPath(string value) => WithPath(() => value);
+    public RequestModelBuilder WithPath(string value)
+    {
+        PathValidator.ValidateAndThrow(value);
+
+        return WithPath(() => value);
+    }

    /// <summary>
    /// Set the Path.
--- a/src/WireMock.Net.Abstractions/Validators/PathValidator.cs
+++ b/src/WireMock.Net.Abstractions/Validators/PathValidator.cs
@@ -0,0 +1,19 @@
+// Copyright © WireMock.Net
+
+using System;
+
+namespace WireMock.Validators;
+
+public static class PathValidator
+{
+    /// <summary>
+    /// A valid path must start with a '/' and cannot be null, empty or whitespace.
+    /// </summary>
+    public static void ValidateAndThrow(string? path, string? paramName = null)
+    {
+        if (string.IsNullOrWhiteSpace(path) || path?.StartsWith("/") == false)
+        {
+            throw new ArgumentException("Path must start with a '/' and cannot be null, empty or whitespace.", paramName ?? nameof(path));
+        }
+    }
+}
--- a/src/WireMock.Net.Aspire/WireMock.Net.Aspire.csproj
+++ b/src/WireMock.Net.Aspire/WireMock.Net.Aspire.csproj
@@ -30,7 +30,10 @@
    </ItemGroup>

    <ItemGroup>
-        <Compile Include="..\WireMock.Net.Minimal\Util\EnhancedFileSystemWatcher.cs" Link="Utils\EnhancedFileSystemWatcher.cs" />
+        <Compile Include="..\WireMock.Net.Minimal\Util\EnhancedFileSystemWatcher.cs" Link="Util\EnhancedFileSystemWatcher.cs" />
+        <Compile Include="..\WireMock.Net.Minimal\Constants\WireMockConstants.cs" Link="Constants\WireMockConstants.cs" />
+        <Compile Include="..\WireMock.Net.Shared\Constants\RegexConstants.cs" Link="Constants\RegexConstants.cs" />
+        <Compile Include="..\WireMock.Net.Minimal\Util\PortUtils.cs" Link="Util\PortUtils.cs" />
    </ItemGroup>

    <PropertyGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
@@ -42,7 +45,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Aspire.Hosting" Version="9.2.0" />
+        <PackageReference Include="Aspire.Hosting" Version="13.1.0" />
    </ItemGroup>

    <ItemGroup>
--- a/src/WireMock.Net.Aspire/WireMockHealthCheck.cs
+++ b/src/WireMock.Net.Aspire/WireMockHealthCheck.cs
@@ -0,0 +1,44 @@
+// Copyright © WireMock.Net
+
+using Aspire.Hosting.ApplicationModel;
+using Microsoft.Extensions.Diagnostics.HealthChecks;
+using WireMock.Client;
+
+namespace WireMock.Net.Aspire;
+
+/// <summary>
+/// WireMockHealthCheck
+/// </summary>
+public class WireMockHealthCheck(WireMockServerResource resource) : IHealthCheck
+{
+    private const string HealthStatusHealthy = "Healthy";
+
+    /// <inheritdoc />
+    public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
+    {
+        if (!await IsHealthyAsync(resource.AdminApi.Value, cancellationToken))
+        {
+            return HealthCheckResult.Unhealthy("WireMock.Net is not healthy");
+        }
+
+        if (resource.ApiMappingState == WireMockMappingState.NotSubmitted)
+        {
+            return HealthCheckResult.Unhealthy("WireMock.Net has not received mappings");
+        }
+
+        return HealthCheckResult.Healthy();
+    }
+
+    private static async Task<bool> IsHealthyAsync(IWireMockAdminApi adminApi, CancellationToken cancellationToken)
+    {
+        try
+        {
+            var status = await adminApi.GetHealthAsync(cancellationToken);
+            return string.Equals(status, HealthStatusHealthy, StringComparison.OrdinalIgnoreCase);
+        }
+        catch
+        {
+            return false;
+        }
+    }
+}
--- a/src/WireMock.Net.Aspire/WireMockMappingState.cs
+++ b/src/WireMock.Net.Aspire/WireMockMappingState.cs
@@ -0,0 +1,12 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.Net.Aspire;
+
+internal enum WireMockMappingState
+{
+    NoMappings = 0,
+
+    NotSubmitted = 1,
+
+    Submitted = 2
+}
--- a/src/WireMock.Net.Aspire/WireMockServerArguments.cs
+++ b/src/WireMock.Net.Aspire/WireMockServerArguments.cs
@@ -1,7 +1,9 @@
 // Copyright © WireMock.Net

 using System.Diagnostics.CodeAnalysis;
+using Stef.Validation;
 using WireMock.Client.Builders;
+using WireMock.Util;

 // ReSharper disable once CheckNamespace
 namespace Aspire.Hosting;
@@ -21,10 +23,15 @@ public class WireMockServerArguments
    private const string DefaultLogger = "WireMockConsoleLogger";

    /// <summary>
-    /// The HTTP port where WireMock.Net is listening.
+    /// The HTTP ports where WireMock.Net is listening on.
    /// If not defined, .NET Aspire automatically assigns a random port.
    /// </summary>
-    public int? HttpPort { get; set; }
+    public List<int> HttpPorts { get; set; } = [];
+
+    /// <summary>
+    /// Additional Urls on which WireMock listens.
+    /// </summary>
+    public List<string> AdditionalUrls { get; set; } = [];

    /// <summary>
    /// The admin username.
@@ -67,6 +74,42 @@ public class WireMockServerArguments
    /// </summary>
    public Func<AdminApiMappingBuilder, CancellationToken, Task>? ApiMappingBuilder { get; set; }

+    /// <summary>
+    /// Grpc ProtoDefinitions.
+    /// </summary>
+    public Dictionary<string, string[]> ProtoDefinitions { get; set; } = [];
+
+    /// <summary>
+    /// Add an additional Urls on which WireMock should listen.
+    /// </summary>
+    /// <param name="additionalUrls">The additional urls which the WireMock Server should listen on.</param>
+    public void WithAdditionalUrls(params string[] additionalUrls)
+    {
+        foreach (var url in additionalUrls)
+        {
+            if (!PortUtils.TryExtract(Guard.NotNullOrEmpty(url), out _, out _, out _, out _, out var port))
+            {
+                throw new ArgumentException($"The URL '{url}' is not valid.");
+            }
+
+            AdditionalUrls.Add(Guard.NotNullOrWhiteSpace(url));
+            HttpPorts.Add(port);
+        }
+    }
+
+    /// <summary>
+    /// Add a Grpc ProtoDefinition at server-level.
+    /// </summary>
+    /// <param name="id">Unique identifier for the ProtoDefinition.</param>
+    /// <param name="protoDefinitions">The ProtoDefinition as text.</param>
+    public void WithProtoDefinition(string id, params string[] protoDefinitions)
+    {
+        Guard.NotNullOrWhiteSpace(id);
+        Guard.NotNullOrEmpty(protoDefinitions);
+
+        ProtoDefinitions[id] = protoDefinitions;
+    }
+
    /// <summary>
    /// Converts the current instance's properties to an array of command-line arguments for starting the WireMock.Net server.
    /// </summary>
@@ -95,6 +138,11 @@ public class WireMockServerArguments
            Add(args, "--WatchStaticMappingsInSubdirectories", "true");
        }

+        if (AdditionalUrls.Count > 0)
+        {
+            Add(args, "--Urls", $"http://*:{HttpContainerPort} {string.Join(' ', AdditionalUrls)}");
+        }
+
        return args
            .SelectMany(k => new[] { k.Key, k.Value })
            .ToArray();
--- a/src/WireMock.Net.Aspire/WireMockServerBuilderExtensions.cs
+++ b/src/WireMock.Net.Aspire/WireMockServerBuilderExtensions.cs
@@ -3,10 +3,12 @@
 using Aspire.Hosting.ApplicationModel;
 using Aspire.Hosting.Lifecycle;
 using Aspire.Hosting.WireMock;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Stef.Validation;
 using WireMock.Client.Builders;
 using WireMock.Net.Aspire;
+using WireMock.Util;

 // ReSharper disable once CheckNamespace
 namespace Aspire.Hosting;
@@ -33,9 +35,31 @@ public static class WireMockServerBuilderExtensions
        Guard.NotNullOrWhiteSpace(name);
        Guard.Condition(port, p => p is null or > 0 and <= ushort.MaxValue);

-        return builder.AddWireMock(name, callback =>
+        return builder.AddWireMock(name, serverArguments =>
        {
-            callback.HttpPort = port;
+            if (port != null)
+            {
+                serverArguments.HttpPorts = [port.Value];
+            }
+        });
+    }
+
+    /// <summary>
+    /// Adds a WireMock.Net Server resource to the application model.
+    /// </summary>
+    /// <param name="builder">The <see cref="IDistributedApplicationBuilder"/>.</param>
+    /// <param name="name">The name of the resource. This name will be used as the connection string name when referenced in a dependency.</param>
+    /// <param name="additionalUrls">The additional urls which the WireMock Server should listen on.</param>
+    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
+    public static IResourceBuilder<WireMockServerResource> AddWireMock(this IDistributedApplicationBuilder builder, string name, params string[] additionalUrls)
+    {
+        Guard.NotNull(builder);
+        Guard.NotNullOrWhiteSpace(name);
+        Guard.NotNull(additionalUrls);
+
+        return builder.AddWireMock(name, serverArguments =>
+        {
+            serverArguments.WithAdditionalUrls(additionalUrls);
        });
    }

@@ -53,13 +77,50 @@ public static class WireMockServerBuilderExtensions
        Guard.NotNull(arguments);

        var wireMockContainerResource = new WireMockServerResource(name, arguments);
+
+        var healthCheckKey = $"{name}_check";
+        var healthCheckRegistration = new HealthCheckRegistration(
+            healthCheckKey,
+            _ => new WireMockHealthCheck(wireMockContainerResource),
+            failureStatus: null,
+            tags: null);
+        builder.Services.AddHealthChecks().Add(healthCheckRegistration);
+
        var resourceBuilder = builder
            .AddResource(wireMockContainerResource)
            .WithImage(DefaultLinuxImage)
            .WithEnvironment(ctx => ctx.EnvironmentVariables.Add("DOTNET_USE_POLLING_FILE_WATCHER", "1")) // https://khalidabuhakmeh.com/aspnet-docker-gotchas-and-workarounds#configuration-reloads-and-filesystemwatcher
-            .WithHttpEndpoint(port: arguments.HttpPort, targetPort: WireMockServerArguments.HttpContainerPort)
+            .WithHealthCheck(healthCheckKey)
            .WithWireMockInspectorCommand();

+        if (arguments.HttpPorts.Count == 0)
+        {
+            resourceBuilder = resourceBuilder.WithHttpEndpoint(port: null, targetPort: WireMockServerArguments.HttpContainerPort);
+        }
+        else if (arguments.HttpPorts.Count == 1)
+        {
+            resourceBuilder = resourceBuilder.WithHttpEndpoint(port: arguments.HttpPorts[0], targetPort: WireMockServerArguments.HttpContainerPort);
+        }
+        else
+        {
+            // Required for the default admin endpoint and health checks
+            resourceBuilder = resourceBuilder.WithHttpEndpoint(port: null, targetPort: WireMockServerArguments.HttpContainerPort);
+
+            var anyIsHttp2 = false;
+            foreach (var url in arguments.AdditionalUrls)
+            {
+                PortUtils.TryExtract(url, out _, out var isHttp2, out var scheme, out _, out var httpPort);
+                anyIsHttp2 |= isHttp2;
+
+                resourceBuilder = resourceBuilder.WithEndpoint(port: httpPort, targetPort: httpPort, scheme: scheme, name: $"{scheme}-{httpPort}");
+            }
+
+            if (anyIsHttp2)
+            {
+                resourceBuilder = resourceBuilder.AsHttp2Service();
+            }
+        }
+
        if (!string.IsNullOrEmpty(arguments.MappingsPath))
        {
            resourceBuilder = resourceBuilder.WithBindMount(arguments.MappingsPath, DefaultLinuxMappingsPath);
@@ -73,6 +134,9 @@ public static class WireMockServerBuilderExtensions
            }
        });

+        // Always add the lifecycle hook to support dynamic mappings and proto definitions
+        resourceBuilder.ApplicationBuilder.Services.TryAddLifecycleHook<WireMockServerLifecycleHook>();
+
        return resourceBuilder;
    }

@@ -83,7 +147,10 @@ public static class WireMockServerBuilderExtensions
    /// <param name="name">The name of the resource. This name will be used as the connection string name when referenced in a dependency.</param>
    /// <param name="callback">A callback that allows for setting the <see cref="WireMockServerArguments"/>.</param>
    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
-    public static IResourceBuilder<WireMockServerResource> AddWireMock(this IDistributedApplicationBuilder builder, string name, Action<WireMockServerArguments> callback)
+    public static IResourceBuilder<WireMockServerResource> AddWireMock(
+        this IDistributedApplicationBuilder builder,
+        string name,
+        Action<WireMockServerArguments> callback)
    {
        Guard.NotNull(builder);
        Guard.NotNullOrWhiteSpace(name);
@@ -154,7 +221,7 @@ public static class WireMockServerBuilderExtensions
    /// </summary>
    /// <param name="wiremock">The <see cref="IResourceBuilder{WireMockServerResource}"/>.</param>
    /// <param name="configure">Delegate that will be invoked to configure the WireMock.Net resource.</param>
-    /// <returns></returns>
+    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
    public static IResourceBuilder<WireMockServerResource> WithApiMappingBuilder(this IResourceBuilder<WireMockServerResource> wiremock, Func<AdminApiMappingBuilder, Task> configure)
    {
        return wiremock.WithApiMappingBuilder((adminApiMappingBuilder, _) => configure.Invoke(adminApiMappingBuilder));
@@ -165,13 +232,27 @@ public static class WireMockServerBuilderExtensions
    /// </summary>
    /// <param name="wiremock">The <see cref="IResourceBuilder{WireMockServerResource}"/>.</param>
    /// <param name="configure">Delegate that will be invoked to configure the WireMock.Net resource.</param>
-    /// <returns></returns>
+    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
    public static IResourceBuilder<WireMockServerResource> WithApiMappingBuilder(this IResourceBuilder<WireMockServerResource> wiremock, Func<AdminApiMappingBuilder, CancellationToken, Task> configure)
    {
        Guard.NotNull(wiremock);

-        wiremock.ApplicationBuilder.Services.TryAddLifecycleHook<WireMockServerLifecycleHook>();
        wiremock.Resource.Arguments.ApiMappingBuilder = configure;
+        wiremock.Resource.ApiMappingState = WireMockMappingState.NotSubmitted;
+
+        return wiremock;
+    }
+
+    /// <summary>
+    /// Add a Grpc ProtoDefinition at server-level.
+    /// </summary>
+    /// <param name="wiremock">The <see cref="IResourceBuilder{WireMockServerResource}"/>.</param>
+    /// <param name="id">Unique identifier for the ProtoDefinition.</param>
+    /// <param name="protoDefinitions">The ProtoDefinition as text.</param>
+    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
+    public static IResourceBuilder<WireMockServerResource> WithProtoDefinition(this IResourceBuilder<WireMockServerResource> wiremock, string id, params string[] protoDefinitions)
+    {
+        Guard.NotNull(wiremock).Resource.Arguments.WithProtoDefinition(id, protoDefinitions);

        return wiremock;
    }
@@ -183,11 +264,11 @@ public static class WireMockServerBuilderExtensions
    /// dotnet tool install WireMockInspector --global --no-cache --ignore-failed-sources
    /// </code>
    /// </summary>
-    /// <param name="builder">The <see cref="IResourceBuilder{WireMockNetResource}"/>.</param>
-    /// <returns></returns>
-    public static IResourceBuilder<WireMockServerResource> WithWireMockInspectorCommand(this IResourceBuilder<WireMockServerResource> builder)
+    /// <param name="wiremock">The <see cref="IResourceBuilder{WireMockNetResource}"/>.</param>
+    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
+    public static IResourceBuilder<WireMockServerResource> WithWireMockInspectorCommand(this IResourceBuilder<WireMockServerResource> wiremock)
    {
-        Guard.NotNull(builder);
+        Guard.NotNull(wiremock);

        CommandOptions commandOptions = new()
        {
@@ -197,13 +278,13 @@ public static class WireMockServerBuilderExtensions
            IconVariant = IconVariant.Filled
        };

-        builder.WithCommand(
+        wiremock.WithCommand(
            name: "wiremock-inspector",
            displayName: "WireMock Inspector",
-            executeCommand: _ => OnRunOpenInspectorCommandAsync(builder),
+            executeCommand: _ => OnRunOpenInspectorCommandAsync(wiremock),
            commandOptions: commandOptions);

-        return builder;
+        return wiremock;
    }

    private static Task<ExecuteCommandResult> OnRunOpenInspectorCommandAsync(IResourceBuilder<WireMockServerResource> builder)
--- a/src/WireMock.Net.Aspire/WireMockServerLifecycleHook.cs
+++ b/src/WireMock.Net.Aspire/WireMockServerLifecycleHook.cs
@@ -1,5 +1,6 @@
 // Copyright © WireMock.Net

+using System.Diagnostics;
 using Aspire.Hosting.ApplicationModel;
 using Aspire.Hosting.Lifecycle;
 using Microsoft.Extensions.Logging;
@@ -10,32 +11,49 @@ internal class WireMockServerLifecycleHook(ILoggerFactory loggerFactory) : IDist
 {
    private readonly CancellationTokenSource _shutdownCts = new();

-    public async Task AfterResourcesCreatedAsync(DistributedApplicationModel appModel, CancellationToken cancellationToken = default)
+    private CancellationTokenSource? _linkedCts;
+    private Task? _mappingTask;
+
+    public Task AfterEndpointsAllocatedAsync(DistributedApplicationModel appModel, CancellationToken cancellationToken = default)
    {
-        var cts = CancellationTokenSource.CreateLinkedTokenSource(_shutdownCts.Token, cancellationToken);
+        _linkedCts = CancellationTokenSource.CreateLinkedTokenSource(_shutdownCts.Token, cancellationToken);

-        var wireMockServerResources = appModel.Resources
-            .OfType<WireMockServerResource>()
-            .ToArray();
-
-        foreach (var wireMockServerResource in wireMockServerResources)
+        _mappingTask = Task.Run(async () =>
        {
-            wireMockServerResource.SetLogger(loggerFactory.CreateLogger<WireMockServerResource>());
+            var wireMockServerResources = appModel.Resources
+                .OfType<WireMockServerResource>()
+                .ToArray();

-            var endpoint = wireMockServerResource.GetEndpoint();
-            if (endpoint.IsAllocated)
+            foreach (var wireMockServerResource in wireMockServerResources)
            {
-                await wireMockServerResource.WaitForHealthAsync(cts.Token);
+                wireMockServerResource.SetLogger(loggerFactory.CreateLogger<WireMockServerResource>());

-                await wireMockServerResource.CallApiMappingBuilderActionAsync(cts.Token);
+                var endpoint = wireMockServerResource.GetEndpoint();
+                Debug.Assert(endpoint.IsAllocated);

-                wireMockServerResource.StartWatchingStaticMappings(cts.Token);
+                await wireMockServerResource.WaitForHealthAsync(_linkedCts.Token);
+
+                await wireMockServerResource.CallAddProtoDefinitionsAsync(_linkedCts.Token);
+
+                await wireMockServerResource.CallApiMappingBuilderActionAsync(_linkedCts.Token);
+
+                wireMockServerResource.StartWatchingStaticMappings(_linkedCts.Token);
            }
-        }
+        }, _linkedCts.Token);
+
+        return Task.CompletedTask;
    }

    public async ValueTask DisposeAsync()
    {
        await _shutdownCts.CancelAsync();
+
+        _linkedCts?.Dispose();
+        _shutdownCts.Dispose();
+
+        if (_mappingTask is not null)
+        {
+            await _mappingTask;
+        }
    }
 }
--- a/src/WireMock.Net.Aspire/WireMockServerResource.cs
+++ b/src/WireMock.Net.Aspire/WireMockServerResource.cs
@@ -5,6 +5,7 @@ using RestEase;
 using Stef.Validation;
 using WireMock.Client;
 using WireMock.Client.Extensions;
+using WireMock.Net.Aspire;
 using WireMock.Util;

 // ReSharper disable once CheckNamespace
@@ -19,6 +20,7 @@ public class WireMockServerResource : ContainerResource, IResourceWithServiceDis

    internal WireMockServerArguments Arguments { get; }
    internal Lazy<IWireMockAdminApi> AdminApi => new(CreateWireMockAdminApi);
+    internal WireMockMappingState ApiMappingState { get; set; } = WireMockMappingState.NoMappings;

    private ILogger? _logger;
    private EnhancedFileSystemWatcher? _enhancedFileSystemWatcher;
@@ -64,6 +66,36 @@ public class WireMockServerResource : ContainerResource, IResourceWithServiceDis

        var mappingBuilder = AdminApi.Value.GetMappingBuilder();
        await Arguments.ApiMappingBuilder.Invoke(mappingBuilder, cancellationToken);
+
+        ApiMappingState = WireMockMappingState.Submitted;
+    }
+
+    internal async Task CallAddProtoDefinitionsAsync(CancellationToken cancellationToken)
+    {
+        _logger?.LogInformation("Calling AdminApi to add GRPC ProtoDefinition at server level to WireMock.Net");
+
+        foreach (var (id, protoDefinitions) in Arguments.ProtoDefinitions)
+        {
+            _logger?.LogInformation("Adding ProtoDefinition {Id}", id);
+            foreach (var protoDefinition in protoDefinitions)
+            {
+                try
+                {
+                    var status = await AdminApi.Value.AddProtoDefinitionAsync(id, protoDefinition, cancellationToken);
+                    _logger?.LogInformation("ProtoDefinition '{Id}' added with status: {Status}.", id, status.Status);
+                }
+                catch (Exception ex)
+                {
+                    _logger?.LogWarning(ex, "Error adding ProtoDefinition '{Id}'.", id);
+                }
+            }
+        }
+
+        // Force a reload of static mappings when ProtoDefinitions are added at server-level to fix #1382
+        if (Arguments.ProtoDefinitions.Count > 0)
+        {
+            await ReloadStaticMappingsAsync(default);
+        }
    }

    internal void StartWatchingStaticMappings(CancellationToken cancellationToken)
@@ -109,10 +141,17 @@ public class WireMockServerResource : ContainerResource, IResourceWithServiceDis

    private async void FileCreatedChangedOrDeleted(object sender, FileSystemEventArgs args)
    {
-        _logger?.LogInformation("MappingFile created, changed or deleted: '{0}'. Triggering ReloadStaticMappings.", args.FullPath);
+        _logger?.LogInformation("MappingFile created, changed or deleted: '{FullPath}'. Triggering ReloadStaticMappings.", args.FullPath);
+
+        await ReloadStaticMappingsAsync(default);
+    }
+
+    private async Task ReloadStaticMappingsAsync(CancellationToken cancellationToken)
+    {
        try
        {
-            await AdminApi.Value.ReloadStaticMappingsAsync();
+            var status = await AdminApi.Value.ReloadStaticMappingsAsync(cancellationToken);
+            _logger?.LogInformation("ReloadStaticMappings called with status: {Status}.", status);
        }
        catch (Exception ex)
        {
--- a/src/WireMock.Net.MimePart/Util/MimeKitUtils.cs
+++ b/src/WireMock.Net.MimePart/Util/MimeKitUtils.cs
@@ -1,7 +1,6 @@
 // Copyright © WireMock.Net

 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
@@ -33,16 +32,25 @@ internal class MimeKitUtils : IMimeKitUtils
            StartsWithMultiPart(contentTypeHeader)
        )
        {
-            var bytes = requestMessage.BodyData?.DetectedBodyType switch
+            byte[] bytes;
+
+            switch (requestMessage.BodyData?.DetectedBodyType)
            {
                // If the body is bytes, use the BodyAsBytes to match on.
-                BodyType.Bytes => requestMessage.BodyData.BodyAsBytes!,
+                case BodyType.Bytes:
+                    bytes = requestMessage.BodyData.BodyAsBytes!;
+                    break;

                // If the body is a String or MultiPart, use the BodyAsString to match on.
-                BodyType.String or BodyType.MultiPart => Encoding.UTF8.GetBytes(requestMessage.BodyData.BodyAsString!),
+                case BodyType.String or BodyType.MultiPart:
+                    bytes = Encoding.UTF8.GetBytes(requestMessage.BodyData.BodyAsString!);
+                    break;

-                _ => throw new NotSupportedException()
-            };
+                // Else return false.
+                default:
+                    mimeMessageData = null;
+                    return false;
+            }

            var fixedBytes = FixBytes(bytes, contentTypeHeader[0]);

--- a/src/WireMock.Net.Minimal/Http/HttpClientBuilder.cs
+++ b/src/WireMock.Net.Minimal/Http/HttpClientBuilder.cs
@@ -15,8 +15,13 @@ internal static class HttpClientBuilder
        var handler = new HttpClientHandler
        {
            CheckCertificateRevocationList = false,
+#if NET5_0_OR_GREATER
+            SslProtocols = System.Security.Authentication.SslProtocols.Tls13 | System.Security.Authentication.SslProtocols.Tls12 | System.Security.Authentication.SslProtocols.Tls11 | System.Security.Authentication.SslProtocols.Tls,
+#else
            SslProtocols = System.Security.Authentication.SslProtocols.Tls12 | System.Security.Authentication.SslProtocols.Tls11 | System.Security.Authentication.SslProtocols.Tls,
+#endif
            ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true,
+
            AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
        };
 #elif NET46
@@ -62,7 +67,10 @@ internal static class HttpClientBuilder
            }
        }

-#if !NETSTANDARD1_3
+#if NET5_0_OR_GREATER
+        ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls13 | SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
+        ServicePointManager.ServerCertificateValidationCallback = (message, cert, chain, errors) => true;
+#elif !NETSTANDARD1_3
        ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
        ServicePointManager.ServerCertificateValidationCallback = (message, cert, chain, errors) => true;
 #endif
--- a/src/WireMock.Net.Minimal/Http/WebhookSender.cs
+++ b/src/WireMock.Net.Minimal/Http/WebhookSender.cs
@@ -11,24 +11,17 @@ using Stef.Validation;
 using WireMock.Models;
 using WireMock.Settings;
 using WireMock.Transformers;
-using WireMock.Transformers.Handlebars;
-using WireMock.Transformers.Scriban;
 using WireMock.Types;
 using WireMock.Util;

 namespace WireMock.Http;

-internal class WebhookSender
+internal class WebhookSender(WireMockServerSettings settings)
 {
    private const string ClientIp = "::1";
    private static readonly ThreadLocal<Random> Random = new(() => new Random(DateTime.UtcNow.Millisecond));

-    private readonly WireMockServerSettings _settings;
-
-    public WebhookSender(WireMockServerSettings settings)
-    {
-        _settings = Guard.NotNull(settings);
-    }
+    private readonly WireMockServerSettings _settings = Guard.NotNull(settings);

    public async Task<HttpResponseMessage> SendAsync(
        HttpClient client,
@@ -49,24 +42,7 @@ internal class WebhookSender
        string requestUrl;
        if (webhookRequest.UseTransformer == true)
        {
-            ITransformer transformer;
-            switch (webhookRequest.TransformerType)
-            {
-                case TransformerType.Handlebars:
-                    var factoryHandlebars = new HandlebarsContextFactory(_settings);
-                    transformer = new Transformer(_settings, factoryHandlebars);
-                    break;
-
-                case TransformerType.Scriban:
-                case TransformerType.ScribanDotLiquid:
-                    var factoryDotLiquid = new ScribanContextFactory(_settings.FileSystemHandler, webhookRequest.TransformerType);
-                    transformer = new Transformer(_settings, factoryDotLiquid);
-                    break;
-
-                default:
-                    throw new NotImplementedException($"TransformerType '{webhookRequest.TransformerType}' is not supported.");
-            }
-
+            var transformer = TransformerFactory.Create(webhookRequest.TransformerType, _settings);
            bodyData = transformer.TransformBody(mapping, originalRequestMessage, originalResponseMessage, webhookRequest.BodyData, webhookRequest.TransformerReplaceNodeOptions);
            headers = transformer.TransformHeaders(mapping, originalRequestMessage, originalResponseMessage, webhookRequest.Headers);
            requestUrl = transformer.TransformString(mapping, originalRequestMessage, originalResponseMessage, webhookRequest.Url);
--- a/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageBodyMatcher`1.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageBodyMatcher`1.cs
@@ -0,0 +1,60 @@
+// Copyright © WireMock.Net
+
+using System;
+using Newtonsoft.Json.Linq;
+using Stef.Validation;
+
+namespace WireMock.Matchers.Request;
+
+/// <summary>
+/// The request body matcher.
+/// </summary>
+public class RequestMessageBodyMatcher<T> : IRequestMatcher
+{
+    /// <summary>
+    /// The body data function for type T
+    /// </summary>
+    public Func<T?, bool>? Func { get; }
+
+    /// <summary>
+    /// The <see cref="MatchOperator"/>
+    /// </summary>
+    public MatchOperator MatchOperator { get; } = MatchOperator.Or;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+    /// </summary>
+    /// <param name="func">The function.</param>
+    public RequestMessageBodyMatcher(Func<T?, bool> func)
+    {
+        Func = Guard.NotNull(func);
+    }
+
+    /// <inheritdoc />
+    public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
+    {
+        var (score, exception) = CalculateMatchScore(requestMessage).Expand();
+        return requestMatchResult.AddScore(GetType(), score, exception);
+    }
+
+    private MatchResult CalculateMatchScore(IRequestMessage requestMessage)
+    {
+        if (Func != null)
+        {
+            if (requestMessage.BodyData?.BodyAsJson is JObject jsonObject)
+            {
+                try
+                {
+                    var bodyAsT = jsonObject.ToObject<T>();
+                    return MatchScores.ToScore(Func(bodyAsT));
+                }
+                catch (Exception ex)
+                {
+                    return new MatchResult(ex);
+                }
+            }
+        }
+
+        return default;
+    }
+}
--- a/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageMultiPartMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageMultiPartMatcher.cs
@@ -12,7 +12,7 @@ namespace WireMock.Matchers.Request;
 /// </summary>
 public class RequestMessageMultiPartMatcher : IRequestMatcher
 {
-    private static readonly IMimeKitUtils MimeKitUtils = TypeLoader.LoadStaticInstance<IMimeKitUtils>();
+    private readonly IMimeKitUtils _mimeKitUtils = LoadMimeKitUtils();

    /// <summary>
    /// The matchers.
@@ -62,7 +62,7 @@ public class RequestMessageMultiPartMatcher : IRequestMatcher
            return requestMatchResult.AddScore(GetType(), score, null);
        }

-        if (!MimeKitUtils.TryGetMimeMessage(requestMessage, out var message))
+        if (!_mimeKitUtils.TryGetMimeMessage(requestMessage, out var message))
        {
            return requestMatchResult.AddScore(GetType(), score, null);
        }
@@ -96,4 +96,14 @@ public class RequestMessageMultiPartMatcher : IRequestMatcher

        return requestMatchResult.AddScore(GetType(), score, exception);
    }
+
+    private static IMimeKitUtils LoadMimeKitUtils()
+    {
+        if (TypeLoader.TryLoadStaticInstance<IMimeKitUtils>(out var mimeKitUtils))
+        {
+            return mimeKitUtils;
+        }
+
+        throw new InvalidOperationException("MimeKit is required for RequestMessageMultiPartMatcher. Please install the WireMock.Net.MimePart package.");
+    }
 }
--- a/src/WireMock.Net.Minimal/Owin/Mappers/OwinResponseMapper.cs
+++ b/src/WireMock.Net.Minimal/Owin/Mappers/OwinResponseMapper.cs
@@ -178,9 +178,12 @@ namespace WireMock.Owin.Mappers
                    return (bodyData.Encoding ?? _utf8NoBom).GetBytes(jsonBody);

                case BodyType.ProtoBuf:
-                    var protoDefinitions = bodyData.ProtoDefinition?.Invoke().Texts;
-                    var protoBufUtils = TypeLoader.LoadStaticInstance<IProtoBufUtils>();
-                    return await protoBufUtils.GetProtoBufMessageWithHeaderAsync(protoDefinitions, bodyData.ProtoBufMessageType, bodyData.BodyAsJson).ConfigureAwait(false);
+                    if (TypeLoader.TryLoadStaticInstance<IProtoBufUtils>(out var protoBufUtils))
+                    {
+                        var protoDefinitions = bodyData.ProtoDefinition?.Invoke().Texts;
+                        return await protoBufUtils.GetProtoBufMessageWithHeaderAsync(protoDefinitions, bodyData.ProtoBufMessageType, bodyData.BodyAsJson).ConfigureAwait(false);
+                    }
+                    break;

                case BodyType.Bytes:
                    return bodyData.BodyAsBytes;
--- a/src/WireMock.Net.Minimal/Owin/MappingMatcher.cs
+++ b/src/WireMock.Net.Minimal/Owin/MappingMatcher.cs
@@ -9,16 +9,10 @@ using WireMock.Services;

 namespace WireMock.Owin;

-internal class MappingMatcher : IMappingMatcher
+internal class MappingMatcher(IWireMockMiddlewareOptions options, IRandomizerDoubleBetween0And1 randomizerDoubleBetween0And1) : IMappingMatcher
 {
-    private readonly IWireMockMiddlewareOptions _options;
-    private readonly IRandomizerDoubleBetween0And1 _randomizerDoubleBetween0And1;
-
-    public MappingMatcher(IWireMockMiddlewareOptions options, IRandomizerDoubleBetween0And1 randomizerDoubleBetween0And1)
-    {
-        _options = Guard.NotNull(options);
-        _randomizerDoubleBetween0And1 = Guard.NotNull(randomizerDoubleBetween0And1);
-    }
+    private readonly IWireMockMiddlewareOptions _options = Guard.NotNull(options);
+    private readonly IRandomizerDoubleBetween0And1 _randomizerDoubleBetween0And1 = Guard.NotNull(randomizerDoubleBetween0And1);

    public (MappingMatcherResult? Match, MappingMatcherResult? Partial) FindBestMatch(RequestMessage request)
    {
@@ -28,7 +22,7 @@ internal class MappingMatcher : IMappingMatcher

        var mappings = _options.Mappings.Values
            .Where(m => m.TimeSettings.IsValid())
-            .Where(m => m.Probability is null || m.Probability <= _randomizerDoubleBetween0And1.Generate())
+            .Where(m => m.Probability is null || _randomizerDoubleBetween0And1.Generate() <= m.Probability)
            .ToArray();

        foreach (var mapping in mappings)
@@ -41,10 +35,10 @@ internal class MappingMatcher : IMappingMatcher

                var exceptions = mappingMatcherResult.RequestMatchResult.MatchDetails
                    .Where(md => md.Exception != null)
-                    .Select(md => md.Exception)
+                    .Select(md => md.Exception!)
                    .ToArray();

-                if (!exceptions.Any())
+                if (exceptions.Length == 0)
                {
                    possibleMappings.Add(mappingMatcherResult);
                }
@@ -52,7 +46,7 @@ internal class MappingMatcher : IMappingMatcher
                {
                    foreach (var ex in exceptions)
                    {
-                        LogException(mapping, ex!);
+                        LogException(mapping, ex);
                    }
                }
            }
@@ -62,14 +56,16 @@ internal class MappingMatcher : IMappingMatcher
            }
        }

-        var partialMappings = possibleMappings
+        var partialMatches = possibleMappings
            .Where(pm => (pm.Mapping.IsAdminInterface && pm.RequestMatchResult.IsPerfectMatch) || !pm.Mapping.IsAdminInterface)
            .OrderBy(m => m.RequestMatchResult)
                .ThenBy(m => m.RequestMatchResult.TotalNumber)
                .ThenBy(m => m.Mapping.Priority)
+                .ThenByDescending(m => m.Mapping.Probability)
                .ThenByDescending(m => m.Mapping.UpdatedAt)
-            .ToList();
-        var partialMatch = partialMappings.FirstOrDefault(pm => pm.RequestMatchResult.AverageTotalScore > 0.0);
+            .Where(pm => pm.RequestMatchResult.AverageTotalScore > 0.0)
+            .ToArray();
+        var partialMatch = partialMatches.FirstOrDefault();

        if (_options.AllowPartialMapping == true)
        {
@@ -78,7 +74,11 @@ internal class MappingMatcher : IMappingMatcher

        var match = possibleMappings
            .Where(m => m.RequestMatchResult.IsPerfectMatch)
-            .OrderBy(m => m.Mapping.Priority).ThenBy(m => m.RequestMatchResult).ThenByDescending(m => m.Mapping.UpdatedAt)
+            .OrderBy(m => m.Mapping.Priority)
+                .ThenBy(m => m.RequestMatchResult)
+                .ThenBy(m => m.RequestMatchResult.TotalNumber)
+                .ThenByDescending(m => m.Mapping.Probability)
+                .ThenByDescending(m => m.Mapping.UpdatedAt)
            .FirstOrDefault();

        return (match, partialMatch);
--- a/src/WireMock.Net.Minimal/Proxy/ProxyHelper.cs
+++ b/src/WireMock.Net.Minimal/Proxy/ProxyHelper.cs
@@ -13,16 +13,10 @@ using WireMock.Util;

 namespace WireMock.Proxy;

-internal class ProxyHelper
+internal class ProxyHelper(WireMockServerSettings settings)
 {
-    private readonly WireMockServerSettings _settings;
-    private readonly ProxyMappingConverter _proxyMappingConverter;
-
-    public ProxyHelper(WireMockServerSettings settings)
-    {
-        _settings = Guard.NotNull(settings);
-        _proxyMappingConverter = new ProxyMappingConverter(settings, new GuidUtils(), new DateTimeUtils());
-    }
+    private readonly WireMockServerSettings _settings = Guard.NotNull(settings);
+    private readonly ProxyMappingConverter _proxyMappingConverter = new(settings, new GuidUtils(), new DateTimeUtils());

    public async Task<(IResponseMessage Message, IMapping? Mapping)> SendAsync(
        IMapping? mapping,
@@ -39,18 +33,7 @@ internal class ProxyHelper
        var requiredUri = new Uri(url);

        // Create HttpRequestMessage
-        var replaceSettings = proxyAndRecordSettings.ReplaceSettings;
-        string proxyUrl;
-        if (replaceSettings is not null)
-        {
-            var stringComparison = replaceSettings.IgnoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
-            proxyUrl = url.Replace(replaceSettings.OldValue, replaceSettings.NewValue, stringComparison);
-        }
-        else
-        {
-            proxyUrl = url;
-        }
-
+        var proxyUrl = proxyAndRecordSettings.ReplaceSettings != null ? ProxyUrlTransformer.Transform(_settings, proxyAndRecordSettings.ReplaceSettings, url) : url;
        var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, proxyUrl);

        // Call the URL
--- a/src/WireMock.Net.Minimal/Proxy/ProxyUrlTransformer.cs
+++ b/src/WireMock.Net.Minimal/Proxy/ProxyUrlTransformer.cs
@@ -0,0 +1,21 @@
+// Copyright © WireMock.Net
+
+using System;
+using WireMock.Settings;
+using WireMock.Transformers;
+
+namespace WireMock.Proxy;
+
+internal static class ProxyUrlTransformer
+{
+    internal static string Transform(WireMockServerSettings settings, ProxyUrlReplaceSettings replaceSettings, string url)
+    {
+        if (!replaceSettings.UseTransformer)
+        {
+            return url.Replace(replaceSettings.OldValue, replaceSettings.NewValue, replaceSettings.IgnoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal);
+        }
+        
+        var transformer = TransformerFactory.Create(replaceSettings.TransformerType, settings);
+        return transformer.Transform(replaceSettings.TransformTemplate, url);
+    }
+}
--- a/src/WireMock.Net.Minimal/RequestBuilders/Request.WithBody.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/Request.WithBody.cs
@@ -34,13 +34,6 @@ public partial class Request
        return this;
    }

-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsJson(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        var matcher = body as IMatcher ?? new JsonMatcher(matchBehaviour, body);
-        return WithBody([matcher]);
-    }
-
    /// <inheritdoc />
    public IRequestBuilder WithBody(IMatcher matcher)
    {
@@ -98,4 +91,20 @@ public partial class Request
        _requestMatchers.Add(new RequestMessageBodyMatcher(Guard.NotNull(func)));
        return this;
    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithBodyAsJson(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        var matcher = body as IMatcher ?? new JsonMatcher(matchBehaviour, body);
+        return WithBody([matcher]);
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithBodyAsType<T>(Func<T?, bool> func)
+    {
+        Guard.NotNull(func);
+
+        _requestMatchers.Add(new RequestMessageBodyMatcher<T>(func));
+        return this;
+    }
 }
--- a/src/WireMock.Net.Minimal/RequestBuilders/Request.WithPath.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/Request.WithPath.cs
@@ -4,6 +4,7 @@ using System;
 using Stef.Validation;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
+using WireMock.Validators;

 namespace WireMock.RequestBuilders;

@@ -20,7 +21,7 @@ public partial class Request
    {
        Guard.NotNullOrEmpty(matchers);

-        _requestMatchers.Add(new RequestMessagePathMatcher(MatchBehaviour.AcceptOnMatch, MatchOperator.Or, matchers));
+        _requestMatchers.Add(new RequestMessagePathMatcher(MatchBehaviour.AcceptOnMatch, matchOperator, matchers));
        return this;
    }

@@ -34,6 +35,10 @@ public partial class Request
    public IRequestBuilder WithPath(MatchOperator matchOperator, params string[] paths)
    {
        Guard.NotNullOrEmpty(paths);
+        foreach (var path in paths)
+        {
+            PathValidator.ValidateAndThrow(path, nameof(paths));
+        }

        _requestMatchers.Add(new RequestMessagePathMatcher(MatchBehaviour.AcceptOnMatch, matchOperator, paths));
        return this;
--- a/src/WireMock.Net.Minimal/RequestBuilders/Request.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/Request.cs
@@ -29,7 +29,7 @@ public partial class Request : RequestMessageCompositeMatcher, IRequestBuilder
    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
    public static IRequestBuilder Create()
    {
-        return new Request(new List<IRequestMatcher>());
+        return new Request([]);
    }

    /// <summary>
--- a/src/WireMock.Net.Minimal/RequestMessage.cs
+++ b/src/WireMock.Net.Minimal/RequestMessage.cs
@@ -183,16 +183,9 @@ public class RequestMessage : IRequestMessage
 #endif

 #if MIMEKIT
-        try
+        if (TypeLoader.TryLoadStaticInstance<IMimeKitUtils>(out var mimeKitUtils) && mimeKitUtils.TryGetMimeMessage(this, out var mimeMessage))
        {
-            if (TypeLoader.LoadStaticInstance<IMimeKitUtils>().TryGetMimeMessage(this, out var mimeMessage))
-            {
-                BodyAsMimeMessage = mimeMessage;
-            }
-        }
-        catch
-        {
-            // Ignore exception from MimeMessage.Load
+            BodyAsMimeMessage = mimeMessage;
        }
 #endif
    }
--- a/src/WireMock.Net.Minimal/ResponseBuilders/Response.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/Response.cs
@@ -272,25 +272,8 @@ public partial class Response : IResponseBuilder
                }
            }

-            ITransformer responseMessageTransformer;
-            switch (TransformerType)
-            {
-                case TransformerType.Handlebars:
-                    var factoryHandlebars = new HandlebarsContextFactory(settings);
-                    responseMessageTransformer = new Transformer(settings, factoryHandlebars);
-                    break;
-
-                case TransformerType.Scriban:
-                case TransformerType.ScribanDotLiquid:
-                    var factoryDotLiquid = new ScribanContextFactory(settings.FileSystemHandler, TransformerType);
-                    responseMessageTransformer = new Transformer(settings, factoryDotLiquid);
-                    break;
-
-                default:
-                    throw new NotSupportedException($"TransformerType '{TransformerType}' is not supported.");
-            }
-
-            return (responseMessageTransformer.Transform(mapping, requestMessage, responseMessage, UseTransformerForBodyAsFile, TransformerReplaceNodeOptions), null);
+            var transformer = TransformerFactory.Create(TransformerType, settings);
+            return (transformer.Transform(mapping, requestMessage, responseMessage, UseTransformerForBodyAsFile, TransformerReplaceNodeOptions), null);
        }

        if (!UseTransformer && ResponseMessage.BodyData?.BodyAsFileIsCached == true && responseMessage.BodyData?.BodyAsFile is not null)
--- a/src/WireMock.Net.Minimal/Serialization/MappingConverter.cs
+++ b/src/WireMock.Net.Minimal/Serialization/MappingConverter.cs
@@ -226,14 +226,14 @@ internal class MappingConverter(MatcherMapper mapper)
            }
        }

-        if (response.Delay is { })
-        {
-            sb.AppendLine($"        .WithDelay({response.Delay.Value.TotalMilliseconds})");
-        }
-        else if (response is { MinimumDelayMilliseconds: > 0, MaximumDelayMilliseconds: > 0 })
+        if (response is { MinimumDelayMilliseconds: > 0, MaximumDelayMilliseconds: > 0 })
        {
            sb.AppendLine($"        .WithRandomDelay({response.MinimumDelayMilliseconds}, {response.MaximumDelayMilliseconds})");
        }
+        else if (response.Delay is { })
+        {
+            sb.AppendLine($"        .WithDelay({response.Delay.Value.TotalMilliseconds})");
+        }

        if (response.UseTransformer)
        {
--- a/src/WireMock.Net.Minimal/Serialization/MatcherMapper.cs
+++ b/src/WireMock.Net.Minimal/Serialization/MatcherMapper.cs
@@ -55,7 +55,12 @@ internal class MatcherMapper
            case "CSharpCodeMatcher":
                if (_settings.AllowCSharpCodeMatcher == true)
                {
-                    return TypeLoader.LoadNewInstance<ICSharpCodeMatcher>(matchBehaviour, matchOperator, stringPatterns);
+                    if (TypeLoader.TryLoadNewInstance<ICSharpCodeMatcher>(out var csharpCodeMatcher, matchBehaviour, matchOperator, stringPatterns))
+                    {
+                        return csharpCodeMatcher;
+                    }
+
+                    throw new InvalidOperationException("The 'CSharpCodeMatcher' cannot be loaded. Please install the WireMock.Net.Matchers.CSharpCode package.");
                }

                throw new NotSupportedException("It's not allowed to use the 'CSharpCodeMatcher' because WireMockServerSettings.AllowCSharpCodeMatcher is not set to 'true'.");
@@ -75,7 +80,12 @@ internal class MatcherMapper
            case "GraphQLMatcher":
                var patternAsString = stringPatterns[0].GetPattern();
                var schema = new AnyOf<string, StringPattern, ISchemaData>(patternAsString);
-                return TypeLoader.LoadNewInstance<IGraphQLMatcher>(schema, matcherModel.CustomScalars, matchBehaviour, matchOperator);
+                if (TypeLoader.TryLoadNewInstance<IGraphQLMatcher>(out var graphQLMatcher, schema, matcherModel.CustomScalars, matchBehaviour, matchOperator))
+                {
+                    return graphQLMatcher;
+                }
+
+                throw new InvalidOperationException("The 'GraphQLMatcher' cannot be loaded. Please install the WireMock.Net.GraphQL package.");

            case "MimePartMatcher":
                return CreateMimePartMatcher(matchBehaviour, matcherModel);
@@ -282,18 +292,34 @@ internal class MatcherMapper
        var contentTransferEncodingMatcher = Map(matcher.ContentTransferEncodingMatcher) as IStringMatcher;
        var contentMatcher = Map(matcher.ContentMatcher);

-        return TypeLoader.LoadNewInstance<IMimePartMatcher>(matchBehaviour, contentTypeMatcher, contentDispositionMatcher, contentTransferEncodingMatcher, contentMatcher);
+        if (TypeLoader.TryLoadNewInstance<IMimePartMatcher>(
+            out var mimePartMatcher,
+            matchBehaviour,
+            contentTypeMatcher,
+            contentDispositionMatcher,
+            contentTransferEncodingMatcher,
+            contentMatcher))
+        {
+            return mimePartMatcher;
+        }
+
+        throw new InvalidOperationException("The 'MimePartMatcher' cannot be loaded. Please install the WireMock.Net.MimePart package.");
    }

    private IProtoBufMatcher CreateProtoBufMatcher(MatchBehaviour? matchBehaviour, IReadOnlyList<string> protoDefinitions, MatcherModel matcher)
    {
        var objectMatcher = Map(matcher.ContentMatcher) as IObjectMatcher;

-        return TypeLoader.LoadNewInstance<IProtoBufMatcher>(
+        if (TypeLoader.TryLoadNewInstance<IProtoBufMatcher>(
+            out var protobufMatcher,
            () => ProtoDefinitionUtils.GetIdOrTexts(_settings, protoDefinitions.ToArray()),
            matcher.ProtoBufMessageType!,
            matchBehaviour ?? MatchBehaviour.AcceptOnMatch,
-            objectMatcher
-        );
+            objectMatcher))
+        {
+            return protobufMatcher;
+        }
+
+        throw new InvalidOperationException("The 'ProtoBufMatcher' cannot be loaded. Please install the WireMock.Net.ProtoBuf package.");
    }
 }
--- a/src/WireMock.Net.Minimal/Server/WireMockServer.ConvertMapping.cs
+++ b/src/WireMock.Net.Minimal/Server/WireMockServer.ConvertMapping.cs
@@ -366,10 +366,8 @@ public partial class WireMockServer
        }
        else if (responseModel.BodyAsJson != null)
        {
-            if (responseModel.ProtoBufMessageType != null)
+            if (responseModel.ProtoBufMessageType != null && TypeLoader.TryLoadStaticInstance<IProtoBufUtils>(out var protoBufUtils))
            {
-                var protoBufUtils = TypeLoader.LoadStaticInstance<IProtoBufUtils>();
-
                if (responseModel.ProtoDefinition != null)
                {
                    responseBuilder = protoBufUtils.UpdateResponseBuilder(responseBuilder, responseModel.ProtoBufMessageType, responseModel.BodyAsJson, responseModel.ProtoDefinition);
--- a/src/WireMock.Net.Minimal/Settings/SimpleSettingsParser.cs
+++ b/src/WireMock.Net.Minimal/Settings/SimpleSettingsParser.cs
@@ -55,7 +55,7 @@ internal class SimpleSettingsParser
        // Now also parse environment
        if (environment != null)
        {
-            foreach (string key in environment.Keys)
+            foreach (var key in environment.Keys.OfType<string>())
            {
                if (key.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase) && environment.TryGetStringValue(key, out var value))
                {
--- a/src/WireMock.Net.Minimal/Settings/WireMockServerSettingsParser.cs
+++ b/src/WireMock.Net.Minimal/Settings/WireMockServerSettingsParser.cs
@@ -36,7 +36,7 @@ public static class WireMockServerSettingsParser

        if (parser.GetBoolSwitchValue("help"))
        {
-            (logger ?? new WireMockConsoleLogger()).Info("See https://github.com/wiremock/WireMock.Net/wiki/WireMock-commandline-parameters for details on all commandline options.");
+            (logger ?? new WireMockConsoleLogger()).Info("See https://wiremock.org/dotnet/wiremock-commandline-parameters/ for details on all commandline options.");
            settings = null;
            return false;
        }
@@ -153,7 +153,7 @@ public static class WireMockServerSettingsParser
        }
        else if (settings.HostingScheme is null)
        {
-            settings.Urls = parser.GetValues("Urls", ["http://*:9091/"]);
+            settings.Urls = parser.GetValues(nameof(WireMockServerSettings.Urls), defaultValue: ["http://*:9091/"]);
        }
    }

@@ -202,14 +202,27 @@ public static class WireMockServerSettingsParser

    private static void ParseProxyUrlReplaceSettings(ProxyAndRecordSettings settings, SimpleSettingsParser parser)
    {
-        var proxyUrlReplaceOldValue = parser.GetStringValue("ProxyUrlReplaceOldValue");
-        var proxyUrlReplaceNewValue = parser.GetStringValue("ProxyUrlReplaceNewValue");
+        const string prefix = "ProxyUrlReplace";
+        var proxyUrlReplaceOldValue = parser.GetStringValue($"{prefix}OldValue");
+        var proxyUrlReplaceNewValue = parser.GetStringValue($"{prefix}NewValue");
        if (!string.IsNullOrEmpty(proxyUrlReplaceOldValue) && proxyUrlReplaceNewValue != null)
        {
            settings.ReplaceSettings = new ProxyUrlReplaceSettings
            {
-                OldValue = proxyUrlReplaceOldValue!,
-                NewValue = proxyUrlReplaceNewValue
+                OldValue = proxyUrlReplaceOldValue,
+                NewValue = proxyUrlReplaceNewValue,
+                IgnoreCase = parser.GetBoolValue($"{prefix}IgnoreCase")
+            };
+            return;
+        }
+
+        var transformTemplate = parser.GetStringValue($"{prefix}TransformTemplate");
+        if (!string.IsNullOrEmpty(transformTemplate))
+        {
+            settings.ReplaceSettings = new ProxyUrlReplaceSettings
+            {
+                TransformTemplate = transformTemplate,
+                TransformerType = parser.GetEnumValue($"{prefix}TransformerType", TransformerType.Handlebars)
            };
        }
    }
--- a/src/WireMock.Net.Minimal/Transformers/Handlebars/WireMockHandlebarsHelpers.cs
+++ b/src/WireMock.Net.Minimal/Transformers/Handlebars/WireMockHandlebarsHelpers.cs
@@ -39,6 +39,8 @@ internal static class WireMockHandlebarsHelpers
 #endif
            o.CustomHelperPaths = paths;

+            o.Categories = settings.HandlebarsSettings?.AllowedHandlebarsHelpers ?? HandlebarsSettings.DefaultAllowedHandlebarsHelpers;
+
            o.CustomHelpers = new Dictionary<string, IHelpers>();
            if (settings.HandlebarsSettings?.AllowedCustomHandlebarsHelpers.HasFlag(CustomHandlebarsHelpers.File) == true)
            {
--- a/src/WireMock.Net.Minimal/Transformers/ITransformer.cs
+++ b/src/WireMock.Net.Minimal/Transformers/ITransformer.cs
@@ -6,7 +6,7 @@ using WireMock.Util;

 namespace WireMock.Transformers;

-interface ITransformer
+internal interface ITransformer
 {
    ResponseMessage Transform(IMapping mapping, IRequestMessage requestMessage, IResponseMessage original, bool useTransformerForBodyAsFile, ReplaceNodeOptions options);

@@ -15,4 +15,6 @@ interface ITransformer
    IDictionary<string, WireMockList<string>> TransformHeaders(IMapping mapping, IRequestMessage originalRequestMessage, IResponseMessage originalResponseMessage, IDictionary<string, WireMockList<string>>? headers);

    string TransformString(IMapping mapping, IRequestMessage originalRequestMessage, IResponseMessage originalResponseMessage, string? value);
+
+    string Transform(string template, object? model);
 }
--- a/src/WireMock.Net.Minimal/Transformers/ITransformerContextFactory.cs
+++ b/src/WireMock.Net.Minimal/Transformers/ITransformerContextFactory.cs
@@ -1,9 +1,8 @@
 // Copyright © WireMock.Net

-namespace WireMock.Transformers
+namespace WireMock.Transformers;
+
+internal interface ITransformerContextFactory
 {
-    interface ITransformerContextFactory
-    {
-        ITransformerContext Create();
-    }
+    ITransformerContext Create();
 }
--- a/src/WireMock.Net.Minimal/Transformers/Transformer.cs
+++ b/src/WireMock.Net.Minimal/Transformers/Transformer.cs
@@ -75,6 +75,11 @@ internal class Transformer : ITransformer
        return transformerContext.ParseAndRender(value, model);
    }

+    public string Transform(string template, object? model)
+    {
+        return model is null ? string.Empty : _factory.Create().ParseAndRender(template, model);
+    }
+
    public ResponseMessage Transform(IMapping mapping, IRequestMessage requestMessage, IResponseMessage original, bool useTransformerForBodyAsFile, ReplaceNodeOptions options)
    {
        var responseMessage = new ResponseMessage();
--- a/src/WireMock.Net.Minimal/Transformers/TransformerFactory.cs
+++ b/src/WireMock.Net.Minimal/Transformers/TransformerFactory.cs
@@ -0,0 +1,30 @@
+// Copyright © WireMock.Net
+
+using System;
+using WireMock.Settings;
+using WireMock.Transformers.Handlebars;
+using WireMock.Transformers.Scriban;
+using WireMock.Types;
+
+namespace WireMock.Transformers;
+
+internal static class TransformerFactory
+{
+    internal static ITransformer Create(TransformerType transformerType, WireMockServerSettings settings)
+    {
+        switch (transformerType)
+        {
+            case TransformerType.Handlebars:
+                var factoryHandlebars = new HandlebarsContextFactory(settings);
+                return new Transformer(settings, factoryHandlebars);
+                
+            case TransformerType.Scriban:
+            case TransformerType.ScribanDotLiquid:
+                var factoryDotLiquid = new ScribanContextFactory(settings.FileSystemHandler, transformerType);
+                return new Transformer(settings, factoryDotLiquid);
+
+            default:
+                throw new NotSupportedException($"{nameof(TransformerType)} '{transformerType}' is not supported.");
+        }
+    }
+}
--- a/src/WireMock.Net.Minimal/Util/PortUtils.cs
+++ b/src/WireMock.Net.Minimal/Util/PortUtils.cs
@@ -84,22 +84,22 @@ internal static class PortUtils
    }

    /// <summary>
-    /// Extract the isHttps, isHttp2, protocol, host and port from a URL.
+    /// Extract the isHttps, isHttp2, scheme, host and port from a URL.
    /// </summary>
-    public static bool TryExtract(string url, out bool isHttps, out bool isHttp2, [NotNullWhen(true)] out string? protocol, [NotNullWhen(true)] out string? host, out int port)
+    public static bool TryExtract(string url, out bool isHttps, out bool isHttp2, [NotNullWhen(true)] out string? scheme, [NotNullWhen(true)] out string? host, out int port)
    {
        isHttps = false;
        isHttp2 = false;
-        protocol = null;
+        scheme = null;
        host = null;
        port = 0;

        var match = UrlDetailsRegex.Match(url);
        if (match.Success)
        {
-            protocol = match.Groups["proto"].Value;
-            isHttps = protocol.StartsWith("https", StringComparison.OrdinalIgnoreCase) || protocol.StartsWith("grpcs", StringComparison.OrdinalIgnoreCase);
-            isHttp2 = protocol.StartsWith("grpc", StringComparison.OrdinalIgnoreCase);
+            scheme = match.Groups["proto"].Value;
+            isHttps = scheme.StartsWith("https", StringComparison.OrdinalIgnoreCase) || scheme.StartsWith("grpcs", StringComparison.OrdinalIgnoreCase);
+            isHttp2 = scheme.StartsWith("grpc", StringComparison.OrdinalIgnoreCase);
            host = match.Groups["host"].Value;

            return int.TryParse(match.Groups["port"].Value, out port);
--- a/src/WireMock.Net.NUnit/TestContextWireMockLogger.cs
+++ b/src/WireMock.Net.NUnit/TestContextWireMockLogger.cs
@@ -0,0 +1,71 @@
+// Copyright © WireMock.Net
+
+using System;
+using JsonConverter.Abstractions;
+using JsonConverter.Newtonsoft.Json;
+using NUnit.Framework;
+using WireMock.Admin.Requests;
+using WireMock.Logging;
+
+namespace WireMock.Net.NUnit;
+
+/// <summary>
+/// When using NUnit, this class enables to log the output from WireMock.Net using the <see cref="TestContext"/>.
+/// </summary>
+public sealed class TestContextWireMockLogger(IJsonConverter? jsonConverter = null) : IWireMockLogger
+{
+    private readonly JsonConverterOptions _jsonConverterOptions = new() { WriteIndented = true, IgnoreNullValues = true };
+    private readonly IJsonConverter _jsonConverter = jsonConverter ?? new NewtonsoftJsonConverter();
+
+    /// <inheritdoc />
+    public void Debug(string formatString, params object[] args)
+    {
+        TestContext.WriteLine(Format("Debug", formatString, args));
+    }
+
+    /// <inheritdoc />
+    public void Info(string formatString, params object[] args)
+    {
+        TestContext.WriteLine(Format("Info", formatString, args));
+    }
+
+    /// <inheritdoc />
+    public void Warn(string formatString, params object[] args)
+    {
+        TestContext.WriteLine(Format("Warning", formatString, args));
+    }
+
+    /// <inheritdoc />
+    public void Error(string formatString, params object[] args)
+    {
+        TestContext.WriteLine(Format("Error", formatString, args));
+    }
+
+    /// <inheritdoc />
+    public void Error(string message, Exception exception)
+    {
+        TestContext.WriteLine(Format("Error", $"{message} {{0}}", exception));
+
+        if (exception is AggregateException ae)
+        {
+            ae.Handle(ex =>
+            {
+                TestContext.WriteLine(Format("Error", "Exception {0}", ex));
+                return true;
+            });
+        }
+    }
+
+    /// <inheritdoc />
+    public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
+    {
+        var message = _jsonConverter.Serialize(logEntryModel, _jsonConverterOptions);
+        TestContext.WriteLine(Format("DebugRequestResponse", "Admin[{0}] {1}", isAdminRequest, message));
+    }
+
+    private static string Format(string level, string formatString, params object[] args)
+    {
+        var message = args.Length > 0 ? string.Format(formatString, args) : formatString;
+        return $"{DateTime.UtcNow} [{level}] : {message}";
+    }
+}
--- a/src/WireMock.Net.NUnit/WireMock.Net.NUnit.csproj
+++ b/src/WireMock.Net.NUnit/WireMock.Net.NUnit.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <Description>Some extensions for NUnit</Description>
+        <AssemblyTitle>WireMock.Net.NUnit</AssemblyTitle>
+        <Authors>Stef Heyenrath</Authors>
+        <TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <AssemblyName>WireMock.Net.NUnit</AssemblyName>
+        <RootNamespace>WireMock.Net.NUnit</RootNamespace>
+        <PackageId>WireMock.Net.NUnit</PackageId>
+        <PackageTags>tdd;wiremock;test;unittest;nunit</PackageTags>
+        <ProjectGuid>{2DBBD70D-8051-441F-92BB-3F9B8B4B4983}</ProjectGuid>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+        <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="JsonConverter.Newtonsoft.Json" Version="0.8.0" />
+        <PackageReference Include="NUnit" Version="4.4.0" />
+        <PackageReference Include="Stef.Validation" Version="0.1.1" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
+    </ItemGroup>
+</Project>
--- a/src/WireMock.Net.OpenApiParser/Extensions/OpenApiSchemaExtensions.cs
+++ b/src/WireMock.Net.OpenApiParser/Extensions/OpenApiSchemaExtensions.cs
@@ -5,9 +5,7 @@ using System.Linq;
 using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Models.Interfaces;
+using Microsoft.OpenApi;
 using WireMock.Net.OpenApiParser.Types;

 namespace WireMock.Net.OpenApiParser.Extensions;
--- a/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs
+++ b/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs
@@ -6,8 +6,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Models.Interfaces;
+using Microsoft.OpenApi;
 using Newtonsoft.Json;
 using Stef.Validation;
 using WireMock.Admin.Mappings;
@@ -19,18 +18,12 @@ using SystemTextJsonSerializer = System.Text.Json.JsonSerializer;

 namespace WireMock.Net.OpenApiParser.Mappers;

-internal class OpenApiPathsMapper
+internal class OpenApiPathsMapper(WireMockOpenApiParserSettings settings)
 {
    private const string HeaderContentType = "Content-Type";

-    private readonly WireMockOpenApiParserSettings _settings;
-    private readonly ExampleValueGenerator _exampleValueGenerator;
-
-    public OpenApiPathsMapper(WireMockOpenApiParserSettings settings)
-    {
-        _settings = Guard.NotNull(settings);
-        _exampleValueGenerator = new ExampleValueGenerator(settings);
-    }
+    private readonly WireMockOpenApiParserSettings _settings = Guard.NotNull(settings);
+    private readonly ExampleValueGenerator _exampleValueGenerator = new(settings);

    public IReadOnlyList<MappingModel> ToMappingModels(OpenApiPaths? paths, IList<OpenApiServer> servers)
    {
@@ -41,7 +34,7 @@ internal class OpenApiPathsMapper
            .ToArray() ?? [];
    }

-    private IReadOnlyList<MappingModel> MapPath(string path, IOpenApiPathItem pathItem, IList<OpenApiServer> servers)
+    private MappingModel[] MapPath(string path, IOpenApiPathItem pathItem, IList<OpenApiServer> servers)
    {
        return pathItem.Operations?.Select(o => MapOperationToMappingModel(path, o.Key.ToString().ToUpperInvariant(), o.Value, servers)).ToArray() ?? [];
    }
@@ -50,35 +43,7 @@ internal class OpenApiPathsMapper
    {
        var queryParameters = operation.Parameters?.Where(p => p.In == ParameterLocation.Query) ?? [];
        var pathParameters = operation.Parameters?.Where(p => p.In == ParameterLocation.Path) ?? [];
-        var headers = operation.Parameters?.Where(p => p.In == ParameterLocation.Header) ?? [];
-
-        var response = operation.Responses?.FirstOrDefault() ?? new KeyValuePair<string, IOpenApiResponse>();
-
-        TryGetContent(response.Value?.Content, out OpenApiMediaType? responseContent, out var responseContentType);
-        var responseSchema = response.Value?.Content?.FirstOrDefault().Value?.Schema;
-        var responseExample = responseContent?.Example;
-        var responseSchemaExample = responseContent?.Schema?.Example;
-
-        var responseBody = responseExample ?? responseSchemaExample ?? MapSchemaToObject(responseSchema);
-
-        var requestBodyModel = new BodyModel();
-        if (operation.RequestBody != null && operation.RequestBody.Content != null && operation.RequestBody.Required)
-        {
-            var request = operation.RequestBody.Content;
-            TryGetContent(request, out var requestContent, out _);
-
-            var requestBodySchema = operation.RequestBody.Content.First().Value?.Schema;
-            var requestBodyExample = requestContent!.Example;
-            var requestBodySchemaExample = requestContent.Schema?.Example;
-
-            var requestBodyMapped = requestBodyExample ?? requestBodySchemaExample ?? MapSchemaToObject(requestBodySchema);
-            requestBodyModel = MapRequestBody(requestBodyMapped);
-        }
-
-        if (!int.TryParse(response.Key, out var httpStatusCode))
-        {
-            httpStatusCode = 200;
-        }
+        var requestHeaders = operation.Parameters?.Where(p => p.In == ParameterLocation.Header) ?? [];

        return new MappingModel
        {
@@ -88,15 +53,94 @@ internal class OpenApiPathsMapper
                Methods = [httpMethod],
                Path = PathUtils.Combine(MapBasePath(servers), MapPathWithParameters(path, pathParameters)),
                Params = MapQueryParameters(queryParameters),
-                Headers = MapRequestHeaders(headers),
-                Body = requestBodyModel
+                Headers = MapRequestHeaders(requestHeaders),
+                Body = GetRequestBodyModel(operation.RequestBody)
            },
-            Response = new ResponseModel
-            {
-                StatusCode = httpStatusCode,
-                Headers = MapHeaders(responseContentType, response.Value?.Headers),
-                BodyAsJson = responseBody != null ? JsonConvert.DeserializeObject(SystemTextJsonSerializer.Serialize(responseBody)) : null
-            }
+            Response = GetResponseModel(operation.Responses?.FirstOrDefault())
+        };
+    }
+
+    private BodyModel GetRequestBodyModel(IOpenApiRequestBody? openApiRequestBody)
+    {
+        if (openApiRequestBody is not { Content: not null, Required: true })
+        {
+            return new BodyModel();
+        }
+
+        var content = openApiRequestBody.Content;
+
+        TryGetContent(content, out var requestContent, out _);
+
+        var requestExample = requestContent?.Example;
+        var requestExamples = requestContent?.Examples;
+        var requestSchemaExample = requestContent?.Schema?.Example;
+        var requestSchemaExamples = requestContent?.Schema?.Examples;
+
+        JsonNode? request;
+        if (requestExample != null)
+        {
+            request = requestExample;
+        }
+        else if (requestSchemaExample != null)
+        {
+            request = requestSchemaExample;
+        }
+        else if (requestExamples != null)
+        {
+            request = requestExamples.FirstOrDefault().Value.Value;
+        }
+        else if (requestSchemaExamples != null)
+        {
+            request = requestSchemaExamples.FirstOrDefault();
+        }
+        else
+        {
+            var requestSchema = content?.FirstOrDefault().Value.Schema;
+            request = MapSchemaToObject(requestSchema);
+        }
+
+        return MapRequestBody(request) ?? new BodyModel();
+    }
+
+    private ResponseModel GetResponseModel(KeyValuePair<string, IOpenApiResponse>? openApiResponse)
+    {
+        var content = openApiResponse?.Value.Content;
+
+        TryGetContent(content, out var responseContent, out var contentType);
+
+        var responseExample = responseContent?.Example;
+        var responseExamples = responseContent?.Examples;
+        var responseSchemaExample = responseContent?.Schema?.Example;
+        var responseSchemaExamples = responseContent?.Schema?.Examples;
+
+        JsonNode? response;
+        if (responseExample != null)
+        {
+            response = responseExample;
+        }
+        else if (responseSchemaExample != null)
+        {
+            response = responseSchemaExample;
+        }
+        else if (responseExamples != null)
+        {
+            response = responseExamples.FirstOrDefault().Value.Value;
+        }
+        else if (responseSchemaExamples != null)
+        {
+            response = responseSchemaExamples.FirstOrDefault();
+        }
+        else
+        {
+            var responseSchema = content?.FirstOrDefault().Value?.Schema;
+            response = MapSchemaToObject(responseSchema);
+        }
+
+        return new ResponseModel
+        {
+            StatusCode = int.TryParse(openApiResponse?.Key, out var httpStatusCode) ? httpStatusCode : 200,
+            Headers = MapHeaders(contentType, openApiResponse?.Value.Headers),
+            BodyAsJson = response != null ? JsonConvert.DeserializeObject(SystemTextJsonSerializer.Serialize(response)) : null
        };
    }

--- a/src/WireMock.Net.OpenApiParser/Settings/IWireMockOpenApiParserExampleValues.cs
+++ b/src/WireMock.Net.OpenApiParser/Settings/IWireMockOpenApiParserExampleValues.cs
@@ -1,7 +1,7 @@
 // Copyright © WireMock.Net

 using System;
-using Microsoft.OpenApi.Models.Interfaces;
+using Microsoft.OpenApi;

 namespace WireMock.Net.OpenApiParser.Settings;

--- a/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserDynamicExampleValues.cs
+++ b/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserDynamicExampleValues.cs
@@ -1,7 +1,7 @@
 // Copyright © WireMock.Net

 using System;
-using Microsoft.OpenApi.Models.Interfaces;
+using Microsoft.OpenApi;
 using RandomDataGenerator.FieldOptions;
 using RandomDataGenerator.Randomizers;

--- a/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserExampleValues.cs
+++ b/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserExampleValues.cs
@@ -1,8 +1,7 @@
 // Copyright © WireMock.Net

 using System;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Models.Interfaces;
+using Microsoft.OpenApi;

 namespace WireMock.Net.OpenApiParser.Settings;

--- a/src/WireMock.Net.OpenApiParser/Utils/ExampleValueGenerator.cs
+++ b/src/WireMock.Net.OpenApiParser/Utils/ExampleValueGenerator.cs
@@ -3,8 +3,7 @@
 using System;
 using System.Linq;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Models.Interfaces;
+using Microsoft.OpenApi;
 using Stef.Validation;
 using WireMock.Net.OpenApiParser.Extensions;
 using WireMock.Net.OpenApiParser.Settings;
--- a/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj
+++ b/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj
@@ -27,22 +27,22 @@
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
-        <PackageReference Include="RamlToOpenApiConverter.SourceOnly" Version="0.8.0" />
-        <PackageReference Include="YamlDotNet" Version="8.1.0" />
+        <PackageReference Include="RamlToOpenApiConverter.SourceOnly" Version="0.11.0" />
+        <PackageReference Include="YamlDotNet" Version="16.3.0" />
        <PackageReference Include="RandomDataGenerator.Net" Version="1.0.19" />
        <PackageReference Include="Stef.Validation" Version="0.1.1" />
    </ItemGroup>

    <ItemGroup Condition="'$(Configuration)' == 'Debug'">
-        <PackageReference Include="Microsoft.OpenApi.YamlReader" Version="2.0.0-preview.17" />
+        <PackageReference Include="Microsoft.OpenApi.YamlReader" Version="2.3.0" />
    </ItemGroup>

    <ItemGroup Condition="'$(Configuration)' == 'Release'">
        <PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.40" PrivateAssets="All" />
-        <PackageReference Include="Microsoft.OpenApi" Version="2.0.0-preview.17" PrivateAssets="All" />
-        <PackageReference Include="Microsoft.OpenApi.YamlReader" Version="2.0.0-preview.17" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.OpenApi" Version="2.3.0" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.OpenApi.YamlReader" Version="2.3.0" PrivateAssets="All" />
        <PackageReference Include="System.Text.Json" Version="8.0.5" />
-        <PackageReference Include="SharpYaml" Version="2.1.1" />
+        <PackageReference Include="SharpYaml" Version="2.1.3" />
    </ItemGroup>

    <ItemGroup>
--- a/src/WireMock.Net.OpenApiParser/WireMockOpenApiParser.cs
+++ b/src/WireMock.Net.OpenApiParser/WireMockOpenApiParser.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using JetBrains.Annotations;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Microsoft.OpenApi.Reader;
 using Microsoft.OpenApi.YamlReader;
 using RamlToOpenApiConverter;
--- a/src/WireMock.Net.ProtoBuf/Matchers/ProtoBufMatcher.cs
+++ b/src/WireMock.Net.ProtoBuf/Matchers/ProtoBufMatcher.cs
@@ -96,14 +96,14 @@ public class ProtoBufMatcher : IProtoBufMatcher
        }

        var protoDefinitions = ProtoDefinition().Texts;
-       
+
        var resolver = new WireMockProtoFileResolver(protoDefinitions);
        var request = new ConvertToObjectRequest(protoDefinitions[0], MessageType, input)
            .WithProtoFileResolver(resolver);

        try
        {
-            return await ProtoBufToJsonConverter.ConvertAsync(request, cancellationToken).ConfigureAwait(false);
+            return await ProtoBufToJsonConverter.ConvertAsync(request, cancellationToken);
        }
        catch
        {
--- a/src/WireMock.Net.ProtoBuf/WireMock.Net.ProtoBuf.csproj
+++ b/src/WireMock.Net.ProtoBuf/WireMock.Net.ProtoBuf.csproj
@@ -26,7 +26,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="ProtoBufJsonConverter" Version="0.10.0" />
+        <PackageReference Include="ProtoBufJsonConverter" Version="0.11.0" />
    </ItemGroup>

    <ItemGroup>
--- a/src/WireMock.Net.Shared/Matchers/Request/RequestMessageGraphQLMatcher.cs
+++ b/src/WireMock.Net.Shared/Matchers/Request/RequestMessageGraphQLMatcher.cs
@@ -100,7 +100,10 @@ public class RequestMessageGraphQLMatcher : IRequestMatcher
        IDictionary<string, Type>? customScalars
    )
    {
-        var graphQLMatcher = TypeLoader.LoadNewInstance<IGraphQLMatcher>(schema, customScalars, matchBehaviour, MatchOperator.Or);
-        return [graphQLMatcher];
+        if (TypeLoader.TryLoadNewInstance<IGraphQLMatcher>(out var graphQLMatcher, schema, customScalars, matchBehaviour, MatchOperator.Or))
+        {
+            return [graphQLMatcher];
+        }
+        return [];
    }
 }
--- a/src/WireMock.Net.Shared/Matchers/Request/RequestMessageProtoBufMatcher.cs
+++ b/src/WireMock.Net.Shared/Matchers/Request/RequestMessageProtoBufMatcher.cs
@@ -25,7 +25,10 @@ public class RequestMessageProtoBufMatcher : IRequestMatcher
    /// <param name="matcher">The optional matcher to use to match the ProtoBuf as (json) object.</param>
    public RequestMessageProtoBufMatcher(MatchBehaviour matchBehaviour, Func<IdOrTexts> protoDefinition, string messageType, IObjectMatcher? matcher = null)
    {
-        Matcher = TypeLoader.LoadNewInstance<IProtoBufMatcher>(protoDefinition, messageType, matchBehaviour, matcher);
+        if (TypeLoader.TryLoadNewInstance<IProtoBufMatcher>(out var protoBufMatcher, protoDefinition, messageType, matchBehaviour, matcher))
+        {
+            Matcher = protoBufMatcher;
+        }
    }

    /// <inheritdoc />
--- a/src/WireMock.Net.Shared/RequestBuilders/IBodyRequestBuilder.cs
+++ b/src/WireMock.Net.Shared/RequestBuilders/IBodyRequestBuilder.cs
@@ -80,6 +80,14 @@ public interface IBodyRequestBuilder : IMultiPartRequestBuilder
    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
    IRequestBuilder WithBody(Func<object?, bool> func);

+    /// <summary>
+    /// WithBody: func (type)
+    /// </summary>
+    /// <typeparam name="T">The type.</typeparam>
+    /// <param name="func">The function.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithBodyAsType<T>(Func<T?, bool> func);
+
    /// <summary>
    /// WithBody: func (BodyData object)
    /// </summary>
--- a/src/WireMock.Net.Shared/Settings/ProxyUrlReplaceSettings.cs
+++ b/src/WireMock.Net.Shared/Settings/ProxyUrlReplaceSettings.cs
@@ -1,5 +1,8 @@
 // Copyright © WireMock.Net

+using System.Diagnostics.CodeAnalysis;
+using WireMock.Types;
+
 namespace WireMock.Settings;

 /// <summary>
@@ -8,17 +11,35 @@ namespace WireMock.Settings;
 public class ProxyUrlReplaceSettings
 {
    /// <summary>
-    /// The old path value to be replaced by the new path value
+    /// The old path value to be replaced by the new path value.
    /// </summary>
-    public string OldValue { get; set; } = null!;
+    public string? OldValue { get; set; }

    /// <summary>
-    /// The new path value to replace the old value with
+    /// The new path value to replace the old value with.
    /// </summary>
-    public string NewValue { get; set; } = null!;
+    public string? NewValue { get; set; }

    /// <summary>
    /// Defines if the case should be ignored when replacing.
    /// </summary>
    public bool IgnoreCase { get; set; }
+
+    /// <summary>
+    /// Holds the transformation template used when <see cref="UseTransformer"/> is true.
+    /// </summary>
+    public string? TransformTemplate { get; set; }
+
+    /// <summary>
+    /// Use Transformer.
+    /// </summary>
+    [MemberNotNullWhen(true, nameof(TransformTemplate))]
+    [MemberNotNullWhen(false, nameof(OldValue))]
+    [MemberNotNullWhen(false, nameof(NewValue))]
+    public bool UseTransformer => !string.IsNullOrEmpty(TransformTemplate);
+
+    /// <summary>
+    /// The transformer type, in case <see cref="UseTransformer"/> is set to <c>true</c>.
+    /// </summary>
+    public TransformerType TransformerType { get; set; } = TransformerType.Handlebars;
 }
--- a/src/WireMock.Net.Shared/Util/TypeLoader.cs
+++ b/src/WireMock.Net.Shared/Util/TypeLoader.cs
@@ -14,68 +14,130 @@ internal static class TypeLoader
 {
    private static readonly ConcurrentDictionary<string, Type> Assemblies = new();
    private static readonly ConcurrentDictionary<Type, object> Instances = new();
+    private static readonly ConcurrentBag<(string FullName, Type Type)> InstancesWhichCannotBeFoundByFullName = [];
+    private static readonly ConcurrentBag<(string FullName, Type Type)> StaticInstancesWhichCannotBeFoundByFullName = [];
+    private static readonly ConcurrentBag<Type> InstancesWhichCannotBeFound = [];
+    private static readonly ConcurrentBag<Type> StaticInstancesWhichCannotBeFound = [];

-    public static TInterface LoadNewInstance<TInterface>(params object?[] args) where TInterface : class
+    public static bool TryLoadNewInstance<TInterface>([NotNullWhen(true)] out TInterface? instance, params object?[] args) where TInterface : class
    {
-        var pluginType = GetPluginType<TInterface>();
+        var type = typeof(TInterface);
+        if (InstancesWhichCannotBeFound.Contains(type))
+        {
+            instance = null;
+            return false;
+        }

-        return (TInterface)Activator.CreateInstance(pluginType, args)!;
+        if (TryGetPluginType<TInterface>(out var pluginType))
+        {
+            instance = (TInterface)Activator.CreateInstance(pluginType, args)!;
+            return true;
+        }
+
+        InstancesWhichCannotBeFound.Add(type);
+        instance = null;
+        return false;
    }

-    public static TInterface LoadStaticInstance<TInterface>(params object?[] args) where TInterface : class
+    public static bool TryLoadStaticInstance<TInterface>([NotNullWhen(true)] out TInterface? staticInstance, params object?[] args) where TInterface : class
    {
-        var pluginType = GetPluginType<TInterface>();
+        var type = typeof(TInterface);
+        if (StaticInstancesWhichCannotBeFound.Contains(type))
+        {
+            staticInstance = null;
+            return false;
+        }

-        return (TInterface)Instances.GetOrAdd(pluginType, key => Activator.CreateInstance(key, args)!);
+        if (TryGetPluginType<TInterface>(out var pluginType))
+        {
+            staticInstance = (TInterface)Instances.GetOrAdd(pluginType, key => Activator.CreateInstance(key, args)!);
+            return true;
+        }
+
+        StaticInstancesWhichCannotBeFound.Add(type);
+        staticInstance = null;
+        return false;
    }

-    public static TInterface LoadNewInstanceByFullName<TInterface>(string implementationTypeFullName, params object?[] args) where TInterface : class
+    public static bool TryLoadNewInstanceByFullName<TInterface>([NotNullWhen(true)] out TInterface? instance, string implementationTypeFullName, params object?[] args) where TInterface : class
    {
        Guard.NotNullOrEmpty(implementationTypeFullName);

-        var pluginType = GetPluginTypeByFullName<TInterface>(implementationTypeFullName);
+        var type = typeof(TInterface);
+        if (InstancesWhichCannotBeFoundByFullName.Contains((implementationTypeFullName, type)))
+        {
+            instance = null;
+            return false;
+        }

-        return (TInterface)Activator.CreateInstance(pluginType, args)!;
+        if (TryGetPluginTypeByFullName<TInterface>(implementationTypeFullName, out var pluginType))
+        {
+            instance = (TInterface)Activator.CreateInstance(pluginType, args)!;
+            return true;
+        }
+
+        InstancesWhichCannotBeFoundByFullName.Add((implementationTypeFullName, type));
+        instance = null;
+        return false;
    }

-    public static TInterface LoadStaticInstanceByFullName<TInterface>(string implementationTypeFullName, params object?[] args) where TInterface : class
+    public static bool TryLoadStaticInstanceByFullName<TInterface>([NotNullWhen(true)] out TInterface? staticInstance, string implementationTypeFullName, params object?[] args) where TInterface : class
    {
        Guard.NotNullOrEmpty(implementationTypeFullName);

-        var pluginType = GetPluginTypeByFullName<TInterface>(implementationTypeFullName);
+        var type = typeof(TInterface);
+        if (StaticInstancesWhichCannotBeFoundByFullName.Contains((implementationTypeFullName, type)))
+        {
+            staticInstance = null;
+            return false;
+        }

-        return (TInterface)Instances.GetOrAdd(pluginType, key => Activator.CreateInstance(key, args)!);
+        if (TryGetPluginTypeByFullName<TInterface>(implementationTypeFullName, out var pluginType))
+        {
+            staticInstance = (TInterface)Instances.GetOrAdd(pluginType, key => Activator.CreateInstance(key, args)!);
+            return true;
+        }
+
+        StaticInstancesWhichCannotBeFoundByFullName.Add((implementationTypeFullName, type));
+        staticInstance = null;
+        return false;
    }

-    private static Type GetPluginType<TInterface>() where TInterface : class
+    private static bool TryGetPluginType<TInterface>([NotNullWhen(true)] out Type? foundType) where TInterface : class
    {
        var key = typeof(TInterface).FullName!;

-        return Assemblies.GetOrAdd(key, _ =>
+        if (Assemblies.TryGetValue(key, out foundType))
        {
-            if (TryFindTypeInDlls<TInterface>(null, out var foundType))
-            {
-                return foundType;
-            }
+            return true;
+        }

-            throw new DllNotFoundException($"No dll found which implements interface '{key}'.");
-        });
+        if (TryFindTypeInDlls<TInterface>(null, out foundType))
+        {
+            Assemblies.TryAdd(key, foundType);
+            return true;
+        }
+
+        return false;
    }

-    private static Type GetPluginTypeByFullName<TInterface>(string implementationTypeFullName) where TInterface : class
+    private static bool TryGetPluginTypeByFullName<TInterface>(string implementationTypeFullName, [NotNullWhen(true)] out Type? foundType) where TInterface : class
    {
        var @interface = typeof(TInterface).FullName;
        var key = $"{@interface}_{implementationTypeFullName}";

-        return Assemblies.GetOrAdd(key, _ =>
+        if (Assemblies.TryGetValue(key, out foundType))
        {
-            if (TryFindTypeInDlls<TInterface>(implementationTypeFullName, out var foundType))
-            {
-                return foundType;
-            }
+            return true;
+        }

-            throw new DllNotFoundException($"No dll found which implements Interface '{@interface}' and has FullName '{implementationTypeFullName}'.");
-        });
+        if (TryFindTypeInDlls<TInterface>(implementationTypeFullName, out foundType))
+        {
+            Assemblies.TryAdd(key, foundType);
+            return true;
+        }
+
+        return false;
    }

    private static bool TryFindTypeInDlls<TInterface>(string? implementationTypeFullName, [NotNullWhen(true)] out Type? pluginType) where TInterface : class
--- a/src/WireMock.Net.Testcontainers/Extensions/HttpWaitStrategyExtensions.cs
+++ b/src/WireMock.Net.Testcontainers/Extensions/HttpWaitStrategyExtensions.cs
@@ -0,0 +1,18 @@
+// Copyright © WireMock.Net
+
+using WireMock.Net.Testcontainers;
+
+namespace DotNet.Testcontainers.Configurations;
+
+internal static class HttpWaitStrategyExtensions
+{
+    internal static HttpWaitStrategy WithBasicAuthentication(this HttpWaitStrategy strategy, WireMockConfiguration configuration)
+    {
+        if (configuration.HasBasicAuthentication)
+        {
+            return strategy.WithBasicAuthentication(configuration.Username, configuration.Password);
+        }
+
+        return strategy;
+    }
+}
--- a/src/WireMock.Net.Testcontainers/Utils/CombineUtils.cs
+++ b/src/WireMock.Net.Testcontainers/Utils/CombineUtils.cs
@@ -0,0 +1,20 @@
+// Copyright © WireMock.Net
+
+using System.Collections.Generic;
+using System.Linq;
+
+namespace WireMock.Net.Testcontainers.Utils;
+
+internal static class CombineUtils
+{
+    internal static List<T> Combine<T>(List<T> oldValue, List<T> newValue)
+    {
+        return oldValue.Union(newValue).ToList();
+    }
+
+    internal static Dictionary<TKey, TValue> Combine<TKey, TValue>(Dictionary<TKey, TValue> oldValue, Dictionary<TKey, TValue> newValue)
+        where TKey : notnull
+    {
+        return oldValue.Union(newValue).ToDictionary(item => item.Key, item => item.Value);
+    }
+}
--- a/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj
+++ b/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj
@@ -39,7 +39,7 @@
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
        <PackageReference Include="Stef.Validation" Version="0.1.1" />
-        <PackageReference Include="Testcontainers" Version="4.7.0" />
+        <PackageReference Include="Testcontainers" Version="4.10.0" />
    </ItemGroup>

    <ItemGroup>
--- a/src/WireMock.Net.Testcontainers/WireMockConfiguration.cs
+++ b/src/WireMock.Net.Testcontainers/WireMockConfiguration.cs
@@ -1,12 +1,12 @@
 // Copyright © WireMock.Net

 using System.Collections.Generic;
-using System.Linq;
 using Docker.DotNet.Models;
 using DotNet.Testcontainers.Builders;
 using DotNet.Testcontainers.Configurations;
 using JetBrains.Annotations;
 using Stef.Validation;
+using WireMock.Net.Testcontainers.Utils;

 namespace WireMock.Net.Testcontainers;

@@ -77,8 +77,8 @@ public sealed class WireMockConfiguration : ContainerConfiguration
        StaticMappingsPath = BuildConfiguration.Combine(oldValue.StaticMappingsPath, newValue.StaticMappingsPath);
        WatchStaticMappings = BuildConfiguration.Combine(oldValue.WatchStaticMappings, newValue.WatchStaticMappings);
        WatchStaticMappingsInSubdirectories = BuildConfiguration.Combine(oldValue.WatchStaticMappingsInSubdirectories, newValue.WatchStaticMappingsInSubdirectories);
-        AdditionalUrls = Combine(oldValue.AdditionalUrls, newValue.AdditionalUrls);
-        ProtoDefinitions = Combine(oldValue.ProtoDefinitions, newValue.ProtoDefinitions);
+        AdditionalUrls = CombineUtils.Combine(oldValue.AdditionalUrls, newValue.AdditionalUrls);
+        ProtoDefinitions = CombineUtils.Combine(oldValue.ProtoDefinitions, newValue.ProtoDefinitions);
    }

    /// <summary>
@@ -130,16 +130,4 @@ public sealed class WireMockConfiguration : ContainerConfiguration

        return this;
    }
-
-    private static List<T> Combine<T>(List<T> oldValue, List<T> newValue)
-    {
-        return oldValue.Concat(newValue).ToList();
-    }
-
-    private static Dictionary<TKey, TValue> Combine<TKey, TValue>(Dictionary<TKey, TValue> oldValue, Dictionary<TKey, TValue> newValue)
-    {
-        return newValue
-            .Concat(oldValue.Where(item => !newValue.Keys.Contains(item.Key)))
-            .ToDictionary(item => item.Key, item => item.Value);
-    }
 }
--- a/src/WireMock.Net.Testcontainers/WireMockContainer.cs
+++ b/src/WireMock.Net.Testcontainers/WireMockContainer.cs
@@ -24,28 +24,21 @@ namespace WireMock.Net.Testcontainers;
 /// <summary>
 /// A container for running WireMock in a docker environment.
 /// </summary>
-public sealed class WireMockContainer : DockerContainer
+/// <remarks>
+/// Initializes a new instance of the <see cref="WireMockContainer" /> class.
+/// </remarks>
+/// <param name="configuration">The container configuration.</param>
+public sealed class WireMockContainer(WireMockConfiguration configuration) : DockerContainer(configuration)
 {
    private const int EnhancedFileSystemWatcherTimeoutMs = 2000;
    internal const int ContainerPort = 80;

-    private readonly WireMockConfiguration _configuration;
+    private readonly WireMockConfiguration _configuration = Guard.NotNull(configuration);

    private IWireMockAdminApi? _adminApi;
    private EnhancedFileSystemWatcher? _enhancedFileSystemWatcher;
    private IDictionary<int, Uri>? _publicUris;

-    /// <summary>
-    /// Initializes a new instance of the <see cref="WireMockContainer" /> class.
-    /// </summary>
-    /// <param name="configuration">The container configuration.</param>
-    public WireMockContainer(WireMockConfiguration configuration) : base(configuration)
-    {
-        _configuration = Guard.NotNull(configuration);
-
-        Started += async (sender, eventArgs) => await WireMockContainerStartedAsync(sender, eventArgs);
-    }
-
    /// <summary>
    /// Gets the public Url.
    /// </summary>
@@ -128,12 +121,14 @@ public sealed class WireMockContainer : DockerContainer
    /// </summary>
    /// <param name="source">The source directory or file to be copied.</param>
    /// <param name="target">The target directory path to copy the files to.</param>
+    /// <param name="uid">The user ID to set for the copied file or directory. Defaults to 0 (root).</param>
+    /// <param name="gid">The group ID to set for the copied file or directory. Defaults to 0 (root).</param>
    /// <param name="fileMode">The POSIX file mode permission.</param>
    /// <param name="ct">Cancellation token.</param>
    /// <returns>A task that completes when the directory or file has been copied.</returns>
-    public new async Task CopyAsync(string source, string target, UnixFileModes fileMode = Unix.FileMode644, CancellationToken ct = default)
+    public new async Task CopyAsync(string source, string target, uint uid = 0, uint gid = 0, UnixFileModes fileMode = Unix.FileMode644, CancellationToken ct = default)
    {
-        await base.CopyAsync(source, target, fileMode, ct);
+        await base.CopyAsync(source, target, uid, gid, fileMode, ct);

        if (_configuration.WatchStaticMappings && await PathStartsWithContainerMappingsPath(target))
        {
@@ -154,14 +149,29 @@ public sealed class WireMockContainer : DockerContainer

        try
        {
-            await _adminApi.ReloadStaticMappingsAsync(cancellationToken);
+            var result = await _adminApi.ReloadStaticMappingsAsync(cancellationToken);
+            Logger.LogInformation("WireMock.Net -> ReloadStaticMappings result: {Result}", result);
        }
        catch (Exception ex)
        {
-            Logger.LogWarning(ex, "Error calling /__admin/mappings/reloadStaticMappings");
+            Logger.LogWarning(ex, "WireMock.Net -> Error calling /__admin/mappings/reloadStaticMappings");
        }
    }

+    /// <summary>
+    /// Performs additional actions after the container is ready.
+    /// </summary>
+    public Task CallAdditionalActionsAfterReadyAsync()
+    {
+        Logger.LogInformation("WireMock.Net -> Calling additional actions.");
+
+        _adminApi = CreateWireMockAdminClient();
+
+        RegisterEnhancedFileSystemWatcher();
+
+        return AddProtoDefinitionsAsync();
+    }
+
    /// <inheritdoc />
    protected override ValueTask DisposeAsyncCore()
    {
@@ -194,15 +204,6 @@ public sealed class WireMockContainer : DockerContainer
        }
    }

-    private async Task WireMockContainerStartedAsync(object sender, EventArgs e)
-    {
-        _adminApi = CreateWireMockAdminClient();
-
-        RegisterEnhancedFileSystemWatcher();
-
-        await CallAdditionalActionsAfterStartedAsync();
-    }
-
    private void RegisterEnhancedFileSystemWatcher()
    {
        if (!_configuration.WatchStaticMappings || string.IsNullOrEmpty(_configuration.StaticMappingsPath))
@@ -220,23 +221,31 @@ public sealed class WireMockContainer : DockerContainer
        _enhancedFileSystemWatcher.EnableRaisingEvents = true;
    }

-    private async Task CallAdditionalActionsAfterStartedAsync()
+    private async Task AddProtoDefinitionsAsync()
    {
        foreach (var kvp in _configuration.ProtoDefinitions)
        {
-            Logger.LogInformation("Adding ProtoDefinition {Id}", kvp.Key);
+            Logger.LogInformation("WireMock.Net -> Adding ProtoDefinition '{Id}'", kvp.Key);
+
            foreach (var protoDefinition in kvp.Value)
            {
                try
                {
-                    await _adminApi!.AddProtoDefinitionAsync(kvp.Key, protoDefinition);
+                    var result = await _adminApi!.AddProtoDefinitionAsync(kvp.Key, protoDefinition);
+                    Logger.LogInformation("WireMock.Net -> AddProtoDefinition '{Id}' result: {Result}", kvp.Key, result);
                }
                catch (Exception ex)
                {
-                    Logger.LogWarning(ex, "Error adding ProtoDefinition '{Id}'.", kvp.Key);
+                    Logger.LogWarning(ex, "WireMock.Net -> Error adding ProtoDefinition '{Id}'.", kvp.Key);
                }
            }
        }
+
+        // Force a reload of static mappings when ProtoDefinitions are added at server-level to fix #1382
+        if (_configuration.ProtoDefinitions.Count > 0)
+        {
+            await ReloadStaticMappingsAsync();
+        }
    }

    private async void FileCreatedChangedOrDeleted(object sender, FileSystemEventArgs args)
@@ -244,16 +253,17 @@ public sealed class WireMockContainer : DockerContainer
        try
        {
            await ReloadStaticMappingsAsync(args.FullPath);
+            Logger.LogInformation("WireMock.Net -> ReloadStaticMappings triggered from file change: '{FullPath}'.", args.FullPath);
        }
        catch (Exception ex)
        {
-            Logger.LogWarning(ex, "Error reloading static mappings from '{FullPath}'.", args.FullPath);
+            Logger.LogWarning(ex, "WireMock.Net -> Error reloading static mappings from '{FullPath}'.", args.FullPath);
        }
    }

    private async Task ReloadStaticMappingsAsync(string path, CancellationToken cancellationToken = default)
    {
-        Logger.LogInformation("MappingFile created, changed or deleted: '{Path}'. Triggering ReloadStaticMappings.", path);
+        Logger.LogInformation("WireMock.Net -> MappingFile created, changed or deleted: '{Path}'. Triggering ReloadStaticMappings.", path);
        await ReloadStaticMappingsAsync(cancellationToken);
    }

--- a/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs
+++ b/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs
@@ -2,6 +2,8 @@

 using System;
 using System.Linq;
+using System.Net;
+using System.Net.Http;
 using System.Runtime.InteropServices;
 using Docker.DotNet.Models;
 using DotNet.Testcontainers.Builders;
@@ -62,6 +64,29 @@ public sealed class WireMockContainerBuilder : ContainerBuilder<WireMockContaine
        return WithImage(OSPlatform.Windows);
    }

+    /// <summary>
+    /// Sets a custom WireMock.Net image for which to create the container.
+    /// </summary>
+    /// <param name="image">The image name.</param>
+    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
+    [PublicAPI]
+    public new WireMockContainerBuilder WithImage(string image)
+    {
+        return WithCustomImage(image);
+    }
+
+    /// <summary>
+    /// Sets a custom WireMock.Net image for which to create the container.
+    /// </summary>
+    /// <param name="image">The image name.</param>
+    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
+    [PublicAPI]
+    public WireMockContainerBuilder WithCustomImage(string image)
+    {
+        _imageOS ??= TestcontainersUtils.GetImageOSAsync.Value.GetAwaiter().GetResult();
+        return base.WithImage(image);
+    }
+
    /// <summary>
    /// Set the admin username and password for the container (basic authentication).
    /// </summary>
@@ -112,6 +137,7 @@ public sealed class WireMockContainerBuilder : ContainerBuilder<WireMockContaine
    {
        DockerResourceConfiguration.WithWatchStaticMappings(includeSubDirectories);
        return
+            WithCommand("--ReadStaticMappings true").
            WithCommand("--WatchStaticMappings true").
            WithCommand("--WatchStaticMappingsInSubdirectories", includeSubDirectories);
    }
@@ -129,9 +155,7 @@ public sealed class WireMockContainerBuilder : ContainerBuilder<WireMockContaine

        DockerResourceConfiguration.WithStaticMappingsPath(path);

-        return
-            WithReadStaticMappings().
-            WithCommand("--WatchStaticMappingsInSubdirectories", includeSubDirectories);
+        return WithWatchStaticMappings(includeSubDirectories);
    }

    /// <summary>
@@ -208,9 +232,9 @@ public sealed class WireMockContainerBuilder : ContainerBuilder<WireMockContaine
        // In case the _imageOS is not set, determine it from the Image FullName.
        if (_imageOS == null)
        {
-            if (builder.DockerResourceConfiguration.Image.FullName.IndexOf("wiremock.net", StringComparison.OrdinalIgnoreCase) < 0)
+            if (builder.DockerResourceConfiguration.Image.FullName.IndexOf("wiremock", StringComparison.OrdinalIgnoreCase) < 0)
            {
-                throw new InvalidOperationException();
+                throw new InvalidOperationException("It's only possible to use a wiremock docker image.");
            }

            _imageOS = builder.DockerResourceConfiguration.Image.FullName.IndexOf("windows", StringComparison.OrdinalIgnoreCase) >= 0 ? OSPlatform.Windows : OSPlatform.Linux;
@@ -228,6 +252,25 @@ public sealed class WireMockContainerBuilder : ContainerBuilder<WireMockContaine

        builder.Validate();

+        var waitForContainerOS = _imageOS == OSPlatform.Windows ? Wait.ForWindowsContainer() : Wait.ForUnixContainer();
+        builder = builder
+            .WithWaitStrategy(waitForContainerOS
+                .UntilMessageIsLogged("WireMock.Net server running", waitStrategy => waitStrategy.WithTimeout(TimeSpan.FromSeconds(30)))
+                .UntilHttpRequestIsSucceeded(httpWaitStrategy => httpWaitStrategy
+                    .ForPort(WireMockContainer.ContainerPort)
+                    .WithMethod(HttpMethod.Get)
+                    .WithBasicAuthentication(DockerResourceConfiguration)
+                    .ForPath("/__admin/health")
+                    .ForStatusCode(HttpStatusCode.OK)
+                    .ForResponseMessageMatching(async httpResponseMessage =>
+                    {
+                        var content = await httpResponseMessage.Content.ReadAsStringAsync();
+                        return content?.Contains("Healthy") == true;
+                    })
+                )
+                .AddCustomWaitStrategy(new WireMockWaitStrategy())
+        );
+
        return new WireMockContainer(builder.DockerResourceConfiguration);
    }

@@ -236,11 +279,9 @@ public sealed class WireMockContainerBuilder : ContainerBuilder<WireMockContaine
    {
        var builder = base.Init();

-        var waitForContainerOS = _imageOS == OSPlatform.Windows ? Wait.ForWindowsContainer() : Wait.ForUnixContainer();
        return builder
            .WithPortBinding(WireMockContainer.ContainerPort, true)
-            .WithCommand($"--WireMockLogger {DefaultLogger}")
-            .WithWaitStrategy(waitForContainerOS.UntilMessageIsLogged("WireMock.Net server running"));
+            .WithCommand($"--WireMockLogger {DefaultLogger}");
    }

    /// <inheritdoc />
--- a/src/WireMock.Net.Testcontainers/WireMockWaitStrategy.cs
+++ b/src/WireMock.Net.Testcontainers/WireMockWaitStrategy.cs
@@ -0,0 +1,23 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Threading.Tasks;
+using DotNet.Testcontainers.Configurations;
+using DotNet.Testcontainers.Containers;
+
+namespace WireMock.Net.Testcontainers;
+
+internal class WireMockWaitStrategy : IWaitUntil
+{
+    public async Task<bool> UntilAsync(IContainer container)
+    {
+        if (container is not WireMockContainer wireMockContainer)
+        {
+            throw new InvalidOperationException("The passed container is not a WireMockContainer.");
+
+        }
+
+        await wireMockContainer.CallAdditionalActionsAfterReadyAsync();
+        return true;
+    }
+}
--- a/src/WireMock.Net.xUnit.v3/TestOutputHelperWireMockLogger.cs
+++ b/src/WireMock.Net.xUnit.v3/TestOutputHelperWireMockLogger.cs
@@ -0,0 +1,79 @@
+// Copyright © WireMock.Net
+
+using System;
+using Newtonsoft.Json;
+using Stef.Validation;
+using WireMock.Admin.Requests;
+using WireMock.Logging;
+using Xunit;
+
+namespace WireMock.Net.Xunit;
+
+/// <summary>
+/// When using xUnit, this class enables to log the output from WireMock.Net to the <see cref="ITestOutputHelper"/>.
+/// </summary>
+public sealed class TestOutputHelperWireMockLogger : IWireMockLogger
+{
+    private readonly ITestOutputHelper _testOutputHelper;
+
+    /// <summary>
+    /// Create a new instance on the <see cref="TestOutputHelperWireMockLogger"/>.
+    /// </summary>
+    /// <param name="testOutputHelper">Represents a class which can be used to provide test output.</param>
+    public TestOutputHelperWireMockLogger(ITestOutputHelper testOutputHelper)
+    {
+        _testOutputHelper = Guard.NotNull(testOutputHelper);
+    }
+
+    /// <inheritdoc />
+    public void Debug(string formatString, params object[] args)
+    {
+        _testOutputHelper.WriteLine(Format("Debug", formatString, args));
+    }
+
+    /// <inheritdoc />
+    public void Info(string formatString, params object[] args)
+    {
+        _testOutputHelper.WriteLine(Format("Info", formatString, args));
+    }
+
+    /// <inheritdoc />
+    public void Warn(string formatString, params object[] args)
+    {
+        _testOutputHelper.WriteLine(Format("Warning", formatString, args));
+    }
+
+    /// <inheritdoc />
+    public void Error(string formatString, params object[] args)
+    {
+        _testOutputHelper.WriteLine(Format("Error", formatString, args));
+    }
+
+    /// <inheritdoc />
+    public void Error(string message, Exception exception)
+    {
+        _testOutputHelper.WriteLine(Format("Error", $"{message} {{0}}", exception));
+
+        if (exception is AggregateException ae)
+        {
+            ae.Handle(ex =>
+            {
+                _testOutputHelper.WriteLine(Format("Error", "Exception {0}", ex));
+                return true;
+            });
+        }
+    }
+
+    /// <inheritdoc />
+    public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
+    {
+        var message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
+        _testOutputHelper.WriteLine(Format("DebugRequestResponse", "Admin[{0}] {1}", isAdminRequest, message));
+    }
+
+    private static string Format(string level, string formatString, params object[] args)
+    {
+        var message = args.Length > 0 ? string.Format(formatString, args) : formatString;
+        return $"{DateTime.UtcNow} [{level}] : {message}";
+    }
+}
--- a/src/WireMock.Net.xUnit.v3/WireMock.Net.xUnit.v3.csproj
+++ b/src/WireMock.Net.xUnit.v3/WireMock.Net.xUnit.v3.csproj
@@ -0,0 +1,37 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <Description>Some extensions for xUnit (ITestOutputHelper)</Description>
+        <AssemblyTitle>WireMock.Net.xUnit.v3</AssemblyTitle>
+        <Authors>Stef Heyenrath</Authors>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <PackageTags>tdd;wiremock;test;unittest;xunit</PackageTags>
+        <ProjectGuid>{4F46BD02-BEBC-4B2D-B857-4169AD222267}</ProjectGuid>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+        <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+        <PackageReference Include="Stef.Validation" Version="0.2.0" />
+        <PackageReference Include="xunit.v3.extensibility.core" Version="3.2.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Update="JetBrains.Annotations" Version="2025.2.2" />
+    </ItemGroup>
+</Project>
--- a/test/WireMock.Net.Aspire.TestAppHost/WireMock.Net.Aspire.TestAppHost.csproj
+++ b/test/WireMock.Net.Aspire.TestAppHost/WireMock.Net.Aspire.TestAppHost.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">

-    <Sdk Name="Aspire.AppHost.Sdk" Version="9.2.0" />
+    <Sdk Name="Aspire.AppHost.Sdk" Version="13.1.0" />

    <PropertyGroup>
        <OutputType>Exe</OutputType>
@@ -19,7 +19,7 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.AppHost" Version="9.2.0" />
+        <PackageReference Include="Aspire.Hosting.AppHost" Version="13.1.0" />
    </ItemGroup>

    <ItemGroup>
--- a/test/WireMock.Net.Aspire.Tests/IntegrationTests.cs
+++ b/test/WireMock.Net.Aspire.Tests/IntegrationTests.cs
@@ -19,6 +19,7 @@ public class IntegrationTests(ITestOutputHelper output)
        var appHostBuilder = await DistributedApplicationTestingBuilder.CreateAsync<WireMock_Net_Aspire_TestAppHost>();
        await using var app = await appHostBuilder.BuildAsync();
        await app.StartAsync();
+        await app.ResourceNotifications.WaitForResourceHealthyAsync("wiremock-service");

        using var httpClient = app.CreateHttpClient("wiremock-service");

@@ -46,6 +47,7 @@ public class IntegrationTests(ITestOutputHelper output)
        var appHostBuilder = await DistributedApplicationTestingBuilder.CreateAsync<WireMock_Net_Aspire_TestAppHost>();
        await using var app = await appHostBuilder.BuildAsync();
        await app.StartAsync();
+        await app.ResourceNotifications.WaitForResourceHealthyAsync("wiremock-service");

        var adminClient = app.CreateWireMockAdminClient("wiremock-service");

--- a/test/WireMock.Net.Aspire.Tests/WireMock.Net.Aspire.Tests.csproj
+++ b/test/WireMock.Net.Aspire.Tests/WireMock.Net.Aspire.Tests.csproj
@@ -13,7 +13,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.Testing" Version="9.2.0" />
+        <PackageReference Include="Aspire.Hosting.Testing" Version="13.1.0" />
        <PackageReference Include="Codecov" Version="1.13.0" />
        <PackageReference Include="coverlet.msbuild" Version="6.0.2">
            <PrivateAssets>all</PrivateAssets>
--- a/test/WireMock.Net.Aspire.Tests/WireMockServerArgumentsTests.cs
+++ b/test/WireMock.Net.Aspire.Tests/WireMockServerArgumentsTests.cs
@@ -13,7 +13,7 @@ public class WireMockServerArgumentsTests
        var args = new WireMockServerArguments();

        // Assert
-        args.HttpPort.Should().BeNull();
+        args.HttpPorts.Should().BeEmpty();
        args.AdminUsername.Should().BeNull();
        args.AdminPassword.Should().BeNull();
        args.ReadStaticMappings.Should().BeFalse();
--- a/test/WireMock.Net.Aspire.Tests/WireMockServerBuilderExtensionsTests.cs
+++ b/test/WireMock.Net.Aspire.Tests/WireMockServerBuilderExtensionsTests.cs
@@ -3,6 +3,7 @@
 using System.Net.Sockets;
 using FluentAssertions;
 using Moq;
+using WireMock.Util;

 namespace WireMock.Net.Aspire.Tests;

@@ -40,7 +41,21 @@ public class WireMockServerBuilderExtensionsTests
    }

    [Fact]
-    public void AddWireMock()
+    public void AddWireMock_WithInvalidAdditionalUrls_ShouldThrowArgumentException()
+    {
+        // Arrange
+        string[] invalidUrls = { "err" };
+        var builder = Mock.Of<IDistributedApplicationBuilder>();
+
+        // Act
+        Action act = () => builder.AddWireMock("ValidName", invalidUrls);
+
+        // Assert
+        act.Should().Throw<ArgumentException>().WithMessage("The URL 'err' is not valid.");
+    }
+
+    [Fact]
+    public void AddWireMockWithPort()
    {
        // Arrange
        var name = $"apiservice{Guid.NewGuid()}";
@@ -65,9 +80,9 @@ public class WireMockServerBuilderExtensionsTests
            ReadStaticMappings = true,
            WatchStaticMappings = false,
            MappingsPath = null,
-            HttpPort = port
+            HttpPorts = [port]
        });
-        wiremock.Resource.Annotations.Should().HaveCount(5);
+        wiremock.Resource.Annotations.Should().HaveCount(6);

        var containerImageAnnotation = wiremock.Resource.Annotations.OfType<ContainerImageAnnotation>().FirstOrDefault();
        containerImageAnnotation.Should().BeEquivalentTo(new ContainerImageAnnotation
@@ -90,9 +105,90 @@ public class WireMockServerBuilderExtensionsTests
        ));

        wiremock.Resource.Annotations.OfType<EnvironmentCallbackAnnotation>().FirstOrDefault().Should().NotBeNull();
-
        wiremock.Resource.Annotations.OfType<CommandLineArgsCallbackAnnotation>().FirstOrDefault().Should().NotBeNull();
+        wiremock.Resource.Annotations.OfType<ResourceCommandAnnotation>().FirstOrDefault().Should().NotBeNull();
+    }

+    [Fact]
+    public void AddWireMockWithAdditionalUrls()
+    {
+        // Arrange
+        var name = $"apiservice{Guid.NewGuid()}";
+        var freePorts = PortUtils.FindFreeTcpPorts(2).ToList();
+        string[] additionalUrls = { $"http://*:{freePorts[0]}", $"grpc://*:{freePorts[1]}" };
+        const string username = "admin";
+        const string password = "test";
+        var builder = DistributedApplication.CreateBuilder();
+
+        // Act
+        var wiremock = builder
+            .AddWireMock(name, additionalUrls)
+            .WithAdminUserNameAndPassword(username, password)
+            .WithReadStaticMappings();
+
+        // Assert
+        wiremock.Resource.Should().NotBeNull();
+        wiremock.Resource.Name.Should().Be(name);
+        wiremock.Resource.Arguments.Should().BeEquivalentTo(new WireMockServerArguments
+        {
+            AdminPassword = password,
+            AdminUsername = username,
+            ReadStaticMappings = true,
+            WatchStaticMappings = false,
+            MappingsPath = null,
+            HttpPorts = freePorts,
+            AdditionalUrls = additionalUrls.ToList()
+        });
+        wiremock.Resource.Annotations.Should().HaveCount(9);
+
+        var containerImageAnnotation = wiremock.Resource.Annotations.OfType<ContainerImageAnnotation>().FirstOrDefault();
+        containerImageAnnotation.Should().BeEquivalentTo(new ContainerImageAnnotation
+        {
+            Image = "sheyenrath/wiremock.net-alpine",
+            Registry = null,
+            Tag = "latest"
+        });
+
+        var endpointAnnotations = wiremock.Resource.Annotations.OfType<EndpointAnnotation>().ToArray();
+        endpointAnnotations.Should().HaveCount(3);
+
+        var endpointAnnotationForHttp80 = endpointAnnotations[0];
+        endpointAnnotationForHttp80.Should().BeEquivalentTo(new EndpointAnnotation(
+            protocol: ProtocolType.Tcp,
+            uriScheme: "http",
+            transport: null,
+            name: null,
+            port: null,
+            targetPort: 80,
+            isExternal: null,
+            isProxied: true
+        ));
+        var endpointAnnotationForHttpFreePort = endpointAnnotations[1];
+        endpointAnnotationForHttpFreePort.Should().BeEquivalentTo(new EndpointAnnotation(
+            protocol: ProtocolType.Tcp,
+            uriScheme: "http",
+            transport: null,
+            name: $"http-{freePorts[0]}",
+            port: freePorts[0],
+            targetPort: freePorts[0],
+            isExternal: null,
+            isProxied: true
+        ));
+
+        var endpointAnnotationForGrpcFreePort = endpointAnnotations[2];
+        endpointAnnotationForGrpcFreePort.Should().BeEquivalentTo(new EndpointAnnotation(
+            protocol: ProtocolType.Tcp,
+            uriScheme: "grpc",
+            transport: null,
+            name: $"grpc-{freePorts[1]}",
+            port: freePorts[1],
+            targetPort: freePorts[1],
+            isExternal: null,
+            isProxied: true
+        ));
+
+        wiremock.Resource.Annotations.OfType<EnvironmentCallbackAnnotation>().FirstOrDefault().Should().NotBeNull();
+        wiremock.Resource.Annotations.OfType<CommandLineArgsCallbackAnnotation>().FirstOrDefault().Should().NotBeNull();
        wiremock.Resource.Annotations.OfType<ResourceCommandAnnotation>().FirstOrDefault().Should().NotBeNull();
    }
 }
--- a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.IWireMockAdminApi_GetMappingAsync_WithProxy_And_ProxyUrlReplaceSettings_And_TransformTemplate.verified.txt
+++ b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.IWireMockAdminApi_GetMappingAsync_WithProxy_And_ProxyUrlReplaceSettings_And_TransformTemplate.verified.txt
@@ -0,0 +1,29 @@
+{
+  Guid: 90356dba-b36c-469a-a17e-669cd84f1f06,
+  UpdatedAt: DateTime_1,
+  Request: {
+    Path: {
+      Matchers: [
+        {
+          Name: WildcardMatcher,
+          Pattern: /1,
+          IgnoreCase: false
+        }
+      ]
+    },
+    Body: {
+      Matcher: {
+        Name: RegexMatcher,
+        Pattern: hello,
+        IgnoreCase: true
+      }
+    }
+  },
+  Response: {
+    ProxyUrl: https://my-proxy.com,
+    ProxyUrlReplaceSettings: {
+      IgnoreCase: false,
+      TransformTemplate: x{{this}}y
+    }
+  }
+}
--- a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.cs
+++ b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.cs
@@ -450,6 +450,55 @@ public partial class WireMockAdminApiTests
        server.Stop();
    }

+    [Fact]
+    public async Task IWireMockAdminApi_GetMappingAsync_WithProxy_And_ProxyUrlReplaceSettings_And_TransformTemplate()
+    {
+        // Arrange
+        var guid = Guid.Parse("90356dba-b36c-469a-a17e-669cd84f1f06");
+        var server = WireMockServer.StartWithAdminInterface();
+        var api = RestClient.For<IWireMockAdminApi>(server.Url);
+
+        // Act
+        var model = new MappingModel
+        {
+            Guid = guid,
+            Request = new RequestModel
+            {
+                Path = "/1",
+                Body = new BodyModel
+                {
+                    Matcher = new MatcherModel
+                    {
+                        Name = "RegexMatcher",
+                        Pattern = "hello",
+                        IgnoreCase = true
+                    }
+                }
+            },
+            Response = new ResponseModel
+            {
+                ProxyUrl = "https://my-proxy.com",
+                ProxyUrlReplaceSettings = new ProxyUrlReplaceSettingsModel
+                {
+                    TransformTemplate = "x{{this}}y"
+                }
+            }
+        };
+        var postMappingResult = await api.PostMappingAsync(model).ConfigureAwait(false);
+
+        // Assert
+        postMappingResult.Should().NotBeNull();
+
+        var mapping = server.Mappings.FirstOrDefault(m => m.Guid == guid);
+        mapping.Should().NotBeNull();
+
+        var getMappingResult = await api.GetMappingAsync(guid).ConfigureAwait(false);
+
+        await Verifier.Verify(getMappingResult, VerifySettings).DontScrubGuids();
+
+        server.Stop();
+    }
+
    [Fact]
    public async Task IWireMockAdminApi_GetRequestsAsync_Json()
    {
--- a/test/WireMock.Net.Tests/MappingBuilderTests.GetMappings.verified.txt
+++ b/test/WireMock.Net.Tests/MappingBuilderTests.GetMappings.verified.txt
@@ -190,5 +190,92 @@
      BodyDestination: SameAsSource,
      Body: Buy milk
    }
+  },
+  {
+    Guid: 98fae52e-76df-47d9-876f-2ee32e931006,
+    UpdatedAt: 2023-01-14 15:16:17,
+    Request: {
+      Path: {
+        Matchers: [
+          {
+            Name: WildcardMatcher,
+            Pattern: /delay,
+            IgnoreCase: false
+          }
+        ]
+      },
+      Methods: [
+        GET
+      ]
+    },
+    Response: {
+      Delay: 1000
+    }
+  },
+  {
+    Guid: 98fae52e-76df-47d9-876f-2ee32e931007,
+    UpdatedAt: 2023-01-14 15:16:17,
+    Request: {
+      Path: {
+        Matchers: [
+          {
+            Name: WildcardMatcher,
+            Pattern: /random-delay,
+            IgnoreCase: false
+          }
+        ]
+      },
+      Methods: [
+        GET
+      ]
+    },
+    Response: {
+      MinimumRandomDelay: 1234,
+      MaximumRandomDelay: 60000
+    }
+  },
+  {
+    Guid: 98fae52e-76df-47d9-876f-2ee32e931008,
+    UpdatedAt: 2023-01-14 15:16:17,
+    Request: {
+      Path: {
+        Matchers: [
+          {
+            Name: WildcardMatcher,
+            Pattern: /prob,
+            IgnoreCase: false
+          }
+        ]
+      },
+      Methods: [
+        GET
+      ]
+    },
+    Response: {
+      StatusCode: 300
+    },
+    Probability: 0.1
+  },
+  {
+    Guid: 98fae52e-76df-47d9-876f-2ee32e931009,
+    UpdatedAt: 2023-01-14 15:16:17,
+    Request: {
+      Path: {
+        Matchers: [
+          {
+            Name: WildcardMatcher,
+            Pattern: /prob,
+            IgnoreCase: false
+          }
+        ]
+      },
+      Methods: [
+        GET
+      ]
+    },
+    Response: {
+      StatusCode: 201
+    },
+    Probability: 0.9
  }
 ]
--- a/test/WireMock.Net.Tests/MappingBuilderTests.ToCSharpCode_Builder.verified.txt
+++ b/test/WireMock.Net.Tests/MappingBuilderTests.ToCSharpCode_Builder.verified.txt
@@ -78,3 +78,45 @@ builder
        .WithBody("Buy milk")
    );

+builder
+    .Given(Request.Create()
+        .UsingMethod("GET")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/delay", false, WireMock.Matchers.MatchOperator.Or))
+    )
+    .WithGuid("98fae52e-76df-47d9-876f-2ee32e931006")
+    .RespondWith(Response.Create()
+        .WithDelay(1000)
+    );
+
+builder
+    .Given(Request.Create()
+        .UsingMethod("GET")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/random-delay", false, WireMock.Matchers.MatchOperator.Or))
+    )
+    .WithGuid("98fae52e-76df-47d9-876f-2ee32e931007")
+    .RespondWith(Response.Create()
+        .WithRandomDelay(1234, 60000)
+    );
+
+builder
+    .Given(Request.Create()
+        .UsingMethod("GET")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/prob", false, WireMock.Matchers.MatchOperator.Or))
+    )
+    .WithGuid("98fae52e-76df-47d9-876f-2ee32e931008")
+    .WithProbability(0.1)
+    .RespondWith(Response.Create()
+        .WithStatusCode(300)
+    );
+
+builder
+    .Given(Request.Create()
+        .UsingMethod("GET")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/prob", false, WireMock.Matchers.MatchOperator.Or))
+    )
+    .WithGuid("98fae52e-76df-47d9-876f-2ee32e931009")
+    .WithProbability(0.9)
+    .RespondWith(Response.Create()
+        .WithStatusCode(201)
+    );
+
--- a/test/WireMock.Net.Tests/MappingBuilderTests.ToCSharpCode_Server.verified.txt
+++ b/test/WireMock.Net.Tests/MappingBuilderTests.ToCSharpCode_Server.verified.txt
@@ -78,3 +78,45 @@ server
        .WithBody("Buy milk")
    );

+server
+    .Given(Request.Create()
+        .UsingMethod("GET")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/delay", false, WireMock.Matchers.MatchOperator.Or))
+    )
+    .WithGuid("98fae52e-76df-47d9-876f-2ee32e931006")
+    .RespondWith(Response.Create()
+        .WithDelay(1000)
+    );
+
+server
+    .Given(Request.Create()
+        .UsingMethod("GET")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/random-delay", false, WireMock.Matchers.MatchOperator.Or))
+    )
+    .WithGuid("98fae52e-76df-47d9-876f-2ee32e931007")
+    .RespondWith(Response.Create()
+        .WithRandomDelay(1234, 60000)
+    );
+
+server
+    .Given(Request.Create()
+        .UsingMethod("GET")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/prob", false, WireMock.Matchers.MatchOperator.Or))
+    )
+    .WithGuid("98fae52e-76df-47d9-876f-2ee32e931008")
+    .WithProbability(0.1)
+    .RespondWith(Response.Create()
+        .WithStatusCode(300)
+    );
+
+server
+    .Given(Request.Create()
+        .UsingMethod("GET")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/prob", false, WireMock.Matchers.MatchOperator.Or))
+    )
+    .WithGuid("98fae52e-76df-47d9-876f-2ee32e931009")
+    .WithProbability(0.9)
+    .RespondWith(Response.Create()
+        .WithStatusCode(201)
+    );
+
--- a/test/WireMock.Net.Tests/MappingBuilderTests.ToJson.verified.txt
+++ b/test/WireMock.Net.Tests/MappingBuilderTests.ToJson.verified.txt
@@ -186,5 +186,92 @@
      BodyDestination: SameAsSource,
      Body: Buy milk
    }
+  },
+  {
+    Guid: 98fae52e-76df-47d9-876f-2ee32e931006,
+    UpdatedAt: 2023-01-14T15:16:17,
+    Request: {
+      Path: {
+        Matchers: [
+          {
+            Name: WildcardMatcher,
+            Pattern: /delay,
+            IgnoreCase: false
+          }
+        ]
+      },
+      Methods: [
+        GET
+      ]
+    },
+    Response: {
+      Delay: 1000
+    }
+  },
+  {
+    Guid: 98fae52e-76df-47d9-876f-2ee32e931007,
+    UpdatedAt: 2023-01-14T15:16:17,
+    Request: {
+      Path: {
+        Matchers: [
+          {
+            Name: WildcardMatcher,
+            Pattern: /random-delay,
+            IgnoreCase: false
+          }
+        ]
+      },
+      Methods: [
+        GET
+      ]
+    },
+    Response: {
+      MinimumRandomDelay: 1234,
+      MaximumRandomDelay: 60000
+    }
+  },
+  {
+    Guid: 98fae52e-76df-47d9-876f-2ee32e931008,
+    UpdatedAt: 2023-01-14T15:16:17,
+    Request: {
+      Path: {
+        Matchers: [
+          {
+            Name: WildcardMatcher,
+            Pattern: /prob,
+            IgnoreCase: false
+          }
+        ]
+      },
+      Methods: [
+        GET
+      ]
+    },
+    Response: {
+      StatusCode: 300
+    },
+    Probability: 0.1
+  },
+  {
+    Guid: 98fae52e-76df-47d9-876f-2ee32e931009,
+    UpdatedAt: 2023-01-14T15:16:17,
+    Request: {
+      Path: {
+        Matchers: [
+          {
+            Name: WildcardMatcher,
+            Pattern: /prob,
+            IgnoreCase: false
+          }
+        ]
+      },
+      Methods: [
+        GET
+      ]
+    },
+    Response: {
+      StatusCode: 201
+    },
+    Probability: 0.9
  }
 ]
--- a/test/WireMock.Net.Tests/MappingBuilderTests.cs
+++ b/test/WireMock.Net.Tests/MappingBuilderTests.cs
@@ -2,6 +2,7 @@

 #if !(NET452 || NET461 || NETCOREAPP3_1)
 using System;
+using System.Net;
 using System.Threading.Tasks;
 using Moq;
 using VerifyTests;
@@ -118,6 +119,35 @@ public class MappingBuilderTests
        .RespondWith(Response.Create()
            .WithBody("Buy milk"));

+        _sut.Given(Request.Create()
+            .WithPath("/delay")
+            .UsingGet()
+        ).RespondWith(Response.Create()
+            .WithDelay(1000)
+        );
+
+        _sut.Given(Request.Create()
+            .WithPath("/random-delay")
+            .UsingGet()
+        ).RespondWith(Response.Create()
+            .WithRandomDelay(1234)
+        );
+
+        _sut.Given(Request.Create()
+            .WithPath("/prob")
+            .UsingGet()
+        ).WithProbability(0.1)
+            .RespondWith(Response.Create()
+            .WithStatusCode(HttpStatusCode.Ambiguous)
+        );
+        _sut.Given(Request.Create()
+            .WithPath("/prob")
+            .UsingGet()
+        ).WithProbability(0.9)
+            .RespondWith(Response.Create()
+            .WithStatusCode(HttpStatusCode.Created)
+        );
+
        _numMappings = _sut.GetMappings().Length;
    }

--- a/test/WireMock.Net.Tests/OpenApiParser/WireMockOpenApiParserTests.FromText_UsingYaml_ShouldReturnMappings.verified.txt
+++ b/test/WireMock.Net.Tests/OpenApiParser/WireMockOpenApiParserTests.FromText_UsingYaml_ShouldReturnMappings.verified.txt
--- a/test/WireMock.Net.Tests/Owin/MappingMatcherTests.cs
+++ b/test/WireMock.Net.Tests/Owin/MappingMatcherTests.cs
@@ -9,7 +9,6 @@ using WireMock.Matchers.Request;
 using WireMock.Models;
 using WireMock.Owin;
 using WireMock.Services;
-using WireMock.Util;
 using Xunit;

 namespace WireMock.Net.Tests.Owin;
@@ -26,7 +25,7 @@ public class MappingMatcherTests
        _optionsMock = new Mock<IWireMockMiddlewareOptions>();
        _optionsMock.SetupAllProperties();
        _optionsMock.Setup(o => o.Mappings).Returns(new ConcurrentDictionary<Guid, IMapping>());
-        _optionsMock.Setup(o => o.LogEntries).Returns(new ConcurrentObservableCollection<LogEntry>());
+        _optionsMock.Setup(o => o.LogEntries).Returns([]);
        _optionsMock.Setup(o => o.Scenarios).Returns(new ConcurrentDictionary<string, ScenarioState>());

        var loggerMock = new Mock<IWireMockLogger>();
@@ -35,7 +34,7 @@ public class MappingMatcherTests
        _optionsMock.Setup(o => o.Logger).Returns(loggerMock.Object);

        _randomizerDoubleBetween0And1Mock = new Mock<IRandomizerDoubleBetween0And1>();
-        _randomizerDoubleBetween0And1Mock.Setup(r => r.Generate()).Returns(0.0);
+        _randomizerDoubleBetween0And1Mock.Setup(r => r.Generate()).Returns(0.5);

        _sut = new MappingMatcher(_optionsMock.Object, _randomizerDoubleBetween0And1Mock.Object);
    }
@@ -84,8 +83,8 @@ public class MappingMatcherTests
        var guid2 = Guid.Parse("00000000-0000-0000-0000-000000000002");
        var mappings = InitMappings
        (
-            (guid1, new[] { 0.1 }, null),
-            (guid2, new[] { 1.0 }, null)
+            (guid1, [0.1], null),
+            (guid2, [1.0], null)
        );
        _optionsMock.Setup(o => o.Mappings).Returns(mappings);

@@ -112,8 +111,8 @@ public class MappingMatcherTests
        var guid2 = Guid.Parse("00000000-0000-0000-0000-000000000002");
        var mappings = InitMappings
        (
-            (guid1, new[] { 0.1 }, null),
-            (guid2, new[] { 0.9 }, null)
+            (guid1, [0.1], null),
+            (guid2, [0.9], null)
        );
        _optionsMock.Setup(o => o.Mappings).Returns(mappings);

@@ -139,8 +138,8 @@ public class MappingMatcherTests

        _optionsMock.SetupGet(o => o.AllowPartialMapping).Returns(true);
        var mappings = InitMappings(
-            (guid1, new[] { 0.1 }, null),
-            (guid2, new[] { 0.9 }, null)
+            (guid1, [0.1], null),
+            (guid2, [0.9], null)
        );
        _optionsMock.Setup(o => o.Mappings).Returns(mappings);

@@ -166,8 +165,8 @@ public class MappingMatcherTests
        var guid1 = Guid.Parse("00000000-0000-0000-0000-000000000001");
        var guid2 = Guid.Parse("00000000-0000-0000-0000-000000000002");
        var mappings = InitMappings(
-            (guid1, new[] { 1.0 }, null),
-            (guid2, new[] { 1.0, 1.0 }, null)
+            (guid1, [1.0], null),
+            (guid2, [1.0, 1.0], null)
        );
        _optionsMock.Setup(o => o.Mappings).Returns(mappings);

@@ -187,15 +186,15 @@ public class MappingMatcherTests
    }

    [Fact]
-    public void MappingMatcher_FindBestMatch_WhenProbabilityFailsFirst_ShouldReturnSecondMatch()
+    public void MappingMatcher_FindBestMatch_WhenProbabilityDoesNotMatch_ShouldReturnNormalMatch()
    {
        // Assign
-        var guid1 = Guid.Parse("00000000-0000-0000-0000-000000000001");
-        var guid2 = Guid.Parse("00000000-0000-0000-0000-000000000002");
+        var withProbability = Guid.Parse("00000000-0000-0000-0000-000000000001");
+        var noProbability = Guid.Parse("00000000-0000-0000-0000-000000000002");
        var mappings = InitMappings
        (
-            (guid1, new[] { 1.0 }, 1.0),
-            (guid2, new[] { 1.0 }, null)
+            (withProbability, [1.0], 0.4),
+            (noProbability, [1.0], null)
        );
        _optionsMock.Setup(o => o.Mappings).Returns(mappings);

@@ -206,8 +205,30 @@ public class MappingMatcherTests

        // Assert
        result.Match.Should().NotBeNull();
-        result.Match!.Mapping.Guid.Should().Be(guid2);
-        result.Match.RequestMatchResult.AverageTotalScore.Should().Be(1.0);
+        result.Match!.Mapping.Guid.Should().Be(noProbability);
+    }
+
+    [Fact]
+    public void MappingMatcher_FindBestMatch_WhenProbabilityDoesMatch_ShouldReturnProbabilityMatch()
+    {
+        // Assign
+        var withProbability = Guid.Parse("00000000-0000-0000-0000-000000000001");
+        var noProbability = Guid.Parse("00000000-0000-0000-0000-000000000002");
+        var mappings = InitMappings
+        (
+            (withProbability, [1.0], 0.6),
+            (noProbability, [1.0], null)
+        );
+        _optionsMock.Setup(o => o.Mappings).Returns(mappings);
+
+        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1");
+
+        // Act
+        var result = _sut.FindBestMatch(request);
+
+        // Assert
+        result.Match.Should().NotBeNull();
+        result.Match!.Mapping.Guid.Should().Be(withProbability);
    }

    private static ConcurrentDictionary<Guid, IMapping> InitMappings(params (Guid guid, double[] scores, double? probability)[] matches)
--- a/test/WireMock.Net.Tests/Proxy/ProxyUrlTransformerTests.cs
+++ b/test/WireMock.Net.Tests/Proxy/ProxyUrlTransformerTests.cs
@@ -0,0 +1,98 @@
+using System.Globalization;
+using Moq;
+using WireMock.Handlers;
+using WireMock.Proxy;
+using WireMock.Settings;
+using WireMock.Types;
+using Xunit;
+
+namespace WireMock.Net.Tests.Proxy;
+
+public class ProxyUrlTransformerTests
+{
+    private readonly Mock<IFileSystemHandler> _fileSystemHandlerMock = new();
+
+    [Fact]
+    public void Transform_WithUseTransformerFalse_PerformsSimpleReplace_CaseSensitive()
+    {
+        // Arrange
+        var settings = new WireMockServerSettings
+        {
+            FileSystemHandler = _fileSystemHandlerMock.Object,
+            Culture = CultureInfo.InvariantCulture
+        };
+
+        var replaceSettings = new ProxyUrlReplaceSettings
+        {
+            TransformTemplate = null,
+            OldValue = "/old",
+            NewValue = "/new",
+            IgnoreCase = false
+        };
+
+        var url = "http://example.com/old/path";
+        var expected = "http://example.com/new/path";
+
+        // Act
+        var actual = ProxyUrlTransformer.Transform(settings, replaceSettings, url);
+
+        // Assert
+        Assert.Equal(expected, actual);
+    }
+
+    [Fact]
+    public void Transform_WithUseTransformerFalse_PerformsSimpleReplace_IgnoreCase()
+    {
+        // Arrange
+        var settings = new WireMockServerSettings
+        {
+            FileSystemHandler = _fileSystemHandlerMock.Object,
+            Culture = CultureInfo.InvariantCulture
+        };
+
+        var replaceSettings = new ProxyUrlReplaceSettings
+        {
+            TransformTemplate = null, // UseTransformer == false
+            OldValue = "/OLD",
+            NewValue = "/new",
+            IgnoreCase = true
+        };
+
+        var url = "http://example.com/old/path"; // lowercase 'old' but OldValue is uppercase
+        var expected = "http://example.com/new/path";
+
+        // Act
+        var actual = ProxyUrlTransformer.Transform(settings, replaceSettings, url);
+
+        // Assert
+        Assert.Equal(expected, actual);
+    }
+
+    [Fact]
+    public void Transform_WithUseTransformerTrue_UsesTransformer_ToTransformUrl()
+    {
+        // Arrange
+        var settings = new WireMockServerSettings
+        {
+            FileSystemHandler = _fileSystemHandlerMock.Object,
+            Culture = CultureInfo.InvariantCulture
+        };
+
+        // Handlebars is the default TransformerType; the TransformTemplate uses the model directly.
+        var replaceSettings = new ProxyUrlReplaceSettings
+        {
+            TransformTemplate = "{{this}}-transformed",
+            // TransformerType defaults to Handlebars but set explicitly for clarity.
+            TransformerType = TransformerType.Handlebars
+        };
+
+        var url = "http://example.com/path";
+        var expected = "http://example.com/path-transformed";
+
+        // Act
+        var actual = ProxyUrlTransformer.Transform(settings, replaceSettings, url);
+
+        // Assert
+        Assert.Equal(expected, actual);
+    }
+}
--- a/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithBodyTests.cs
+++ b/test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithBodyTests.cs
@@ -1,11 +1,12 @@
 // Copyright © WireMock.Net

 using System;
-using FluentAssertions;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using FluentAssertions;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using NFluent;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
@@ -72,15 +73,17 @@ public class RequestBuilderWithBodyTests
    }

    [Fact]
-    public void Request_WithBody_FuncJson()
+    public void Request_WithBody_FuncObject()
    {
        // Assign
-        var requestBuilder = Request.Create().UsingAnyMethod().WithBody(b => b != null);
+        var requestBuilder = Request.Create()
+            .UsingAnyMethod()
+            .WithBody(b => b != null);

        // Act
        var body = new BodyData
        {
-            BodyAsJson = 123,
+            BodyAsJson = JObject.Parse("""{ "X": 123, "Y": "a" }"""),
            DetectedBodyType = BodyType.Json
        };
        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body);
@@ -90,6 +93,57 @@ public class RequestBuilderWithBodyTests
        Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
    }

+    [Theory]
+    [InlineData("""{ "X": 123, "Y": "a" }""", 1.0)]
+    [InlineData("""{ "X": 123, "Y": "b" }""", 0.0)]
+    public void Request_WithBodyAsType_Func(string json, double expected)
+    {
+        // Assign
+        var requestBuilder = Request.Create()
+            .UsingAnyMethod()
+            .WithBodyAsType<FuncType>(ft => ft != null && ft.X == 123 && ft.Y == "a");
+
+        // Act
+        var body = new BodyData
+        {
+            BodyAsJson = JObject.Parse(json),
+            DetectedBodyType = BodyType.Json
+        };
+        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body);
+
+        // Assert
+        var requestMatchResult = new RequestMatchResult();
+        Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(expected);
+    }
+
+    [Fact]
+    public void Request_WithBodyAsType_Func_IncorrectType()
+    {
+        // Assign
+        var requestBuilder = Request.Create()
+            .UsingAnyMethod()
+            .WithBodyAsType<Version>(ft => ft != null);
+
+        // Act
+        var body = new BodyData
+        {
+            BodyAsJson = JObject.Parse("""{ "X": 123, "Y": "a" }"""),
+            DetectedBodyType = BodyType.Json
+        };
+        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body);
+
+        // Assert
+        var requestMatchResult = new RequestMatchResult();
+        Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(0.0);
+    }
+
+    private class FuncType
+    {
+        public int X { get; set; } = 42;
+
+        public string Y { get; set; } = string.Empty;
+    }
+
    [Fact]
    public void Request_WithBody_FuncFormUrlEncoded()
    {
--- a/test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode.cs
+++ b/test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode.cs
@@ -109,7 +109,7 @@ public partial class MappingConverterTests
        var guid = new Guid("8e7b9ab7-e18e-4502-8bc9-11e6679811cc");
        var request = Request.Create()
            .UsingGet()
-            .WithPath("test_path")
+            .WithPath("/test_path")
            .WithParam("q", "42")
            .WithClientIP("112.123.100.99")
            .WithHeader("h-key", "h-value")
--- a/test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode_With_Builder_And_AddStartIsFalse.verified.txt
+++ b/test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode_With_Builder_And_AddStartIsFalse.verified.txt
@@ -1,7 +1,7 @@
 builder
    .Given(Request.Create()
        .UsingMethod("GET")
-        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "test_path", false, WireMock.Matchers.MatchOperator.Or))
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/test_path", false, WireMock.Matchers.MatchOperator.Or))
        .WithParam("q", new ExactMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, false, WireMock.Matchers.MatchOperator.And, "42"))
        .WithClientIP("112.123.100.99")
        .WithHeader("h-key", "h-value", true)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stef Heyenrath	abe996671e	Add Copilot Setup Steps action (#1419 )	2026-01-09 18:20:12 +01:00
Petr Houška	9f819de696	Update aspire to 13.1 (examples + code) (#1417 ) Allows usage of aspire CLI which is very useful for dev in codespaces (for my next PR).	2026-01-09 18:01:45 +01:00
Stef Heyenrath	f5d53453e5	1.23.0	2026-01-05 21:34:11 +01:00
samlatham	0e60e3f3f9	Fix: Pass AllowedHandlebarsHelpers configuration to Handlebars.Net.Helpers (#1416 ) Pass AllowedHandlebarsHelpers configuration to Handlebars.Net.Helpers so that optional handlebars helpers can be enabled. Co-authored-by: Sam Latham <sam.latham@citrix.com>	2026-01-05 21:24:48 +01:00
Luca Ma	9cee6dde00	Pass the parameter matchOperator in Request.WithPath to its inner calls (#1414 ) Co-authored-by: Luca Ma <lucama@microsoft.com>	2026-01-04 08:03:19 +01:00
Stef Heyenrath	c88e7378a7	1.22.0	2026-01-02 21:30:59 +01:00
Vadim Hatsura	b090296559	chore(testcontainers): bump up Testcontainers to version 4.10.0 (#1412 )	2026-01-02 21:25:28 +01:00
Stef Heyenrath	e5afd69f7c	1.21.0	2025-12-25 15:00:54 +01:00
Stef Heyenrath	f38133d7a4	Fix readyness-check for Testcontainers (#1408 ) * Add XUnit Logging to TestcontainersTests * .	2025-12-25 13:56:29 +01:00
Stef Heyenrath	597c95000e	vmImage: 'windows-2025' (#1407 )	2025-12-24 16:59:02 +01:00
Stef Heyenrath	4617b99c30	[Collection("Grpc")]	2025-12-24 12:32:56 +01:00
Stef Heyenrath	ffd4d89946	Re-enable TestcontainersTestsGrpc (#1406 ) * Re-enable TestcontainersTestsGrpc * //[Collection("Grpc")]	2025-12-24 12:16:56 +01:00
Stef Heyenrath	2d46c86f47	1.20.0	2025-12-24 10:11:53 +01:00
Stef Heyenrath	75f4fbe9d0	Fix Testcontainers AddProtoDefinition (#1405 ) * Fix Testcontainers AddProtoDefinition * . * UntilHttpRequestIsSucceeded * WireMockContainer.ContainerPort * System.Net/System.Net.Http * ... * WithWaitStrategy * MaxHealthCheckRetries * for * _adminApi * static * ... * testOutputHelper.WriteLine("Dumping WireMock logs:"); * Console.WriteLine( * testOutputHelper.WriteLine("Dumping WireMock.Net mappings:"); * fix WithWaitStrategy * [Fact] * <PackageReference Include="ProtoBufJsonConverter" Version="0.11.0" /> * [Collection("Grpc")] / [Fact(Skip = "TODO")] * ...	2025-12-24 10:09:30 +01:00
Stef Heyenrath	16e3872402	Run the Grpc TestcontainersTests sequential (#1402 )	2025-12-21 09:40:16 +01:00
Stef Heyenrath	4c797c328f	Add WireMock.Net.NUnit project (#1400 ) * Add WireMock.Net.NUnit project * <Version>0.0.1-preview-01</Version> * --v	2025-12-20 13:43:54 +01:00
Stef Heyenrath	a5e75a7278	Fix Grpc tests (#1401 ) * Fix some Grpc tests * await Task.Delay(1000); * ports	2025-12-20 12:08:41 +01:00
Stef Heyenrath	56f65c19e2	Upgrade RamlToOpenApiConverter and YamlDotNet (#1399 ) * Upgrade RamlToOpenApiConverter and YamlDotNet * fix	2025-12-19 18:33:58 +01:00
Stef Heyenrath	6aef4816a5	WireMockServer_WithRequiredClientCertificates_Should_Work_Correct --> IgnoreOnContinuousIntegrationFact	2025-12-19 17:52:20 +01:00
Stef Heyenrath	197a211a52	TestcontainersTests	2025-12-13 11:48:48 +01:00
Stef Heyenrath	3cfeec6035	1.19.0	2025-12-12 11:16:38 +01:00
Stef Heyenrath	b57d5e7548	WireMockContainerBuilder: allow only docker images named wiremock (#1392 )	2025-12-11 22:21:39 +01:00
Stef Heyenrath	36b89afce5	fix CI link in Readme	2025-12-11 11:25:28 +01:00
Stef Heyenrath	e2acac55a4	Update WireMockContainerBuilder (WithImage and WithCustomImage) (#1391 ) * Update WireMockContainerBuilder (WithImage and WithCustomImage) * .	2025-12-11 10:55:31 +01:00
Stef Heyenrath	ceabd27ce0	1.18.0	2025-12-09 18:28:28 +01:00
Stef Heyenrath	f8e2c7ee90	Add WithBodyAsType to RequestMatcher (#1388 ) * Add WithBody<T> * . * t * t2	2025-12-08 19:15:14 +01:00
Stef Heyenrath	c25d8f33d2	1.17.0	2025-12-07 10:55:07 +01:00
Stef Heyenrath	6da190e596	Aspire: Add WithProtoDefinition to support proto definition at server level (#1383 ) * Add property UseHttp2 to WireMockServerArguments * . * additionalUrls * ok? * WireMockServerArguments * fx * AddProtoDefinition * ... * FIX * Always add the lifecycle hook to support dynamic mappings and proto definitions	2025-12-07 10:50:11 +01:00
Stef Heyenrath	44388ce80d	Fix random delay in mapping json file (#1386 )	2025-11-25 20:54:06 +01:00
Stef Heyenrath	5e25ca767d	Fix BuildId (#1384 )	2025-11-23 11:19:39 +01:00
Stef Heyenrath	0cc583a4a3	WireMock.Net.xUnit.v3 (netstandard2.0)	2025-11-18 18:52:07 +01:00
Stef Heyenrath	f9633adac1	1.16.0	2025-11-18 18:45:12 +01:00
Stef Heyenrath	37bad618a3	Add WireMock.Net.xUnit.v3 project (#1380 ) * Add WireMock.Net.xUnit.v3 project * .	2025-11-18 18:42:28 +01:00
Johannes Häggqvist	8e69f36f04	Add WireMockHealthCheck in WireMock.Net.Aspire (#1375 ) * Add WireMockHealthCheck For use with Aspire, to make WaitFor(wiremock) more useful. Calls /__admin/health and checks the result, as well as checks if mappings using AdminApiMappingBuilder has been submitted to the server. This created a catch-22 problem where the mappings were not submitted until the health check was healthy, but the health check was not healthy until the mappings were submitted. To avoid this, the WireMockServerLifecycleHook class has been slightly re-arranged, and is now using the AfterEndpointsAllocatedAsync callback rather than the AfterResourcesCreatedAsync callback. Within which a separate Task is created that waits until the server is ready and submits the mappings. * Move WireMockMappingState to its own file * Dispose the cancellation tokens in WireMockServerLifecycleHook	2025-11-17 20:14:42 +01:00
Stef Heyenrath	21601889e0	Check if the path is valid when using WithPath(...) (#1377 )	2025-11-08 09:02:00 +01:00
Stef Heyenrath	dfeabf228e	WireMock.Net.OpenApiParser : support Examples (#1366 )	2025-11-08 07:45:38 +01:00
Stef Heyenrath	1feb0ade70	Fix wiki links (#1373 ) * Change all links from wiki to documention website * . * doc * ws	2025-10-26 10:13:58 +01:00
Stef Heyenrath	8b1bd1b21b	1.15.0	2025-10-22 10:58:44 +02:00
Michi	c1b23b615e	Support Testcontainers 4.8.0 (#1370 )	2025-10-22 10:18:16 +02:00
Stef Heyenrath	5885324dfb	Fix WithProbability logic (#1367 ) * Fix WithProbability logic * . * FIX * Update src/WireMock.Net.Minimal/Owin/MappingMatcher.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-10-22 10:16:59 +02:00
Tom Akehurst	e3f3e0a8f2	Tweaked docs message in README	2025-10-13 20:29:29 +01:00
Tom Akehurst	685d28db0b	Added link to new doc site from README.md	2025-10-13 20:23:18 +01:00
Stef Heyenrath	f6c5225fe0	1.14.0	2025-10-06 17:00:19 +02:00
Stef Heyenrath	b9019a2f61	Update ProxyUrlReplaceSettingsModel with TransformTemplate property (#1362 ) * Update ProxyUrlReplaceSettingsModel with TransformTemplate property + parse settings correctly * oldValue nullable * <Version>1.14.0-preview-01</Version>	2025-10-06 09:16:25 +02:00
Stef Heyenrath	b82dad2563	Add Tls13 (#1363 ) * Add Tls13 * fix	2025-10-05 15:51:47 +02:00
Stef Heyenrath	45d4e7077d	1.13.0	2025-09-28 12:44:14 +02:00
Stef Heyenrath	19e95325fa	ProxyUrlTransformer (#1361 ) * ProxyUrlTransformer * tests * Update src/WireMock.Net.Shared/Settings/ProxyUrlReplaceSettings.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-09-28 12:40:33 +02:00
Stef Heyenrath	371bfdc160	TypeLoader: implement Try methods (#1358 ) * TypeLoader: implement Try methods * fix	2025-08-31 08:48:29 +02:00