1.5.37

JmesPathMatcherTests (#998 )
Fix MappingModel to map IgnoreCase and RejectOnMatch for Headers, Cookies and Parameters (#1004 )
2026-01-13 13:53:34 +01:00 · 2023-09-27 21:43:50 +02:00 · 2023-09-27 21:42:34 +02:00 · 2023-09-26 21:01:33 +02:00 · 2023-09-21 11:40:34 +02:00 · 2023-09-21 11:38:01 +02:00
288 changed files with 10764 additions and 4023 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,102 @@
+# 1.5.37 (27 September 2023)
+- [#998](https://github.com/WireMock-Net/WireMock.Net/pull/998) - Add JmesPathMatcher UnitTests [test] contributed by [StefH](https://github.com/StefH)
+- [#1004](https://github.com/WireMock-Net/WireMock.Net/pull/1004) - Fix MappingModel to map IgnoreCase and RejectOnMatch for Headers, Cookies and Parameters [bug] contributed by [StefH](https://github.com/StefH)
+- [#1003](https://github.com/WireMock-Net/WireMock.Net/issues/1003) - Store Mapping per POST request ignores &quot;IgnoreCase&quot; property of HeaderModel [bug]
+
+# 1.5.36 (21 September 2023)
+- [#986](https://github.com/WireMock-Net/WireMock.Net/pull/986) - Write logging in case a Matcher throws an exception [feature] contributed by [StefH](https://github.com/StefH)
+- [#996](https://github.com/WireMock-Net/WireMock.Net/pull/996) - Remove dependency on Microsoft.AspNet.WebApi.Client [feature] contributed by [StefH](https://github.com/StefH)
+- [#1002](https://github.com/WireMock-Net/WireMock.Net/pull/1002) - Fixed logic for SaveUnmatchedRequests [bug] contributed by [StefH](https://github.com/StefH)
+- [#974](https://github.com/WireMock-Net/WireMock.Net/issues/974) - HttpClient extension methods causes ambiguous invocations in .NET 7 [bug]
+- [#1001](https://github.com/WireMock-Net/WireMock.Net/issues/1001) - SaveUnmatchedRequests stopped working [bug]
+
+# 1.5.35 (19 August 2023)
+- [#992](https://github.com/WireMock-Net/WireMock.Net/pull/992) - Add extra unit test for WithParam multiple values comma [test] contributed by [StefH](https://github.com/StefH)
+- [#993](https://github.com/WireMock-Net/WireMock.Net/pull/993) - Update JSONPathMatcher.cs to cover the string path selection to a child contributed by [DayLightDancer](https://github.com/DayLightDancer)
+
+# 1.5.34 (04 August 2023)
+- [#989](https://github.com/WireMock-Net/WireMock.Net/pull/989) - Fix MimeKitLite NuGet include [bug] contributed by [StefH](https://github.com/StefH)
+- [#988](https://github.com/WireMock-Net/WireMock.Net/issues/988) - v1.5.33  Returns always StatusCode 500 [bug]
+
+# 1.5.33 (03 August 2023)
+- [#972](https://github.com/WireMock-Net/WireMock.Net/pull/972) - JsonPartialMatcher - match guid and string contributed by [timurnes](https://github.com/timurnes)
+- [#976](https://github.com/WireMock-Net/WireMock.Net/pull/976) - Upgrade to Handlebars.Net.Helpers 2.4.0 to update XPath.SelectTokens and XPath.EvaluateToString [feature] contributed by [StefH](https://github.com/StefH)
+- [#981](https://github.com/WireMock-Net/WireMock.Net/pull/981) - Add MultiPart/MimePart Request Matcher [feature] contributed by [StefH](https://github.com/StefH)
+- [#968](https://github.com/WireMock-Net/WireMock.Net/issues/968) - Using request multipart in response template [feature]
+- [#969](https://github.com/WireMock-Net/WireMock.Net/issues/969) - Multipart validation [feature]
+- [#970](https://github.com/WireMock-Net/WireMock.Net/issues/970) - Loop through xml elements in handlebars template [feature]
+- [#971](https://github.com/WireMock-Net/WireMock.Net/issues/971) - JsonPartialMatcher - match guid and string [feature]
+
+# 1.5.32 (15 July 2023)
+- [#966](https://github.com/WireMock-Net/WireMock.Net/pull/966) - Fixed JsonPathMatcher to match nested objects [bug] contributed by [StefH](https://github.com/StefH)
+- [#965](https://github.com/WireMock-Net/WireMock.Net/issues/965) - JsonPathMatcher does not match json body nested objects [bug]
+- [#967](https://github.com/WireMock-Net/WireMock.Net/issues/967) - &#11088;10 million downloads ! &#11088; [feature]
+
+# 1.5.31 (08 July 2023)
+- [#964](https://github.com/WireMock-Net/WireMock.Net/pull/964) - Add GraphQL Schema matching [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.5.30 (28 June 2023)
+- [#959](https://github.com/WireMock-Net/WireMock.Net/pull/959) - Fixed logic for FluentAssertions WithHeader [bug] contributed by [StefH](https://github.com/StefH)
+- [#961](https://github.com/WireMock-Net/WireMock.Net/pull/961) - Add unit-test for Param MatcherModel LinqMatcher [test] contributed by [StefH](https://github.com/StefH)
+- [#962](https://github.com/WireMock-Net/WireMock.Net/pull/962) - Bump System.Linq.Dynamic.Core from 1.2.23 to 1.3.0 in /examples/WireMock.Net.Console.Net472.Classic [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#963](https://github.com/WireMock-Net/WireMock.Net/pull/963) - Bump System.Linq.Dynamic.Core from 1.2.23 to 1.3.0 in /examples/WireMock.Net.StandAlone.Net461 [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#958](https://github.com/WireMock-Net/WireMock.Net/issues/958) - [FluentAssertions] Should().HaveReceivedACall().WithHeader() only checks the first header with the matching key. [bug]
+
+# 1.5.29 (22 June 2023)
+- [#954](https://github.com/WireMock-Net/WireMock.Net/pull/954) - Support setting WireMockServerSettings via Environment [feature] contributed by [StefH](https://github.com/StefH)
+- [#955](https://github.com/WireMock-Net/WireMock.Net/pull/955) - Fix some SonarCloud issues [refactor] contributed by [StefH](https://github.com/StefH)
+- [#953](https://github.com/WireMock-Net/WireMock.Net/issues/953) - How to use environment variable [feature]
+
+# 1.5.28 (11 June 2023)
+- [#948](https://github.com/WireMock-Net/WireMock.Net/pull/948) - WireMock.Net.Testcontainers [feature] contributed by [StefH](https://github.com/StefH)
+- [#951](https://github.com/WireMock-Net/WireMock.Net/pull/951) - Allow setting the Content-Length header for a HTTP method HEAD [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.5.27 (03 June 2023)
+- [#946](https://github.com/WireMock-Net/WireMock.Net/pull/946) - Add warning logging when sending a request to a Webhook does not return status 200 [feature] contributed by [StefH](https://github.com/StefH)
+- [#949](https://github.com/WireMock-Net/WireMock.Net/pull/949) - Add &quot;.NET Framework 4.7&quot; to WireMock.Net.FluentAssertions [feature] contributed by [StefH](https://github.com/StefH)
+- [#928](https://github.com/WireMock-Net/WireMock.Net/issues/928) - TypeLoadException when using WithHeader method. [bug]
+- [#945](https://github.com/WireMock-Net/WireMock.Net/issues/945) - Webhook logging [feature]
+
+# 1.5.26 (25 May 2023)
+- [#938](https://github.com/WireMock-Net/WireMock.Net/pull/938) - Add more unitests for CSharpFormatter utils [test] contributed by [StefH](https://github.com/StefH)
+- [#939](https://github.com/WireMock-Net/WireMock.Net/pull/939) - WireMockMiddleware should use HandleRequestsSynchronously correctly [bug] contributed by [StefH](https://github.com/StefH)
+- [#940](https://github.com/WireMock-Net/WireMock.Net/pull/940) - Code generator improvements contributed by [cezarypiatek](https://github.com/cezarypiatek)
+- [#942](https://github.com/WireMock-Net/WireMock.Net/pull/942) - Add GetParameter method to IRequestMessage [feature] contributed by [StefH](https://github.com/StefH)
+- [#941](https://github.com/WireMock-Net/WireMock.Net/issues/941) - RequestMessage.GetParameter method missing from IRequestMessage interface [feature]
+
+# 1.5.25 (13 May 2023)
+- [#934](https://github.com/WireMock-Net/WireMock.Net/pull/934) - Code generator improvements [feature] contributed by [cezarypiatek](https://github.com/cezarypiatek)
+
+# 1.5.24 (07 May 2023)
+- [#926](https://github.com/WireMock-Net/WireMock.Net/pull/926) - Fix C# mapping code generator for header names [bug] contributed by [cezarypiatek](https://github.com/cezarypiatek)
+- [#927](https://github.com/WireMock-Net/WireMock.Net/pull/927) - Enrich generated code with status code [feature] contributed by [cezarypiatek](https://github.com/cezarypiatek)
+- [#930](https://github.com/WireMock-Net/WireMock.Net/pull/930) - Update C# mapping code generator for WithStatusCode [feature] contributed by [StefH](https://github.com/StefH)
+- [#931](https://github.com/WireMock-Net/WireMock.Net/pull/931) - Add property 'IsStartedWithAdminInterface' to 'IWireMockServer' [feature] contributed by [StefH](https://github.com/StefH)
+- [#933](https://github.com/WireMock-Net/WireMock.Net/pull/933) - C# code generator improvements [feature] contributed by [cezarypiatek](https://github.com/cezarypiatek)
+
+# 1.5.23 (23 April 2023)
+- [#922](https://github.com/WireMock-Net/WireMock.Net/pull/922) - Add WithProbability [feature] contributed by [StefH](https://github.com/StefH)
+- [#924](https://github.com/WireMock-Net/WireMock.Net/pull/924) - Allow removal of prefix when proxying to another server (#630) [feature] contributed by [nudejustin](https://github.com/nudejustin)
+- [#925](https://github.com/WireMock-Net/WireMock.Net/pull/925) - Add IgnoreCase option to ProxyUrlReplaceSettings [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.5.22 (08 April 2023)
+- [#914](https://github.com/WireMock-Net/WireMock.Net/pull/914) - #912 add excluded params to proxy mapping [feature] contributed by [walidhaidarii](https://github.com/walidhaidarii)
+- [#916](https://github.com/WireMock-Net/WireMock.Net/pull/916) - Include WireMockOpenApiParser project [feature] contributed by [StefH](https://github.com/StefH)
+- [#912](https://github.com/WireMock-Net/WireMock.Net/issues/912) - Feature: adding excluded params to proxy and records settings [feature]
+
+# 1.5.21 (22 March 2023)
+- [#908](https://github.com/WireMock-Net/WireMock.Net/pull/908) - RequestBuilder : add WithBodyAsJson and WithBody (with IJsonConverter) [feature] contributed by [StefH](https://github.com/StefH)
+- [#911](https://github.com/WireMock-Net/WireMock.Net/pull/911) - Fixed QueryStringParser for UrlEncoded values [bug] contributed by [StefH](https://github.com/StefH)
+- [#901](https://github.com/WireMock-Net/WireMock.Net/issues/901) - Matching one form-urlencoded value [feature]
+
+# 1.5.20 (19 March 2023)
+- [#905](https://github.com/WireMock-Net/WireMock.Net/pull/905) - Add DeserializeFormUrl Encoded to the settings [feature] contributed by [StefH](https://github.com/StefH)
+- [#907](https://github.com/WireMock-Net/WireMock.Net/pull/907) - Fix issue with application/x-www-form-urlencoded and ExactMatcher [bug] contributed by [StefH](https://github.com/StefH)
+- [#906](https://github.com/WireMock-Net/WireMock.Net/issues/906) - Upgrade to 1.5.19 breaks a form data test [bug]
+
 # 1.5.19 (17 March 2023)
 - [#903](https://github.com/WireMock-Net/WireMock.Net/pull/903) - Add WithBody with IDictionary (form-urlencoded values) [feature] contributed by [StefH](https://github.com/StefH)
 - [#904](https://github.com/WireMock-Net/WireMock.Net/pull/904) - Update Handlebars.Net.Helpers to 2.3.15 [feature] contributed by [StefH](https://github.com/StefH)
- [#901](https://github.com/WireMock-Net/WireMock.Net/issues/901) - Matching one form-urlencoded value [feature]

 # 1.5.18 (09 March 2023)
 - [#893](https://github.com/WireMock-Net/WireMock.Net/pull/893) - Add 'Data' to response which can be used during transforming the response [feature] contributed by [StefH](https://github.com/StefH)
@@ -904,7 +999,7 @@
 - [#86](https://github.com/WireMock-Net/WireMock.Net/issues/86) - Feature : Add FileSystemWatcher logic for watching static mapping files [feature]

 # 1.0.2.13 (23 January 2018)
- [#79](https://github.com/WireMock-Net/WireMock.Net/pull/79) - Fix missed content headers contributed by [vladimir-fed](https://github.com/vladimir-fed)
+- [#79](https://github.com/WireMock-Net/WireMock.Net/pull/79) - Fix missed content headers contributed by [volodymyr-fed](https://github.com/volodymyr-fed)
 - [#57](https://github.com/WireMock-Net/WireMock.Net/issues/57) - ProxyAndRecord does not save query-parameters, headers and body [bug]
 - [#78](https://github.com/WireMock-Net/WireMock.Net/issues/78) - WireMock not working when attempting to access from anything other than localhost.

@@ -931,7 +1026,7 @@

 # 1.0.2.7 (18 November 2017)
 - [#62](https://github.com/WireMock-Net/WireMock.Net/pull/62) - Add the Host, Protocol, Port and Origin to the Request message so they can be used in templating contributed by [alastairtree](https://github.com/alastairtree)
- [#63](https://github.com/WireMock-Net/WireMock.Net/pull/63) - Fix issue with concurrent logging contributed by [vladimir-fed](https://github.com/vladimir-fed)
+- [#63](https://github.com/WireMock-Net/WireMock.Net/pull/63) - Fix issue with concurrent logging contributed by [volodymyr-fed](https://github.com/volodymyr-fed)
 - [#27](https://github.com/WireMock-Net/WireMock.Net/issues/27) - New feature: Record and Save
 - [#42](https://github.com/WireMock-Net/WireMock.Net/issues/42) - Enhancement - Save/load request logs to/from disk [feature]
 - [#53](https://github.com/WireMock-Net/WireMock.Net/issues/53) - New feature request: Access to Owin pipeline
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
    </PropertyGroup>

    <PropertyGroup>
-        <VersionPrefix>1.5.19</VersionPrefix>
+        <VersionPrefix>1.5.37</VersionPrefix>
        <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
        <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -12,6 +12,7 @@
        <RepositoryType>git</RepositoryType>
        <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
        <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
+        <PackageReadmeFile>PackageReadme.md</PackageReadmeFile>
        <LangVersion>Latest</LangVersion>
        <Nullable>enable</Nullable>
    </PropertyGroup>
@@ -29,7 +30,7 @@

    <ItemGroup>
        <None Include="../../resources/WireMock.Net-Logo.png" Pack="true" PackagePath="" />
-        <!--<None Include="../../PackageReadme.md" Pack="true" PackagePath=""/>-->
+        <None Include="../../PackageReadme.md" Pack="true" PackagePath=""/>
    </ItemGroup>

    <Choose>
--- a/Generate-ReleaseNotes.cmd
+++ b/Generate-ReleaseNotes.cmd
@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes

-SET version=1.5.19
+SET version=1.5.37

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

--- a/PackageReadme.md
+++ b/PackageReadme.md
@@ -0,0 +1,55 @@
+## WireMock.Net
+Lightweight Http Mocking Server for .NET, inspired by [WireMock(http://WireMock.org) from the Java landscape.
+
+### :star: Key Features
+* HTTP response stubbing, matchable on URL/Path, headers, cookies and body content patterns
+* Library can be used in unit tests and integration tests
+* Runs as a standalone process, as windows service, as Azure/IIS or as docker
+* Configurable via a fluent C# .NET API, JSON files and JSON over HTTP
+* Record/playback of stubs (proxying)
+* Per-request conditional proxying
+* Stateful behaviour simulation
+* Response templating / transformation using Handlebars and extensions
+* Can be used locally or in CI/CD scenarios
+
+### :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-Net/WireMock.Net/wiki/Stubbing).
+
+### :star: Request Matching
+WireMock.Net support advanced request-matching logic, see [Wiki : Request Matching](https://github.com/WireMock-Net/WireMock.Net/wiki/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-Net/WireMock.Net/wiki/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).
+
+### :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).
+
+#### 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).
+
+#### 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).
+
+#### 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-Net/WireMock.Net/wiki/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-Net/WireMock.Net/wiki/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-Net/WireMock.Net-docker).
+
+#### HTTPS / SSL
+More details on using HTTPS (SSL) can be found here [Wiki : HTTPS](https://github.com/WireMock-Net/WireMock.Net/wiki/Using-HTTPS-(SSL))
+
+## :books: Documentation
+For more info, see also this WIKI page: [What is WireMock.Net](https://github.com/WireMock-Net/WireMock.Net/wiki/What-Is-WireMock.Net).
--- a/PackageReleaseNotes.txt
+++ b/PackageReleaseNotes.txt
@@ -1,6 +1,6 @@
-# 1.5.19 (17 March 2023)
- #903 Add WithBody with IDictionary (form-urlencoded values) [feature]
- #904 Update Handlebars.Net.Helpers to 2.3.15 [feature]
- #901 Matching one form-urlencoded value [feature]
+# 1.5.37 (27 September 2023)
+- #998 Add JmesPathMatcher UnitTests [test]
+- #1004 Fix MappingModel to map IgnoreCase and RejectOnMatch for Headers, Cookies and Parameters [bug]
+- #1003 Store Mapping per POST request ignores &quot;IgnoreCase&quot; property of HeaderModel [bug]

 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md
--- a/README.md
+++ b/README.md
@@ -1,24 +1,28 @@
 # WireMock.Net
-A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) which mimics the functionality from the JAVA based [WireMock.org](http://WireMock.org).
+A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) which mimics the functionality from the JAVA based [WireMock](http://WireMock.org).

 For more info, see also this WIKI page: [What is WireMock.Net](https://github.com/WireMock-Net/WireMock.Net/wiki/What-Is-WireMock.Net).

-## Key Features
+## :star: Key Features
 * HTTP response stubbing, matchable on URL/Path, headers, cookies and body content patterns
 * Library can be used in unit tests and integration tests
 * Runs as a standalone process, as windows service, as Azure/IIS or as docker
-* Configurable via a fluent DotNet API, JSON files and JSON over HTTP
+* Configurable via a fluent C# .NET API, JSON files and JSON over HTTP
 * Record/playback of stubs (proxying)
 * Per-request conditional proxying
 * Stateful behaviour simulation
 * Response templating / transformation using Handlebars and extensions
 * Can be used locally or in CI/CD scenarios

-## Info
+## :memo: Blogs
+- [mStack.nl : Generate C# Code from Mapping(s)](https://mstack.nl/blog/20230201-wiremock.net-tocode/)
+
+
+## :computer: Project Info
 | | |
 | --- | --- |
 | ***Project*** | &nbsp; |
-| &nbsp;&nbsp;**Chat** | [![Gitter](https://img.shields.io/gitter/room/wiremock_dotnet/Lobby.svg)](https://gitter.im/wiremock_dotnet/Lobby) |
+| &nbsp;&nbsp;**Chat** | [![Slack](https://badgen.net/badge/icon/slack?icon=slack&label)](https://slack.wiremock.org/) [![Gitter](https://img.shields.io/gitter/room/wiremock_dotnet/Lobby.svg)](https://gitter.im/wiremock_dotnet/Lobby) |
 | &nbsp;&nbsp;**Issues** | [![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/WireMock-Net/WireMock.Net/issues) |
 | | |
 | ***Quality*** | &nbsp; |
@@ -27,7 +31,7 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 | &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-Net/WireMock.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/WireMock-Net/WireMock.Net)|

-### NuGet packages
+### :package: NuGet packages

 | | Official | Preview [:information_source:](https://github.com/WireMock-Net/WireMock.Net/wiki/MyGet-preview-versions) |
 | - | - | - |
@@ -38,39 +42,42 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 | &nbsp;&nbsp;**WireMock.Net.OpenApiParser** | [![NuGet Badge WireMock.Net.OpenApiParser](https://buildstats.info/nuget/WireMock.Net.OpenApiParser)](https://www.nuget.org/packages/WireMock.Net.OpenApiParser) | [![MyGet Badge WireMock.Net.OpenApiParser](https://buildstats.info/myget/wiremock-net/WireMock.Net.OpenApiParser?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.OpenApiParser)
 | &nbsp;&nbsp;**WireMock.Net.RestClient** | [![NuGet Badge WireMock.Net.RestClient](https://buildstats.info/nuget/WireMock.Net.RestClient)](https://www.nuget.org/packages/WireMock.Net.RestClient) | [![MyGet Badge WireMock.Net.RestClient](https://buildstats.info/myget/wiremock-net/WireMock.Net.RestClient?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.RestClient)
 | &nbsp;&nbsp;**WireMock.Net.xUnit** | [![NuGet Badge WireMock.Net.xUnit](https://buildstats.info/nuget/WireMock.Net.xUnit)](https://www.nuget.org/packages/WireMock.Net.xUnit) | [![MyGet Badge WireMock.Net.xUnit](https://buildstats.info/myget/wiremock-net/WireMock.Net.xUnit?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.xUnit)
+| &nbsp;&nbsp;**WireMock.Net.Testcontainers** | [![NuGet Badge WireMock.Net.Testcontainers](https://buildstats.info/nuget/WireMock.Net.Testcontainers)](https://www.nuget.org/packages/WireMock.Net.Testcontainers) | [![MyGet Badge WireMock.Net.Testcontainers](https://buildstats.info/myget/wiremock-net/WireMock.Net.Testcontainers?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Testcontainers)
 | &nbsp;&nbsp;**WireMock.Org.RestClient** | [![NuGet Badge WireMock.Org.RestClient](https://buildstats.info/nuget/WireMock.Org.RestClient)](https://www.nuget.org/packages/WireMock.Org.RestClient) | [![MyGet Badge WireMock.Org.RestClient](https://buildstats.info/myget/wiremock-net/WireMock.Org.RestClient?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Org.RestClient)


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

-## Stubbing
+## :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-Net/WireMock.Net/wiki/Stubbing).

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

-## Response Templating
+## :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-Net/WireMock.Net/wiki/Response-Templating).

-## Admin API Reference
+## :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).

-## Using
+## :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).

+### Unit/Integration Testing using Testcontainers.DotNet
+You can use [Wiki : WireMock.Net.Testcontainers](https://github.com/WireMock-Net/WireMock.Net/wiki/Using-WireMock.Net.Testcontainers) to build a WireMock.Net Docker container which can be used in 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).

 ### 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).

-
 ### 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-Net/WireMock.Net/wiki/WireMock-as-a-Windows-Service).

--- a/Solution.sln
+++ b/Solution.sln
@@ -28,6 +28,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.github\FUNDING.yml = .github\FUNDING.yml
 		Generate-ReleaseNotes.cmd = Generate-ReleaseNotes.cmd
 		nuget.config = nuget.config
+		PackageReadme.md = PackageReadme.md
 		PackageReleaseNotes.template = PackageReleaseNotes.template
 		PackageReleaseNotes.txt = PackageReleaseNotes.txt
 		README.md = README.md
@@ -110,6 +111,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMockAzureQueueExample",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMockAzureQueueProxy", "examples\WireMockAzureQueueProxy\WireMockAzureQueueProxy.csproj", "{ADB557D8-D66B-4387-912B-3F73E290B478}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Testcontainers", "src\WireMock.Net.Testcontainers\WireMock.Net.Testcontainers.csproj", "{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.TestcontainersExample", "examples\WireMock.Net.TestcontainersExample\WireMock.Net.TestcontainersExample.csproj", "{56A38798-C48B-4A4A-B805-071E05C02CE1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{0147029F-FA4A-44B3-B79A-3C3574054EE4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultipartUploader", "tools\MultipartUploader\MultipartUploader.csproj", "{07C30227-ADEC-4BDE-8CDC-849D85A690BB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.NET7.UsingNuGet", "examples\WireMock.Net.Console.NET7.UsingNuGet\WireMock.Net.Console.NET7.UsingNuGet.csproj", "{941229D6-191B-4B5E-AC81-0905EBF4F19D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -264,6 +275,22 @@ Global
 		{ADB557D8-D66B-4387-912B-3F73E290B478}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ADB557D8-D66B-4387-912B-3F73E290B478}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ADB557D8-D66B-4387-912B-3F73E290B478}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56A38798-C48B-4A4A-B805-071E05C02CE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56A38798-C48B-4A4A-B805-071E05C02CE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56A38798-C48B-4A4A-B805-071E05C02CE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56A38798-C48B-4A4A-B805-071E05C02CE1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{07C30227-ADEC-4BDE-8CDC-849D85A690BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{07C30227-ADEC-4BDE-8CDC-849D85A690BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07C30227-ADEC-4BDE-8CDC-849D85A690BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{07C30227-ADEC-4BDE-8CDC-849D85A690BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{941229D6-191B-4B5E-AC81-0905EBF4F19D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{941229D6-191B-4B5E-AC81-0905EBF4F19D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{941229D6-191B-4B5E-AC81-0905EBF4F19D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{941229D6-191B-4B5E-AC81-0905EBF4F19D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -308,6 +335,10 @@ Global
 		{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{ADB557D8-D66B-4387-912B-3F73E290B478} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{56A38798-C48B-4A4A-B805-071E05C02CE1} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{07C30227-ADEC-4BDE-8CDC-849D85A690BB} = {0147029F-FA4A-44B3-B79A-3C3574054EE4}
+		{941229D6-191B-4B5E-AC81-0905EBF4F19D} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}
--- a/Solution.sln.DotSettings
+++ b/Solution.sln.DotSettings
@@ -10,9 +10,11 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD5</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OPTIONS/@EntryIndexedValue">OPTIONS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OS/@EntryIndexedValue">OS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PATCH/@EntryIndexedValue">PATCH</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=POST/@EntryIndexedValue">POST</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PUT/@EntryIndexedValue">PUT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QL/@EntryIndexedValue">QL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RSA/@EntryIndexedValue">RSA</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SSL/@EntryIndexedValue">SSL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TE/@EntryIndexedValue">TE</s:String>
@@ -27,10 +29,12 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Guids/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Heyenrath/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Jmes/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=openapi/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Pacticipant/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Raml/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=randomizer/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Scriban/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=sheyenrath/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Sigil/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Stef/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=templated/@EntryIndexedValue">True</s:Boolean>
--- a/examples/WireMock.Net.Client/Program.cs
+++ b/examples/WireMock.Net.Client/Program.cs
@@ -73,7 +73,6 @@ class Program

        var settingsViaBuilder = new SettingsModelBuilder()
            .WithGlobalProcessingDelay(1077)
-            .WithoutGlobalProcessingDelay()
            .Build();

        settings1.GlobalProcessingDelay = 1077;
--- a/examples/WireMock.Net.Console.NET5/WireMock.Net.Console.NET5.csproj
+++ b/examples/WireMock.Net.Console.NET5/WireMock.Net.Console.NET5.csproj
@@ -28,10 +28,10 @@

  <ItemGroup>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
+    <PackageReference Include="Handlebars.Net.Helpers" Version="2.4.0" />
    <PackageReference Include="log4net" Version="2.0.15" />
    <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
  </ItemGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.Console.NET6/WireMock.Net.Console.NET6.csproj
+++ b/examples/WireMock.Net.Console.NET6/WireMock.Net.Console.NET6.csproj
@@ -3,6 +3,7 @@
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFramework>net6.0</TargetFramework>
+      <DefineConstants>$(DefineConstants);GRAPHQL;MIMEKIT</DefineConstants>
  </PropertyGroup>

  <ItemGroup>
@@ -21,16 +22,10 @@
    <Compile Remove="__admin\mappings\1.cs" />
  </ItemGroup>

-  <ItemGroup>
-    <None Remove="__admin\mappings\array.json" />
-  </ItemGroup>
-
  <ItemGroup>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <!--<PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />-->
    <PackageReference Include="log4net" Version="2.0.15" />
    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
  </ItemGroup>

  <ItemGroup>
@@ -40,15 +35,6 @@
    <None Update="nlog.config">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
-    <None Update="__admin\mappings\791a3f31-6946-4ce7-8e6f-0237c7443275.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="__admin\mappings\791a3f31-6946-4ce7-8e6f-0237c7443275.json">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </None>
-    <None Update="__admin\mappings\MyXmlResponse.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
  </ItemGroup>

 </Project>
--- a/examples/WireMock.Net.Console.NET6/__admin/mappings/issue-1001.json
+++ b/examples/WireMock.Net.Console.NET6/__admin/mappings/issue-1001.json
@@ -0,0 +1,48 @@
+[
+    {
+        "Guid": "12343f31-6946-4ce7-8e6f-0237c7001000",
+        "Title": "1",
+        "Request": {
+            "Path": {
+                "Matchers": [
+                    {
+                        "Name": "WildcardMatcher",
+                        "Pattern": "/mappings_static_1"
+                    }
+                ]
+            },
+            "Methods": [
+                "get"
+            ]
+        },
+        "Response": {
+            "BodyAsJson": { "result": "mappings static_1" },
+            "Headers": {
+                "Content-Type": "application/json"
+            }
+        }
+    },
+    {
+        "Guid": "12343f31-6946-4ce7-8e6f-0237c7002000",
+        "Title": "2",
+        "Request": {
+            "Path": {
+                "Matchers": [
+                    {
+                        "Name": "WildcardMatcher",
+                        "Pattern": "/mappings_static_2"
+                    }
+                ]
+            },
+            "Methods": [
+                "get"
+            ]
+        },
+        "Response": {
+            "BodyAsJson": { "result": "mappings static_2" },
+            "Headers": {
+                "Content-Type": "application/json"
+            }
+        }
+    }
+]
--- a/examples/WireMock.Net.Console.NET7.UsingNuGet/Program.cs
+++ b/examples/WireMock.Net.Console.NET7.UsingNuGet/Program.cs
@@ -0,0 +1,34 @@
+using System.Net;
+using System.Text;
+using FluentAssertions;
+using WireMock.Logging;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Server;
+using WireMock.Settings;
+
+namespace WireMock.Net.Console.NET7.UsingNuGet;
+
+internal class Program
+{
+    private static async Task Main(string[] args)
+    {
+        var server = WireMockServer.Start(new WireMockServerSettings
+        {
+            Logger = new WireMockConsoleLogger(),
+        });
+
+        server.Given(Request.Create().UsingPost().WithPath("/some/endpoint"))
+            .RespondWith(Response.Create().WithStatusCode(HttpStatusCode.Created));
+
+        var httpClient = new HttpClient { BaseAddress = new Uri(server.Url!) };
+        var requestUri = new Uri(httpClient.BaseAddress!, "some/endpoint");
+        var content = new StringContent(string.Empty, Encoding.UTF8, "application/json");
+
+        // Act
+        var actual = await httpClient.PostAsync(requestUri, content);
+
+        // Assert
+        actual.StatusCode.Should().Be(HttpStatusCode.Created);
+    }
+}
--- a/examples/WireMock.Net.Console.NET7.UsingNuGet/WireMock.Net.Console.NET7.UsingNuGet.csproj
+++ b/examples/WireMock.Net.Console.NET7.UsingNuGet/WireMock.Net.Console.NET7.UsingNuGet.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FluentAssertions" Version="6.11.0" />
+    <PackageReference Include="WireMock.Net" Version="1.5.32" />
+  </ItemGroup>
+
+</Project>
--- a/examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj
+++ b/examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj
@@ -19,14 +19,14 @@

  <ItemGroup>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.*" />
+    <PackageReference Include="Handlebars.Net.Helpers" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.4.0" />
    <PackageReference Include="log4net" Version="2.0.15" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
  </ItemGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj
+++ b/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj
@@ -31,14 +31,14 @@

  <ItemGroup>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.*" />
+    <PackageReference Include="Handlebars.Net.Helpers" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.4.0" />
    <PackageReference Include="log4net" Version="2.0.15" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
  </ItemGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.Console.NETCoreApp3/WireMock.Net.Console.NETCoreApp3.csproj
+++ b/examples/WireMock.Net.Console.NETCoreApp3/WireMock.Net.Console.NETCoreApp3.csproj
@@ -28,14 +28,14 @@

  <ItemGroup>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.*" />
+    <PackageReference Include="Handlebars.Net.Helpers" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.4.0" />
    <PackageReference Include="log4net" Version="2.0.15" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
  </ItemGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
+++ b/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
@@ -42,6 +42,36 @@ namespace WireMock.Net.ConsoleApplication

    public static class MainApp
    {
+        private const string TestSchema = @"
+  input MessageInput {
+    content: String
+    author: String
+  }
+
+  type Message {
+    id: ID!
+    content: String
+    author: String
+  }
+
+  type Mutation {
+    createMessage(input: MessageInput): Message
+    updateMessage(id: ID!, input: MessageInput): Message
+  }
+
+  type Query {
+   greeting:String
+   students:[Student]
+   studentById(id:ID!):Student
+  }
+
+  type Student {
+   id:ID!
+   firstName:String
+   lastName:String
+   fullName:String 
+  }";
+
        public static void Run()
        {
            var mappingBuilder = new MappingBuilder();
@@ -107,6 +137,7 @@ namespace WireMock.Net.ConsoleApplication
                Urls = new[] { url1, url2, url3 },
                StartAdminInterface = true,
                ReadStaticMappings = true,
+                SaveUnmatchedRequests = true,
                WatchStaticMappings = true,
                WatchStaticMappingsInSubdirectories = true,
                //ProxyAndRecordSettings = new ProxyAndRecordSettings
@@ -136,7 +167,51 @@ namespace WireMock.Net.ConsoleApplication
            //server.SetAzureADAuthentication("6c2a4722-f3b9-4970-b8fc-fac41e29stef", "8587fde1-7824-42c7-8592-faf92b04stef");

            // server.AllowPartialMapping();
+#if GRAPHQL
+            server
+                .Given(Request.Create()
+                    .WithPath("/graphql")
+                    .UsingPost()
+                    .WithGraphQLSchema(TestSchema)
+                )
+                .RespondWith(Response.Create()
+                    .WithBody("GraphQL is ok")
+                );
+#endif

+#if MIMEKIT
+            var textPlainContentTypeMatcher = new ContentTypeMatcher("text/plain");
+            var textPlainContentMatcher = new ExactMatcher("This is some plain text");
+            var textPlainMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, textPlainContentTypeMatcher, null, null, textPlainContentMatcher);
+
+            var textJsonContentTypeMatcher = new ContentTypeMatcher("text/json");
+            var textJsonContentMatcher = new JsonMatcher(new { Key = "Value" }, true);
+            var textJsonMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, textJsonContentTypeMatcher, null, null, textJsonContentMatcher);
+
+            var imagePngContentTypeMatcher = new ContentTypeMatcher("image/png");
+            var imagePngContentDispositionMatcher = new ExactMatcher("attachment; filename=\"image.png\"");
+            var imagePngContentTransferEncodingMatcher = new ExactMatcher("base64");
+            var imagePngContentMatcher = new ExactObjectMatcher(Convert.FromBase64String("iVBORw0KGgoAAAANSUhEUgAAAAIAAAACAgMAAAAP2OW3AAAADFBMVEX/tID/vpH/pWX/sHidUyjlAAAADElEQVR4XmMQYNgAAADkAMHebX3mAAAAAElFTkSuQmCC"));
+            var imagePngMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, imagePngContentTypeMatcher, imagePngContentDispositionMatcher, imagePngContentTransferEncodingMatcher, imagePngContentMatcher);
+
+            var matchers = new IMatcher[]
+            {
+                textPlainMatcher,
+                textJsonMatcher,
+                imagePngMatcher
+            };
+
+            server
+                .Given(Request.Create()
+                    .WithPath("/multipart")
+                    .UsingPost()
+                    .WithMultiPart(matchers)
+                )
+                .WithGuid("b9c82182-e469-41da-bcaf-b6e3157fefdb")
+                .RespondWith(Response.Create()
+                    .WithBody("MultiPart is ok")
+                );
+#endif
            // 400 ms
            server
                .Given(Request.Create()
@@ -676,8 +751,9 @@ namespace WireMock.Net.ConsoleApplication
                }));

            server.Given(Request.Create().WithPath(new WildcardMatcher("/multi-webhook", true)).UsingPost())
-                .WithWebhook(new[] {
-                    new Webhook()
+                .WithWebhook
+                (
+                    new Webhook
                    {
                        Request = new WebhookRequest
                        {
@@ -685,12 +761,13 @@ namespace WireMock.Net.ConsoleApplication
                            Method = "post",
                            BodyData = new BodyData
                            {
-                                BodyAsString = "OK 1!", DetectedBodyType = BodyType.String
+                                BodyAsString = "OK 1!",
+                                DetectedBodyType = BodyType.String
                            },
                            Delay = 1000
                        }
                    },
-                    new Webhook()
+                    new Webhook
                    {
                        Request = new WebhookRequest
                        {
@@ -705,7 +782,7 @@ namespace WireMock.Net.ConsoleApplication
                            MaximumRandomDelay = 7000
                        }
                    }
-                })
+                )
                .WithWebhookFireAndForget(true)
                .RespondWith(Response.Create().WithBody("a-response"));

--- a/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj
+++ b/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj
@@ -39,14 +39,14 @@
    <Reference Include="AnyOf, Version=0.3.0.0, Culture=neutral, PublicKeyToken=b35e6abbb527c6b1, processorArchitecture=MSIL">
      <HintPath>..\..\packages\AnyOf.0.3.0\lib\net45\AnyOf.dll</HintPath>
    </Reference>
-    <Reference Include="Handlebars, Version=2.1.2.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.2.1.2\lib\net452\Handlebars.dll</HintPath>
+    <Reference Include="Handlebars, Version=2.1.4.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.2.1.4\lib\net452\Handlebars.dll</HintPath>
    </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.12\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+    <Reference Include="Handlebars.Net.Helpers, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.4.0\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.12\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.4.0\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
    </Reference>
    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
@@ -56,7 +56,7 @@
      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
    </Reference>
    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
      <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
@@ -67,6 +67,7 @@
    <Reference Include="System" />
    <Reference Include="System.Configuration" />
    <Reference Include="System.Core" />
+    <Reference Include="System.Net.Http" />
    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
    </Reference>
--- a/examples/WireMock.Net.Console.Net452.Classic/packages.config
+++ b/examples/WireMock.Net.Console.Net452.Classic/packages.config
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="AnyOf" version="0.3.0" targetFramework="net452" />
-  <package id="Handlebars.Net" version="2.1.2" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers" version="2.3.12" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.3.12" targetFramework="net452" />
+  <package id="Handlebars.Net" version="2.1.4" targetFramework="net452" />
+  <package id="Handlebars.Net.Helpers" version="2.4.0" targetFramework="net452" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.4.0" targetFramework="net452" />
  <package id="log4net" version="2.0.15" targetFramework="net452" />
  <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net452" />
  <package id="Stef.Validation" version="0.1.1" targetFramework="net452" />
  <package id="System.ValueTuple" version="4.5.0" targetFramework="net452" />
--- a/examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj
+++ b/examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj
@@ -38,14 +38,14 @@
    <Reference Include="AnyOf, Version=0.3.0.0, Culture=neutral, PublicKeyToken=b35e6abbb527c6b1, processorArchitecture=MSIL">
      <HintPath>..\..\packages\AnyOf.0.3.0\lib\net45\AnyOf.dll</HintPath>
    </Reference>
-    <Reference Include="Handlebars, Version=2.1.2.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.2.1.2\lib\net46\Handlebars.dll</HintPath>
+    <Reference Include="Handlebars, Version=2.1.4.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.2.1.4\lib\net46\Handlebars.dll</HintPath>
    </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.12\lib\net46\Handlebars.Net.Helpers.dll</HintPath>
+    <Reference Include="Handlebars.Net.Helpers, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.4.0\lib\net46\Handlebars.Net.Helpers.dll</HintPath>
    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.4.0\lib\net46\HandlebarsDotNet.Helpers.Core.dll</HintPath>
    </Reference>
    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
@@ -54,7 +54,7 @@
      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
    </Reference>
    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
      <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
--- a/examples/WireMock.Net.Console.Net461.Classic/packages.config
+++ b/examples/WireMock.Net.Console.Net461.Classic/packages.config
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="AnyOf" version="0.3.0" targetFramework="net461" />
-  <package id="Handlebars.Net" version="2.1.2" targetFramework="net461" />
-  <package id="Handlebars.Net.Helpers" version="2.3.12" targetFramework="net461" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.3.12" targetFramework="net461" />
+  <package id="Handlebars.Net" version="2.1.4" targetFramework="net461" />
+  <package id="Handlebars.Net.Helpers" version="2.4.0" targetFramework="net461" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.4.0" targetFramework="net461" />
  <package id="log4net" version="2.0.15" targetFramework="net461" />
  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.2.0" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net461" />
  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
  <package id="Stef.Validation" version="0.1.1" targetFramework="net461" />
  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
--- a/examples/WireMock.Net.Console.Net472.Classic/App.config
+++ b/examples/WireMock.Net.Console.Net472.Classic/App.config
@@ -101,6 +101,10 @@
        <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-6.25.0.0" newVersion="6.25.0.0" />
      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="NJsonSchema" publicKeyToken="c2f9c3bdfae56102" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.7.2.0" newVersion="10.7.2.0" />
+      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 </configuration>
--- a/examples/WireMock.Net.Console.Net472.Classic/WireMock.Net.Console.Net472.Classic.csproj
+++ b/examples/WireMock.Net.Console.Net472.Classic/WireMock.Net.Console.Net472.Classic.csproj
@@ -46,32 +46,32 @@
    <Reference Include="Fare, Version=2.2.0.0, Culture=neutral, PublicKeyToken=ea68d375bf33a7c8, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Fare.2.2.1\lib\net35\Fare.dll</HintPath>
    </Reference>
-    <Reference Include="Handlebars, Version=2.1.2.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.2.1.2\lib\net46\Handlebars.dll</HintPath>
+    <Reference Include="Handlebars, Version=2.1.4.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.2.1.4\lib\net46\Handlebars.dll</HintPath>
    </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.12\lib\net46\Handlebars.Net.Helpers.dll</HintPath>
+    <Reference Include="Handlebars.Net.Helpers, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.4.0\lib\net46\Handlebars.Net.Helpers.dll</HintPath>
    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.4.0\lib\net46\HandlebarsDotNet.Helpers.Core.dll</HintPath>
    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.DynamicLinq, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.DynamicLinq.2.3.12\lib\net46\HandlebarsDotNet.Helpers.DynamicLinq.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.DynamicLinq, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.DynamicLinq.2.4.0\lib\net46\HandlebarsDotNet.Helpers.DynamicLinq.dll</HintPath>
    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Humanizer, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Humanizer.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Humanizer.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Humanizer, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Humanizer.2.4.0\lib\net46\HandlebarsDotNet.Helpers.Humanizer.dll</HintPath>
    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Json, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Json.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Json.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Json, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Json.2.4.0\lib\net46\HandlebarsDotNet.Helpers.Json.dll</HintPath>
    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Random, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Random.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Random.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Random, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Random.2.4.0\lib\net46\HandlebarsDotNet.Helpers.Random.dll</HintPath>
    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Xeger, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Xeger.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Xeger.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Xeger, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Xeger.2.4.0\lib\net46\HandlebarsDotNet.Helpers.Xeger.dll</HintPath>
    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.XPath, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.XPath.2.3.12\lib\net46\HandlebarsDotNet.Helpers.XPath.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.XPath, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.XPath.2.4.0\lib\net46\HandlebarsDotNet.Helpers.XPath.dll</HintPath>
    </Reference>
    <Reference Include="Humanizer, Version=2.14.0.0, Culture=neutral, PublicKeyToken=979442b78dfc278e, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Humanizer.Core.2.14.1\lib\netstandard2.0\Humanizer.dll</HintPath>
@@ -257,16 +257,16 @@
      <HintPath>..\..\packages\Namotion.Reflection.2.0.10\lib\net45\Namotion.Reflection.dll</HintPath>
    </Reference>
    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
-    <Reference Include="NJsonSchema, Version=10.6.10.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NJsonSchema.10.6.10\lib\net45\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=10.7.2.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NJsonSchema.10.7.2\lib\net45\NJsonSchema.dll</HintPath>
    </Reference>
    <Reference Include="NJsonSchema.Extensions, Version=0.1.0.0, Culture=neutral, PublicKeyToken=e52fadf300daf456, processorArchitecture=MSIL">
      <HintPath>..\..\packages\NJsonSchema.Extensions.0.1.0\lib\net45\NJsonSchema.Extensions.dll</HintPath>
    </Reference>
-    <Reference Include="NSwag.Core, Version=13.15.10.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NSwag.Core.13.15.10\lib\net45\NSwag.Core.dll</HintPath>
+    <Reference Include="NSwag.Core, Version=13.16.1.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NSwag.Core.13.16.1\lib\net45\NSwag.Core.dll</HintPath>
    </Reference>
    <Reference Include="RandomDataGenerator, Version=1.0.16.0, Culture=neutral, PublicKeyToken=ae5c571d29a3b8d9, processorArchitecture=MSIL">
      <HintPath>..\..\packages\RandomDataGenerator.Net.1.0.17\lib\net45\RandomDataGenerator.dll</HintPath>
@@ -302,8 +302,8 @@
    <Reference Include="System.IO.Pipelines, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.IO.Pipelines.4.5.3\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
    </Reference>
-    <Reference Include="System.Linq.Dynamic.Core, Version=1.2.23.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.2.23\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
+    <Reference Include="System.Linq.Dynamic.Core, Version=1.3.1.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.3.1\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
    </Reference>
    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
--- a/examples/WireMock.Net.Console.Net472.Classic/packages.config
+++ b/examples/WireMock.Net.Console.Net472.Classic/packages.config
@@ -2,15 +2,15 @@
 <packages>
  <package id="AnyOf" version="0.3.0" targetFramework="net472" />
  <package id="Fare" version="2.2.1" targetFramework="net472" />
-  <package id="Handlebars.Net" version="2.1.2" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.DynamicLinq" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Humanizer" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Json" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Random" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Xeger" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.XPath" version="2.3.12" targetFramework="net472" />
+  <package id="Handlebars.Net" version="2.1.4" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers" version="2.4.0" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.4.0" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.DynamicLinq" version="2.4.0" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Humanizer" version="2.4.0" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Json" version="2.4.0" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Random" version="2.4.0" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Xeger" version="2.4.0" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.XPath" version="2.4.0" targetFramework="net472" />
  <package id="Humanizer" version="2.14.1" targetFramework="net472" />
  <package id="Humanizer.Core" version="2.14.1" targetFramework="net472" />
  <package id="Humanizer.Core.af" version="2.14.1" targetFramework="net472" />
@@ -123,10 +123,10 @@
  <package id="Microsoft.IdentityModel.Tokens" version="6.25.0" targetFramework="net472" />
  <package id="Microsoft.Net.Http.Headers" version="2.2.0" targetFramework="net472" />
  <package id="Namotion.Reflection" version="2.0.10" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
-  <package id="NJsonSchema" version="10.6.10" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
+  <package id="NJsonSchema" version="10.7.2" targetFramework="net472" />
  <package id="NJsonSchema.Extensions" version="0.1.0" targetFramework="net472" />
-  <package id="NSwag.Core" version="13.15.10" targetFramework="net472" />
+  <package id="NSwag.Core" version="13.16.1" targetFramework="net472" />
  <package id="Nullable" version="1.3.1" targetFramework="net472" developmentDependency="true" />
  <package id="RandomDataGenerator.Net" version="1.0.17" targetFramework="net472" />
  <package id="Scriban.Signed" version="2.1.4" targetFramework="net472" />
@@ -138,7 +138,7 @@
  <package id="System.Diagnostics.DiagnosticSource" version="4.5.0" targetFramework="net472" />
  <package id="System.IdentityModel.Tokens.Jwt" version="6.25.0" targetFramework="net472" />
  <package id="System.IO.Pipelines" version="4.5.3" targetFramework="net472" />
-  <package id="System.Linq.Dynamic.Core" version="1.2.23" targetFramework="net472" />
+  <package id="System.Linq.Dynamic.Core" version="1.3.1" targetFramework="net472" />
  <package id="System.Memory" version="4.5.4" targetFramework="net472" />
  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
  <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net472" />
--- a/examples/WireMock.Net.Console.Proxy.NETCoreApp/WireMock.Net.Console.Proxy.NETCoreApp.csproj
+++ b/examples/WireMock.Net.Console.Proxy.NETCoreApp/WireMock.Net.Console.Proxy.NETCoreApp.csproj
@@ -9,7 +9,7 @@
  <ItemGroup>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
  </ItemGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.Console.Proxy.NETCoreApp2/WireMock.Net.Console.Proxy.NETCoreApp2.csproj
+++ b/examples/WireMock.Net.Console.Proxy.NETCoreApp2/WireMock.Net.Console.Proxy.NETCoreApp2.csproj
@@ -7,7 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
  </ItemGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.Console.Proxy.Net452/WireMock.Net.Console.Proxy.Net452.csproj
+++ b/examples/WireMock.Net.Console.Proxy.Net452/WireMock.Net.Console.Proxy.Net452.csproj
@@ -72,7 +72,7 @@
      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
    </Reference>
    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
--- a/examples/WireMock.Net.Console.Proxy.Net452/packages.config
+++ b/examples/WireMock.Net.Console.Proxy.Net452/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
 </packages>
--- a/examples/WireMock.Net.OpenApiParser.ConsoleApp/DynamicDataGeneration.cs
+++ b/examples/WireMock.Net.OpenApiParser.ConsoleApp/DynamicDataGeneration.cs
@@ -11,7 +11,7 @@ public class DynamicDataGeneration : WireMockOpenApiParserDynamicExampleValues
        get
        {
            // Since you have your Schema, you can get if max-length is set. You can generate accurate examples with this settings
-            var maxLength = Schema.MaxLength ?? 9;
+            var maxLength = Schema?.MaxLength ?? 9;

            return RandomizerFactory.GetRandomizer(new FieldOptionsTextRegex
            {
--- a/examples/WireMock.Net.OpenApiParser.ConsoleApp/Program.cs
+++ b/examples/WireMock.Net.OpenApiParser.ConsoleApp/Program.cs
@@ -17,7 +17,7 @@ class Program

    private static void RunMockServerWithDynamicExampleGeneration()
    {
-        //Run your mocking framework specifieing youur Example Values generator class.
+        // Run your mocking framework specifying your Example Values generator class.
        var serverCustomer_V2_json = Run.RunServer(Path.Combine(Folder, "Swagger_Customer_V2.0.json"), "http://localhost:8090/", true, new DynamicDataGeneration(), Types.ExampleValueType.Value, Types.ExampleValueType.Value);
        Console.WriteLine("Press any key to stop the servers");

@@ -27,15 +27,15 @@ class Program

    private static void RunOthersOpenApiParserExample()
    {
-        var serverOpenAPIExamples = Run.RunServer(Path.Combine(Folder, "openAPIExamples.yaml"), "https://localhost:9091/");
-        var serverPetstore_V2_json = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V2.0.json"), "https://localhost:9092/");
-        var serverPetstore_V2_yaml = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V2.0.yaml"), "https://localhost:9093/");
-        var serverPetstore_V300_yaml = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V3.0.0.yaml"), "https://localhost:9094/");
-        var serverPetstore_V302_json = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V3.0.2.json"), "https://localhost:9095/");
-        var testopenapifile_json = Run.RunServer(Path.Combine(Folder, "testopenapifile.json"), "https://localhost:9096/");
-        var file_errorYaml = Run.RunServer(Path.Combine(Folder, "file_error.yaml"), "https://localhost:9097/");
-        var file_petJson = Run.RunServer(Path.Combine(Folder, "pet.json"), "https://localhost:9098/");
-        var refsYaml = Run.RunServer(Path.Combine(Folder, "refs.yaml"), "https://localhost:9099/");
+        var serverOpenAPIExamples = Run.RunServer(Path.Combine(Folder, "openAPIExamples.yaml"), "http://localhost:9091/");
+        var serverPetstore_V2_json = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V2.0.json"), "http://localhost:9092/");
+        var serverPetstore_V2_yaml = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V2.0.yaml"), "http://localhost:9093/");
+        var serverPetstore_V300_yaml = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V3.0.0.yaml"), "http://localhost:9094/");
+        var serverPetstore_V302_json = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V3.0.2.json"), "http://localhost:9095/");
+        var testopenapifile_json = Run.RunServer(Path.Combine(Folder, "testopenapifile.json"), "http://localhost:9096/");
+        var file_errorYaml = Run.RunServer(Path.Combine(Folder, "file_error.yaml"), "http://localhost:9097/");
+        var file_petJson = Run.RunServer(Path.Combine(Folder, "pet.json"), "http://localhost:9098/");
+        var refsYaml = Run.RunServer(Path.Combine(Folder, "refs.yaml"), "http://localhost:9099/");

        testopenapifile_json
            .Given(Request.Create().WithPath("/x").UsingGet())
--- a/examples/WireMock.Net.OpenApiParser.ConsoleApp/Run.cs
+++ b/examples/WireMock.Net.OpenApiParser.ConsoleApp/Run.cs
@@ -9,64 +9,70 @@ using WireMock.Net.OpenApiParser.Types;
 using WireMock.Server;
 using WireMock.Settings;

-namespace WireMock.Net.OpenApiParser.ConsoleApp
+namespace WireMock.Net.OpenApiParser.ConsoleApp;
+
+public static class Run
 {
-    public static class Run
+    public static WireMockServer RunServer(
+        string path,
+        string url,
+        bool dynamicExamples = true,
+        IWireMockOpenApiParserExampleValues? examplesValuesGenerator = null,
+        ExampleValueType pathPatternToUse = ExampleValueType.Wildcard,
+        ExampleValueType headerPatternToUse = ExampleValueType.Wildcard
+    )
    {
-        public static WireMockServer RunServer(string path, string url, bool dynamicExamples = true, IWireMockOpenApiParserExampleValues examplesValuesGenerator =  null, ExampleValueType pathPatternToUse = ExampleValueType.Wildcard, ExampleValueType headerPatternToUse = ExampleValueType.Wildcard)
+        var server = WireMockServer.Start(new WireMockServerSettings
        {
-            var server = WireMockServer.Start(new WireMockServerSettings
-            {
-                AllowCSharpCodeMatcher = true,
-                Urls = new[] { url },
-                StartAdminInterface = true,
-                ReadStaticMappings = true,
-                WatchStaticMappings = false,
-                WatchStaticMappingsInSubdirectories = false,
-                Logger = new WireMockConsoleLogger(),
-                SaveUnmatchedRequests = true
-            });
+            AllowCSharpCodeMatcher = true,
+            Urls = new[] { url },
+            StartAdminInterface = true,
+            ReadStaticMappings = true,
+            WatchStaticMappings = false,
+            WatchStaticMappingsInSubdirectories = false,
+            Logger = new WireMockConsoleLogger(),
+            SaveUnmatchedRequests = true
+        });

-            Console.WriteLine("WireMockServer listening at {0}", string.Join(",", server.Urls));
+        Console.WriteLine("WireMockServer listening at {0}", string.Join(",", server.Urls));

-            //server.SetBasicAuthentication("a", "b");
+        //server.SetBasicAuthentication("a", "b");

-            var settings = new WireMockOpenApiParserSettings
-            {
-                DynamicExamples = dynamicExamples,
-                ExampleValues = examplesValuesGenerator,
-                PathPatternToUse = pathPatternToUse,
-                HeaderPatternToUse = headerPatternToUse,
-            };
-
-            server.WithMappingFromOpenApiFile(path, settings, out var diag);
-
-            return server;
-        }
-
-        public static void RunServer(IEnumerable<MappingModel> mappings)
+        var settings = new WireMockOpenApiParserSettings
        {
-            string url1 = "http://localhost:9091/";
+            DynamicExamples = dynamicExamples,
+            ExampleValues = examplesValuesGenerator,
+            PathPatternToUse = pathPatternToUse,
+            HeaderPatternToUse = headerPatternToUse,
+        };

-            var server = WireMockServer.Start(new WireMockServerSettings
-            {
-                AllowCSharpCodeMatcher = true,
-                Urls = new[] { url1 },
-                StartAdminInterface = true,
-                ReadStaticMappings = false,
-                WatchStaticMappings = false,
-                WatchStaticMappingsInSubdirectories = false,
-                Logger = new WireMockConsoleLogger(),
-            });
-            Console.WriteLine("WireMockServer listening at {0}", string.Join(",", server.Urls));
+        server.WithMappingFromOpenApiFile(path, settings, out var diag);

-            server.SetBasicAuthentication("a", "b");
+        return server;
+    }

-            server.WithMapping(mappings.ToArray());
+    public static void RunServer(IEnumerable<MappingModel> mappings)
+    {
+        string url1 = "http://localhost:9091/";

-            Console.WriteLine("Press any key to stop the server");
-            System.Console.ReadKey();
-            server.Stop();
-        }
+        var server = WireMockServer.Start(new WireMockServerSettings
+        {
+            AllowCSharpCodeMatcher = true,
+            Urls = new[] { url1 },
+            StartAdminInterface = true,
+            ReadStaticMappings = false,
+            WatchStaticMappings = false,
+            WatchStaticMappingsInSubdirectories = false,
+            Logger = new WireMockConsoleLogger(),
+        });
+        Console.WriteLine("WireMockServer listening at {0}", string.Join(",", server.Urls));
+
+        server.SetBasicAuthentication("a", "b");
+
+        server.WithMapping(mappings.ToArray());
+
+        Console.WriteLine("Press any key to stop the server");
+        System.Console.ReadKey();
+        server.Stop();
    }
 }
--- a/examples/WireMock.Net.Service/WireMock.Net.Service.csproj
+++ b/examples/WireMock.Net.Service/WireMock.Net.Service.csproj
@@ -46,7 +46,7 @@
      <HintPath>..\..\packages\Microsoft.Owin.Hosting.2.0.2\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
    </Reference>
    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
--- a/examples/WireMock.Net.Service/packages.config
+++ b/examples/WireMock.Net.Service/packages.config
@@ -8,7 +8,7 @@
  <package id="Microsoft.Owin" version="4.2.2" targetFramework="net452" />
  <package id="Microsoft.Owin.Host.HttpListener" version="2.0.2" targetFramework="net452" />
  <package id="Microsoft.Owin.Hosting" version="2.0.2" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
  <package id="Owin" version="1.0" targetFramework="net452" />
  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net452" />
  <package id="System.Net.Http" version="4.3.4" targetFramework="net452" requireReinstallation="true" />
--- a/examples/WireMock.Net.StandAlone.NETCoreApp/Program.cs
+++ b/examples/WireMock.Net.StandAlone.NETCoreApp/Program.cs
@@ -24,12 +24,12 @@ static class Program

    static async Task Main(string[] args)
    {
-        await TestAsync().ConfigureAwait(false);
-        return;
+        //await TestAsync().ConfigureAwait(false);
+        //return;

        XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));

-        if (!WireMockServerSettingsParser.TryParseArguments(args, out var settings, new WireMockLog4NetLogger()))
+        if (!WireMockServerSettingsParser.TryParseArguments(args, Environment.GetEnvironmentVariables(), out var settings, new WireMockLog4NetLogger()))
        {
            return;
        }
--- a/examples/WireMock.Net.StandAlone.NETCoreApp/WireMockLog4NetLogger.cs
+++ b/examples/WireMock.Net.StandAlone.NETCoreApp/WireMockLog4NetLogger.cs
@@ -1,44 +1,43 @@
-using System;
+using System;
 using log4net;
 using Newtonsoft.Json;
 using WireMock.Admin.Requests;
 using WireMock.Logging;

-namespace WireMock.Net.StandAlone.NETCoreApp
+namespace WireMock.Net.StandAlone.NETCoreApp;
+
+internal class WireMockLog4NetLogger : IWireMockLogger
 {
-    internal class WireMockLog4NetLogger : IWireMockLogger
+    private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+
+    public void Debug(string formatString, params object[] args)
    {
-        private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+        Log.DebugFormat(formatString, args);
+    }

-        public void Debug(string formatString, params object[] args)
-        {
-            Log.DebugFormat(formatString, args);
-        }
+    public void Info(string formatString, params object[] args)
+    {
+        Log.InfoFormat(formatString, args);
+    }

-        public void Info(string formatString, params object[] args)
-        {
-            Log.InfoFormat(formatString, args);
-        }
+    public void Warn(string formatString, params object[] args)
+    {
+        Log.WarnFormat(formatString, args);
+    }

-        public void Warn(string formatString, params object[] args)
-        {
-            Log.WarnFormat(formatString, args);
-        }
+    public void Error(string formatString, params object[] args)
+    {
+        Log.ErrorFormat(formatString, args);
+    }

-        public void Error(string formatString, params object[] args)
-        {
-            Log.ErrorFormat(formatString, args);
-        }
+    public void Error(string message, Exception exception)
+    {
+        Log.Error(message, exception);
+    }

-        public void Error(string message, Exception exception)
-        {
-            Log.Error(message, exception);
-        }
-
-        public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
-        {
-            string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
-            Log.DebugFormat("Admin[{0}] {1}", isAdminRequest, message);
-        }
+    public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
+    {
+        string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
+        Log.DebugFormat("Admin[{0}] {1}", isAdminRequest, message);
    }
 }
--- a/examples/WireMock.Net.StandAlone.Net452/Program.cs
+++ b/examples/WireMock.Net.StandAlone.Net452/Program.cs
@@ -13,7 +13,7 @@ public class Program
    {
        XmlConfigurator.Configure(new FileInfo("log4net.config"));

-        if (WireMockServerSettingsParser.TryParseArguments(args, out var settings))
+        if (WireMockServerSettingsParser.TryParseArguments(args, Environment.GetEnvironmentVariables(), out var settings))
        {
            Console.WriteLine("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));

--- a/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj
+++ b/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj
@@ -46,7 +46,7 @@
      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.4.0.0\lib\net451\Microsoft.Owin.Host.HttpListener.dll</HintPath>
    </Reference>
    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Configuration" />
--- a/examples/WireMock.Net.StandAlone.Net452/packages.config
+++ b/examples/WireMock.Net.StandAlone.Net452/packages.config
@@ -3,5 +3,5 @@
  <package id="log4net" version="2.0.15" targetFramework="net452" />
  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.6" targetFramework="net452" />
  <package id="Microsoft.Owin.Host.HttpListener" version="4.0.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
 </packages>
--- a/examples/WireMock.Net.StandAlone.Net461/Program.cs
+++ b/examples/WireMock.Net.StandAlone.Net461/Program.cs
@@ -9,7 +9,7 @@ static class Program
 {
    static void Main(string[] args)
    {
-        if (WireMockServerSettingsParser.TryParseArguments(args, out var settings))
+        if (WireMockServerSettingsParser.TryParseArguments(args, Environment.GetEnvironmentVariables(), out var settings))
        {
            Console.WriteLine("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));

--- a/examples/WireMock.Net.StandAlone.Net461/WireMock.Net.StandAlone.Net461.csproj
+++ b/examples/WireMock.Net.StandAlone.Net461/WireMock.Net.StandAlone.Net461.csproj
@@ -39,8 +39,8 @@
    <StartupObject>WireMock.Net.StandAlone.Net461.Program</StartupObject>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Handlebars, Version=2.1.2.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.2.1.2\lib\net46\Handlebars.dll</HintPath>
+    <Reference Include="Handlebars, Version=2.1.4.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.2.1.4\lib\net46\Handlebars.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.AspNetCore, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.AspNetCore.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.dll</HintPath>
@@ -205,7 +205,7 @@
      <HintPath>..\..\packages\MimeKitLite.2.0.7\lib\net45\MimeKitLite.dll</HintPath>
    </Reference>
    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
@@ -235,8 +235,8 @@
    <Reference Include="System.IO.Pipelines, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.IO.Pipelines.4.5.3\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
    </Reference>
-    <Reference Include="System.Linq.Dynamic.Core, Version=1.2.23.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.2.23\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
+    <Reference Include="System.Linq.Dynamic.Core, Version=1.3.1.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.3.1\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
    </Reference>
    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
--- a/examples/WireMock.Net.StandAlone.Net461/packages.config
+++ b/examples/WireMock.Net.StandAlone.Net461/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Handlebars.Net" version="2.1.2" targetFramework="net461" />
+  <package id="Handlebars.Net" version="2.1.4" targetFramework="net461" />
  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.9" targetFramework="net461" />
  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.9" targetFramework="net461" />
  <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.9" targetFramework="net461" />
@@ -59,7 +59,7 @@
  <package id="Microsoft.Owin.Host.HttpListener" version="4.2.2" targetFramework="net461" />
  <package id="Microsoft.Owin.Hosting" version="4.2.2" targetFramework="net461" />
  <package id="MimeKitLite" version="2.0.7" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net461" />
  <package id="Owin" version="1.0" targetFramework="net461" />
  <package id="RestEase" version="1.5.7" targetFramework="net461" />
  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
@@ -68,7 +68,7 @@
  <package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net461" />
  <package id="System.Diagnostics.DiagnosticSource" version="4.5.1" targetFramework="net461" />
  <package id="System.IO.Pipelines" version="4.5.3" targetFramework="net461" />
-  <package id="System.Linq.Dynamic.Core" version="1.2.23" targetFramework="net461" />
+  <package id="System.Linq.Dynamic.Core" version="1.3.1" targetFramework="net461" />
  <package id="System.Memory" version="4.5.4" targetFramework="net461" />
  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
  <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net461" />
--- a/examples/WireMock.Net.TestcontainersExample/Program.cs
+++ b/examples/WireMock.Net.TestcontainersExample/Program.cs
@@ -0,0 +1,43 @@
+using Newtonsoft.Json;
+using Testcontainers.MsSql;
+using WireMock.Net.Testcontainers;
+
+namespace WireMock.Net.TestcontainersExample;
+
+internal class Program
+{
+    private static async Task Main(string[] args)
+    {
+        var container = new WireMockContainerBuilder()
+            .WithAdminUserNameAndPassword("x", "y")
+            .WithMappings(@"C:\Dev\GitHub\WireMock.Net\examples\WireMock.Net.Console.NET6\__admin\mappings")
+            .WithWatchStaticMappings(true)
+            .WithAutoRemove(true)
+            .WithCleanUp(true)
+            .Build();
+
+        await container.StartAsync().ConfigureAwait(false);
+
+        var logs = await container.GetLogsAsync(DateTime.Now.AddDays(-1)).ConfigureAwait(false);
+        Console.WriteLine("logs = " + logs.Stdout);
+
+        var restEaseApiClient = container.CreateWireMockAdminClient();
+
+        var settings = await restEaseApiClient.GetSettingsAsync();
+        Console.WriteLine("settings = " + JsonConvert.SerializeObject(settings, Formatting.Indented));
+
+        var mappings = await restEaseApiClient.GetMappingsAsync();
+        Console.WriteLine("mappings = " + JsonConvert.SerializeObject(mappings, Formatting.Indented));
+
+        var client = container.CreateClient();
+        var result = await client.GetStringAsync("/static/mapping");
+        Console.WriteLine("result = " + result);
+
+        await container.StopAsync();
+
+        var sql = new MsSqlBuilder()
+            .WithAutoRemove(true)
+            .WithCleanUp(true)
+            .Build();
+    }
+}
--- a/examples/WireMock.Net.TestcontainersExample/WireMock.Net.TestcontainersExample.csproj
+++ b/examples/WireMock.Net.TestcontainersExample/WireMock.Net.TestcontainersExample.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Testcontainers.MsSql" Version="3.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.Testcontainers\WireMock.Net.Testcontainers.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>
--- a/examples/WireMock.Net.WebApplication.NET6/WireMock.Net.WebApplication.NET6.csproj
+++ b/examples/WireMock.Net.WebApplication.NET6/WireMock.Net.WebApplication.NET6.csproj
@@ -12,7 +12,7 @@

    <ItemGroup>
        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
    </ItemGroup>

    <ItemGroup>
--- a/examples/WireMock.Net.WebApplication.NETCore2/WireMock.Net.WebApplication.NETCore2.csproj
+++ b/examples/WireMock.Net.WebApplication.NETCore2/WireMock.Net.WebApplication.NETCore2.csproj
@@ -12,13 +12,13 @@
  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0'">
    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.9" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
  </ItemGroup>

  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1'">
    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
    <PackageReference Include="Microsoft.AspNetCore.All" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
  </ItemGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.WebApplication.NETCore3/WireMock.Net.WebApplication.NETCore3.csproj
+++ b/examples/WireMock.Net.WebApplication.NETCore3/WireMock.Net.WebApplication.NETCore3.csproj
@@ -12,7 +12,7 @@

 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.8" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>

 	<ItemGroup>
--- a/examples/WireMockAzureQueueProxy/WireMockAzureQueueProxy.csproj
+++ b/examples/WireMockAzureQueueProxy/WireMockAzureQueueProxy.csproj
@@ -6,7 +6,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
    </ItemGroup>

    <ItemGroup>
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/CookieModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/CookieModel.cs
@@ -19,12 +19,12 @@ public class CookieModel
    public IList<MatcherModel>? Matchers { get; set; }

    /// <summary>
-    /// Gets or sets the ignore case.
+    /// Gets or sets the ignore case for the Cookie Name.
    /// </summary>
    public bool? IgnoreCase { get; set; }

    /// <summary>
-    /// Reject on match.
+    /// Gets or sets the Reject on match for the Cookie Name.
    /// </summary>
    public bool? RejectOnMatch { get; set; }

--- a/src/WireMock.Net.Abstractions/Admin/Mappings/FaultModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/FaultModel.cs
@@ -1,19 +1,18 @@
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// Fault Model
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class FaultModel
 {
    /// <summary>
-    /// Fault Model
+    /// Gets or sets the fault. Can be null, "", NONE, EMPTY_RESPONSE or MALFORMED_RESPONSE_CHUNK.
    /// </summary>
-    [FluentBuilder.AutoGenerateBuilder]
-    public class FaultModel
-    {
-        /// <summary>
-        /// Gets or sets the fault. Can be null, "", NONE, EMPTY_RESPONSE, MALFORMED_RESPONSE_CHUNK or RANDOM_DATA_THEN_CLOSE.
-        /// </summary>
-        public string Type { get; set; }
+    public string? Type { get; set; }

-        /// <summary>
-        /// Gets or sets the fault percentage.
-        /// </summary>
-        public double? Percentage { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the fault percentage.
+    /// </summary>
+    public double? Percentage { get; set; }
 }
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/HeaderModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/HeaderModel.cs
@@ -9,7 +9,7 @@ namespace WireMock.Admin.Mappings;
 public class HeaderModel
 {
    /// <summary>
-    /// Gets or sets the name.
+    /// Gets or sets the name (key).
    /// </summary>
    public string Name { get; set; } = null!;

@@ -19,12 +19,12 @@ public class HeaderModel
    public IList<MatcherModel>? Matchers { get; set; }

    /// <summary>
-    /// Gets or sets the ignore case.
+    /// Gets or sets the ignore case for the Header Key.
    /// </summary>
    public bool? IgnoreCase { get; set; }

    /// <summary>
-    /// Reject on match.
+    /// Gets or sets the Reject on match for the Header Key.
    /// </summary>
    public bool? RejectOnMatch { get; set; }

--- a/src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using WireMock.Models;

 namespace WireMock.Admin.Mappings;
@@ -94,4 +93,9 @@ public class MappingModel
    /// </example>
    /// </summary>
    public object? Data { get; set; }
+
+    /// <summary> 
+    /// The probability when this request should be matched. Value is between 0 and 1. [Optional]
+    /// </summary>
+    public double? Probability { get; set; }
 }
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/MatcherModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/MatcherModel.cs
@@ -39,14 +39,38 @@ public class MatcherModel
    /// <summary>
    /// The Operator to use when multiple patterns are defined. Optional.
    /// - null      = Same as "or".
-    /// - "or"      = Only one pattern should match.
+    /// - "or"      = Only one pattern is required to match.
    /// - "and"     = All patterns should match.
    /// - "average" = The average value from all patterns.
    /// </summary>
    public string? MatchOperator { get; set; }

+    #region JsonPartialMatcher and JsonPartialWildcardMatcher
    /// <summary>
-    /// Support Regex, only used for JsonPartialMatcher.
+    /// Support Regex.
    /// </summary>
    public bool? Regex { get; set; }
+    #endregion
+
+    #region MimePartMatcher
+    /// <summary>
+    /// ContentType Matcher (image/png; name=image.png)
+    /// </summary>
+    public MatcherModel? ContentTypeMatcher { get; set; }
+
+    /// <summary>
+    /// ContentDisposition Matcher (attachment; filename=image.png)
+    /// </summary>
+    public MatcherModel? ContentDispositionMatcher { get; set; }
+
+    /// <summary>
+    /// ContentTransferEncoding Matcher (base64)
+    /// </summary>
+    public MatcherModel? ContentTransferEncodingMatcher { get; set; }
+
+    /// <summary>
+    /// Content Matcher
+    /// </summary>
+    public MatcherModel? ContentMatcher { get; set; }
+    #endregion
 }
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/ParamModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/ParamModel.cs
@@ -16,6 +16,11 @@ public class ParamModel
    /// </summary>
    public bool? IgnoreCase { get; set; }

+    /// <summary>
+    /// Gets or sets the Reject on match for the Param Name.
+    /// </summary>
+    public bool? RejectOnMatch { get; set; }
+
    /// <summary>
    /// Gets or sets the matchers.
    /// </summary>
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/StatusModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/StatusModel.cs
@@ -1,21 +1,25 @@
-using System;
+using System;

-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// Status
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class StatusModel
 {
    /// <summary>
-    /// Status
+    /// The optional guid.
    /// </summary>
-    [FluentBuilder.AutoGenerateBuilder]
-    public class StatusModel
-    {
-        /// <summary>
-        /// The optional guid.
-        /// </summary>
-        public Guid? Guid { get; set; }
+    public Guid? Guid { get; set; }

-        /// <summary>
-        /// The status (can also contain the error message).
-        /// </summary>
-        public string Status { get; set; }
-    }
+    /// <summary>
+    /// The status.
+    /// </summary>
+    public string? Status { get; set; }
+
+    /// <summary>
+    /// The error message.
+    /// </summary>
+    public string? Error { get; set; }
 }
--- a/src/WireMock.Net.Abstractions/Admin/Settings/ProxyAndRecordSettingsModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Settings/ProxyAndRecordSettingsModel.cs
@@ -1,71 +1,76 @@
-namespace WireMock.Admin.Settings;
-
-[FluentBuilder.AutoGenerateBuilder]
-public class ProxyAndRecordSettingsModel
-{
-    /// <summary>
-    /// The clientCertificate thumbprint or subject name fragment to use.
-    /// Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
-    /// </summary>
-    public string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }
-
-    /// <summary>
-    /// Defines the WebProxySettings.
-    /// </summary>
-    public WebProxySettingsModel WebProxySettings { get; set; }
-
-    /// <summary>
-    /// Proxy requests should follow redirection (30x).
-    /// </summary>
-    public bool? AllowAutoRedirect { get; set; }
-
-    /// <summary>
-    /// The URL to proxy.
-    /// </summary>
-    public string Url { get; set; }
-
-    /// <summary>
-    /// Save the mapping for each request/response to the internal Mappings.
-    /// </summary>
-    public bool SaveMapping { get; set; }
-
-    /// <summary>
-    /// Save the mapping for each request/response also to a file. (Note that SaveMapping must also be set to true.)
-    /// </summary>
-    public bool SaveMappingToFile { get; set; }
-
-    /// <summary>
-    /// Only save request/response to the internal Mappings if the status code is included in this pattern. (Note that SaveMapping must also be set to true.)
-    /// The pattern can contain a single value like "200", but also ranges like "2xx", "100,300,600" or "100-299,6xx" are supported.
-    /// </summary>
-    public string SaveMappingForStatusCodePattern { get; set; } = "*";
-
-    /// <summary>
-    /// Defines a list from headers which will be excluded from the saved mappings.
-    /// </summary>
-    public string[] ExcludedHeaders { get; set; }
-
-    /// <summary>
-    /// Defines a list of cookies which will be excluded from the saved mappings.
-    /// </summary>
-    public string[] ExcludedCookies { get; set; }
-
-    /// <summary>
-    /// Prefer the Proxy Mapping over the saved Mapping (in case SaveMapping is set to <c>true</c>).
-    /// </summary>
-    // public bool PreferProxyMapping { get; set; }
-
-    /// <summary>
-    /// When SaveMapping is set to <c>true</c>, this setting can be used to control the behavior of the generated request matchers for the new mapping.
-    /// - <c>false</c>, the default matchers will be used.
-    /// - <c>true</c>, the defined mappings in the request wil be used for the new mapping.
-    ///
-    /// Default value is false.
-    /// </summary>
-    public bool UseDefinedRequestMatchers { get; set; }
-
-    /// <summary>
-    /// Append an unique GUID to the filename from the saved mapping file.
-    /// </summary>
-    public bool AppendGuidToSavedMappingFile { get; set; }
+namespace WireMock.Admin.Settings;
+
+[FluentBuilder.AutoGenerateBuilder]
+public class ProxyAndRecordSettingsModel
+{
+    /// <summary>
+    /// The clientCertificate thumbprint or subject name fragment to use.
+    /// Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
+    /// </summary>
+    public string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }
+
+    /// <summary>
+    /// Defines the WebProxySettings.
+    /// </summary>
+    public WebProxySettingsModel WebProxySettings { get; set; }
+
+    /// <summary>
+    /// Proxy requests should follow redirection (30x).
+    /// </summary>
+    public bool? AllowAutoRedirect { get; set; }
+
+    /// <summary>
+    /// The URL to proxy.
+    /// </summary>
+    public string Url { get; set; }
+
+    /// <summary>
+    /// Save the mapping for each request/response to the internal Mappings.
+    /// </summary>
+    public bool SaveMapping { get; set; }
+
+    /// <summary>
+    /// Save the mapping for each request/response also to a file. (Note that SaveMapping must also be set to true.)
+    /// </summary>
+    public bool SaveMappingToFile { get; set; }
+
+    /// <summary>
+    /// Only save request/response to the internal Mappings if the status code is included in this pattern. (Note that SaveMapping must also be set to true.)
+    /// The pattern can contain a single value like "200", but also ranges like "2xx", "100,300,600" or "100-299,6xx" are supported.
+    /// </summary>
+    public string SaveMappingForStatusCodePattern { get; set; } = "*";
+
+    /// <summary>
+    /// Defines a list from headers which will be excluded from the saved mappings.
+    /// </summary>
+    public string[] ExcludedHeaders { get; set; }
+
+    /// <summary>
+    /// Defines a list of cookies which will be excluded from the saved mappings.
+    /// </summary>
+    public string[] ExcludedCookies { get; set; }
+
+    /// <summary>
+    /// Prefer the Proxy Mapping over the saved Mapping (in case SaveMapping is set to <c>true</c>).
+    /// </summary>
+    // public bool PreferProxyMapping { get; set; }
+
+    /// <summary>
+    /// When SaveMapping is set to <c>true</c>, this setting can be used to control the behavior of the generated request matchers for the new mapping.
+    /// - <c>false</c>, the default matchers will be used.
+    /// - <c>true</c>, the defined mappings in the request wil be used for the new mapping.
+    ///
+    /// Default value is false.
+    /// </summary>
+    public bool UseDefinedRequestMatchers { get; set; }
+
+    /// <summary>
+    /// Append an unique GUID to the filename from the saved mapping file.
+    /// </summary>
+    public bool AppendGuidToSavedMappingFile { get; set; }
+
+    /// <summary>
+    /// Defines the Replace Settings
+    /// </summary>
+    public ProxyUrlReplaceSettingsModel? ReplaceSettings { get; set; }
 }
--- a/src/WireMock.Net.Abstractions/Admin/Settings/ProxyUrlReplaceSettingsModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Settings/ProxyUrlReplaceSettingsModel.cs
@@ -0,0 +1,23 @@
+namespace WireMock.Admin.Settings;
+
+/// <summary>
+/// Defines an old path param and a new path param to be replaced when proxying.
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class ProxyUrlReplaceSettingsModel
+{
+    /// <summary>
+    /// The old path value to be replaced by the new path value
+    /// </summary>
+    public string OldValue { get; set; } = null!;
+
+    /// <summary>
+    /// The new path value to replace the old value with
+    /// </summary>
+    public string NewValue { get; set; } = null!;
+
+    /// <summary>
+    /// Defines if the case should be ignore when replacing.
+    /// </summary>
+    public bool IgnoreCase { get; set; }
+}
--- a/src/WireMock.Net.Abstractions/Admin/Settings/SettingsModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Settings/SettingsModel.cs
@@ -31,27 +31,44 @@ public class SettingsModel
    public int? MaxRequestLogCount { get; set; }

    /// <summary>
-    /// Allow a Body for all HTTP Methods. (default set to false).
+    /// Allow a Body for all HTTP Methods. (default set to <c>false</c>).
    /// </summary>
    public bool? AllowBodyForAllHttpMethods { get; set; }

    /// <summary>
-    /// Handle all requests synchronously. (default set to false).
+    /// Allow only a HttpStatus Code in the response which is defined. (default set to <c>false</c>).
+    /// - false : also null, 0, empty or invalid HttpStatus codes are allowed.
+    /// - true  : only codes defined in <see cref="System.Net.HttpStatusCode"/> are allowed.
+    /// </summary>
+    public bool? AllowOnlyDefinedHttpStatusCodeInResponse { get; set; }
+
+    /// <summary>
+    /// Set to true to disable Json deserialization when processing requests. (default set to <c>false</c>).
+    /// </summary>
+    public bool? DisableJsonBodyParsing { get; set; }
+
+    /// <summary>
+    /// Disable support for GZip and Deflate request body decompression. (default set to <c>false</c>).
+    /// </summary>
+    public bool? DisableRequestBodyDecompressing { get; set; }
+
+    /// <summary>
+    /// Set to true to disable FormUrlEncoded deserializing when processing requests. (default set to <c>false</c>).
+    /// </summary>
+    public bool? DisableDeserializeFormUrlEncoded { get; set; }
+
+    /// <summary>
+    /// Handle all requests synchronously. (default set to <c>false</c>).
    /// </summary>
    public bool? HandleRequestsSynchronously { get; set; }

    /// <summary>
-    /// Throw an exception when the Matcher fails because of invalid input. (default set to false).
-    /// </summary>
-    public bool? ThrowExceptionWhenMatcherFails { get; set; }
-
-    /// <summary>
-    /// Use the RegexExtended instead of the default <see cref="Regex"/>.  (default set to true).
+    /// Use the RegexExtended instead of the default <see cref="Regex"/>.  (default set to <c>true</c>).
    /// </summary>
    public bool? UseRegexExtended { get; set; }

    /// <summary>
-    /// Save unmatched requests to a file using the <see cref="IFileSystemHandler"/>. (default set to false).
+    /// Save unmatched requests to a file using the <see cref="IFileSystemHandler"/>. (default set to <c>false</c>).
    /// </summary>
    public bool? SaveUnmatchedRequests { get; set; }

@@ -86,7 +103,7 @@ public class SettingsModel
    public HostingScheme? HostingScheme { get; set; }

    /// <summary>
-    /// Don't save the response-string in the LogEntry when WithBody(Func{IRequestMessage, string}) or WithBody(Func{IRequestMessage, Task{string}}) is used. (default set to false).
+    /// Don't save the response-string in the LogEntry when WithBody(Func{IRequestMessage, string}) or WithBody(Func{IRequestMessage, Task{string}}) is used. (default set to <c>false</c>).
    /// </summary>
    public bool? DoNotSaveDynamicResponseInLogEntry { get; set; }

--- a/src/WireMock.Net.Abstractions/Handlers/IFileSystemHandler.cs
+++ b/src/WireMock.Net.Abstractions/Handlers/IFileSystemHandler.cs
@@ -1,121 +1,120 @@
 using JetBrains.Annotations;
 using System.Collections.Generic;

-namespace WireMock.Handlers
+namespace WireMock.Handlers;
+
+/// <summary>
+/// Handler to interact with the file system to handle folders and read and write (static mapping) files.
+/// </summary>
+public interface IFileSystemHandler
 {
    /// <summary>
-    /// Handler to interact with the file system to handle folders and read and write (static mapping) files.
+    /// Gets the folder where the static mappings are located. For local file system, this would be `{CurrentFolder}/__admin/mappings`.
    /// </summary>
-    public interface IFileSystemHandler
-    {
-        /// <summary>
-        /// Gets the folder where the static mappings are located. For local file system, this would be `{CurrentFolder}/__admin/mappings`.
-        /// </summary>
-        /// <returns>The folder name.</returns>
-        string GetMappingFolder();
+    /// <returns>The folder name.</returns>
+    string GetMappingFolder();

-        /// <summary>
-        /// Determines whether the given path refers to an existing directory on disk.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>true if path refers to an existing directory; false if the directory does not exist or an error occurs when trying to determine if the specified directory exists.</returns>
-        bool FolderExists([NotNull] string path);
+    /// <summary>
+    /// Determines whether the given path refers to an existing directory on disk.
+    /// </summary>
+    /// <param name="path">The path.</param>
+    /// <returns>true if path refers to an existing directory; false if the directory does not exist or an error occurs when trying to determine if the specified directory exists.</returns>
+    bool FolderExists([NotNull] string path);

-        /// <summary>
-        ///  Creates all directories and subdirectories in the specified path unless they already exist.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        void CreateFolder([NotNull] string path);
+    /// <summary>
+    ///  Creates all directories and subdirectories in the specified path unless they already exist.
+    /// </summary>
+    /// <param name="path">The path.</param>
+    void CreateFolder([NotNull] string path);

-        /// <summary>
-        ///  Returns an enumerable collection of file names in a specified path.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <param name="includeSubdirectories">A value indicating whether subdirectories should also included when enumerating files.</param>
-        /// <returns>An enumerable collection of the full names (including paths) for the files in the directory (and optionally subdirectories) specified by path.</returns>
-        IEnumerable<string> EnumerateFiles([NotNull] string path, bool includeSubdirectories);
+    /// <summary>
+    ///  Returns an enumerable collection of file names in a specified path.
+    /// </summary>
+    /// <param name="path">The path.</param>
+    /// <param name="includeSubdirectories">A value indicating whether subdirectories should also included when enumerating files.</param>
+    /// <returns>An enumerable collection of the full names (including paths) for the files in the directory (and optionally subdirectories) specified by path.</returns>
+    IEnumerable<string> EnumerateFiles([NotNull] string path, bool includeSubdirectories);

-        /// <summary>
-        /// Read a static mapping file as text.
-        /// </summary>
-        /// <param name="path">The path (folder + filename with .json extension).</param>
-        /// <returns>The file content as text.</returns>
-        string ReadMappingFile([NotNull] string path);
+    /// <summary>
+    /// Read a static mapping file as text.
+    /// </summary>
+    /// <param name="path">The path (folder + filename with .json extension).</param>
+    /// <returns>The file content as text.</returns>
+    string ReadMappingFile([NotNull] string path);

-        /// <summary>
-        /// Write the static mapping file.
-        /// </summary>
-        /// <param name="path">The path (folder + filename with .json extension).</param>
-        /// <param name="text">The text.</param>
-        void WriteMappingFile([NotNull] string path, [NotNull] string text);
+    /// <summary>
+    /// Write the static mapping file.
+    /// </summary>
+    /// <param name="path">The path (folder + filename with .json extension).</param>
+    /// <param name="text">The text.</param>
+    void WriteMappingFile([NotNull] string path, [NotNull] string text);

-        /// <summary>
-        /// Read a response body file as byte[].
-        /// </summary>
-        /// <param name="path">The path or filename from the file to read.</param>
-        /// <returns>The file content as bytes.</returns>
-        byte[] ReadResponseBodyAsFile([NotNull] string path);
+    /// <summary>
+    /// Read a response body file as byte[].
+    /// </summary>
+    /// <param name="path">The path or filename from the file to read.</param>
+    /// <returns>The file content as bytes.</returns>
+    byte[] ReadResponseBodyAsFile([NotNull] string path);

-        /// <summary>
-        /// Read a response body file as text.
-        /// </summary>
-        /// <param name="path">The path or filename from the file to read.</param>
-        /// <returns>The file content as text.</returns>
-        string ReadResponseBodyAsString([NotNull] string path);
+    /// <summary>
+    /// Read a response body file as text.
+    /// </summary>
+    /// <param name="path">The path or filename from the file to read.</param>
+    /// <returns>The file content as text.</returns>
+    string ReadResponseBodyAsString([NotNull] string path);

-        /// <summary>
-        /// Delete a file.
-        /// </summary>
-        /// <param name="filename">The filename.</param>
-        void DeleteFile([NotNull] string filename);
+    /// <summary>
+    /// Delete a file.
+    /// </summary>
+    /// <param name="filename">The filename.</param>
+    void DeleteFile([NotNull] string filename);

-        /// <summary>
-        /// Determines whether the given path refers to an existing file on disk.
-        /// </summary>
-        /// <param name="filename">The filename.</param>
-        /// <returns>true if path refers to an existing file; false if the file does not exist.</returns>
-        bool FileExists([NotNull] string filename);
+    /// <summary>
+    /// Determines whether the given path refers to an existing file on disk.
+    /// </summary>
+    /// <param name="filename">The filename.</param>
+    /// <returns>true if path refers to an existing file; false if the file does not exist.</returns>
+    bool FileExists([NotNull] string filename);

-        /// <summary>
-        /// Write a file.
-        /// </summary>
-        /// <param name="filename">The filename.</param>
-        /// <param name="bytes">The bytes.</param>
-        void WriteFile([NotNull] string filename, [NotNull] byte[] bytes);
+    /// <summary>
+    /// Write a file.
+    /// </summary>
+    /// <param name="filename">The filename.</param>
+    /// <param name="bytes">The bytes.</param>
+    void WriteFile([NotNull] string filename, [NotNull] byte[] bytes);

-        /// <summary>
-        /// Write a file.
-        /// </summary>
-        /// <param name="folder">The folder.</param>
-        /// <param name="filename">The filename.</param>
-        /// <param name="bytes">The bytes.</param>
-        void WriteFile([NotNull] string folder, [NotNull] string filename, [NotNull] byte[] bytes);
+    /// <summary>
+    /// Write a file.
+    /// </summary>
+    /// <param name="folder">The folder.</param>
+    /// <param name="filename">The filename.</param>
+    /// <param name="bytes">The bytes.</param>
+    void WriteFile([NotNull] string folder, [NotNull] string filename, [NotNull] byte[] bytes);

-        /// <summary>
-        /// Read a file as bytes.
-        /// </summary>
-        /// <param name="filename">The filename.</param>
-        /// <returns>The file content as bytes.</returns>
-        byte[] ReadFile([NotNull] string filename);
+    /// <summary>
+    /// Read a file as bytes.
+    /// </summary>
+    /// <param name="filename">The filename.</param>
+    /// <returns>The file content as bytes.</returns>
+    byte[] ReadFile([NotNull] string filename);

-        /// <summary>
-        /// Read a file as string.
-        /// </summary>
-        /// <param name="filename">The filename.</param>
-        /// <returns>The file content as a string.</returns>
-        string ReadFileAsString([NotNull] string filename);
+    /// <summary>
+    /// Read a file as string.
+    /// </summary>
+    /// <param name="filename">The filename.</param>
+    /// <returns>The file content as a string.</returns>
+    string ReadFileAsString([NotNull] string filename);

-        /// <summary>
-        /// Gets the folder where the unmatched requests should be stored. For local file system, this would be `{CurrentFolder}/requests/unmatched`.
-        /// </summary>
-        /// <returns>The folder name.</returns>
-        string GetUnmatchedRequestsFolder();
+    /// <summary>
+    /// Gets the folder where the unmatched requests should be stored. For local file system, this would be `{CurrentFolder}/requests/unmatched`.
+    /// </summary>
+    /// <returns>The folder name.</returns>
+    string GetUnmatchedRequestsFolder();

-        /// <summary>
-        /// Write a unmatched request to the Unmatched RequestsFolder.
-        /// </summary>
-        /// <param name="filename">The filename.</param>
-        /// <param name="text">The text.</param>
-        void WriteUnmatchedRequest([NotNull] string filename, [NotNull] string text);
-    }
+    /// <summary>
+    /// Write a unmatched request to the Unmatched RequestsFolder.
+    /// </summary>
+    /// <param name="filename">The filename.</param>
+    /// <param name="text">The text.</param>
+    void WriteUnmatchedRequest([NotNull] string filename, [NotNull] string text);
 }
--- a/src/WireMock.Net.Abstractions/IRequestMessage.cs
+++ b/src/WireMock.Net.Abstractions/IRequestMessage.cs
@@ -96,32 +96,39 @@ public interface IRequestMessage
    /// <summary>
    /// The original body as string. Convenience getter for Handlebars.
    /// </summary>
-    string Body { get; }
+    string? Body { get; }

    /// <summary>
    /// The body (as JSON object). Convenience getter for Handlebars.
    /// </summary>
-    object BodyAsJson { get; }
+    object? BodyAsJson { get; }

    /// <summary>
    /// The body (as bytearray). Convenience getter for Handlebars.
    /// </summary>
-    byte[] BodyAsBytes { get; }
+    byte[]? BodyAsBytes { get; }
+
+#if MIMEKIT
+    /// <summary>
+    /// The original body as MimeMessage. Convenience getter for Handlebars.
+    /// </summary>
+    object? BodyAsMimeMessage { get; }
+#endif

    /// <summary>
    /// The detected body type. Convenience getter for Handlebars.
    /// </summary>
-    string DetectedBodyType { get; }
+    string? DetectedBodyType { get; }

    /// <summary>
    /// The detected body type from the Content-Type header. Convenience getter for Handlebars.
    /// </summary>
-    string DetectedBodyTypeFromContentType { get; }
+    string? DetectedBodyTypeFromContentType { get; }

    /// <summary>
    /// The detected compression from the Content-Encoding header. Convenience getter for Handlebars.
    /// </summary>
-    string DetectedCompression { get; }
+    string? DetectedCompression { get; }

    /// <summary>
    /// Gets the Host
@@ -143,6 +150,14 @@ public interface IRequestMessage
    /// </summary>
    string Origin { get; }

+    /// <summary>
+    /// Get a query parameter.
+    /// </summary>
+    /// <param name="key">The key.</param>
+    /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
+    /// <returns>The query parameter value as WireMockList or null when not found.</returns>
+    WireMockList<string>? GetParameter(string key, bool ignoreCase = false);
+
 #if NETSTANDARD1_3_OR_GREATER || NET461
    /// <summary>
    /// Gets the connection's client certificate
--- a/src/WireMock.Net.Abstractions/Logging/IWireMockLogger.cs
+++ b/src/WireMock.Net.Abstractions/Logging/IWireMockLogger.cs
@@ -2,65 +2,63 @@ using System;
 using JetBrains.Annotations;
 using WireMock.Admin.Requests;

-namespace WireMock.Logging
+namespace WireMock.Logging;
+
+/// <summary>
+/// IWireMockLogger interface
+/// </summary>
+[PublicAPI]
+public interface IWireMockLogger
 {
    /// <summary>
-    /// IWireMockLogger interface
+    /// Writes the message at the Debug level using the specified parameters. 
    /// </summary>
+    /// <param name="formatString">The format string.</param>
+    /// <param name="args">The arguments.</param>
    [PublicAPI]
-    public interface IWireMockLogger
-    {
-        /// <summary>
-        /// Writes the message at the Debug level using the specified parameters. 
-        /// </summary>
-        /// <param name="formatString">The format string.</param>
-        /// <param name="args">The arguments.</param>
-        [PublicAPI]
-        [StringFormatMethod("formatString")]
-        void Debug(string formatString, params object[] args);
+    [StringFormatMethod("formatString")]
+    void Debug(string formatString, params object[] args);

-        /// <summary>
-        /// Writes the message at the Info level using the specified parameters. 
-        /// </summary>
-        /// <param name="formatString">The format string.</param>
-        /// <param name="args">The arguments.</param>
-        [PublicAPI]
-        [StringFormatMethod("formatString")]
-        void Info(string formatString, params object[] args);
+    /// <summary>
+    /// Writes the message at the Info level using the specified parameters. 
+    /// </summary>
+    /// <param name="formatString">The format string.</param>
+    /// <param name="args">The arguments.</param>
+    [PublicAPI]
+    [StringFormatMethod("formatString")]
+    void Info(string formatString, params object[] args);

-        /// <summary>
-        /// Writes the message at the Warning level using the specified parameters. 
-        /// </summary>
-        /// <param name="formatString">The format string.</param>
-        /// <param name="args">The arguments.</param>
-        [PublicAPI]
-        [StringFormatMethod("formatString")]
-        void Warn(string formatString, params object[] args);
+    /// <summary>
+    /// Writes the message at the Warning level using the specified parameters. 
+    /// </summary>
+    /// <param name="formatString">The format string.</param>
+    /// <param name="args">The arguments.</param>
+    [PublicAPI]
+    [StringFormatMethod("formatString")]
+    void Warn(string formatString, params object[] args);

-        /// <summary>
-        /// Writes the message at the Error level using the specified parameters. 
-        /// </summary>
-        /// <param name="formatString">The format string.</param>
-        /// <param name="args">The arguments.</param>
-        [PublicAPI]
-        [StringFormatMethod("formatString")]
-        void Error(string formatString, params object[] args);
+    /// <summary>
+    /// Writes the message at the Error level using the specified parameters. 
+    /// </summary>
+    /// <param name="formatString">The format string.</param>
+    /// <param name="args">The arguments.</param>
+    [PublicAPI]
+    [StringFormatMethod("formatString")]
+    void Error(string formatString, params object[] args);

-        /// <summary>
-        /// Writes the message at the Error level using the specified exception. 
-        /// </summary>
-        /// <param name="formatString">The format string.</param>
-        /// <param name="exception">The exception.</param>
-        [PublicAPI]
-        [StringFormatMethod("formatString")]
-        void Error(string formatString, Exception exception);
+    /// <summary>
+    /// Writes the message at the Error level using the specified exception. 
+    /// </summary>
+    /// <param name="formatString">The format string.</param>
+    /// <param name="exception">The exception.</param>
+    [PublicAPI]
+    void Error(string formatString, Exception exception);

-        /// <summary>
-        /// Writes the LogEntryModel (LogRequestModel, LogResponseModel and more).
-        /// </summary>
-        /// <param name="logEntryModel">The Request Log Model.</param>
-        /// <param name="isAdminRequest">Defines if this request is an admin request.</param>
-        [PublicAPI]
-        void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest);
-    }
+    /// <summary>
+    /// Writes the LogEntryModel (LogRequestModel, LogResponseModel and more).
+    /// </summary>
+    /// <param name="logEntryModel">The Request Log Model.</param>
+    /// <param name="isAdminRequest">Defines if this request is an admin request.</param>
+    [PublicAPI]
+    void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest);
 }
--- a/src/WireMock.Net.Abstractions/Matchers/Request/IRequestMatchResult.cs
+++ b/src/WireMock.Net.Abstractions/Matchers/Request/IRequestMatchResult.cs
@@ -1,56 +1,56 @@
 using System;
 using System.Collections.Generic;

-namespace WireMock.Matchers.Request
+namespace WireMock.Matchers.Request;
+
+/// <summary>
+/// IRequestMatchResult
+/// </summary>
+public interface IRequestMatchResult : IComparable
 {
    /// <summary>
-    /// IRequestMatchResult
+    /// Gets the match percentage.
    /// </summary>
-    public interface IRequestMatchResult : IComparable
-    {
-        /// <summary>
-        /// Gets the match percentage.
-        /// </summary>
-        /// <value>
-        /// The match percentage.
-        /// </value>
-        double AverageTotalScore { get; }
+    /// <value>
+    /// The match percentage.
+    /// </value>
+    double AverageTotalScore { get; }

-        /// <summary>
-        /// Gets or sets a value indicating whether this instance is perfect match.
-        /// </summary>
-        /// <value>
-        /// <c>true</c> if this instance is perfect match; otherwise, <c>false</c>.
-        /// </value>
-        bool IsPerfectMatch { get; }
+    /// <summary>
+    /// Gets or sets a value indicating whether this instance is perfect match.
+    /// </summary>
+    /// <value>
+    /// <c>true</c> if this instance is perfect match; otherwise, <c>false</c>.
+    /// </value>
+    bool IsPerfectMatch { get; }

-        /// <summary>
-        /// Gets the match details.
-        /// </summary>
-        IList<MatchDetail> MatchDetails { get; }
+    /// <summary>
+    /// Gets the match details.
+    /// </summary>
+    IList<MatchDetail> MatchDetails { get; }

-        /// <summary>
-        /// Gets or sets the total number of matches.
-        /// </summary>
-        /// <value>
-        /// The total number of matches.
-        /// </value>
-        int TotalNumber { get; }
+    /// <summary>
+    /// Gets or sets the total number of matches.
+    /// </summary>
+    /// <value>
+    /// The total number of matches.
+    /// </value>
+    int TotalNumber { get; }

-        /// <summary>
-        /// Gets or sets the match-score.
-        /// </summary>
-        /// <value>
-        /// The match-score.
-        /// </value>
-        double TotalScore { get; }
+    /// <summary>
+    /// Gets or sets the match-score.
+    /// </summary>
+    /// <value>
+    /// The match-score.
+    /// </value>
+    double TotalScore { get; }

-        /// <summary>
-        /// Adds the score.
-        /// </summary>
-        /// <param name="matcherType">The matcher Type.</param>
-        /// <param name="score">The score.</param>
-        /// <returns>The score.</returns>
-        double AddScore(Type matcherType, double score);
-    }
+    /// <summary>
+    /// Adds the score.
+    /// </summary>
+    /// <param name="matcherType">The matcher Type.</param>
+    /// <param name="score">The score.</param>
+    /// <param name="exception">The exception [Optional].</param>
+    /// <returns>The score.</returns>
+    double AddScore(Type matcherType, double score, Exception? exception);
 }
--- a/src/WireMock.Net.Abstractions/Matchers/Request/MatchDetail.cs
+++ b/src/WireMock.Net.Abstractions/Matchers/Request/MatchDetail.cs
@@ -1,20 +1,25 @@
-using System;
+using System;

-namespace WireMock.Matchers.Request
+namespace WireMock.Matchers.Request;
+
+/// <summary>
+/// MatchDetail
+/// </summary>
+public class MatchDetail
 {
    /// <summary>
-    /// MatchDetail
+    /// Gets or sets the type of the matcher.
    /// </summary>
-    public class MatchDetail
-    {
-        /// <summary>
-        /// Gets or sets the type of the matcher.
-        /// </summary>
-        public Type MatcherType { get; set; }
+    public Type MatcherType { get; set; } = null!;

-        /// <summary>
-        /// Gets or sets the score between 0.0 and 1.0
-        /// </summary>
-        public double Score { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the score between 0.0 and 1.0
+    /// </summary>
+    public double Score { get; set; }
+
+    /// <summary>
+    /// The exception in case the Matcher throws exception.
+    /// [Optional]
+    /// </summary>
+    public Exception? Exception { get; set; }
 }
--- a/src/WireMock.Net.Abstractions/ResponseBuilders/FaultType.cs
+++ b/src/WireMock.Net.Abstractions/ResponseBuilders/FaultType.cs
@@ -1,23 +1,23 @@
-namespace WireMock.ResponseBuilders
+// ReSharper disable InconsistentNaming
+namespace WireMock.ResponseBuilders;
+
+/// <summary>
+/// The FaultType enumeration
+/// </summary>
+public enum FaultType
 {
    /// <summary>
-    /// The FaultType enumeration
+    /// No Fault
    /// </summary>
-    public enum FaultType
-    {
-        /// <summary>
-        /// No Fault
-        /// </summary>
-        NONE,
+    NONE,

-        /// <summary>
-        /// Return a completely empty response.
-        /// </summary>
-        EMPTY_RESPONSE,
+    /// <summary>
+    /// Return a completely empty response.
+    /// </summary>
+    EMPTY_RESPONSE,

-        /// <summary>
-        /// Send a defined status header, then garbage, then close the connection.
-        /// </summary>
-        MALFORMED_RESPONSE_CHUNK
-    }
+    /// <summary>
+    /// Send a defined status header, then garbage, then close the connection.
+    /// </summary>
+    MALFORMED_RESPONSE_CHUNK
 }
--- a/src/WireMock.Net.Abstractions/Server/IWireMockServer.cs
+++ b/src/WireMock.Net.Abstractions/Server/IWireMockServer.cs
@@ -17,6 +17,11 @@ public interface IWireMockServer : IDisposable
    /// </summary>
    bool IsStarted { get; }

+    /// <summary>
+    /// Gets a value indicating whether this server is started with the admin interface enabled.
+    /// </summary>
+    bool IsStartedWithAdminInterface { get; }
+
    /// <summary>
    /// Gets the request logs.
    /// </summary>
--- a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
+++ b/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
@@ -30,12 +30,16 @@
        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
    </PropertyGroup>

+    <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'" >
+        <DefineConstants>$(DefineConstants);GRAPHQL;MIMEKIT</DefineConstants>
+    </PropertyGroup>
+
    <ItemGroup>
        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />

        <!-- See also https://mstack.nl/blog/20210801-source-generators -->
-        <PackageReference Include="FluentBuilder" Version="0.7.0">
+        <PackageReference Include="FluentBuilder" Version="0.9.0">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
--- a/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.cs
+++ b/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.cs
@@ -149,15 +149,15 @@ public class WireMockAssertions

        using (new AssertionScope($"header \"{expectedKey}\" from requests sent with value(s)"))
        {
-            var headerValues = _headers.First(h => h.Key == expectedKey).Value;
+            var matchingHeaderValues = _headers.Where(h => h.Key == expectedKey).SelectMany(h => h.Value.ToArray()).ToArray();

            if (expectedValues.Length == 1)
            {
-                headerValues.Should().Contain(expectedValues.First(), because, becauseArgs);
+                matchingHeaderValues.Should().Contain(expectedValues.First(), because, becauseArgs);
            }
            else
            {
-                var trimmedHeaderValues = string.Join(",", headerValues.Select(x => x)).Split(',').Select(x => x.Trim()).ToList();
+                var trimmedHeaderValues = string.Join(",", matchingHeaderValues.Select(x => x)).Split(',').Select(x => x.Trim()).ToList();
                foreach (var expectedValue in expectedValues)
                {
                    trimmedHeaderValues.Should().Contain(expectedValue, because, becauseArgs);
--- a/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj
+++ b/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj
@@ -1,49 +1,49 @@
 <Project Sdk="Microsoft.NET.Sdk">

-	<PropertyGroup>
-		<Description>FluentAssertions extensions for WireMock.Net</Description>
-		<AssemblyTitle>WireMock.Net.FluentAssertions</AssemblyTitle>
-		<Authors>Mahmoud Ali;Stef Heyenrath</Authors>
-		<TargetFrameworks>net451;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
-		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-		<AssemblyName>WireMock.Net.FluentAssertions</AssemblyName>
-		<PackageId>WireMock.Net.FluentAssertions</PackageId>
-		<PackageTags>wiremock;FluentAssertions;UnitTest;Assert;Assertions</PackageTags>
-		<RootNamespace>WireMock.FluentAssertions</RootNamespace>
-		<ProjectGuid>{B6269AAC-170A-4346-8B9A-579DED3D9A95}</ProjectGuid>
-		<PublishRepositoryUrl>true</PublishRepositoryUrl>
-		<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-		<EmbedUntrackedSources>true</EmbedUntrackedSources>
-		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-		<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-		<CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
-		<SignAssembly>true</SignAssembly>
-		<AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
-		<!--<DelaySign>true</DelaySign>-->
-		<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <LangVersion>10</LangVersion>
-	</PropertyGroup>
+    <PropertyGroup>
+        <Description>FluentAssertions extensions for WireMock.Net</Description>
+        <AssemblyTitle>WireMock.Net.FluentAssertions</AssemblyTitle>
+        <Authors>Mahmoud Ali;Stef Heyenrath</Authors>
+        <TargetFrameworks>net451;net47;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <AssemblyName>WireMock.Net.FluentAssertions</AssemblyName>
+        <PackageId>WireMock.Net.FluentAssertions</PackageId>
+        <PackageTags>wiremock;FluentAssertions;UnitTest;Assert;Assertions</PackageTags>
+        <RootNamespace>WireMock.FluentAssertions</RootNamespace>
+        <ProjectGuid>{B6269AAC-170A-4346-8B9A-579DED3D9A95}</ProjectGuid>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+        <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+        <!--<DelaySign>true</DelaySign>-->
+        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <LangVersion>10</LangVersion>
+    </PropertyGroup>

-	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-	</PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>

-	<ItemGroup>
-		<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-	</ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    </ItemGroup>

-  <ItemGroup Condition="'$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'netstandard1.3'">
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-  </ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'netstandard1.3'">
+        <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    </ItemGroup>

-  <ItemGroup Condition="'$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'netstandard1.3'">
-    <PackageReference Include="FluentAssertions" Version="6.5.1" />
-  </ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'netstandard1.3'">
+        <PackageReference Include="FluentAssertions" Version="6.5.1" />
+    </ItemGroup>

-	<ItemGroup>
-	  <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
-	</ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
+    </ItemGroup>

 </Project>
--- a/src/WireMock.Net.Matchers.CSharpCode/Matchers/CSharpCodeMatcher.cs
+++ b/src/WireMock.Net.Matchers.CSharpCode/Matchers/CSharpCodeMatcher.cs
@@ -30,11 +30,9 @@ internal class CSharpCodeMatcher : ICSharpCodeMatcher
        "Newtonsoft.Json.Linq"
    };

+    /// <inheritdoc />
    public MatchBehaviour MatchBehaviour { get; }

-    /// <inheritdoc cref="IMatcher.ThrowException"/>
-    public bool ThrowException { get; }
-
    private readonly AnyOf<string, StringPattern>[] _patterns;

    /// <summary>
@@ -55,37 +53,44 @@ internal class CSharpCodeMatcher : ICSharpCodeMatcher
    {
        _patterns = Guard.NotNull(patterns);
        MatchBehaviour = matchBehaviour;
-        ThrowException = false;
        MatchOperator = matchOperator;
    }

-    public double IsMatch(string? input)
+    public MatchResult IsMatch(string? input)
    {
        return IsMatchInternal(input);
    }

-    public double IsMatch(object? input)
+    public MatchResult IsMatch(object? input)
    {
        return IsMatchInternal(input);
    }

-    public double IsMatchInternal(object? input)
+    public MatchResult IsMatchInternal(object? input)
    {
-        double match = MatchScores.Mismatch;
+        var score = MatchScores.Mismatch;
+        Exception? exception = null;

        if (input != null)
        {
-            match = MatchScores.ToScore(_patterns.Select(pattern => IsMatch(input, pattern.GetPattern())).ToArray(), MatchOperator);
+            try
+            {
+                score = MatchScores.ToScore(_patterns.Select(pattern => IsMatch(input, pattern.GetPattern())).ToArray(), MatchOperator);
+            }
+            catch (Exception ex)
+            {
+                exception = ex;
+            }
        }

-        return MatchBehaviourHelper.Convert(MatchBehaviour, match);
+        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), exception);
    }

    private bool IsMatch(dynamic input, string pattern)
    {
-        bool isMatchWithString = input is string;
+        var isMatchWithString = input is string;
        var inputValue = isMatchWithString ? input : JObject.FromObject(input);
-        string source = GetSourceForIsMatchWithString(pattern, isMatchWithString);
+        var source = GetSourceForIsMatchWithString(pattern, isMatchWithString);

        object? result;

@@ -155,7 +160,7 @@ internal class CSharpCodeMatcher : ICSharpCodeMatcher
            }

 #elif (NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP3_1 || NET5_0 || NET6_0 || NET7_0)
-        Assembly assembly;
+            Assembly assembly;
            try
            {
                assembly = CSScriptLib.CSScript.Evaluator.CompileCode(source);
@@ -198,10 +203,10 @@ internal class CSharpCodeMatcher : ICSharpCodeMatcher

    private string GetSourceForIsMatchWithString(string pattern, bool isMatchWithString)
    {
-        string template = isMatchWithString ? TemplateForIsMatchWithString : TemplateForIsMatchWithDynamic;
+        var template = isMatchWithString ? TemplateForIsMatchWithString : TemplateForIsMatchWithDynamic;

        var stringBuilder = new StringBuilder();
-        foreach (string @using in _usings)
+        foreach (var @using in _usings)
        {
            stringBuilder.AppendLine($"using {@using};");
        }
@@ -211,7 +216,7 @@ internal class CSharpCodeMatcher : ICSharpCodeMatcher
        return stringBuilder.ToString();
    }

-    /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
+    /// <inheritdoc />
    public AnyOf<string, StringPattern>[] GetPatterns()
    {
        return _patterns;
@@ -220,6 +225,6 @@ internal class CSharpCodeMatcher : ICSharpCodeMatcher
    /// <inheritdoc />
    public MatchOperator MatchOperator { get; }

-    /// <inheritdoc cref="IMatcher.Name"/>
-    public string Name => "CSharpCodeMatcher";
+    /// <inheritdoc />
+    public string Name => nameof(CSharpCodeMatcher);
 }
--- a/src/WireMock.Net.OpenApiParser/Extensions/WireMockServerExtensions.cs
+++ b/src/WireMock.Net.OpenApiParser/Extensions/WireMockServerExtensions.cs
@@ -31,13 +31,13 @@ public static class WireMockServerExtensions
    /// </summary>
    /// <param name="server">The WireMockServer instance</param>
    /// <param name="path">Path containing OpenAPI file to parse and use the mappings.</param>
-    /// <param name="diagnostic">Returns diagnostic object containing errors detected during parsing</param>
    /// <param name="settings">Additional settings</param>
+    /// <param name="diagnostic">Returns diagnostic object containing errors detected during parsing</param>
    [PublicAPI]
    public static IWireMockServer WithMappingFromOpenApiFile(this IWireMockServer server, string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
    {
-        Guard.NotNull(server, nameof(server));
-        Guard.NotNullOrEmpty(path, nameof(path));
+        Guard.NotNull(server);
+        Guard.NotNullOrEmpty(path);

        var mappings = new WireMockOpenApiParser().FromFile(path, settings, out diagnostic);

@@ -80,9 +80,9 @@ public static class WireMockServerExtensions
    /// </summary>
    /// <param name="server">The WireMockServer instance</param>
    /// <param name="document">The OpenAPI document to use as mappings.</param>
-    /// <param name="settings">Additional settings [optional]</param>
+    /// <param name="settings">Additional settings [optional].</param>
    [PublicAPI]
-    public static IWireMockServer WithMappingFromOpenApiDocument(this IWireMockServer server, OpenApiDocument document, WireMockOpenApiParserSettings settings)
+    public static IWireMockServer WithMappingFromOpenApiDocument(this IWireMockServer server, OpenApiDocument document, WireMockOpenApiParserSettings? settings = null)
    {
        Guard.NotNull(server);
        Guard.NotNull(document);
--- a/src/WireMock.Net.OpenApiParser/IWireMockOpenApiParser.cs
+++ b/src/WireMock.Net.OpenApiParser/IWireMockOpenApiParser.cs
@@ -5,53 +5,69 @@ using Microsoft.OpenApi.Readers;
 using WireMock.Admin.Mappings;
 using WireMock.Net.OpenApiParser.Settings;

-namespace WireMock.Net.OpenApiParser
+namespace WireMock.Net.OpenApiParser;
+
+/// <summary>
+/// Parse a OpenApi/Swagger/V2/V3 or Raml to WireMock MappingModels.
+/// </summary>
+public interface IWireMockOpenApiParser
 {
    /// <summary>
-    /// Parse a OpenApi/Swagger/V2/V3 or Raml to WireMock MappingModels.
+    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from a file-path.
    /// </summary>
-    public interface IWireMockOpenApiParser
-    {
-        /// <summary>
-        /// Generate <see cref="IEnumerable{MappingModel}"/> from a file-path.
-        /// </summary>
-        /// <param name="path">The path to read the OpenApi/Swagger/V2/V3 or Raml file.</param>
-        /// <param name="diagnostic">OpenApiDiagnostic output</param>
-        /// <returns>MappingModel</returns>
-        IEnumerable<MappingModel> FromFile(string path, out OpenApiDiagnostic diagnostic);
+    /// <param name="path">The path to read the OpenApi/Swagger/V2/V3 or Raml file.</param>
+    /// <param name="diagnostic">OpenApiDiagnostic output</param>
+    /// <returns>MappingModel</returns>
+    IReadOnlyList<MappingModel> FromFile(string path, out OpenApiDiagnostic diagnostic);

-        /// <summary>
-        /// Generate <see cref="IEnumerable{MappingModel}"/> from a file-path.
-        /// </summary>
-        /// <param name="path">The path to read the OpenApi/Swagger/V2/V3 or Raml file.</param>
-        /// <param name="settings">Additional settings</param>
-        /// <param name="diagnostic">OpenApiDiagnostic output</param>
-        /// <returns>MappingModel</returns>
-        IEnumerable<MappingModel> FromFile(string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic);
+    /// <summary>
+    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from a file-path.
+    /// </summary>
+    /// <param name="path">The path to read the OpenApi/Swagger/V2/V3 or Raml file.</param>
+    /// <param name="settings">Additional settings</param>
+    /// <param name="diagnostic">OpenApiDiagnostic output</param>
+    /// <returns>MappingModel</returns>
+    IReadOnlyList<MappingModel> FromFile(string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic);

-        /// <summary>
-        /// Generate <see cref="IEnumerable{MappingModel}"/> from an <seealso cref="OpenApiDocument"/>.
-        /// </summary>
-        /// <param name="document">The source OpenApiDocument</param>
-        /// <param name="settings">Additional settings [optional]</param>
-        /// <returns>MappingModel</returns>
-        IEnumerable<MappingModel> FromDocument(OpenApiDocument document, WireMockOpenApiParserSettings? settings = null);
+    /// <summary>
+    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from an <seealso cref="OpenApiDocument"/>.
+    /// </summary>
+    /// <param name="document">The source OpenApiDocument</param>
+    /// <param name="settings">Additional settings [optional]</param>
+    /// <returns>MappingModel</returns>
+    IReadOnlyList<MappingModel> FromDocument(OpenApiDocument document, WireMockOpenApiParserSettings? settings = null);

-        /// <summary>
-        /// Generate <see cref="IEnumerable{MappingModel}"/> from a <seealso cref="Stream"/>.
-        /// </summary>
-        /// <param name="stream">The source stream</param>
-        /// <param name="diagnostic">OpenApiDiagnostic output</param>
-        /// <returns>MappingModel</returns>
-        IEnumerable<MappingModel> FromStream(Stream stream, out OpenApiDiagnostic diagnostic);
+    /// <summary>
+    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from a <seealso cref="Stream"/>.
+    /// </summary>
+    /// <param name="stream">The source stream</param>
+    /// <param name="diagnostic">OpenApiDiagnostic output</param>
+    /// <returns>MappingModel</returns>
+    IReadOnlyList<MappingModel> FromStream(Stream stream, out OpenApiDiagnostic diagnostic);

-        /// <summary>
-        /// Generate <see cref="IEnumerable{MappingModel}"/> from a <seealso cref="Stream"/>.
-        /// </summary>
-        /// <param name="stream">The source stream</param>
-        /// <param name="settings">Additional settings</param>
-        /// <param name="diagnostic">OpenApiDiagnostic output</param>
-        /// <returns>MappingModel</returns>
-        IEnumerable<MappingModel> FromStream(Stream stream, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic);
-    }
+    /// <summary>
+    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from a <seealso cref="Stream"/>.
+    /// </summary>
+    /// <param name="stream">The source stream</param>
+    /// <param name="settings">Additional settings</param>
+    /// <param name="diagnostic">OpenApiDiagnostic output</param>
+    /// <returns>MappingModel</returns>
+    IReadOnlyList<MappingModel> FromStream(Stream stream, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic);
+
+    /// <summary>
+    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from a <seealso cref="string"/>.
+    /// </summary>
+    /// <param name="text">The source text</param>
+    /// <param name="diagnostic">OpenApiDiagnostic output</param>
+    /// <returns>MappingModel</returns>
+    IReadOnlyList<MappingModel> FromText(string text, out OpenApiDiagnostic diagnostic);
+
+    /// <summary>
+    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from a <seealso cref="string"/>.
+    /// </summary>
+    /// <param name="text">The source text</param>
+    /// <param name="settings">Additional settings</param>
+    /// <param name="diagnostic">OpenApiDiagnostic output</param>
+    /// <returns>MappingModel</returns>
+    IReadOnlyList<MappingModel> FromText(string text, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic);
 }
--- a/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs
+++ b/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs
@@ -31,19 +31,29 @@ internal class OpenApiPathsMapper
        _exampleValueGenerator = new ExampleValueGenerator(settings);
    }

-    public IEnumerable<MappingModel> ToMappingModels(OpenApiPaths paths, IList<OpenApiServer> servers)
+    public IReadOnlyList<MappingModel> ToMappingModels(OpenApiPaths? paths, IList<OpenApiServer> servers)
    {
-        return paths.Select(p => MapPath(p.Key, p.Value, servers)).SelectMany(x => x);
+        return paths?
+            .OrderBy(p => p.Key)
+            .Select(p => MapPath(p.Key, p.Value, servers))
+            .SelectMany(x => x)
+            .ToArray() ??
+               Array.Empty<MappingModel>();
    }

-    private IEnumerable<MappingModel> MapPaths(OpenApiPaths paths, IList<OpenApiServer> servers)
+    private IReadOnlyList<MappingModel> MapPaths(OpenApiPaths? paths, IList<OpenApiServer> servers)
    {
-        return paths.Select(p => MapPath(p.Key, p.Value, servers)).SelectMany(x => x);
+        return paths?
+            .OrderBy(p => p.Key)
+            .Select(p => MapPath(p.Key, p.Value, servers))
+            .SelectMany(x => x)
+            .ToArray() ??
+               Array.Empty<MappingModel>();
    }

-    private IEnumerable<MappingModel> MapPath(string path, OpenApiPathItem pathItem, IList<OpenApiServer> servers)
+    private IReadOnlyList<MappingModel> MapPath(string path, OpenApiPathItem pathItem, IList<OpenApiServer> servers)
    {
-        return pathItem.Operations.Select(o => MapOperationToMappingModel(path, o.Key.ToString().ToUpperInvariant(), o.Value, servers));
+        return pathItem.Operations.Select(o => MapOperationToMappingModel(path, o.Key.ToString().ToUpperInvariant(), o.Value, servers)).ToArray();
    }

    private MappingModel MapOperationToMappingModel(string path, string httpMethod, OpenApiOperation operation, IList<OpenApiServer> servers)
@@ -123,7 +133,7 @@ internal class OpenApiPathsMapper
        };
    }

-    private bool TryGetContent(IDictionary<string, OpenApiMediaType>? contents, [NotNullWhen(true)] out OpenApiMediaType? openApiMediaType, [NotNullWhen(true)] out string? contentType)
+    private static bool TryGetContent(IDictionary<string, OpenApiMediaType>? contents, [NotNullWhen(true)] out OpenApiMediaType? openApiMediaType, [NotNullWhen(true)] out string? contentType)
    {
        openApiMediaType = null;
        contentType = null;
@@ -305,16 +315,16 @@ internal class OpenApiPathsMapper
        return JObject.Parse(outputString.ToString());
    }

-    private IDictionary<string, object?>? MapHeaders(string responseContentType, IDictionary<string, OpenApiHeader> headers)
+    private IDictionary<string, object>? MapHeaders(string? responseContentType, IDictionary<string, OpenApiHeader>? headers)
    {
-        var mappedHeaders = headers.ToDictionary(
+        var mappedHeaders = headers?.ToDictionary(
            item => item.Key,
-            _ => GetExampleMatcherModel(null, _settings.HeaderPatternToUse).Pattern
-        );
+            _ => GetExampleMatcherModel(null, _settings.HeaderPatternToUse).Pattern!
+        ) ?? new Dictionary<string, object>();

        if (!string.IsNullOrEmpty(responseContentType))
        {
-            mappedHeaders.TryAdd(HeaderContentType, responseContentType);
+            mappedHeaders.TryAdd(HeaderContentType, responseContentType!);
        }

        return mappedHeaders.Keys.Any() ? mappedHeaders : null;
@@ -360,9 +370,18 @@ internal class OpenApiPathsMapper
    {
        return type switch
        {
-            ExampleValueType.Value => new MatcherModel { Name = "ExactMatcher", Pattern = GetExampleValueAsStringForSchemaType(schema), IgnoreCase = _settings.IgnoreCaseExampleValues },
+            ExampleValueType.Value => new MatcherModel
+            {
+                Name = "ExactMatcher",
+                Pattern = GetExampleValueAsStringForSchemaType(schema),
+                IgnoreCase = _settings.IgnoreCaseExampleValues
+            },

-            _ => new MatcherModel { Name = "WildcardMatcher", Pattern = "*" }
+            _ => new MatcherModel
+            {
+                Name = "WildcardMatcher",
+                Pattern = "*"
+            }
        };
    }

--- a/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserExampleValues.cs
+++ b/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserExampleValues.cs
@@ -36,5 +36,5 @@ public class WireMockOpenApiParserExampleValues : IWireMockOpenApiParserExampleV
    public virtual string String { get; set; } = "example-string";

    /// <inheritdoc />
-    public virtual OpenApiSchema? Schema { get; set; } = new OpenApiSchema();
+    public virtual OpenApiSchema? Schema { get; set; } = new();
 }
--- a/src/WireMock.Net.OpenApiParser/Utils/ExampleValueGenerator.cs
+++ b/src/WireMock.Net.OpenApiParser/Utils/ExampleValueGenerator.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Linq;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
 using Stef.Validation;
@@ -11,116 +10,108 @@ namespace WireMock.Net.OpenApiParser.Utils;

 internal class ExampleValueGenerator
 {
-    private readonly WireMockOpenApiParserSettings _settings;
+    private readonly IWireMockOpenApiParserExampleValues _exampleValues;

    public ExampleValueGenerator(WireMockOpenApiParserSettings settings)
    {
-        _settings = Guard.NotNull(settings);
+        Guard.NotNull(settings);

        // Check if user provided an own implementation
        if (settings.ExampleValues is null)
        {
-            if (_settings.DynamicExamples)
+            if (settings.DynamicExamples)
            {
-                _settings.ExampleValues = new WireMockOpenApiParserDynamicExampleValues();
+                _exampleValues = new WireMockOpenApiParserDynamicExampleValues();
            }
            else
            {
-                _settings.ExampleValues = new WireMockOpenApiParserExampleValues();
+                _exampleValues = new WireMockOpenApiParserExampleValues();
            }
        }
+        else
+        {
+            _exampleValues = settings.ExampleValues;
+        }
    }

    public object GetExampleValue(OpenApiSchema? schema)
    {
        var schemaExample = schema?.Example;
-        var schemaEnum = GetRandomEnumValue(schema?.Enum);
+        var schemaEnum = schema?.Enum?.FirstOrDefault();

-        _settings.ExampleValues.Schema = schema;
+        _exampleValues.Schema = schema;

        switch (schema?.GetSchemaType())
        {
            case SchemaType.Boolean:
                var exampleBoolean = schemaExample as OpenApiBoolean;
-                return exampleBoolean is null ? _settings.ExampleValues.Boolean : exampleBoolean.Value;
+                return exampleBoolean?.Value ?? _exampleValues.Boolean;

            case SchemaType.Integer:
                switch (schema?.GetSchemaFormat())
                {
                    case SchemaFormat.Int64:
-                        var exampleLong = (OpenApiLong)schemaExample;
-                        var enumLong = (OpenApiLong)schemaEnum;
-                        var valueLongEnumOrExample = enumLong is null ? exampleLong?.Value : enumLong?.Value;
-                        return valueLongEnumOrExample ?? _settings.ExampleValues.Integer;
+                        var exampleLong = schemaExample as OpenApiLong;
+                        var enumLong = schemaEnum as OpenApiLong;
+                        var valueLongEnumOrExample = enumLong?.Value ?? exampleLong?.Value;
+                        return valueLongEnumOrExample ?? _exampleValues.Integer;

                    default:
-                        var exampleInteger = (OpenApiInteger)schemaExample;
-                        var enumInteger = (OpenApiInteger)schemaEnum;
-                        var valueIntegerEnumOrExample = enumInteger is null ? exampleInteger?.Value : enumInteger?.Value;
-                        return valueIntegerEnumOrExample ?? _settings.ExampleValues.Integer;
+                        var exampleInteger = schemaExample as OpenApiInteger;
+                        var enumInteger = schemaEnum as OpenApiInteger;
+                        var valueIntegerEnumOrExample = enumInteger?.Value ?? exampleInteger?.Value;
+                        return valueIntegerEnumOrExample ?? _exampleValues.Integer;
                }

            case SchemaType.Number:
                switch (schema?.GetSchemaFormat())
                {
                    case SchemaFormat.Float:
-                        var exampleFloat = (OpenApiFloat)schemaExample;
-                        var enumFloat = (OpenApiFloat)schemaEnum;
-                        var valueFloatEnumOrExample = enumFloat is null ? exampleFloat?.Value : enumFloat?.Value;
-                        return valueFloatEnumOrExample ?? _settings.ExampleValues.Float;
+                        var exampleFloat = schemaExample as OpenApiFloat;
+                        var enumFloat = schemaEnum as OpenApiFloat;
+                        var valueFloatEnumOrExample = enumFloat?.Value ?? exampleFloat?.Value;
+                        return valueFloatEnumOrExample ?? _exampleValues.Float;

                    default:
-                        var exampleDouble = (OpenApiDouble)schemaExample;
-                        var enumDouble = (OpenApiDouble)schemaEnum;
-                        var valueDoubleEnumOrExample = enumDouble is null ? exampleDouble?.Value : enumDouble?.Value;
-                        return valueDoubleEnumOrExample ?? _settings.ExampleValues.Double;
+                        var exampleDouble = schemaExample as OpenApiDouble;
+                        var enumDouble = schemaEnum as OpenApiDouble;
+                        var valueDoubleEnumOrExample = enumDouble?.Value ?? exampleDouble?.Value;
+                        return valueDoubleEnumOrExample ?? _exampleValues.Double;
                }

            default:
                switch (schema?.GetSchemaFormat())
                {
                    case SchemaFormat.Date:
-                        var exampleDate = (OpenApiDate)schemaExample;
-                        var enumDate = (OpenApiDate)schemaEnum;
-                        var valueDateEnumOrExample = enumDate is null ? exampleDate?.Value : enumDate?.Value;
-                        return DateTimeUtils.ToRfc3339Date(valueDateEnumOrExample ?? _settings.ExampleValues.Date());
+                        var exampleDate = schemaExample as OpenApiDate;
+                        var enumDate = schemaEnum as OpenApiDate;
+                        var valueDateEnumOrExample = enumDate?.Value ?? exampleDate?.Value;
+                        return DateTimeUtils.ToRfc3339Date(valueDateEnumOrExample ?? _exampleValues.Date());

                    case SchemaFormat.DateTime:
-                        var exampleDateTime = (OpenApiDateTime)schemaExample;
-                        var enumDateTime = (OpenApiDateTime)schemaEnum;
-                        var valueDateTimeEnumOrExample = enumDateTime is null ? exampleDateTime?.Value : enumDateTime?.Value;
-                        return DateTimeUtils.ToRfc3339DateTime(valueDateTimeEnumOrExample?.DateTime ?? _settings.ExampleValues.DateTime());
+                        var exampleDateTime = schemaExample as OpenApiDateTime;
+                        var enumDateTime = schemaEnum as OpenApiDateTime;
+                        var valueDateTimeEnumOrExample = enumDateTime?.Value ?? exampleDateTime?.Value;
+                        return DateTimeUtils.ToRfc3339DateTime(valueDateTimeEnumOrExample?.DateTime ?? _exampleValues.DateTime());

                    case SchemaFormat.Byte:
-                        var exampleByte = (OpenApiByte)schemaExample;
-                        var enumByte = (OpenApiByte)schemaEnum;
-                        var valueByteEnumOrExample = enumByte is null ? exampleByte?.Value : enumByte?.Value;
-                        return valueByteEnumOrExample ?? _settings.ExampleValues.Bytes;
+                        var exampleByte = schemaExample as OpenApiByte;
+                        var enumByte = schemaEnum as OpenApiByte;
+                        var valueByteEnumOrExample = enumByte?.Value ?? exampleByte?.Value;
+                        return valueByteEnumOrExample ?? _exampleValues.Bytes;

                    case SchemaFormat.Binary:
-                        var exampleBinary = (OpenApiBinary)schemaExample;
-                        var enumBinary = (OpenApiBinary)schemaEnum;
-                        var valueBinaryEnumOrExample = enumBinary is null ? exampleBinary?.Value : enumBinary?.Value;
-                        return valueBinaryEnumOrExample ?? _settings.ExampleValues.Object;
+                        var exampleBinary = schemaExample as OpenApiBinary;
+                        var enumBinary = schemaEnum as OpenApiBinary;
+                        var valueBinaryEnumOrExample = enumBinary?.Value ?? exampleBinary?.Value;
+                        return valueBinaryEnumOrExample ?? _exampleValues.Object;

                    default:
-                        var exampleString = (OpenApiString)schemaExample;
-                        var enumString = (OpenApiString)schemaEnum;
-                        var valueStringEnumOrExample = enumString is null ? exampleString?.Value : enumString?.Value;
-                        return valueStringEnumOrExample ?? _settings.ExampleValues.String;
+                        var exampleString = schemaExample as OpenApiString;
+                        var enumString = schemaEnum as OpenApiString;
+                        var valueStringEnumOrExample = enumString?.Value ?? exampleString?.Value;
+                        return valueStringEnumOrExample ?? _exampleValues.String;
                }
        }
    }
-
-    private static IOpenApiAny? GetRandomEnumValue(IList<IOpenApiAny>? schemaEnum)
-    {
-        if (schemaEnum?.Count > 0)
-        {
-            int maxValue = schemaEnum.Count - 1;
-            int randomEnum = new Random().Next(0, maxValue);
-            return schemaEnum[randomEnum];
-        }
-
-        return null;
-    }
 }
--- a/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj
+++ b/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj
@@ -4,7 +4,7 @@
        <Description>An OpenApi (swagger) parser to generate MappingModel or mapping.json file.</Description>
        <TargetFrameworks>net46;netstandard2.0;netstandard2.1</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <PackageTags>wiremock;openapi;OAS;converter;parser;openapiparser</PackageTags>
+        <PackageTags>wiremock;openapi;OAS;raml;converter;parser;openapiparser</PackageTags>
        <ProjectGuid>{D3804228-91F4-4502-9595-39584E5AADAD}</ProjectGuid>
        <PublishRepositoryUrl>true</PublishRepositoryUrl>
        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
@@ -20,7 +20,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
        <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.2.3" />
        <PackageReference Include="Nullable" Version="1.3.1">
          <PrivateAssets>all</PrivateAssets>
--- a/src/WireMock.Net.OpenApiParser/WireMockOpenApiParser.cs
+++ b/src/WireMock.Net.OpenApiParser/WireMockOpenApiParser.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
 using JetBrains.Annotations;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers;
@@ -16,18 +17,18 @@ namespace WireMock.Net.OpenApiParser;
 /// </summary>
 public class WireMockOpenApiParser : IWireMockOpenApiParser
 {
-    private readonly OpenApiStreamReader _reader = new OpenApiStreamReader();
+    private readonly OpenApiStreamReader _reader = new();

-    /// <inheritdoc cref="IWireMockOpenApiParser.FromFile(string, out OpenApiDiagnostic)" />
+    /// <inheritdoc />
    [PublicAPI]
-    public IEnumerable<MappingModel> FromFile(string path, out OpenApiDiagnostic diagnostic)
+    public IReadOnlyList<MappingModel> FromFile(string path, out OpenApiDiagnostic diagnostic)
    {
        return FromFile(path, new WireMockOpenApiParserSettings(), out diagnostic);
    }

-    /// <inheritdoc cref="IWireMockOpenApiParser.FromFile(string, WireMockOpenApiParserSettings, out OpenApiDiagnostic)" />
+    /// <inheritdoc />
    [PublicAPI]
-    public IEnumerable<MappingModel> FromFile(string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
+    public IReadOnlyList<MappingModel> FromFile(string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
    {
        OpenApiDocument document;
        if (Path.GetExtension(path).EndsWith("raml", StringComparison.OrdinalIgnoreCase))
@@ -44,24 +45,38 @@ public class WireMockOpenApiParser : IWireMockOpenApiParser
        return FromDocument(document, settings);
    }

-    /// <inheritdoc cref="IWireMockOpenApiParser.FromStream(Stream, out OpenApiDiagnostic)" />
+    /// <inheritdoc />
    [PublicAPI]
-    public IEnumerable<MappingModel> FromStream(Stream stream, out OpenApiDiagnostic diagnostic)
+    public IReadOnlyList<MappingModel> FromDocument(OpenApiDocument document, WireMockOpenApiParserSettings? settings = null)
+    {
+        return new OpenApiPathsMapper(settings ?? new WireMockOpenApiParserSettings()).ToMappingModels(document.Paths, document.Servers);
+    }
+
+    /// <inheritdoc  />
+    [PublicAPI]
+    public IReadOnlyList<MappingModel> FromStream(Stream stream, out OpenApiDiagnostic diagnostic)
    {
        return FromDocument(_reader.Read(stream, out diagnostic));
    }

-    /// <inheritdoc cref="IWireMockOpenApiParser.FromStream(Stream, WireMockOpenApiParserSettings, out OpenApiDiagnostic)" />
+    /// <inheritdoc />
    [PublicAPI]
-    public IEnumerable<MappingModel> FromStream(Stream stream, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
+    public IReadOnlyList<MappingModel> FromStream(Stream stream, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
    {
        return FromDocument(_reader.Read(stream, out diagnostic), settings);
    }

-    /// <inheritdoc cref="IWireMockOpenApiParser.FromDocument(OpenApiDocument, WireMockOpenApiParserSettings)" />
+    /// <inheritdoc  />
    [PublicAPI]
-    public IEnumerable<MappingModel> FromDocument(OpenApiDocument openApiDocument, WireMockOpenApiParserSettings? settings = null)
+    public IReadOnlyList<MappingModel> FromText(string text, out OpenApiDiagnostic diagnostic)
    {
-        return new OpenApiPathsMapper(settings).ToMappingModels(openApiDocument.Paths, openApiDocument.Servers);
+        return FromStream(new MemoryStream(Encoding.UTF8.GetBytes(text)), out diagnostic);
+    }
+
+    /// <inheritdoc />
+    [PublicAPI]
+    public IReadOnlyList<MappingModel> FromText(string text, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
+    {
+        return FromStream(new MemoryStream(Encoding.UTF8.GetBytes(text)), settings, out diagnostic);
    }
 }
--- a/src/WireMock.Net.RestClient/IWireMockAdminApi.cs
+++ b/src/WireMock.Net.RestClient/IWireMockAdminApi.cs
@@ -280,4 +280,20 @@ public interface IWireMockAdminApi
    /// <param name="cancellationToken">The optional cancellationToken.</param>
    [Head("files/{filename}")]
    Task FileExistsAsync([Path] string filename, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Convert an OpenApi / RAML document to mappings.
+    /// </summary>
+    /// <param name="text">The OpenApi or RAML document as text.</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
+    [Post("openapi/convert")]
+    Task<IReadOnlyList<MappingModel>> OpenApiConvertAsync([Body] string text, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Convert an OpenApi / RAML document to mappings and save these.
+    /// </summary>
+    /// <param name="text">The OpenApi or RAML document as text.</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
+    [Post("openapi/save")]
+    Task<StatusModel> OpenApiSaveAsync([Body] string text, CancellationToken cancellationToken = default);
 }
--- a/src/WireMock.Net.StandAlone/StandAloneApp.cs
+++ b/src/WireMock.Net.StandAlone/StandAloneApp.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
@@ -24,7 +25,7 @@ public static class StandAloneApp
    [PublicAPI]
    public static WireMockServer Start(WireMockServerSettings settings)
    {
-        Guard.NotNull(settings, nameof(settings));
+        Guard.NotNull(settings);

        var server = WireMockServer.Start(settings);

@@ -42,7 +43,7 @@ public static class StandAloneApp
    [PublicAPI]
    public static WireMockServer Start(string[] args, IWireMockLogger? logger = null)
    {
-        Guard.NotNull(args, nameof(args));
+        Guard.NotNull(args);

        if (TryStart(args, out var server, logger))
        {
@@ -61,9 +62,9 @@ public static class StandAloneApp
    [PublicAPI]
    public static bool TryStart(string[] args, [NotNullWhen(true)] out WireMockServer? server, IWireMockLogger? logger = null)
    {
-        Guard.NotNull(args, nameof(args));
+        Guard.NotNull(args);

-        if (WireMockServerSettingsParser.TryParseArguments(args, out var settings, logger))
+        if (WireMockServerSettingsParser.TryParseArguments(args, Environment.GetEnvironmentVariables(), out var settings, logger))
        {
            settings.Logger?.Info("Version [{0}]", Version);
            settings.Logger?.Debug("Server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
--- a/src/WireMock.Net.Testcontainers/Models/ContainerInfo.cs
+++ b/src/WireMock.Net.Testcontainers/Models/ContainerInfo.cs
@@ -0,0 +1,7 @@
+namespace WireMock.Net.Testcontainers.Models;
+
+internal record ContainerInfo
+(
+    string Image,
+    string MappingsPath
+);
--- a/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj
+++ b/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj
@@ -0,0 +1,43 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <Description>A fluent testcontainer builder for the Docker version of WireMock.Net</Description>
+        <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <PackageTags>wiremock;docker;testcontainer;testcontainers</PackageTags>
+        <ProjectGuid>{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}</ProjectGuid>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <LangVersion>10</LangVersion>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <Compile Include="..\WireMock.Net\Http\HttpClientFactory2.cs" Link="Http\HttpClientFactory2.cs" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="IsExternalInit" Version="1.0.3">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Stef.Validation" Version="0.1.1" />
+        <PackageReference Include="Testcontainers" Version="3.2.0" />
+        <PackageReference Include="JetBrains.Annotations" VersionOverride="2022.3.1" PrivateAssets="All" Version="2022.3.1" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\WireMock.Net.RestClient\WireMock.Net.RestClient.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="Http\" />
+    </ItemGroup>
+</Project>
--- a/src/WireMock.Net.Testcontainers/WireMockConfiguration.cs
+++ b/src/WireMock.Net.Testcontainers/WireMockConfiguration.cs
@@ -0,0 +1,66 @@
+using Docker.DotNet.Models;
+using DotNet.Testcontainers.Builders;
+using DotNet.Testcontainers.Configurations;
+using JetBrains.Annotations;
+
+namespace WireMock.Net.Testcontainers;
+
+/// <inheritdoc cref="ContainerConfiguration" />
+[PublicAPI]
+public sealed class WireMockConfiguration : ContainerConfiguration
+{
+#pragma warning disable CS1591
+    public string? Username { get; }
+
+    public string? Password { get; }
+
+    public bool HasBasicAuthentication => !string.IsNullOrEmpty(Username) && !string.IsNullOrEmpty(Password);
+
+    public WireMockConfiguration(
+        string? username = null,
+        string? password = null
+    )
+    {
+        Username = username;
+        Password = password;
+    }
+#pragma warning restore CS1591
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockConfiguration" /> class.
+    /// </summary>
+    /// <param name="resourceConfiguration">The Docker resource configuration.</param>
+    public WireMockConfiguration(IResourceConfiguration<CreateContainerParameters> resourceConfiguration) : base(resourceConfiguration)
+    {
+        // Passes the configuration upwards to the base implementations to create an updated immutable copy.
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockConfiguration" /> class.
+    /// </summary>
+    /// <param name="resourceConfiguration">The Docker resource configuration.</param>
+    public WireMockConfiguration(IContainerConfiguration resourceConfiguration) : base(resourceConfiguration)
+    {
+        // Passes the configuration upwards to the base implementations to create an updated immutable copy.
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockConfiguration" /> class.
+    /// </summary>
+    /// <param name="resourceConfiguration">The Docker resource configuration.</param>
+    public WireMockConfiguration(WireMockConfiguration resourceConfiguration) : this(new WireMockConfiguration(), resourceConfiguration)
+    {
+        // Passes the configuration upwards to the base implementations to create an updated immutable copy.
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockConfiguration" /> class.
+    /// </summary>
+    /// <param name="oldValue">The old Docker resource configuration.</param>
+    /// <param name="newValue">The new Docker resource configuration.</param>
+    public WireMockConfiguration(WireMockConfiguration oldValue, WireMockConfiguration newValue) : base(oldValue, newValue)
+    {
+        Username = BuildConfiguration.Combine(oldValue.Username, newValue.Username);
+        Password = BuildConfiguration.Combine(oldValue.Password, newValue.Password);
+    }
+}
--- a/src/WireMock.Net.Testcontainers/WireMockContainer.cs
+++ b/src/WireMock.Net.Testcontainers/WireMockContainer.cs
@@ -0,0 +1,111 @@
+using System;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using DotNet.Testcontainers.Containers;
+using JetBrains.Annotations;
+using Microsoft.Extensions.Logging;
+using RestEase;
+using Stef.Validation;
+using WireMock.Client;
+using WireMock.Http;
+
+namespace WireMock.Net.Testcontainers;
+
+/// <summary>
+/// A container for running WireMock in a docker environment.
+/// </summary>
+public sealed class WireMockContainer : DockerContainer
+{
+    internal const int ContainerPort = 80;
+
+    private readonly WireMockConfiguration _configuration;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockContainer" /> class.
+    /// </summary>
+    /// <param name="configuration">The container configuration.</param>
+    /// <param name="logger">The logger.</param>
+    public WireMockContainer(WireMockConfiguration configuration, ILogger logger) : base(configuration, logger)
+    {
+        _configuration = Guard.NotNull(configuration);
+    }
+
+    /// <summary>
+    /// Gets the public Url.
+    /// </summary>
+    [PublicAPI]
+    public string GetPublicUrl() => GetPublicUri().ToString();
+
+    /// <summary>
+    /// Create a RestEase Admin client which can be used to call the admin REST endpoint.
+    /// </summary>
+    /// <returns>A <see cref="IWireMockAdminApi"/></returns>
+    [PublicAPI]
+    public IWireMockAdminApi CreateWireMockAdminClient()
+    {
+        ValidateIfRunning();
+
+        var api = RestClient.For<IWireMockAdminApi>(GetPublicUri());
+
+        if (_configuration.HasBasicAuthentication)
+        {
+            api.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(Encoding.ASCII.GetBytes($"{_configuration.Username}:{_configuration.Password}")));
+        }
+
+        return api;
+    }
+
+    /// <summary>
+    /// Create a <see cref="HttpClient"/> which can be used to call this instance.
+    /// <param name="handlers">
+    /// An ordered list of System.Net.Http.DelegatingHandler instances to be invoked
+    /// as an System.Net.Http.HttpRequestMessage travels from the System.Net.Http.HttpClient
+    /// to the network and an System.Net.Http.HttpResponseMessage travels from the network
+    /// back to System.Net.Http.HttpClient. The handlers are invoked in a top-down fashion.
+    /// That is, the first entry is invoked first for an outbound request message but
+    /// last for an inbound response message.
+    /// </param>
+    /// </summary>
+    [PublicAPI]
+    public HttpClient CreateClient(params DelegatingHandler[] handlers)
+    {
+        ValidateIfRunning();
+
+        var client = HttpClientFactory2.Create(handlers);
+        client.BaseAddress = GetPublicUri();
+        return client;
+    }
+
+    /// <summary>
+    /// Create a <see cref="HttpClient"/> (one for each URL) which can be used to call this instance.
+    /// <param name="innerHandler">The inner handler represents the destination of the HTTP message channel.</param>
+    /// <param name="handlers">
+    /// An ordered list of System.Net.Http.DelegatingHandler instances to be invoked
+    /// as an System.Net.Http.HttpRequestMessage travels from the System.Net.Http.HttpClient
+    /// to the network and an System.Net.Http.HttpResponseMessage travels from the network
+    /// back to System.Net.Http.HttpClient. The handlers are invoked in a top-down fashion.
+    /// That is, the first entry is invoked first for an outbound request message but
+    /// last for an inbound response message.
+    /// </param>
+    /// </summary>
+    [PublicAPI]
+    public HttpClient CreateClient(HttpMessageHandler innerHandler, params DelegatingHandler[] handlers)
+    {
+        ValidateIfRunning();
+
+        var client = HttpClientFactory2.Create(innerHandler, handlers);
+        client.BaseAddress = GetPublicUri();
+        return client;
+    }
+
+    private void ValidateIfRunning()
+    {
+        if (State != TestcontainersStates.Running)
+        {
+            throw new InvalidOperationException("Unable to create HttpClient because the WireMock.Net is not yet running.");
+        }
+    }
+
+    private Uri GetPublicUri() => new UriBuilder(Uri.UriSchemeHttp, Hostname, GetMappedPublicPort(ContainerPort)).Uri;
+}
--- a/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs
+++ b/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs
@@ -0,0 +1,175 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Docker.DotNet.Models;
+using DotNet.Testcontainers.Builders;
+using DotNet.Testcontainers.Configurations;
+using JetBrains.Annotations;
+using Stef.Validation;
+using WireMock.Net.Testcontainers.Models;
+
+namespace WireMock.Net.Testcontainers;
+
+/// <summary>
+/// An specific fluent Docker container builder for WireMock.Net
+/// </summary>
+public sealed class WireMockContainerBuilder : ContainerBuilder<WireMockContainerBuilder, WireMockContainer, WireMockConfiguration>
+{
+    private readonly Dictionary<bool, ContainerInfo> _info = new()
+    {
+        { false, new ContainerInfo("sheyenrath/wiremock.net:latest", "/app/__admin/mappings") },
+        { true, new ContainerInfo("sheyenrath/wiremock.net-windows:latest", @"c:\app\__admin\mappings") }
+    };
+
+    private const string DefaultLogger = "WireMockConsoleLogger";
+
+    private readonly Lazy<Task<bool>> _isWindowsAsLazy = new(async () =>
+    {
+        using var dockerClientConfig = TestcontainersSettings.OS.DockerEndpointAuthConfig.GetDockerClientConfiguration();
+        using var dockerClient = dockerClientConfig.CreateClient();
+
+        var version = await dockerClient.System.GetVersionAsync();
+        return version.Os.IndexOf("Windows", StringComparison.OrdinalIgnoreCase) > -1;
+    });
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ContainerBuilder" /> class.
+    /// </summary>
+    public WireMockContainerBuilder() : this(new WireMockConfiguration())
+    {
+        DockerResourceConfiguration = Init().DockerResourceConfiguration;
+    }
+
+    /// <summary>
+    /// Automatically set the correct image (Linux or Windows) for WireMock which to create the container.
+    /// </summary>
+    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
+    [PublicAPI]
+    public WireMockContainerBuilder WithImage()
+    {
+        var isWindows = _isWindowsAsLazy.Value.GetAwaiter().GetResult();
+        return WithImage(_info[isWindows].Image);
+    }
+
+    /// <summary>
+    /// Set the admin username and password for the container (basic authentication).
+    /// </summary>
+    /// <param name="username">The admin username.</param>
+    /// <param name="password">The admin password.</param>
+    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
+    public WireMockContainerBuilder WithAdminUserNameAndPassword(string username, string password)
+    {
+        Guard.NotNull(username);
+        Guard.NotNull(password);
+
+        if (string.IsNullOrEmpty(username) && string.IsNullOrEmpty(password))
+        {
+            return this;
+        }
+
+        return Merge(DockerResourceConfiguration, new WireMockConfiguration(username, password))
+            .WithCommand($"--AdminUserName {username}", $"--AdminPassword {password}");
+    }
+
+    /// <summary>
+    /// Use the WireMockNullLogger.
+    /// </summary>
+    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
+    [PublicAPI]
+    public WireMockContainerBuilder WithNullLogger()
+    {
+        return WithCommand("--WireMockLogger WireMockNullLogger");
+    }
+
+    /// <summary>
+    /// Defines if the static mappings should be read at startup (default set to false).
+    /// </summary>
+    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
+    [PublicAPI]
+    public WireMockContainerBuilder WithReadStaticMappings()
+    {
+        return WithCommand("--ReadStaticMappings true");
+    }
+
+    /// <summary>
+    /// Watch the static mapping files + folder for changes when running.
+    /// </summary>
+    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
+    [PublicAPI]
+    public WireMockContainerBuilder WithWatchStaticMappings(bool includeSubDirectories)
+    {
+        return WithCommand("--WatchStaticMappings true").WithCommand($"--WatchStaticMappingsInSubdirectories {includeSubDirectories}");
+    }
+
+    /// <summary>
+    /// Specifies the path for the (static) mapping json files.
+    /// </summary>
+    /// <param name="path">The path</param>
+    /// <returns></returns>
+    [PublicAPI]
+    public WireMockContainerBuilder WithMappings(string path)
+    {
+        Guard.NotNullOrEmpty(path);
+
+        var isWindows = _isWindowsAsLazy.Value.GetAwaiter().GetResult();
+
+        return WithReadStaticMappings().WithBindMount(path, _info[isWindows].MappingsPath);
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockContainerBuilder" /> class.
+    /// </summary>
+    /// <param name="dockerResourceConfiguration">The Docker resource configuration.</param>
+    private WireMockContainerBuilder(WireMockConfiguration dockerResourceConfiguration) : base(dockerResourceConfiguration)
+    {
+        DockerResourceConfiguration = dockerResourceConfiguration;
+    }
+
+    /// <inheritdoc />
+    protected override WireMockConfiguration DockerResourceConfiguration { get; }
+
+    /// <inheritdoc />
+    public override WireMockContainer Build()
+    {
+        Validate();
+
+        return new WireMockContainer(DockerResourceConfiguration, TestcontainersSettings.Logger);
+    }
+
+    /// <inheritdoc />
+    protected override WireMockContainerBuilder Init()
+    {
+        var builder = base.Init();
+
+        // In case no image has been set, set the image using internal logic.
+        if (builder.DockerResourceConfiguration.Image == null)
+        {
+            builder = builder.WithImage();
+        }
+
+        var isWindows = _isWindowsAsLazy.Value.GetAwaiter().GetResult();
+        var waitForContainerOS = isWindows ? Wait.ForWindowsContainer() : Wait.ForUnixContainer();
+        return builder
+            .WithPortBinding(WireMockContainer.ContainerPort, true)
+            .WithCommand($"--WireMockLogger {DefaultLogger}")
+            .WithWaitStrategy(waitForContainerOS.UntilMessageIsLogged("By Stef Heyenrath"));
+    }
+
+    /// <inheritdoc />
+    protected override WireMockContainerBuilder Clone(IContainerConfiguration resourceConfiguration)
+    {
+        return Merge(DockerResourceConfiguration, new WireMockConfiguration(resourceConfiguration));
+    }
+
+    /// <inheritdoc />
+    protected override WireMockContainerBuilder Clone(IResourceConfiguration<CreateContainerParameters> resourceConfiguration)
+    {
+        return Merge(DockerResourceConfiguration, new WireMockConfiguration(resourceConfiguration));
+    }
+
+    /// <inheritdoc />
+    protected override WireMockContainerBuilder Merge(WireMockConfiguration oldValue, WireMockConfiguration newValue)
+    {
+        return new WireMockContainerBuilder(new WireMockConfiguration(oldValue, newValue));
+    }
+}
--- a/src/WireMock.Net.xUnit/WireMock.Net.xUnit.csproj
+++ b/src/WireMock.Net.xUnit/WireMock.Net.xUnit.csproj
@@ -26,7 +26,7 @@

    <ItemGroup>
        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
        <PackageReference Include="Stef.Validation" Version="0.1.1" />
        <PackageReference Include="xUnit.abstractions" Version="2.0.3" />
    </ItemGroup>
--- a/src/WireMock.Net/.filenesting.json
+++ b/src/WireMock.Net/.filenesting.json
@@ -0,0 +1,17 @@
+{
+    "help": "https://go.microsoft.com/fwlink/?linkid=866610",
+    "root": true,
+
+    "dependentFileProviders": {
+        "add": {
+            "addedExtension": {},
+            "pathSegment": {
+                "add": {
+                    ".*": [
+                        ".cs"
+                    ]
+                }
+            }
+        }
+    }
+}
--- a/src/WireMock.Net/Authentication/AzureADAuthenticationMatcher.cs
+++ b/src/WireMock.Net/Authentication/AzureADAuthenticationMatcher.cs
@@ -34,8 +34,6 @@ internal class AzureADAuthenticationMatcher : IStringMatcher

    public MatchBehaviour MatchBehaviour => MatchBehaviour.AcceptOnMatch;

-    public bool ThrowException => false;
-
    public AnyOf<string, StringPattern>[] GetPatterns()
    {
        return EmptyArray<AnyOf<string, StringPattern>>.Value;
@@ -43,7 +41,7 @@ internal class AzureADAuthenticationMatcher : IStringMatcher

    public MatchOperator MatchOperator { get; } = MatchOperator.Or;

-    public double IsMatch(string? input)
+    public MatchResult IsMatch(string? input)
    {
        if (string.IsNullOrEmpty(input))
        {
@@ -70,9 +68,9 @@ internal class AzureADAuthenticationMatcher : IStringMatcher

            return MatchScores.Perfect;
        }
-        catch
+        catch (Exception ex)
        {
-            return MatchScores.Mismatch;
+            return new MatchResult(MatchScores.Mismatch, ex);
        }
    }
 }
--- a/src/WireMock.Net/Compatibility/StringExtensions.cs
+++ b/src/WireMock.Net/Compatibility/StringExtensions.cs
@@ -0,0 +1,15 @@
+#if NET451 || NET452 || NET46 || NET451 || NET461 || NETSTANDARD1_3 || NETSTANDARD2_0
+using System.Text.RegularExpressions;
+
+// ReSharper disable once CheckNamespace
+namespace System;
+
+internal static class StringExtensions
+{
+    public static string Replace(this string text, string oldValue, string newValue, StringComparison stringComparison)
+    {
+        var options = stringComparison == StringComparison.OrdinalIgnoreCase ? RegexOptions.IgnoreCase : RegexOptions.None;
+        return Regex.Replace(text, oldValue, newValue, options);
+    }
+}
+#endif
--- a/src/WireMock.Net/Constants/WireMockConstants.cs
+++ b/src/WireMock.Net/Constants/WireMockConstants.cs
@@ -8,4 +8,6 @@ internal static class WireMockConstants

    public const string ContentTypeJson = "application/json";
    public const string ContentTypeTextPlain = "text/plain";
+
+    public const string NoMatchingFound = "No matching mapping found";
 }
--- a/src/WireMock.Net/Exceptions/WireMockException.cs
+++ b/src/WireMock.Net/Exceptions/WireMockException.cs
@@ -1,35 +1,34 @@
-using System;
+using System;

-namespace WireMock.Exceptions
+namespace WireMock.Exceptions;
+
+/// <summary>
+/// WireMockException
+/// </summary>
+/// <seealso cref="Exception" />
+public class WireMockException : Exception
 {
    /// <summary>
-    /// WireMockException
+    /// Initializes a new instance of the <see cref="WireMockException"/> class.
    /// </summary>
-    /// <seealso cref="Exception" />
-    public class WireMockException : Exception
+    public WireMockException()
    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WireMockException"/> class.
-        /// </summary>
-        public WireMockException()
-        {
-        }
+    }

-        /// <summary>
-        /// Initializes a new instance of the <see cref="WireMockException"/> class.
-        /// </summary>
-        /// <param name="message">The message that describes the error.</param>
-        public WireMockException(string message) : base(message)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockException"/> class.
+    /// </summary>
+    /// <param name="message">The message that describes the error.</param>
+    public WireMockException(string message) : base(message)
+    {
+    }

-        /// <summary>
-        /// Initializes a new instance of the <see cref="WireMockException"/> class.
-        /// </summary>
-        /// <param name="message">The message.</param>
-        /// <param name="inner">The inner.</param>
-        public WireMockException(string message, Exception inner) : base(message, inner)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockException"/> class.
+    /// </summary>
+    /// <param name="message">The message.</param>
+    /// <param name="inner">The inner.</param>
+    public WireMockException(string message, Exception inner) : base(message, inner)
+    {
    }
 }
--- a/src/WireMock.Net/Extensions/DictionaryExtensions.cs
+++ b/src/WireMock.Net/Extensions/DictionaryExtensions.cs
@@ -0,0 +1,29 @@
+using System.Collections;
+using System.Diagnostics.CodeAnalysis;
+using Stef.Validation;
+
+namespace WireMock.Extensions;
+
+internal static class DictionaryExtensions
+{
+    public static bool TryGetStringValue(this IDictionary dictionary, string key, [NotNullWhen(true)] out string? value)
+    {
+        Guard.NotNull(dictionary);
+        
+        if (dictionary[key] is string valueIsString)
+        {
+            value = valueIsString;
+            return true;
+        }
+
+        var valueToString = dictionary[key]?.ToString();
+        if (valueToString != null)
+        {
+            value = valueToString;
+            return true;
+        }
+
+        value = default;
+        return false;
+    }
+}
--- a/src/WireMock.Net/Extensions/ExceptionExtensions.cs
+++ b/src/WireMock.Net/Extensions/ExceptionExtensions.cs
@@ -0,0 +1,16 @@
+using System;
+
+namespace WireMock.Extensions;
+
+internal static class ExceptionExtensions
+{
+    public static Exception? ToException(this Exception[] exceptions)
+    {
+        return exceptions.Length switch
+        {
+            1 => exceptions[0],
+            > 1 => new AggregateException(exceptions),
+            _ => null
+        };
+    }
+}
--- a/src/WireMock.Net/Handlers/LocalFileSystemHandler.cs
+++ b/src/WireMock.Net/Handlers/LocalFileSystemHandler.cs
@@ -3,179 +3,178 @@ using System.IO;
 using WireMock.Util;
 using Stef.Validation;

-namespace WireMock.Handlers
+namespace WireMock.Handlers;
+
+/// <summary>
+/// Default implementation for a handler to interact with the local file system to read and write static mapping files.
+/// </summary>
+public class LocalFileSystemHandler : IFileSystemHandler
 {
+    private static readonly string AdminMappingsFolder = Path.Combine("__admin", "mappings");
+    private static readonly string UnmatchedRequestsFolder = Path.Combine("requests", "unmatched");
+
+    private readonly string _rootFolder;
+
    /// <summary>
-    /// Default implementation for a handler to interact with the local file system to read and write static mapping files.
+    /// Initializes a new instance of the <see cref="LocalFileSystemHandler"/> class.
    /// </summary>
-    public class LocalFileSystemHandler : IFileSystemHandler
+    public LocalFileSystemHandler() : this(Directory.GetCurrentDirectory())
    {
-        private static readonly string AdminMappingsFolder = Path.Combine("__admin", "mappings");
-        private static readonly string UnmatchedRequestsFolder = Path.Combine("requests", "unmatched");
+    }

-        private readonly string _rootFolder;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LocalFileSystemHandler"/> class.
+    /// </summary>
+    /// <param name="rootFolder">The root folder.</param>
+    public LocalFileSystemHandler(string rootFolder)
+    {
+        _rootFolder = rootFolder;
+    }

-        /// <summary>
-        /// Initializes a new instance of the <see cref="LocalFileSystemHandler"/> class.
-        /// </summary>
-        public LocalFileSystemHandler() : this(Directory.GetCurrentDirectory())
+    /// <inheritdoc cref="IFileSystemHandler.FolderExists"/>
+    public virtual bool FolderExists(string path)
+    {
+        Guard.NotNullOrEmpty(path);
+
+        return Directory.Exists(path);
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.CreateFolder"/>
+    public virtual void CreateFolder(string path)
+    {
+        Guard.NotNullOrEmpty(path);
+
+        Directory.CreateDirectory(path);
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.EnumerateFiles"/>
+    public virtual IEnumerable<string> EnumerateFiles(string path, bool includeSubdirectories)
+    {
+        Guard.NotNullOrEmpty(path);
+
+        return includeSubdirectories ? Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories) : Directory.EnumerateFiles(path);
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.GetMappingFolder"/>
+    public virtual string GetMappingFolder()
+    {
+        return Path.Combine(_rootFolder, AdminMappingsFolder);
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.ReadMappingFile"/>
+    public virtual string ReadMappingFile(string path)
+    {
+        Guard.NotNullOrEmpty(path);
+
+        return File.ReadAllText(path);
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.WriteMappingFile(string, string)"/>
+    public virtual void WriteMappingFile(string path, string text)
+    {
+        Guard.NotNullOrEmpty(path, nameof(path));
+        Guard.NotNull(text, nameof(text));
+
+        File.WriteAllText(path, text);
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsFile"/>
+    public virtual byte[] ReadResponseBodyAsFile(string path)
+    {
+        Guard.NotNullOrEmpty(path);
+        path = PathUtils.CleanPath(path)!;
+        // If the file exists at the given path relative to the MappingsFolder, then return that.
+        // Else the path will just be as-is.
+        return File.ReadAllBytes(File.Exists(PathUtils.Combine(GetMappingFolder(), path)) ? PathUtils.Combine(GetMappingFolder(), path) : path);
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsString"/>
+    public virtual string ReadResponseBodyAsString(string path)
+    {
+        Guard.NotNullOrEmpty(path);
+        path = PathUtils.CleanPath(path)!;
+        // In case the path is a filename, the path will be adjusted to the MappingFolder.
+        // Else the path will just be as-is.
+        return File.ReadAllText(File.Exists(PathUtils.Combine(GetMappingFolder(), path)) ? PathUtils.Combine(GetMappingFolder(), path) : path);
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.FileExists"/>
+    public virtual bool FileExists(string filename)
+    {
+        Guard.NotNullOrEmpty(filename);
+
+        return File.Exists(AdjustPathForMappingFolder(filename));
+    }
+
+    /// <inheritdoc />
+    public virtual void WriteFile(string filename, byte[] bytes)
+    {
+        Guard.NotNullOrEmpty(filename);
+        Guard.NotNull(bytes);
+
+        File.WriteAllBytes(AdjustPathForMappingFolder(filename), bytes);
+    }
+
+    /// <inheritdoc />
+    public virtual void WriteFile(string folder, string filename, byte[] bytes)
+    {
+        Guard.NotNullOrEmpty(folder);
+        Guard.NotNullOrEmpty(filename);
+        Guard.NotNull(bytes);
+
+        File.WriteAllBytes(PathUtils.Combine(folder, filename), bytes);
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.DeleteFile"/>
+    public virtual void DeleteFile(string filename)
+    {
+        Guard.NotNullOrEmpty(filename);
+
+        File.Delete(AdjustPathForMappingFolder(filename));
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.ReadFile"/>
+    public virtual byte[] ReadFile(string filename)
+    {
+        Guard.NotNullOrEmpty(filename);
+
+        return File.ReadAllBytes(AdjustPathForMappingFolder(filename));
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.ReadFileAsString"/>
+    public virtual string ReadFileAsString(string filename)
+    {
+        return File.ReadAllText(AdjustPathForMappingFolder(Guard.NotNullOrEmpty(filename, nameof(filename))));
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.GetUnmatchedRequestsFolder"/>
+    public virtual string GetUnmatchedRequestsFolder()
+    {
+        return Path.Combine(_rootFolder, UnmatchedRequestsFolder);
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.WriteUnmatchedRequest"/>
+    public virtual void WriteUnmatchedRequest(string filename, string text)
+    {
+        Guard.NotNullOrEmpty(filename);
+        Guard.NotNull(text);
+
+        var folder = GetUnmatchedRequestsFolder();
+        if (!FolderExists(folder))
        {
+            CreateFolder(folder);
        }

-        /// <summary>
-        /// Initializes a new instance of the <see cref="LocalFileSystemHandler"/> class.
-        /// </summary>
-        /// <param name="rootFolder">The root folder.</param>
-        public LocalFileSystemHandler(string rootFolder)
-        {
-            _rootFolder = rootFolder;
-        }
+        File.WriteAllText(Path.Combine(folder, filename), text);
+    }

-        /// <inheritdoc cref="IFileSystemHandler.FolderExists"/>
-        public virtual bool FolderExists(string path)
-        {
-            Guard.NotNullOrEmpty(path, nameof(path));
-
-            return Directory.Exists(path);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.CreateFolder"/>
-        public virtual void CreateFolder(string path)
-        {
-            Guard.NotNullOrEmpty(path, nameof(path));
-
-            Directory.CreateDirectory(path);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.EnumerateFiles"/>
-        public virtual IEnumerable<string> EnumerateFiles(string path, bool includeSubdirectories)
-        {
-            Guard.NotNullOrEmpty(path, nameof(path));
-
-            return includeSubdirectories ? Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories) : Directory.EnumerateFiles(path);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.GetMappingFolder"/>
-        public virtual string GetMappingFolder()
-        {
-            return Path.Combine(_rootFolder, AdminMappingsFolder);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.ReadMappingFile"/>
-        public virtual string ReadMappingFile(string path)
-        {
-            Guard.NotNullOrEmpty(path, nameof(path));
-
-            return File.ReadAllText(path);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.WriteMappingFile(string, string)"/>
-        public virtual void WriteMappingFile(string path, string text)
-        {
-            Guard.NotNullOrEmpty(path, nameof(path));
-            Guard.NotNull(text, nameof(text));
-
-            File.WriteAllText(path, text);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsFile"/>
-        public virtual byte[] ReadResponseBodyAsFile(string path)
-        {
-            Guard.NotNullOrEmpty(path, nameof(path));
-            path = PathUtils.CleanPath(path);
-            // If the file exists at the given path relative to the MappingsFolder, then return that.
-            // Else the path will just be as-is.
-            return File.ReadAllBytes(File.Exists(PathUtils.Combine(GetMappingFolder(), path)) ? PathUtils.Combine(GetMappingFolder(), path) : path);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsString"/>
-        public virtual string ReadResponseBodyAsString(string path)
-        {
-            Guard.NotNullOrEmpty(path, nameof(path));
-            path = PathUtils.CleanPath(path);
-            // In case the path is a filename, the path will be adjusted to the MappingFolder.
-            // Else the path will just be as-is.
-            return File.ReadAllText(File.Exists(PathUtils.Combine(GetMappingFolder(), path)) ? PathUtils.Combine(GetMappingFolder(), path) : path);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.FileExists"/>
-        public virtual bool FileExists(string filename)
-        {
-            Guard.NotNullOrEmpty(filename, nameof(filename));
-
-            return File.Exists(AdjustPathForMappingFolder(filename));
-        }
-
-        /// <inheritdoc />
-        public virtual void WriteFile(string filename, byte[] bytes)
-        {
-            Guard.NotNullOrEmpty(filename, nameof(filename));
-            Guard.NotNull(bytes, nameof(bytes));
-
-            File.WriteAllBytes(AdjustPathForMappingFolder(filename), bytes);
-        }
-
-        /// <inheritdoc />
-        public virtual void WriteFile(string folder, string filename, byte[] bytes)
-        {
-            Guard.NotNullOrEmpty(folder);
-            Guard.NotNullOrEmpty(filename);
-            Guard.NotNull(bytes);
-
-            File.WriteAllBytes(PathUtils.Combine(folder, filename), bytes);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.DeleteFile"/>
-        public virtual void DeleteFile(string filename)
-        {
-            Guard.NotNullOrEmpty(filename, nameof(filename));
-
-            File.Delete(AdjustPathForMappingFolder(filename));
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.ReadFile"/>
-        public virtual byte[] ReadFile(string filename)
-        {
-            Guard.NotNullOrEmpty(filename, nameof(filename));
-
-            return File.ReadAllBytes(AdjustPathForMappingFolder(filename));
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.ReadFileAsString"/>
-        public virtual string ReadFileAsString(string filename)
-        {
-            return File.ReadAllText(AdjustPathForMappingFolder(Guard.NotNullOrEmpty(filename, nameof(filename))));
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.GetUnmatchedRequestsFolder"/>
-        public virtual string GetUnmatchedRequestsFolder()
-        {
-            return Path.Combine(_rootFolder, UnmatchedRequestsFolder);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.WriteUnmatchedRequest"/>
-        public virtual void WriteUnmatchedRequest(string filename, string text)
-        {
-            Guard.NotNullOrEmpty(filename, nameof(filename));
-            Guard.NotNull(text, nameof(text));
-
-            var folder = GetUnmatchedRequestsFolder();
-            if (!FolderExists(folder))
-            {
-                CreateFolder(folder);
-            }
-
-            File.WriteAllText(Path.Combine(folder, filename), text);
-        }
-
-        /// <summary>
-        /// Adjusts the path to the MappingFolder.
-        /// </summary>
-        /// <param name="filename">The path.</param>
-        /// <returns>Adjusted path</returns>
-        private string AdjustPathForMappingFolder(string filename)
-        {
-            return Path.Combine(GetMappingFolder(), filename);
-        }
+    /// <summary>
+    /// Adjusts the path to the MappingFolder.
+    /// </summary>
+    /// <param name="filename">The path.</param>
+    /// <returns>Adjusted path</returns>
+    private string AdjustPathForMappingFolder(string filename)
+    {
+        return Path.Combine(GetMappingFolder(), filename);
    }
 }
--- a/src/WireMock.Net/Http/HttpClientFactory2.cs
+++ b/src/WireMock.Net/Http/HttpClientFactory2.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using System.Net.Http;

 namespace WireMock.Http;
@@ -6,19 +7,31 @@ internal static class HttpClientFactory2
 {
    public static HttpClient Create(params DelegatingHandler[] handlers)
    {
-#if NETSTANDARD1_3
-        return new HttpClient();
-#else
-        return HttpClientFactory.Create(handlers);
-#endif
+        var handler = CreateHandlerPipeline(new HttpClientHandler(), handlers);
+        return new HttpClient(handler);
    }

    public static HttpClient Create(HttpMessageHandler innerHandler, params DelegatingHandler[] handlers)
    {
-#if NETSTANDARD1_3
-        return new HttpClient(innerHandler);
-#else
-        return HttpClientFactory.Create(innerHandler, handlers);
-#endif
+        var handler = CreateHandlerPipeline(innerHandler, handlers);
+        return new HttpClient(handler);
+    }
+
+    private static HttpMessageHandler CreateHandlerPipeline(HttpMessageHandler handler, params DelegatingHandler[] delegatingHandlers)
+    {
+        if (delegatingHandlers.Length == 0)
+        {
+            return handler;
+        }
+
+        var next = handler;
+
+        foreach (var delegatingHandler in delegatingHandlers.Reverse())
+        {
+            delegatingHandler.InnerHandler = next;
+            next = delegatingHandler;
+        }
+
+        return next;
    }
 }
--- a/src/WireMock.Net/Http/HttpRequestMessageHelper.cs
+++ b/src/WireMock.Net/Http/HttpRequestMessageHelper.cs
@@ -5,12 +5,18 @@ using System.Net.Http;
 using System.Net.Http.Headers;
 using Newtonsoft.Json;
 using Stef.Validation;
+using WireMock.Constants;
 using WireMock.Types;

 namespace WireMock.Http;

 internal static class HttpRequestMessageHelper
 {
+    private static readonly IDictionary<string, bool> ContentLengthHeaderAllowed = new Dictionary<string, bool>(StringComparer.OrdinalIgnoreCase)
+    {
+        { HttpRequestMethod.HEAD, true }
+    };
+
    internal static HttpRequestMessage Create(IRequestMessage requestMessage, string url)
    {
        Guard.NotNull(requestMessage);
@@ -25,20 +31,14 @@ internal static class HttpRequestMessageHelper
            MediaTypeHeaderValue.TryParse(value, out contentType);
        }

-        switch (requestMessage.BodyData?.DetectedBodyType)
+        httpRequestMessage.Content = requestMessage.BodyData?.DetectedBodyType switch
        {
-            case BodyType.Bytes:
-                httpRequestMessage.Content = ByteArrayContentHelper.Create(requestMessage.BodyData.BodyAsBytes, contentType);
-                break;
-
-            case BodyType.Json:
-                httpRequestMessage.Content = StringContentHelper.Create(JsonConvert.SerializeObject(requestMessage.BodyData.BodyAsJson), contentType);
-                break;
-
-            case BodyType.String:
-                httpRequestMessage.Content = StringContentHelper.Create(requestMessage.BodyData.BodyAsString, contentType);
-                break;
-        }
+            BodyType.Bytes => ByteArrayContentHelper.Create(requestMessage.BodyData.BodyAsBytes!, contentType),
+            BodyType.Json => StringContentHelper.Create(JsonConvert.SerializeObject(requestMessage.BodyData.BodyAsJson), contentType),
+            BodyType.String => StringContentHelper.Create(requestMessage.BodyData.BodyAsString!, contentType),
+            BodyType.FormUrlEncoded => StringContentHelper.Create(requestMessage.BodyData.BodyAsString!, contentType),
+            _ => httpRequestMessage.Content
+        };

        // Overwrite the host header
        httpRequestMessage.Headers.Host = new Uri(url).Authority;
@@ -49,7 +49,19 @@ internal static class HttpRequestMessageHelper
            return httpRequestMessage;
        }

-        var excludeHeaders = new List<string> { HttpKnownHeaderNames.Host, HttpKnownHeaderNames.ContentLength };
+        var excludeHeaders = new List<string> { HttpKnownHeaderNames.Host };
+
+        var contentLengthHeaderAllowed = ContentLengthHeaderAllowed.TryGetValue(requestMessage.Method, out var allowed) && allowed;
+        if (contentLengthHeaderAllowed)
+        {
+            // Set Content to empty ByteArray to be able to set the Content-Length on the content in case of a HEAD method.
+            httpRequestMessage.Content ??= new ByteArrayContent(EmptyArray<byte>.Value);
+        }
+        else
+        {
+            excludeHeaders.Add(HttpKnownHeaderNames.ContentLength);
+        }
+
        if (contentType != null)
        {
            // Content-Type should be set on the content
--- a/src/WireMock.Net/Http/HttpResponseMessageHelper.cs
+++ b/src/WireMock.Net/Http/HttpResponseMessageHelper.cs
@@ -15,7 +15,8 @@ internal static class HttpResponseMessageHelper
        Uri requiredUri,
        Uri originalUri,
        bool deserializeJson,
-        bool decompressGzipAndDeflate)
+        bool decompressGzipAndDeflate,
+        bool deserializeFormUrlEncoded)
    {
        var responseMessage = new ResponseMessage { StatusCode = (int)httpResponseMessage.StatusCode };

@@ -44,7 +45,8 @@ internal static class HttpResponseMessageHelper
                    ContentType = contentTypeHeader?.FirstOrDefault(),
                    DeserializeJson = deserializeJson,
                    ContentEncoding = contentEncodingHeader?.FirstOrDefault(),
-                    DecompressGZipAndDeflate = decompressGzipAndDeflate
+                    DecompressGZipAndDeflate = decompressGzipAndDeflate,
+                    DeserializeFormUrlEncoded = deserializeFormUrlEncoded
                };
                responseMessage.BodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
            }
@@ -55,7 +57,7 @@ internal static class HttpResponseMessageHelper
            // If Location header contains absolute redirect URL, and base URL is one that we proxy to,
            // we need to replace it to original one.
            if (string.Equals(header.Key, HttpKnownHeaderNames.Location, StringComparison.OrdinalIgnoreCase)
-                && Uri.TryCreate(header.Value.First(), UriKind.Absolute, out Uri absoluteLocationUri)
+                && Uri.TryCreate(header.Value.First(), UriKind.Absolute, out var absoluteLocationUri)
                && string.Equals(absoluteLocationUri.Host, requiredUri.Host, StringComparison.OrdinalIgnoreCase))
            {
                var replacedLocationUri = new Uri(originalUri, absoluteLocationUri.PathAndQuery);
--- a/src/WireMock.Net/IMapping.cs
+++ b/src/WireMock.Net/IMapping.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using WireMock.Matchers.Request;
 using WireMock.Models;
@@ -121,7 +120,7 @@ public interface IMapping
    /// <summary>
    /// Use Fire and Forget for the defined webhook(s). [Optional]
    /// </summary>
-    bool? UseWebhooksFireAndForget { get; set; }
+    bool? UseWebhooksFireAndForget { get; }

    /// <summary>
    /// Data Object which can be used when WithTransformer is used.
@@ -130,7 +129,12 @@ public interface IMapping
    /// lookup data "1"
    /// </example>
    /// </summary>
-    object? Data { get; set; }
+    object? Data { get; }
+
+    /// <summary> 
+    /// The probability when this request should be matched. Value is between 0 and 1. [Optional]
+    /// </summary>
+    double? Probability { get; }

    /// <summary>
    /// ProvideResponseAsync
--- a/src/WireMock.Net/Json/DynamicPropertyWithValue.cs
+++ b/src/WireMock.Net/Json/DynamicPropertyWithValue.cs
@@ -4,7 +4,7 @@ using System.Linq.Dynamic.Core;

 namespace WireMock.Json;

-public class DynamicPropertyWithValue : DynamicProperty
+internal class DynamicPropertyWithValue : DynamicProperty
 {
    public object? Value { get; }

--- a/src/WireMock.Net/Json/JObjectExtensions.cs
+++ b/src/WireMock.Net/Json/JObjectExtensions.cs
@@ -60,7 +60,7 @@ internal static class JObjectExtensions
    {
        if (src == null)
        {
-            return new object?[0];
+            return EmptyArray<object?>.Value;
        }

        return ConvertJTokenArray(src, options);
--- a/src/WireMock.Net/Mapping.cs
+++ b/src/WireMock.Net/Mapping.cs
@@ -67,13 +67,16 @@ public class Mapping : IMapping
    public IWebhook[]? Webhooks { get; }

    /// <inheritdoc />
-    public bool? UseWebhooksFireAndForget { get; set; }
+    public bool? UseWebhooksFireAndForget { get; }

    /// <inheritdoc />
    public ITimeSettings? TimeSettings { get; }

    /// <inheritdoc />
-    public object? Data { get; set; }
+    public object? Data { get; }
+
+    /// <inheritdoc />
+    public double? Probability { get; }

    /// <summary>
    /// Initializes a new instance of the <see cref="Mapping"/> class.
@@ -95,6 +98,7 @@ public class Mapping : IMapping
    /// <param name="useWebhooksFireAndForget">Use Fire and Forget for the defined webhook(s). [Optional]</param>
    /// <param name="timeSettings">The TimeSettings. [Optional]</param>
    /// <param name="data">The data object. [Optional]</param>
+    /// <param name="probability">Define the probability when this request should be matched. [Optional]</param>
    public Mapping(
        Guid guid,
        DateTime updatedAt,
@@ -112,7 +116,8 @@ public class Mapping : IMapping
        IWebhook[]? webhooks,
        bool? useWebhooksFireAndForget,
        ITimeSettings? timeSettings,
-        object? data)
+        object? data,
+        double? probability)
    {
        Guid = guid;
        UpdatedAt = updatedAt;
@@ -131,15 +136,16 @@ public class Mapping : IMapping
        UseWebhooksFireAndForget = useWebhooksFireAndForget;
        TimeSettings = timeSettings;
        Data = data;
+        Probability = probability;
    }

-    /// <inheritdoc cref="IMapping.ProvideResponseAsync" />
+    /// <inheritdoc />
    public Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IRequestMessage requestMessage)
    {
        return Provider.ProvideResponseAsync(this, requestMessage, Settings);
    }

-    /// <inheritdoc cref="IMapping.GetRequestMatchResult" />
+    /// <inheritdoc />
    public IRequestMatchResult GetRequestMatchResult(IRequestMessage requestMessage, string? nextState)
    {
        var result = new RequestMatchResult();
--- a/src/WireMock.Net/MappingBuilder.cs
+++ b/src/WireMock.Net/MappingBuilder.cs
@@ -69,12 +69,7 @@ public class MappingBuilder : IMappingBuilder
    /// <inheritdoc />
    public MappingModel[] GetMappings()
    {
-        return GetMappingsInternal().Select(_mappingConverter.ToMappingModel).ToArray();
-    }
-
-    internal IMapping[] GetMappingsInternal()
-    {
-        return _options.Mappings.Values.ToArray().Where(m => !m.IsAdminInterface).ToArray();
+        return GetNonAdminMappings().Select(_mappingConverter.ToMappingModel).ToArray();
    }

    /// <inheritdoc />
@@ -86,7 +81,7 @@ public class MappingBuilder : IMappingBuilder
    /// <inheritdoc />
    public string? ToCSharpCode(Guid guid, MappingConverterType converterType)
    {
-        var mapping = GetMappingsInternal().FirstOrDefault(m => m.Guid == guid);
+        var mapping = GetNonAdminMappings().FirstOrDefault(m => m.Guid == guid);
        if (mapping is null)
        {
            return null;
@@ -101,7 +96,7 @@ public class MappingBuilder : IMappingBuilder
    {
        var sb = new StringBuilder();
        bool addStart = true;
-        foreach (var mapping in GetMappingsInternal())
+        foreach (var mapping in GetNonAdminMappings())
        {
            sb.AppendLine(_mappingConverter.ToCSharpCode(mapping, new MappingConverterSettings { AddStart = addStart, ConverterType = converterType }));

@@ -123,7 +118,7 @@ public class MappingBuilder : IMappingBuilder
    /// <inheritdoc />
    public void SaveMappingsToFolder(string? folder)
    {
-        foreach (var mapping in GetNonAdminMappings().Where(m => !m.IsAdminInterface))
+        foreach (var mapping in GetNonAdminMappings())
        {
            _mappingToFileSaver.SaveMappingToFile(mapping, folder);
        }
@@ -131,7 +126,7 @@ public class MappingBuilder : IMappingBuilder

    private IMapping[] GetNonAdminMappings()
    {
-        return _options.Mappings.Values.ToArray();
+        return _options.Mappings.Values.Where(m => !m.IsAdminInterface).OrderBy(m => m.UpdatedAt).ToArray();
    }

    private void RegisterMapping(IMapping mapping, bool saveToFile)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stef Heyenrath	a25a8cabf8	1.5.37	2023-09-27 21:43:50 +02:00
Stef Heyenrath	9f9fc85a64	JmesPathMatcherTests (#998 )	2023-09-27 21:42:34 +02:00
Stef Heyenrath	b63076a9ac	Fix MappingModel to map IgnoreCase and RejectOnMatch for Headers, Cookies and Parameters (#1004 )	2023-09-26 21:01:33 +02:00
Stef Heyenrath	05e2aa548b	1.5.36	2023-09-21 11:40:34 +02:00
Stef Heyenrath	b9a8ee4145	Fixed logic for SaveUnmatchedRequests (#1002 ) * Fixed logic for SaveUnmatchedRequests * fix	2023-09-21 11:38:01 +02:00
Stef Heyenrath	59aab9e1c3	Remove dependency on Microsoft.AspNet.WebApi.Client (#996 ) * Using an alias for System.Net.Http.Formatting * . * fix * space	2023-08-29 17:53:17 +02:00
Stef Heyenrath	93c87845c2	Write logging in case a Matcher throws an exception (#986 ) * ThrowException * ... * . * ... * b * fix test * ... * . * sonar * ft * . * fix tst	2023-08-21 20:07:46 +02:00
Stef Heyenrath	09a302baf2	1.5.35	2023-08-19 10:00:18 +02:00
Stef Heyenrath	f0139eb837	Update comment in JsonPathMatcher.cs	2023-08-17 17:22:05 +02:00
DayLightDancer	8adf34fb56	Update JSONPathMatcher.cs to cover the string path selection to a child (#993 ) * Update JSONPathMatcher.cs to cover the string path selection to a child The .SelectToken method accept string path selection and JSONPath queries. The current code works only for the queries because the result is JObject. When the string path is selected the result is JValue and event with a valid result the code the code doesn't return valued result. https://www.newtonsoft.com/json/help/html/SelectToken.htm * Added unit tests * Addressed the comments * Addressed the comments * Update JSONPathMatcher.cs	2023-08-17 17:18:32 +02:00
Stef Heyenrath	fd816f0952	Add extra unit test for WithParam multiple values comma (#992 )	2023-08-12 21:05:13 +02:00
Stef Heyenrath	205c1d598b	1.5.34	2023-08-04 10:51:51 +02:00
Stef Heyenrath	b986633eca	Fix MimeKitLite NuGet include (#989 ) * Fix 500 * MimeKiteLite : fix NuGet include * .	2023-08-04 10:44:53 +02:00
Stef Heyenrath	6aa7aac151	1.5.33	2023-08-03 16:08:50 +02:00
Stef Heyenrath	4688f556b5	Add MultiPart/MimePart Request Matcher (#981 ) * wip * . * mm * x * . * . * . * tests * . * more tests * trans * x * win * fix * . * tests	2023-08-03 15:55:46 +02:00
Stef Heyenrath	a58ead7b4e	Upgrade to Handlebars.Net.Helpers 2.4.0 to update XPath.SelectTokens and XPath.EvaluateToString (#976 ) * Upgrade to Handlebars.Net.Helpers 2.4.0 to update XPath.SelectTokens and XPath.EvaluateToString * fix	2023-07-20 21:49:00 +02:00
Tymur Nesterenko	58bfb3ea33	JsonPartialMatcher - match guid and string (#972 ) * JsonPartialMatcher - match guid and string (#971) * JsonPartialMatcher - match guid and string. Add Regex with Guid test (#971)	2023-07-19 22:34:02 +02:00
Stef Heyenrath	9c51548d2b	1.5.32	2023-07-15 09:41:05 +02:00
Stef Heyenrath	98b8ede826	Fixed JsonPathMatcher to match nested objects (#966 ) * Fixed JsonPathMatcher to match nested objects * fix * . * 100%	2023-07-15 09:29:13 +02:00
Stef Heyenrath	a6f3f976af	1.5.31	2023-07-08 14:57:12 +02:00
Stef Heyenrath	b495eb83b1	Add GraphQL Schema matching (#964 ) * Add GrapQLMatcher * tests * x * . * . * RequestMessageGraphQLMatcher * . * more tests * tests * ... * ms * . * more tests * GraphQL.NET !!! * . * executionResult * nw * sonarcloud	2023-07-07 21:43:46 +02:00
Stef Heyenrath	9443e4f071	1.5.30	2023-06-28 08:12:10 +02:00
dependabot[bot]	7a914481e5	Bump System.Linq.Dynamic.Core (#963 ) Bumps [System.Linq.Dynamic.Core](https://github.com/zzzprojects/System.Linq.Dynamic.Core) from 1.2.23 to 1.3.0. - [Release notes](https://github.com/zzzprojects/System.Linq.Dynamic.Core/releases) - [Changelog](https://github.com/zzzprojects/System.Linq.Dynamic.Core/blob/master/CHANGELOG.md) - [Commits](https://github.com/zzzprojects/System.Linq.Dynamic.Core/compare/v1.2.23...v1.3.0) --- updated-dependencies: - dependency-name: System.Linq.Dynamic.Core dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-06-28 07:58:03 +02:00
dependabot[bot]	1ad836659d	Bump System.Linq.Dynamic.Core (#962 ) Bumps [System.Linq.Dynamic.Core](https://github.com/zzzprojects/System.Linq.Dynamic.Core) from 1.2.23 to 1.3.0. - [Release notes](https://github.com/zzzprojects/System.Linq.Dynamic.Core/releases) - [Changelog](https://github.com/zzzprojects/System.Linq.Dynamic.Core/blob/master/CHANGELOG.md) - [Commits](https://github.com/zzzprojects/System.Linq.Dynamic.Core/compare/v1.2.23...v1.3.0) --- updated-dependencies: - dependency-name: System.Linq.Dynamic.Core dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-06-28 07:57:50 +02:00
Stef Heyenrath	ed7f9c1143	Add unit-test for Param - MatcherModel - LinqMatcher (#961 )	2023-06-27 22:31:14 +02:00
Stef Heyenrath	c92183558b	Fixed logic for FluentAssertions WithHeader (#959 )	2023-06-23 15:20:57 +02:00
Stef Heyenrath	8ce24249d0	1.5.29	2023-06-22 19:02:10 +02:00
Stef Heyenrath	7ca70309cb	Support setting WireMockServerSettings via Environment (#954 ) * Support parsing environment variables (WireMockServerSettings__) * case ignore * fix * SimpleSettingsParserTests * . * int * more test	2023-06-22 10:35:21 +02:00
Stef Heyenrath	5d0bf6f4e1	Fix some SonarCloud issues (#955 ) * Fixed some SonarCloud issues * if (value.Contains('\n'))	2023-06-13 19:31:04 +02:00
Stef Heyenrath	f6e35cbe2d	1.5.28	2023-06-11 14:22:54 +02:00
Stef Heyenrath	dc4c8d1dba	WireMock.Net.Testcontainers (#948 ) * WireMock.Net.Testcontainers * . * logger? * . * . * WatchStaticMappings * linux * . * -- * ContainerInfo * . * 02 * . * fix * .	2023-06-11 13:55:57 +02:00
Stef Heyenrath	adf1914877	Allow setting the Content-Length header for a HTTP method HEAD (#951 ) * Allow setting the Content-Length header for a HTTP method HEAD * .	2023-06-06 22:44:14 +02:00
Stef Heyenrath	1f1bc05f00	1.5.27	2023-06-03 17:00:18 +02:00
Stef Heyenrath	c107e38e3b	Fix WireMock.Net.FluentAssertions for net47	2023-06-02 12:03:12 +02:00
Stef Heyenrath	a77c4fe1ac	Add ".NET Framework 4.7" to WireMock.Net.FluentAssertions (#949 )	2023-06-01 18:06:28 +02:00
Stef Heyenrath	c1e71707c5	Add warning logging when sending a request to a Webhook does not return status 200 (#946 )	2023-05-28 10:53:54 +02:00
Oleg Nenashev	69499afe43	Update Slack link (#944 ) Better to use https://slack.wiremock.org/ to have proper Slack signup	2023-05-26 10:01:16 +02:00
Stef Heyenrath	aadac78577	add Slack	2023-05-25 23:49:12 +02:00
Stef Heyenrath	71393204cc	1.5.26	2023-05-25 21:36:01 +02:00
Cezary Piątek	e5cc6f570c	Code generator improvements (#940 ) * Fix quotation marks escaping in multiline string * Add support for JsonPartialMatcher and JsonPartialWildcardMatcher in mapping code generator	2023-05-25 20:59:13 +02:00
Stef Heyenrath	7c3a0c815d	Add GetParameter method to IRequestMessage (#942 )	2023-05-25 15:14:02 +02:00
Stef Heyenrath	e61f08fe48	WireMockMiddleware should use HandleRequestsSynchronously correctly (#939 )	2023-05-19 21:43:14 +02:00
Stef Heyenrath	11f4c47851	Add more unitests for CSharpFormatter utils (#938 ) * Add unit-tests for CSharpFormatter * . * t	2023-05-19 16:14:26 +02:00
Stef Heyenrath	3956cd703b	1.5.25 (ReleaseNotes)	2023-05-13 11:17:03 +02:00
Stef Heyenrath	27682d0ce4	1.5.25 + Fixes in CSharpFormatter	2023-05-13 11:15:40 +02:00
Cezary Piątek	8444c8c506	Code generator improvements (#934 ) * Handle new line escaping in C# mapping code generator * Prevent date conversion when value persisted as string * Handle object properties named as csharp keywords * Refactor: Extract logic responsible for generating anonymous object definition to a separate class	2023-05-13 09:33:25 +02:00
Stef Heyenrath	6ef116a295	1.5.24	2023-05-07 14:48:20 +02:00
Stef Heyenrath	59195eaed8	Refactor some code (MappingConverter)	2023-05-07 14:42:00 +02:00
Cezary Piątek	7d9e450814	C# code generator improvements (#933 ) * Escape quotes in generated C# strings * Handle response with JSON body in C# code generator	2023-05-07 14:37:48 +02:00
Stef Heyenrath	7019a5a78c	Add Package Readme (#932 ) * Add Package Readme * C# .NET API * <PackageReadmeFile>PackageReadme.md</PackageReadmeFile>	2023-05-07 09:24:48 +02:00
Stef Heyenrath	d29f3e81f3	Add property 'IsStartedWithAdminInterface' to 'IWireMockServer' (#931 ) * Add property 'IsStartedWithAdminInterface' to 'IWireMockServer' * update tests * .	2023-05-06 13:12:00 +02:00
Stef Heyenrath	ccd8026884	Update C# mapping code generator for WithStatusCode (#930 )	2023-05-06 10:24:53 +02:00
Cezary Piątek	1214ba5108	Enrich generated code with status code (#927 )	2023-05-06 09:40:41 +02:00
Cezary Piątek	427715a38a	Fix csharp mapping code generator (#926 )	2023-05-02 16:48:32 +02:00
Stef Heyenrath	d949dfb64c	1.5.23	2023-04-23 12:06:38 +02:00
Stef Heyenrath	0a2763c06e	Add IgnoreCase option to ProxyUrlReplaceSettings (#925 ) * Add IgnoreCase option to ProxyUrlReplaceSettings * fix	2023-04-23 11:56:08 +02:00
nudejustin	9ef8bd0b7b	Allow removal of prefix when proxying to another server (#630 ) (#924 ) * #630 Allow removal of prefix when proxying to another server * #630 Rename replace to replace settings and ensure properties used in place of fields * #630 Update replace settings type name to ProxyUrlReplaceSettings * #630 Add admin model and update settings parser to parse new values * Fix formatting issues * #630 Ensure json mapping between admin model and internal model takes place * #630 Refactor parsing and structure of extracting new proxy url * Reduce function complexity * #630 Fix line length issues and remove try prefix from parser methods	2023-04-23 09:31:38 +02:00
Stef Heyenrath	090e0eb437	Add WithProbability (#922 ) * WithProbability * fix * x * , * . * . * .	2023-04-12 20:48:53 +02:00
Stef Heyenrath	f3d52adbb2	1.5.22	2023-04-08 21:37:18 +02:00
Stef Heyenrath	a8775c3b77	Include WireMockOpenApiParser project (#916 ) * Fix some nullability warnings for WireMockOpenApiParser * . * . * . * opt * FromText * ab * . * private const string AdminOpenApi = "/__admin/openapi"; * fix test * rnd * . * urldetails * 0 * , * . * tests * . * CompressionUtilsTests * ut * .	2023-04-08 21:25:17 +02:00
Stef Heyenrath	3e24e3452b	Add Blogs	2023-04-01 11:21:16 +02:00
Walid Haidari	95bf8e31aa	#912 add excluded params to proxy mapping (#914 )	2023-03-24 16:35:09 +01:00
Stef Heyenrath	090989ea7f	Update comments for models (#913 )	2023-03-24 09:20:23 +01:00
Stef Heyenrath	651486f718	Make some classes internal + chnage some files to file-scoped namespaces	2023-03-22 21:57:23 +01:00
Stef Heyenrath	9dea577da1	1.5.21	2023-03-22 16:18:19 +01:00
Stef Heyenrath	7ca4294de6	Fixed QueryStringParser for UrlEncoded values (#911 )	2023-03-22 16:15:50 +01:00
Stef Heyenrath	66245409f9	RequestBuilder : add WithBodyAsJson and WithBody (with IJsonConverter) (#908 ) * RequestBuilder : add WithBodyAsJson and WithBody (with IJsonConverter) * tests	2023-03-22 15:47:58 +01:00
Stef Heyenrath	da6cb9fe0a	1.5.20	2023-03-19 10:23:24 +01:00
Stef Heyenrath	b30e4faab6	Fix issue with application/x-www-form-urlencoded and ExactMatcher (#907 )	2023-03-19 10:21:47 +01:00
Stef Heyenrath	1221d52c69	Add DeserializeFormUrl Encoded to the settings (#905 ) * Add DeserializeFormUrlEncoded to Settings * EmptyArray<>.Value * .	2023-03-19 09:19:53 +01:00