1.11.2

Revert JetBrains.Annotations and add System.Text.RegularExpressions to solve CVE (#1355 )
1.11.1
2026-01-13 13:53:34 +01:00 · 2025-08-27 10:25:31 +02:00 · 2025-08-27 10:04:36 +02:00 · 2025-08-27 08:47:58 +02:00 · 2025-08-27 08:45:24 +02:00 · 2025-08-27 08:33:01 +02:00
138 changed files with 2404 additions and 704 deletions
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -8,7 +8,7 @@ assignees: ''
 ---

 **Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+A clear and concise description of what the problem is.

 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
@@ -17,7 +17,7 @@ A clear and concise description of what you want to happen.
 A clear and concise description of any alternative solutions or features you've considered.

 **Is your feature request supported by [WireMock (java version)](https://www.wiremock.org)? Please provide details.**
-Provide relevant information if requested feature is supported in [Handlebarsjs](https://handlebarsjs.com/) but is missing in our implementation.
+Provide relevant information if requested feature is supported but is missing in this implementation.

 **Additional context**
 Add any other context or screenshots about the feature request here.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,35 @@
+# 1.11.2 (27 August 2025)
+- [#1352](https://github.com/wiremock/WireMock.Net/pull/1352) - Add additional try-catch to TypeLoader logic [feature] contributed by [StefH](https://github.com/StefH)
+- [#1354](https://github.com/wiremock/WireMock.Net/pull/1354) - Add System.Net.Http again to solve CVE warning [bug] contributed by [StefH](https://github.com/StefH)
+- [#1355](https://github.com/wiremock/WireMock.Net/pull/1355) - Revert JetBrains.Annotations and add System.Text.RegularExpressions t&#8230; [bug] contributed by [StefH](https://github.com/StefH)
+- [#1071](https://github.com/wiremock/WireMock.Net/issues/1071) - Split WireMock into multiple nuget packages depending on features [feature]
+- [#1351](https://github.com/wiremock/WireMock.Net/issues/1351) - Version 1.11.0 seems to have a dependency to non-existing version of JetBrans.Annotations [bug]
+- [#1353](https://github.com/wiremock/WireMock.Net/issues/1353) - 1.11.0: NU1903: Warning As Error: Package 'System.Net.Http' 4.3.0 has a known high severity vulnerability, https://github.com/advisories/GHSA-7jgj-8wvc-jh57 [bug]
+
+# 1.11.0 (26 August 2025)
+- [#1350](https://github.com/wiremock/WireMock.Net/pull/1350) - Create WireMock.Net.ProtoBuf project [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.10.1 (22 August 2025)
+- [#1349](https://github.com/wiremock/WireMock.Net/pull/1349) - Add AtPath and AtAbsolutePath to Assertions projects [feature] contributed by [StefH](https://github.com/StefH)
+- [#1348](https://github.com/wiremock/WireMock.Net/issues/1348) - Support AtPath and AtAbsolutePath in WireMockAssertions [feature]
+
+# 1.10.0 (18 August 2025)
+- [#1344](https://github.com/wiremock/WireMock.Net/pull/1344) - Add new package WireMock.Net.Extensions.Routing which provides minimal-API-style routing for WireMock.Net [feature] contributed by [GennadyGS](https://github.com/GennadyGS)
+- [#1340](https://github.com/wiremock/WireMock.Net/issues/1340) - Feature Request: Add minimal-API-style routing as Extension Package [feature]
+
+# 1.9.1 (17 August 2025)
+- [#1345](https://github.com/wiremock/WireMock.Net/pull/1345) - Add TimesInSameState to MappingModel [feature] contributed by [StefH](https://github.com/StefH)
+- [#1347](https://github.com/wiremock/WireMock.Net/pull/1347) - Fix generating source code for Scenario and State [bug] contributed by [StefH](https://github.com/StefH)
+- [#1343](https://github.com/wiremock/WireMock.Net/issues/1343) - MappingModel allows to configure the times for WillSetStateTo [feature]
+- [#1346](https://github.com/wiremock/WireMock.Net/issues/1346) - Mapping: generated C# code is missing InScenario and WillSetStateTo [bug]
+
+# 1.9.0 (10 August 2025)
+- [#1334](https://github.com/wiremock/WireMock.Net/pull/1334) - Create GraphQL project [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.8.18 (04 August 2025)
+- [#1339](https://github.com/wiremock/WireMock.Net/pull/1339) - Fixes an issue with matching JSON bodies as bytes [bug] contributed by [smfields](https://github.com/smfields)
+- [#1338](https://github.com/wiremock/WireMock.Net/issues/1338) - Specifying .WithBody(byte[]) fails to match for JSON bodies [bug]
+
 # 1.8.17 (23 July 2025)
 - [#1337](https://github.com/wiremock/WireMock.Net/pull/1337) - Make CSharpCodeMatcher public [bug] contributed by [StefH](https://github.com/StefH)
 - [#1336](https://github.com/wiremock/WireMock.Net/issues/1336) - Is CSharpCodeMatcher actually usable? [bug]
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
    </PropertyGroup>

    <PropertyGroup>
-        <VersionPrefix>1.8.17</VersionPrefix>
+        <Version>1.11.2</Version>
        <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
        <PackageProjectUrl>https://github.com/wiremock/WireMock.Net</PackageProjectUrl>
        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -58,7 +58,7 @@
    </ItemGroup>

    <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-        <PackageReference Include="SonarAnalyzer.CSharp" Version="9.32.0.97167">
+        <PackageReference Include="SonarAnalyzer.CSharp" Version="10.15.0.120848">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
--- a/Generate-ReleaseNotes.cmd
+++ b/Generate-ReleaseNotes.cmd
@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes

-SET version=1.8.17
+SET version=1.11.2

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

--- a/PackageReleaseNotes.txt
+++ b/PackageReleaseNotes.txt
@@ -1,5 +1,9 @@
-# 1.8.17 (23 July 2025)
- #1337 Make CSharpCodeMatcher public [bug]
- #1336 Is CSharpCodeMatcher actually usable? [bug]
+# 1.11.2 (27 August 2025)
+- #1352 Add additional try-catch to TypeLoader logic [feature]
+- #1354 Add System.Net.Http again to solve CVE warning [bug]
+- #1355 Revert JetBrains.Annotations and add System.Text.RegularExpressions t&#8230; [bug]
+- #1071 Split WireMock into multiple nuget packages depending on features [feature]
+- #1351 Version 1.11.0 seems to have a dependency to non-existing version of JetBrans.Annotations [bug]
+- #1353 1.11.0: NU1903: Warning As Error: Package 'System.Net.Http' 4.3.0 has a known high severity vulnerability, https://github.com/advisories/GHSA-7jgj-8wvc-jh57 [bug]

 The full release notes can be found here: https://github.com/wiremock/WireMock.Net/blob/master/CHANGELOG.md
--- a/README.md
+++ b/README.md
@@ -51,16 +51,19 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 | &nbsp;&nbsp;**WireMock.Net.xUnit** | [![NuGet Badge WireMock.Net.xUnit](https://img.shields.io/nuget/v/WireMock.Net.xUnit)](https://www.nuget.org/packages/WireMock.Net.xUnit) | [![MyGet Badge WireMock.Net.xUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.xUnit?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.xUnit)
 | &nbsp;&nbsp;**WireMock.Net.TUnit** | [![NuGet Badge WireMock.Net.TUnit](https://img.shields.io/nuget/v/WireMock.Net.TUnit)](https://www.nuget.org/packages/WireMock.Net.TUnit) | [![MyGet Badge WireMock.Net.TUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.TUnit?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.TUnit)
 | | | |
+| &nbsp;&nbsp;**WireMock.Net.Extensions.Routing** | [![NuGet Badge WireMock.Net.Extensions.Routing](https://img.shields.io/nuget/v/WireMock.Net.Extensions.Routing)](https://www.nuget.org/packages/WireMock.Net.Extensions.Routing) | [![MyGet Badge WireMock.Net.Extensions.Routing](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Extensions.Routing?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Extensions.Routing)
 | &nbsp;&nbsp;**WireMock.Net.Matchers.CSharpCode** | [![NuGet Badge WireMock.Net.Matchers.CSharpCode](https://img.shields.io/nuget/v/WireMock.Net.Matchers.CSharpCode)](https://www.nuget.org/packages/WireMock.Net.Matchers.CSharpCode) | [![MyGet Badge WireMock.Net.Matchers.CSharpCode](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Matchers.CSharpCode?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Matchers.CSharpCode)
 | &nbsp;&nbsp;**WireMock.Net.OpenApiParser** | [![NuGet Badge WireMock.Net.OpenApiParser](https://img.shields.io/nuget/v/WireMock.Net.OpenApiParser)](https://www.nuget.org/packages/WireMock.Net.OpenApiParser) | [![MyGet Badge WireMock.Net.OpenApiParser](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.OpenApiParser?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.OpenApiParser)
 | &nbsp;&nbsp;**WireMock.Net.MimePart** | [![NuGet Badge WireMock.Net.MimePart](https://img.shields.io/nuget/v/WireMock.Net.MimePart)](https://www.nuget.org/packages/WireMock.Net.MimePart) | [![MyGet Badge WireMock.Net.MimePart](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.MimePart?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.MimePart)
+| &nbsp;&nbsp;**WireMock.Net.GraphQL** | [![NuGet Badge WireMock.Net.GraphQL](https://img.shields.io/nuget/v/WireMock.Net.GraphQL)](https://www.nuget.org/packages/WireMock.Net.GraphQL) | [![MyGet Badge WireMock.Net.GraphQL](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.GraphQL?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.GraphQL)
+| &nbsp;&nbsp;**WireMock.Net.ProtoBuf** | [![NuGet Badge WireMock.Net.ProtoBuf](https://img.shields.io/nuget/v/WireMock.Net.ProtoBuf)](https://www.nuget.org/packages/WireMock.Net.ProtoBuf) | [![MyGet Badge WireMock.Net.ProtoBuf](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.ProtoBuf?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.ProtoBuf)
 | | | |
 | &nbsp;&nbsp;**WireMock.Net.RestClient** | [![NuGet Badge WireMock.Net.RestClient](https://img.shields.io/nuget/v/WireMock.Net.RestClient)](https://www.nuget.org/packages/WireMock.Net.RestClient) | [![MyGet Badge WireMock.Net.RestClient](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.RestClient?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.RestClient)
 | &nbsp;&nbsp;**WireMock.Org.RestClient** | [![NuGet Badge WireMock.Org.RestClient](https://img.shields.io/nuget/v/WireMock.Org.RestClient)](https://www.nuget.org/packages/WireMock.Org.RestClient) | [![MyGet Badge WireMock.Org.RestClient](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Org.RestClient?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Org.RestClient)

 <br />

-🔺 **WireMock.Net.Minimal** does not include: **WireMock.Net.MimePart**
+🔺 **WireMock.Net.Minimal** does not include *WireMock.Net.MimePart*, *WireMock.Net.GraphQL* and *WireMock.Net.ProtoBuf*.

 ---

--- a/Solution.sln
+++ b/Solution.sln
@@ -136,6 +136,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.ConsoleApp.Usi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Tests.UsingNuGet", "test\WireMock.Net.Tests.UsingNuGet\WireMock.Net.Tests.UsingNuGet.csproj", "{BBA332C6-28A9-42E7-9C4D-A0816E52A198}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.GraphQL", "src\WireMock.Net.GraphQL\WireMock.Net.GraphQL.csproj", "{B6269AAC-170A-4346-8B9A-444DED3D9A45}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Extensions.Routing.Tests", "test\WireMock.Net.Extensions.Routing.Tests\WireMock.Net.Extensions.Routing.Tests.csproj", "{3FCBCA9C-9DB0-4A96-B47E-30470764CC9C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Extensions.Routing", "src\WireMock.Net.Extensions.Routing\WireMock.Net.Extensions.Routing.csproj", "{1E874C8F-08A2-493B-8421-619F9A6E9E77}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.ProtoBuf", "src\WireMock.Net.ProtoBuf\WireMock.Net.ProtoBuf.csproj", "{B47413AA-55D3-49A7-896A-17ADBFF72407}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -326,6 +334,22 @@ Global
 		{BBA332C6-28A9-42E7-9C4D-A0816E52A198}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BBA332C6-28A9-42E7-9C4D-A0816E52A198}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BBA332C6-28A9-42E7-9C4D-A0816E52A198}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6269AAC-170A-4346-8B9A-444DED3D9A45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-444DED3D9A45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-444DED3D9A45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6269AAC-170A-4346-8B9A-444DED3D9A45}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3FCBCA9C-9DB0-4A96-B47E-30470764CC9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3FCBCA9C-9DB0-4A96-B47E-30470764CC9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3FCBCA9C-9DB0-4A96-B47E-30470764CC9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3FCBCA9C-9DB0-4A96-B47E-30470764CC9C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E874C8F-08A2-493B-8421-619F9A6E9E77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E874C8F-08A2-493B-8421-619F9A6E9E77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E874C8F-08A2-493B-8421-619F9A6E9E77}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E874C8F-08A2-493B-8421-619F9A6E9E77}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B47413AA-55D3-49A7-896A-17ADBFF72407}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B47413AA-55D3-49A7-896A-17ADBFF72407}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B47413AA-55D3-49A7-896A-17ADBFF72407}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B47413AA-55D3-49A7-896A-17ADBFF72407}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -379,6 +403,10 @@ Global
 		{BFEF8990-65B3-4274-310F-7355F0B84035} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{1F80A6E6-D146-4E40-9EA8-49DB8494239F} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{BBA332C6-28A9-42E7-9C4D-A0816E52A198} = {0BB8B634-407A-4610-A91F-11586990767A}
+		{B6269AAC-170A-4346-8B9A-444DED3D9A45} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{3FCBCA9C-9DB0-4A96-B47E-30470764CC9C} = {0BB8B634-407A-4610-A91F-11586990767A}
+		{1E874C8F-08A2-493B-8421-619F9A6E9E77} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{B47413AA-55D3-49A7-896A-17ADBFF72407} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs
@@ -56,6 +56,11 @@ public class MappingModel
    /// In case the value is null state will not be changed.
    /// </summary>
    public string? SetStateTo { get; set; }
+    
+    /// <summary>
+    /// The number of times this match should be matched before the state will be changed to the specified one.
+    /// </summary>
+    public int? TimesInSameState { get; set; }

    /// <summary>
    /// The request model.
@@ -86,7 +91,7 @@ public class MappingModel
    /// Fire and forget for webhooks.
    /// </summary>
    public bool? UseWebhooksFireAndForget { get; set; }
-    
+
    /// <summary>
    /// Data Object which can be used when WithTransformer is used.
    /// e.g. lookup a path in this object using
--- a/src/WireMock.Net.Abstractions/IResponseMessage.cs
+++ b/src/WireMock.Net.Abstractions/IResponseMessage.cs
@@ -15,12 +15,12 @@ public interface IResponseMessage
    /// <summary>
    /// The Body.
    /// </summary>
-    IBodyData? BodyData { get; }
+    IBodyData? BodyData { get; set; }

    /// <summary>
    /// Gets the body destination (Null, SameAsSource, String or Bytes).
    /// </summary>
-    string? BodyDestination { get; }
+    string? BodyDestination { get; set; }

    /// <summary>
    /// Gets or sets the body.
@@ -30,27 +30,27 @@ public interface IResponseMessage
    /// <summary>
    /// Gets the Fault percentage.
    /// </summary>
-    double? FaultPercentage { get; }
+    double? FaultPercentage { get; set; }

    /// <summary>
    /// The FaultType.
    /// </summary>
-    FaultType FaultType { get; }
+    FaultType FaultType { get; set; }

    /// <summary>
    /// Gets the headers.
    /// </summary>
-    IDictionary<string, WireMockList<string>>? Headers { get; }
+    IDictionary<string, WireMockList<string>>? Headers { get; set; }

    /// <summary>
    /// Gets the trailing headers.
    /// </summary>
-    IDictionary<string, WireMockList<string>>? TrailingHeaders { get; }
+    IDictionary<string, WireMockList<string>>? TrailingHeaders { get; set; }

    /// <summary>
    /// Gets or sets the status code.
    /// </summary>
-    object? StatusCode { get; }
+    object? StatusCode { get; set; }

    /// <summary>
    /// Adds the header.
--- a/src/WireMock.Net.Abstractions/Models/GraphQL/ISchemaData.cs
+++ b/src/WireMock.Net.Abstractions/Models/GraphQL/ISchemaData.cs
@@ -0,0 +1,5 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.Models.GraphQL;
+
+public interface ISchemaData;
--- a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
+++ b/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
@@ -38,7 +38,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <!-- CVE-2018-8292 -->
+        <!-- CVE-2018-8292 / https://github.com/advisories/GHSA-7jgj-8wvc-jh57 -->
        <PackageReference Include="System.Net.Http " Version="4.3.4" />

        <!-- See also https://mstack.nl/blog/20210801-source-generators -->
@@ -50,34 +50,15 @@
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
-        <!--<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="Stef.Validation" Version="0.1.1" />
-        <PackageReference Include="AnyOf" Version="0.4.0" />-->
    </ItemGroup>

    <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) and '$(TargetFramework)' != 'netstandard1.0'">
      <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.0" />
    </ItemGroup>

-    <!--<ItemGroup>
-        <PackageReference Include="Nullable" Version="1.3.1">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-    </ItemGroup>-->

    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net461'">
        <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-
-        <!--<PackageReference Include="Nullable" Version="1.3.1">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>-->
-
-        <!--<PackageReference Include="PolySharp" Version="1.14.1">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>-->
    </ItemGroup>

 </Project>
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockANumberOfCallsAssertions.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockANumberOfCallsAssertions.cs
@@ -4,11 +4,11 @@ using Stef.Validation;
 using WireMock.Server;

 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
+namespace WireMock.AwesomeAssertions;

 /// <summary>
 /// Provides assertion methods to verify the number of calls made to a WireMock server.
-/// This class is used in the context of FluentAssertions.
+/// This class is used in the context of AwesomeAssertions.
 /// </summary>
 public class WireMockANumberOfCallsAssertions
 {
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.AtPath.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.AtPath.cs
@@ -0,0 +1,83 @@
+// Copyright © WireMock.Net
+
+using WireMock.Extensions;
+using WireMock.Matchers;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.AwesomeAssertions;
+
+#pragma warning disable CS1591
+public partial class WireMockAssertions
+{
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> AtAbsolutePath(string absolutePath, string because = "", params object[] becauseArgs)
+    {
+        _ = AtAbsolutePath(new ExactMatcher(true, absolutePath), because, becauseArgs);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, absolutePath);
+    }
+
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, IStringMatcher> AtAbsolutePath(IStringMatcher absolutePathMatcher, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => absolutePathMatcher.IsPerfectMatch(request.AbsolutePath));
+
+        var absolutePath = absolutePathMatcher.GetPatterns().FirstOrDefault().GetPattern();
+
+        _chain
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the absolute path {0}{reason}, but no calls were made.",
+                absolutePath
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the absolute path {0}{reason}, but didn't find it among the calls to {1}.",
+                _ => absolutePath,
+                requests => requests.Select(request => request.AbsolutePath)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, IStringMatcher>(this, absolutePathMatcher);
+    }
+
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> AtPath(string path, string because = "", params object[] becauseArgs)
+    {
+        _ = AtPath(new ExactMatcher(true, path), because, becauseArgs);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, path);
+    }
+
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, IStringMatcher> AtPath(IStringMatcher pathMatcher, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => pathMatcher.IsPerfectMatch(request.Path));
+
+        var path = pathMatcher.GetPatterns().FirstOrDefault().GetPattern();
+
+        _chain
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the path {0}{reason}, but no calls were made.",
+                path
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the path {0}{reason}, but didn't find it among the calls to {1}.",
+                _ => path,
+                requests => requests.Select(request => request.Path)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, IStringMatcher>(this, pathMatcher);
+    }
+}
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.AtUrl.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.AtUrl.cs
@@ -4,7 +4,7 @@ using WireMock.Extensions;
 using WireMock.Matchers;

 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
+namespace WireMock.AwesomeAssertions;

 #pragma warning disable CS1591
 public partial class WireMockAssertions
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.FromClientIP.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.FromClientIP.cs
@@ -4,7 +4,7 @@
 using System;

 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
+namespace WireMock.AwesomeAssertions;

 public partial class WireMockAssertions
 {
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.UsingMethod.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.UsingMethod.cs
@@ -5,7 +5,7 @@ using System;
 using WireMock.Constants;

 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
+namespace WireMock.AwesomeAssertions;

 public partial class WireMockAssertions
 {
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithBody.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithBody.cs
@@ -11,7 +11,7 @@ using WireMock.Matchers;
 using WireMock.Models;

 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
+namespace WireMock.AwesomeAssertions;

 public partial class WireMockAssertions
 {
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithHeader.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithHeader.cs
@@ -3,7 +3,7 @@
 #pragma warning disable CS1591

 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
+namespace WireMock.AwesomeAssertions;

 public partial class WireMockAssertions
 {
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithProxy.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithProxy.cs
@@ -4,7 +4,7 @@
 using System;

 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
+namespace WireMock.AwesomeAssertions;

 public partial class WireMockAssertions
 {
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.cs
@@ -7,7 +7,7 @@ using WireMock.Matchers;
 using WireMock.Server;

 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
+namespace WireMock.AwesomeAssertions;

 public partial class WireMockAssertions
 {
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockReceivedAssertions.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockReceivedAssertions.cs
@@ -4,7 +4,7 @@ using AwesomeAssertions.Primitives;
 using WireMock.Server;

 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
+namespace WireMock.AwesomeAssertions;

 /// <summary>
 /// Contains a number of methods to assert that the <see cref="IWireMockServer"/> is in the expected state.
--- a/src/WireMock.Net.AwesomeAssertions/Extensions/WireMockExtensions.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Extensions/WireMockExtensions.cs
@@ -3,7 +3,7 @@
 using WireMock.Server;

 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions
+namespace WireMock.AwesomeAssertions
 {
    /// <summary>
    /// Contains extension methods for custom assertions in unit tests.
--- a/src/WireMock.Net.Extensions.Routing/Delegates/WireMockHttpRequestHandler.cs
+++ b/src/WireMock.Net.Extensions.Routing/Delegates/WireMockHttpRequestHandler.cs
@@ -0,0 +1,10 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.Net.Extensions.Routing.Delegates;
+
+/// <summary>
+/// Represents a handler for processing WireMock.Net HTTP requests and returning a response asynchronously.
+/// </summary>
+/// <param name="requestMessage">The incoming request message.</param>
+/// <returns>A task that resolves to a <see cref="ResponseMessage"/>.</returns>
+public delegate Task<IResponseMessage> WireMockHttpRequestHandler(IRequestMessage requestMessage);
--- a/src/WireMock.Net.Extensions.Routing/Delegates/WireMockMiddleware.cs
+++ b/src/WireMock.Net.Extensions.Routing/Delegates/WireMockMiddleware.cs
@@ -0,0 +1,10 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.Net.Extensions.Routing.Delegates;
+
+/// <summary>
+/// Represents a middleware component for WireMock.Net HTTP request handling.
+/// </summary>
+/// <param name="next">The next request handler in the middleware pipeline.</param>
+/// <returns>A <see cref="WireMockHttpRequestHandler"/> that processes the request.</returns>
+public delegate WireMockHttpRequestHandler WireMockMiddleware(WireMockHttpRequestHandler next);
--- a/src/WireMock.Net.Extensions.Routing/Extensions/DictionaryExtensions.cs
+++ b/src/WireMock.Net.Extensions.Routing/Extensions/DictionaryExtensions.cs
@@ -0,0 +1,19 @@
+// Copyright © WireMock.Net
+
+using System.Collections.Immutable;
+
+namespace WireMock.Net.Extensions.Routing.Extensions;
+
+internal static class DictionaryExtensions
+{
+    public static IDictionary<TKey, TValue> AddIf<TKey, TValue>(
+        this IDictionary<TKey, TValue> source,
+        bool condition,
+        TKey key,
+        TValue value,
+        IEqualityComparer<TKey>? keyComparer = null)
+        where TKey : notnull =>
+        condition
+            ? source.ToImmutableDictionary(keyComparer).Add(key, value)
+            : source;
+}
--- a/src/WireMock.Net.Extensions.Routing/Extensions/HttpResponseExtensions.cs
+++ b/src/WireMock.Net.Extensions.Routing/Extensions/HttpResponseExtensions.cs
@@ -0,0 +1,34 @@
+// Copyright © WireMock.Net
+
+using Microsoft.AspNetCore.Http;
+using WireMock.Types;
+using WireMock.Util;
+
+namespace WireMock.Net.Extensions.Routing.Extensions;
+
+internal static class HttpResponseExtensions
+{
+    public static async Task<ResponseMessage> ToResponseMessageAsync(
+        this HttpResponse response)
+    {
+        var headers = response.Headers.ToDictionary(
+            header => header.Key, header => new WireMockList<string?>(header.Value.ToArray()));
+        return new()
+        {
+            Headers = headers!,
+            BodyData = new BodyData
+            {
+                DetectedBodyType = BodyType.String,
+                BodyAsString = await response.ReadBodyAsStringAsync(),
+            },
+            StatusCode = response.StatusCode,
+        };
+    }
+
+    public static async Task<string> ReadBodyAsStringAsync(this HttpResponse response)
+    {
+        response.Body.Seek(0, SeekOrigin.Begin);
+        using var reader = new StreamReader(response.Body);
+        return await reader.ReadToEndAsync();
+    }
+}
--- a/src/WireMock.Net.Extensions.Routing/Extensions/RequestMessageExtensions.cs
+++ b/src/WireMock.Net.Extensions.Routing/Extensions/RequestMessageExtensions.cs
@@ -0,0 +1,16 @@
+// Copyright © WireMock.Net
+
+using JsonConverter.Abstractions;
+
+namespace WireMock.Net.Extensions.Routing.Extensions;
+
+internal static class RequestMessageExtensions
+{
+    public static T? GetBodyAsJson<T>(
+        this IRequestMessage requestMessage,
+        IJsonConverter jsonConverter,
+        JsonConverterOptions? jsonOptions = null) =>
+        requestMessage.Body is not null
+            ? jsonConverter.Deserialize<T>(requestMessage.Body, jsonOptions)
+            : default;
+}
--- a/src/WireMock.Net.Extensions.Routing/Extensions/StringExtensions.cs
+++ b/src/WireMock.Net.Extensions.Routing/Extensions/StringExtensions.cs
@@ -0,0 +1,9 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.Net.Extensions.Routing.Extensions;
+
+internal static class StringExtensions
+{
+    public static string ToMatchFullStringRegex(this string regex) =>
+        $"^{regex}$";
+}
--- a/src/WireMock.Net.Extensions.Routing/Extensions/TaskExtensions.cs
+++ b/src/WireMock.Net.Extensions.Routing/Extensions/TaskExtensions.cs
@@ -0,0 +1,39 @@
+// Copyright © WireMock.Net
+
+using System.Reflection;
+
+namespace WireMock.Net.Extensions.Routing.Extensions;
+
+internal static class TaskExtensions
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage(
+        "Usage",
+        "VSTHRD003:Avoid awaiting foreign Tasks",
+        Justification = "Await is required here to transform base task to generic one.")]
+    public static async Task<object?> ToGenericTaskAsync(this Task task)
+    {
+        await task;
+        var taskType = task.GetType();
+        if (!IsAssignableToGenericTaskType(taskType))
+        {
+            return null;
+        }
+
+        return task
+            .GetType()
+            .GetProperty("Result", BindingFlags.Instance | BindingFlags.Public)!
+            .GetValue(task);
+    }
+
+    private static bool IsAssignableToGenericTaskType(Type type)
+    {
+        if (type.IsGenericType &&
+            type.GetGenericTypeDefinition() == typeof(Task<>) &&
+            type.GetGenericArguments()[0] != Type.GetType("System.Threading.Tasks.VoidTaskResult"))
+        {
+            return true;
+        }
+
+        return type.BaseType is not null && IsAssignableToGenericTaskType(type.BaseType);
+    }
+}
--- a/src/WireMock.Net.Extensions.Routing/Extensions/WireMockHttpRequestHandlerExtensions.cs
+++ b/src/WireMock.Net.Extensions.Routing/Extensions/WireMockHttpRequestHandlerExtensions.cs
@@ -0,0 +1,17 @@
+// Copyright © WireMock.Net
+
+using WireMock.Net.Extensions.Routing.Delegates;
+
+namespace WireMock.Net.Extensions.Routing.Extensions;
+
+internal static class WireMockHttpRequestHandlerExtensions
+{
+    public static WireMockHttpRequestHandler UseMiddleware(
+        this WireMockHttpRequestHandler handler, WireMockMiddleware middleware) =>
+        middleware(handler);
+
+    public static WireMockHttpRequestHandler UseMiddlewareCollection(
+        this WireMockHttpRequestHandler handler,
+        IReadOnlyCollection<WireMockMiddleware> middlewareCollection) =>
+        middlewareCollection.Aggregate(handler, UseMiddleware);
+}
--- a/src/WireMock.Net.Extensions.Routing/Extensions/WireMockRouterExtensions.cs
+++ b/src/WireMock.Net.Extensions.Routing/Extensions/WireMockRouterExtensions.cs
@@ -0,0 +1,224 @@
+// Copyright © WireMock.Net
+
+using JsonConverter.Abstractions;
+using WireMock.Net.Extensions.Routing.Models;
+
+namespace WireMock.Net.Extensions.Routing.Extensions;
+
+/// <summary>
+/// Provides extension methods for mapping HTTP routes to handlers in <see cref="WireMockRouter"/>.
+/// </summary>
+public static class WireMockRouterExtensions
+{
+    /// <summary>
+    /// Maps a GET request to a synchronous request handler.
+    /// </summary>
+    /// <param name="source">The router to extend.</param>
+    /// <param name="pattern">The route pattern.</param>
+    /// <param name="requestHandler">The request handler function.</param>
+    /// <returns>The current <see cref="WireMockRouter"/> instance.</returns>
+    public static WireMockRouter MapGet(
+        this WireMockRouter source,
+        string pattern,
+        Func<WireMockRequestInfo, object?> requestHandler) =>
+        source.Map(HttpMethod.Get.Method, pattern, requestHandler);
+
+    /// <summary>
+    /// Maps a GET request to an asynchronous request handler.
+    /// </summary>
+    /// <param name="source">The router to extend.</param>
+    /// <param name="pattern">The route pattern.</param>
+    /// <param name="requestHandler">The asynchronous request handler function.</param>
+    /// <returns>The current <see cref="WireMockRouter"/> instance.</returns>
+    public static WireMockRouter MapGet(
+        this WireMockRouter source,
+        string pattern,
+        Func<WireMockRequestInfo, Task<object?>> requestHandler) =>
+        source.Map(HttpMethod.Get.Method, pattern, requestHandler);
+
+    /// <summary>
+    /// Maps a POST request to a synchronous request handler.
+    /// </summary>
+    /// <param name="source">The router to extend.</param>
+    /// <param name="pattern">The route pattern.</param>
+    /// <param name="requestHandler">The request handler function.</param>
+    /// <returns>The current <see cref="WireMockRouter"/> instance.</returns>
+    public static WireMockRouter MapPost(
+        this WireMockRouter source,
+        string pattern,
+        Func<WireMockRequestInfo, object?> requestHandler) =>
+        source.Map(HttpMethod.Post.Method, pattern, requestHandler);
+
+    /// <summary>
+    /// Maps a POST request to an asynchronous request handler.
+    /// </summary>
+    /// <param name="source">The router to extend.</param>
+    /// <param name="pattern">The route pattern.</param>
+    /// <param name="requestHandler">The asynchronous request handler function.</param>
+    /// <returns>The current <see cref="WireMockRouter"/> instance.</returns>
+    public static WireMockRouter MapPost(
+        this WireMockRouter source,
+        string pattern,
+        Func<WireMockRequestInfo, Task<object?>> requestHandler) =>
+        source.Map(HttpMethod.Post.Method, pattern, requestHandler);
+
+    /// <summary>
+    /// Maps a POST request to a synchronous request handler with a typed body.
+    /// </summary>
+    /// <typeparam name="TRequest">The type of the request body.</typeparam>
+    /// <param name="source">The router to extend.</param>
+    /// <param name="pattern">The route pattern.</param>
+    /// <param name="requestHandler">The request handler function.</param>
+    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
+    /// <param name="jsonOptions">The <see cref="JsonConverterOptions"/> [optional].</param>
+    /// <returns>The current <see cref="WireMockRouter"/> instance.</returns>
+    public static WireMockRouter MapPost<TRequest>(
+        this WireMockRouter source,
+        string pattern,
+        Func<WireMockRequestInfo<TRequest>, object?> requestHandler,
+        IJsonConverter? jsonConverter = null,
+        JsonConverterOptions? jsonOptions = null) =>
+        source.Map(HttpMethod.Post.Method, pattern, requestHandler, jsonConverter, jsonOptions);
+
+    /// <summary>
+    /// Maps a POST request to an asynchronous request handler with a typed body.
+    /// </summary>
+    /// <typeparam name="TRequest">The type of the request body.</typeparam>
+    /// <param name="source">The router to extend.</param>
+    /// <param name="pattern">The route pattern.</param>
+    /// <param name="requestHandler">The asynchronous request handler function.</param>
+    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
+    /// <param name="jsonOptions">The <see cref="JsonConverterOptions"/> [optional].</param>
+    /// <returns>The current <see cref="WireMockRouter"/> instance.</returns>
+    public static WireMockRouter MapPost<TRequest>(
+        this WireMockRouter source,
+        string pattern,
+        Func<WireMockRequestInfo<TRequest>, Task<object?>> requestHandler,
+        IJsonConverter? jsonConverter = null,
+        JsonConverterOptions? jsonOptions = null) =>
+        source.Map(HttpMethod.Post.Method, pattern, requestHandler, jsonConverter, jsonOptions);
+
+    /// <summary>
+    /// Maps a PUT request to a synchronous request handler.
+    /// </summary>
+    /// <param name="source">The router to extend.</param>
+    /// <param name="pattern">The route pattern.</param>
+    /// <param name="requestHandler">The request handler function.</param>
+    /// <returns>The current <see cref="WireMockRouter"/> instance.</returns>
+    public static WireMockRouter MapPut(
+        this WireMockRouter source,
+        string pattern,
+        Func<WireMockRequestInfo, object?> requestHandler) =>
+        source.Map(HttpMethod.Put.Method, pattern, requestHandler);
+
+    /// <summary>
+    /// Maps a PUT request to an asynchronous request handler.
+    /// </summary>
+    /// <param name="source">The router to extend.</param>
+    /// <param name="pattern">The route pattern.</param>
+    /// <param name="requestHandler">The asynchronous request handler function.</param>
+    /// <returns>The current <see cref="WireMockRouter"/> instance.</returns>
+    public static WireMockRouter MapPut(
+        this WireMockRouter source,
+        string pattern,
+        Func<WireMockRequestInfo, Task<object?>> requestHandler) =>
+        source.Map(HttpMethod.Put.Method, pattern, requestHandler);
+
+    /// <summary>
+    /// Maps a PUT request to a synchronous request handler with a typed body.
+    /// </summary>
+    /// <typeparam name="TRequest">The type of the request body.</typeparam>
+    /// <param name="source">The router to extend.</param>
+    /// <param name="pattern">The route pattern.</param>
+    /// <param name="requestHandler">The request handler function.</param>
+    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
+    /// <param name="jsonOptions">The <see cref="JsonConverterOptions"/> [optional].</param>
+    /// <returns>The current <see cref="WireMockRouter"/> instance.</returns>
+    public static WireMockRouter MapPut<TRequest>(
+        this WireMockRouter source,
+        string pattern,
+        Func<WireMockRequestInfo<TRequest>, object?> requestHandler,
+        IJsonConverter? jsonConverter = null,
+        JsonConverterOptions? jsonOptions = null) =>
+        source.Map(HttpMethod.Put.Method, pattern, requestHandler, jsonConverter, jsonOptions);
+
+    /// <summary>
+    /// Maps a PUT request to an asynchronous request handler with a typed body.
+    /// </summary>
+    /// <typeparam name="TRequest">The type of the request body.</typeparam>
+    /// <param name="source">The router to extend.</param>
+    /// <param name="pattern">The route pattern.</param>
+    /// <param name="requestHandler">The asynchronous request handler function.</param>
+    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
+    /// <param name="jsonOptions">The <see cref="JsonConverterOptions"/> [optional].</param>
+    /// <returns>The current <see cref="WireMockRouter"/> instance.</returns>
+    public static WireMockRouter MapPut<TRequest>(
+        this WireMockRouter source,
+        string pattern,
+        Func<WireMockRequestInfo<TRequest>, Task<object?>> requestHandler,
+        IJsonConverter? jsonConverter = null,
+        JsonConverterOptions? jsonOptions = null) =>
+        source.Map(HttpMethod.Put.Method, pattern, requestHandler, jsonConverter, jsonOptions);
+
+    /// <summary>
+    /// Maps a DELETE request to a synchronous request handler.
+    /// </summary>
+    /// <param name="source">The router to extend.</param>
+    /// <param name="pattern">The route pattern.</param>
+    /// <param name="requestHandler">The request handler function.</param>
+    /// <returns>The current <see cref="WireMockRouter"/> instance.</returns>
+    public static WireMockRouter MapDelete(
+        this WireMockRouter source,
+        string pattern,
+        Func<WireMockRequestInfo, object?> requestHandler) =>
+        source.Map(HttpMethod.Delete.Method, pattern, requestHandler);
+
+    /// <summary>
+    /// Maps a DELETE request to an asynchronous request handler.
+    /// </summary>
+    /// <param name="source">The router to extend.</param>
+    /// <param name="pattern">The route pattern.</param>
+    /// <param name="requestHandler">The asynchronous request handler function.</param>
+    /// <returns>The current <see cref="WireMockRouter"/> instance.</returns>
+    public static WireMockRouter MapDelete(
+        this WireMockRouter source,
+        string pattern,
+        Func<WireMockRequestInfo, Task<object?>> requestHandler) =>
+        source.Map(HttpMethod.Delete.Method, pattern, requestHandler);
+
+    /// <summary>
+    /// Maps a DELETE request to a synchronous request handler with a typed body.
+    /// </summary>
+    /// <typeparam name="TRequest">The type of the request body.</typeparam>
+    /// <param name="source">The router to extend.</param>
+    /// <param name="pattern">The route pattern.</param>
+    /// <param name="requestHandler">The request handler function.</param>
+    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
+    /// <param name="jsonOptions">The <see cref="JsonConverterOptions"/> [optional].</param>
+    /// <returns>The current <see cref="WireMockRouter"/> instance.</returns>
+    public static WireMockRouter MapDelete<TRequest>(
+        this WireMockRouter source,
+        string pattern,
+        Func<WireMockRequestInfo<TRequest>, object?> requestHandler,
+        IJsonConverter? jsonConverter = null,
+        JsonConverterOptions? jsonOptions = null) =>
+        source.Map(HttpMethod.Delete.Method, pattern, requestHandler, jsonConverter, jsonOptions);
+
+    /// <summary>
+    /// Maps a DELETE request to an asynchronous request handler with a typed body.
+    /// </summary>
+    /// <typeparam name="TRequest">The type of the request body.</typeparam>
+    /// <param name="source">The router to extend.</param>
+    /// <param name="pattern">The route pattern.</param>
+    /// <param name="requestHandler">The asynchronous request handler function.</param>
+    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
+    /// <param name="jsonOptions">The <see cref="JsonConverterOptions"/> [optional].</param>
+    /// <returns>The current <see cref="WireMockRouter"/> instance.</returns>
+    public static WireMockRouter MapDelete<TRequest>(
+        this WireMockRouter source,
+        string pattern,
+        Func<WireMockRequestInfo<TRequest>, Task<object?>> requestHandler,
+        IJsonConverter? jsonConverter = null,
+        JsonConverterOptions? jsonOptions = null) =>
+        source.Map(HttpMethod.Delete.Method, pattern, requestHandler, jsonConverter, jsonOptions);
+}
--- a/src/WireMock.Net.Extensions.Routing/Extensions/WireMockServerExtensions.cs
+++ b/src/WireMock.Net.Extensions.Routing/Extensions/WireMockServerExtensions.cs
@@ -0,0 +1,35 @@
+// Copyright © WireMock.Net
+
+using WireMock.Matchers;
+using WireMock.Net.Extensions.Routing.Delegates;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Server;
+
+namespace WireMock.Net.Extensions.Routing.Extensions;
+
+/// <summary>
+/// Provides extension methods for mapping HTTP requests to handlers in <see cref="WireMockServer"/>.
+/// </summary>
+public static class WireMockServerExtensions
+{
+    /// <summary>
+    /// Maps a request to a WireMock.Net server using the specified method, path matcher, and request handler.
+    /// </summary>
+    /// <param name="source">The WireMock.Net server to extend.</param>
+    /// <param name="method">The HTTP method to match.</param>
+    /// <param name="pathMatcher">The matcher for the request path.</param>
+    /// <param name="httpRequestHandler">The handler to process the request.</param>
+    /// <returns>The current <see cref="WireMockServer"/> instance.</returns>
+    public static WireMockServer Map(
+        this WireMockServer source,
+        string method,
+        IStringMatcher pathMatcher,
+        WireMockHttpRequestHandler httpRequestHandler)
+    {
+        source
+            .Given(Request.Create().WithPath(pathMatcher).UsingMethod(method))
+            .RespondWith(Response.Create().WithCallback(req => httpRequestHandler(req)));
+        return source;
+    }
+}
--- a/src/WireMock.Net.Extensions.Routing/Models/WireMockRequestInfo.cs
+++ b/src/WireMock.Net.Extensions.Routing/Models/WireMockRequestInfo.cs
@@ -0,0 +1,29 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.Net.Extensions.Routing.Models;
+
+/// <summary>
+/// Represents request information for WireMock.Net routing, including the request message and route arguments.
+/// </summary>
+public class WireMockRequestInfo
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockRequestInfo"/> class.
+    /// </summary>
+    /// <param name="request">The incoming request message.</param>
+    public WireMockRequestInfo(IRequestMessage request)
+    {
+        Request = request;
+    }
+
+    /// <summary>
+    /// Gets the incoming request message.
+    /// </summary>
+    public IRequestMessage Request { get; }
+
+    /// <summary>
+    /// Gets or initializes the route arguments extracted from the request path.
+    /// </summary>
+    public IDictionary<string, object> RouteArgs { get; init; } =
+        new Dictionary<string, object>();
+}
--- a/src/WireMock.Net.Extensions.Routing/Models/WireMockRequestInfo{TBody}.cs
+++ b/src/WireMock.Net.Extensions.Routing/Models/WireMockRequestInfo{TBody}.cs
@@ -0,0 +1,24 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.Net.Extensions.Routing.Models;
+
+/// <summary>
+/// Represents request information with a strongly-typed deserialized body for WireMock.Net routing.
+/// </summary>
+/// <typeparam name="TBody">The type of the deserialized request body.</typeparam>
+public sealed class WireMockRequestInfo<TBody> : WireMockRequestInfo
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockRequestInfo{TBody}"/> class.
+    /// </summary>
+    /// <param name="request">The incoming request message.</param>
+    public WireMockRequestInfo(IRequestMessage request)
+        : base(request)
+    {
+    }
+
+    /// <summary>
+    /// Gets or initializes the deserialized request body.
+    /// </summary>
+    public TBody? Body { get; init; }
+}
--- a/src/WireMock.Net.Extensions.Routing/README.md
+++ b/src/WireMock.Net.Extensions.Routing/README.md
@@ -0,0 +1,138 @@
+# WireMock.Net.Extensions.Routing
+
+**WireMock.Net.Extensions.Routing** extends [WireMock.Net](https://github.com/wiremock/wiremock) with modern, minimal-API-style routing for .NET. It provides extension methods for expressive, maintainable, and testable HTTP routing, inspired by [ASP.NET Core Minimal APIs](https://learn.microsoft.com/en-us/aspnet/core/fundamentals/minimal-apis?view=aspnetcore-9.0).
+
+---
+
+## Motivation
+
+While [WireMock.Net](https://github.com/WireMock-Net/WireMock.Net) is a powerful tool for HTTP mocking in .NET, its native API for defining routes and request handlers can be verbose and require significant boilerplate. Setting up even simple endpoints often involves multiple chained method calls, manual parsing of request data, and repetitive configuration, which can make tests harder to read and maintain.
+
+**WireMock.Net.Extensions.Routing** addresses these pain points by introducing a concise, fluent, and minimal-API-inspired approach to routing. This makes your test code:
+
+- **More readable:** Route definitions are clear and expressive, closely resembling production minimal APIs.
+- **Easier to maintain:** Less boilerplate means fewer places for errors and easier refactoring.
+- **Faster to write:** Define routes and handlers in a single line, with strong typing and async support.
+
+### Example: Native WireMock.Net vs. WireMock.Net.Extensions.Routing
+
+#### Native WireMock.Net
+
+```csharp
+server.Given(
+    Request.Create().WithPath("/hello").UsingGet()
+)
+.RespondWith(
+    Response.Create().WithBody("Hello, world!")
+);
+
+server.Given(
+    Request.Create().WithPath("/user/*").UsingGet()
+)
+.RespondWith(
+    Response.Create().WithCallback(request =>
+    {
+        var id = request.PathSegments[1];
+        // ...fetch user by id...
+        return new ResponseMessage { Body = $"User: {id}" };
+    })
+);
+```
+
+#### With WireMock.Net.Extensions.Routing
+
+```csharp
+router.MapGet("/hello", _ => "Hello, world!");
+
+router.MapGet("/user/{id:int}", requestInfo =>
+{
+    var id = requestInfo.RouteArgs["id"];
+    // ...fetch user by id...
+    return $"User: {id}";
+});
+```
+
+With **WireMock.Net.Extensions.Routing**, you get:
+
+- Minimal, one-line route definitions
+- Typed route parameters (e.g., `{id:int}`)
+- Direct access to parsed route arguments and request bodies
+- Async handler support
+
+This leads to more maintainable, scalable, and production-like test code.
+
+---
+
+## Features
+
+- Minimal API-style route definitions for WireMock.Net
+- Strongly-typed request handling
+- Routing parameters with constraints (`int` and `string` are currently supported)
+- Asynchronous handlers
+- Fluent, composable routing extensions
+- Easy integration with existing WireMock.Net servers
+- .NET 8+ support
+
+---
+
+## Installation
+
+Install from NuGet:
+
+```shell
+dotnet add package WireMock.Net.Extensions.Routing
+```
+
+---
+
+## Quick Start
+
+```csharp
+using System.Net.Http.Json;
+using WireMock.Net.Extensions.Routing;
+using WireMock.Net.Extensions.Routing.Extensions;
+using WireMock.Server;
+
+var server = WireMockServer.Start();
+var router = new WireMockRouter(server);
+
+router.MapGet("/hello", _ => "Hello, world!");
+
+using var client = server.CreateClient();
+var result = await client.GetFromJsonAsync<string>("/hello");
+// Hello, world!
+```
+
+---
+
+## Usage
+
+### Routing with route parameters
+
+```csharp
+router.MapGet("/user/{id:int}", async requestInfo => {
+    var userId = requestInfo.RouteArgs["id"];
+    // var user = await ...
+    return user;
+});
+```
+
+### Strongly-Typed Request Info
+
+```csharp
+router.MapPost<Item>("/api/items", requestInfo => {
+    var item = requestInfo.Body!;
+    // process item
+    return Results.Json(new { success = true });
+});
+```
+
+### Supported Methods
+
+- `MapGet`, `MapPost`, `MapPut`, `MapDelete`
+---
+
+## Documentation
+
+- [API Reference](./src/WireMock.Net.Extensions.Routing/)
+- [WireMock.Net Documentation](https://github.com/WireMock-Net/WireMock.Net)
--- a/src/WireMock.Net.Extensions.Routing/Utils/RoutePattern.cs
+++ b/src/WireMock.Net.Extensions.Routing/Utils/RoutePattern.cs
@@ -0,0 +1,107 @@
+// Copyright © WireMock.Net
+
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using WireMock.Net.Extensions.Routing.Extensions;
+
+namespace WireMock.Net.Extensions.Routing.Utils;
+
+internal static class RoutePattern
+{
+    private static readonly Regex ArgRegex =
+        new(@"{(?'name'\w+)(?::(?'type'\w+))?}", RegexOptions.Compiled);
+
+    public static IDictionary<string, object> GetArgs(string pattern, string route) =>
+        TryGetArgs(pattern, route, out var args)
+            ? args
+            : throw new InvalidOperationException(
+                $"Url {route} does not match route pattern {pattern}");
+
+    public static bool TryGetArgs(
+        string pattern, string route, [NotNullWhen(true)] out IDictionary<string, object>? args)
+    {
+        var regex = new Regex(ToRegex(pattern), RegexOptions.IgnoreCase);
+        var match = regex.Match(route);
+        if (!match.Success)
+        {
+            args = null;
+            return false;
+        }
+
+        var routeArgTypeMap = GetArgTypeMap(pattern);
+        args = match.Groups
+            .Cast<Group>()
+            .Where(g => g.Index > 0)
+            .ToDictionary(g => g.Name, g => routeArgTypeMap[g.Name].Parse(g.Value));
+        return true;
+    }
+
+    public static string ToRegex(string pattern)
+    {
+        return ArgRegex
+            .Replace(pattern, m => $"(?'{m.Groups["name"].Value}'{GetArgMatchingRegex(m)})")
+            .ToMatchFullStringRegex();
+
+        static string GetArgMatchingRegex(Match match) =>
+            ArgType.GetByName(match.Groups["type"].Value).GetRegex();
+    }
+
+    private static IDictionary<string, ArgType> GetArgTypeMap(string pattern) =>
+        ArgRegex
+            .Matches(pattern)
+            .ToDictionary(
+                m => m.Groups["name"].Value, m => ArgType.GetByName(m.Groups["type"].Value));
+
+    private abstract record ArgType
+    {
+        private ArgType(string name)
+        {
+            Name = name;
+        }
+
+        public string Name { get; }
+
+        public static ArgType String { get; } = new StringArgType();
+
+        public static ArgType Int { get; } = new IntArgType();
+
+        private static IReadOnlyCollection<ArgType> All { get; } =
+            typeof(ArgType)
+                .GetProperties(BindingFlags.Public | BindingFlags.Static)
+                .Where(p => p.PropertyType.IsAssignableTo(typeof(ArgType)))
+                .Select(p => p.GetValue(null))
+                .Cast<ArgType>()
+                .ToList();
+
+        private static IReadOnlyDictionary<string, ArgType> MapByName { get; } =
+            All.ToDictionary(x => x.Name);
+
+        public static ArgType GetByName(string name) =>
+            GetByNameOrDefault(name)
+            ?? throw new InvalidOperationException($"Route argument type {name} is not found");
+
+        public static ArgType? GetByNameOrDefault(string name) =>
+            !string.IsNullOrEmpty(name)
+                ? MapByName.GetValueOrDefault(name)
+                : String;
+
+        public abstract object Parse(string input);
+
+        public abstract string GetRegex();
+
+        private sealed record StringArgType() : ArgType("string")
+        {
+            public override object Parse(string input) => input;
+
+            public override string GetRegex() => @".*";
+        }
+
+        private sealed record IntArgType() : ArgType("int")
+        {
+            public override object Parse(string input) => int.Parse(input);
+
+            public override string GetRegex() => @"-?\d+";
+        }
+    }
+}
--- a/src/WireMock.Net.Extensions.Routing/WireMock.Net.Extensions.Routing.csproj
+++ b/src/WireMock.Net.Extensions.Routing/WireMock.Net.Extensions.Routing.csproj
@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <Description>WireMock.Net.Routing extends WireMock.Net with modern, minimal-API-style routing for .NET</Description>
+        <Authors>Gennadii Saltyshchak</Authors>
+        <TargetFrameworks>net8.0</TargetFrameworks>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <PackageTags>tdd;mock;http;wiremock;test;server;unittest;routing;minimalapi</PackageTags>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <!--<TreatWarningsAsErrors>true</TreatWarningsAsErrors>-->
+    </PropertyGroup>
+
+    <ItemGroup>
+        <None Include="..\..\README.md" Link="README.md" Pack="true" PackagePath="" />
+    </ItemGroup>
+
+    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="JsonConverter.Newtonsoft.Json" Version="0.7.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\WireMock.Net.Minimal\WireMock.Net.Minimal.csproj" />
+    </ItemGroup>
+</Project>
--- a/src/WireMock.Net.Extensions.Routing/WireMockRouter.cs
+++ b/src/WireMock.Net.Extensions.Routing/WireMockRouter.cs
@@ -0,0 +1,153 @@
+// Copyright © WireMock.Net
+
+using JsonConverter.Abstractions;
+using JsonConverter.Newtonsoft.Json;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+using WireMock.Matchers;
+using WireMock.Net.Extensions.Routing.Delegates;
+using WireMock.Net.Extensions.Routing.Extensions;
+using WireMock.Net.Extensions.Routing.Models;
+using WireMock.Net.Extensions.Routing.Utils;
+using WireMock.Server;
+
+namespace WireMock.Net.Extensions.Routing;
+
+/// <summary>
+/// Provides routing and request mapping functionality for WireMock.Net,
+/// mimicking ASP.NET Core Minimal APIs routing style.
+/// </summary>
+/// <remarks>
+/// Initializes a new instance of the <see cref="WireMockRouter"/> class.
+/// </remarks>
+/// <param name="server">The WireMock.Net server instance.</param>
+public sealed class WireMockRouter(WireMockServer server)
+{
+    private readonly WireMockServer _server = server;
+
+    /// <summary>
+    /// Gets or initializes the collection of middleware for the router.
+    /// </summary>
+    public IReadOnlyCollection<WireMockMiddleware> MiddlewareCollection { get; init; } = [];
+
+    /// <summary>
+    /// Gets or initializes the default <see cref="IJsonConverter"/> [optional].
+    /// </summary>
+    public IJsonConverter? DefaultJsonConverter { get; init; }
+
+    /// <summary>
+    /// Gets or initializes the default <see cref="JsonConverterOptions"/> [optional].
+    /// </summary>
+    public JsonConverterOptions? DefaultJsonOptions { get; init; }
+
+    /// <summary>
+    /// Maps a route to a synchronous request handler.
+    /// </summary>
+    /// <param name="method">The HTTP method.</param>
+    /// <param name="pattern">The route pattern.</param>
+    /// <param name="requestHandler">The request handler function.</param>
+    /// <returns>The current <see cref="WireMockRouter"/> instance.</returns>
+    public WireMockRouter Map(
+        string method, string pattern, Func<WireMockRequestInfo, object?> requestHandler)
+    {
+        return Map(method, pattern, CreateResponse);
+
+        object? CreateResponse(IRequestMessage request) =>
+            requestHandler(CreateRequestInfo(request, pattern));
+    }
+
+    /// <summary>
+    /// Maps a route to an asynchronous request handler.
+    /// </summary>
+    /// <param name="method">The HTTP method.</param>
+    /// <param name="pattern">The route pattern.</param>
+    /// <param name="requestHandler">The asynchronous request handler function.</param>
+    /// <returns>The current <see cref="WireMockRouter"/> instance.</returns>
+    public WireMockRouter Map(
+        string method, string pattern, Func<WireMockRequestInfo, Task<object?>> requestHandler)
+    {
+        return Map(method, pattern, CreateResponseAsync);
+
+        Task<object?> CreateResponseAsync(IRequestMessage request) =>
+            requestHandler(CreateRequestInfo(request, pattern));
+    }
+
+    /// <summary>
+    /// Maps a route to a request handler with a typed body.
+    /// </summary>
+    /// <typeparam name="TRequest">The type of the request body.</typeparam>
+    /// <param name="method">The HTTP method.</param>
+    /// <param name="pattern">The route pattern.</param>
+    /// <param name="requestHandler">The request handler function.</param>
+    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
+    /// <param name="jsonOptions">The <see cref="JsonConverterOptions"/> [optional].</param>
+    /// <returns>The current <see cref="WireMockRouter"/> instance.</returns>
+    public WireMockRouter Map<TRequest>(
+        string method,
+        string pattern,
+        Func<WireMockRequestInfo<TRequest>, object?> requestHandler,
+        IJsonConverter? jsonConverter = null,
+        JsonConverterOptions? jsonOptions = null)
+    {
+        return Map(method, pattern, CreateBody);
+
+        object? CreateBody(IRequestMessage request) =>
+            requestHandler(CreateRequestInfo<TRequest>(request, pattern, jsonConverter, jsonOptions));
+    }
+
+    private static WireMockRequestInfo CreateRequestInfo(IRequestMessage request, string pattern) =>
+        new(request)
+        {
+            RouteArgs = RoutePattern.GetArgs(pattern, request.Path),
+        };
+
+    private static WireMockHttpRequestHandler CreateHttpRequestHandler(
+        Func<IRequestMessage, object?> requestHandler) =>
+        request => CreateResponseMessageAsync(requestHandler(request));
+
+    private static async Task<IResponseMessage> CreateResponseMessageAsync(object? response)
+    {
+        var awaitedResponse = response is Task task
+            ? await task.ToGenericTaskAsync()
+            : response;
+        var result = awaitedResponse as IResult ?? Results.Ok(awaitedResponse);
+        var httpContext = CreateHttpContext();
+        await result.ExecuteAsync(httpContext);
+        return await httpContext.Response.ToResponseMessageAsync();
+    }
+
+    private static HttpContext CreateHttpContext() =>
+        new DefaultHttpContext
+        {
+            RequestServices = new ServiceCollection().AddLogging().BuildServiceProvider(),
+            Response = { Body = new MemoryStream() },
+        };
+
+    private WireMockRequestInfo<TRequest> CreateRequestInfo<TRequest>(
+        IRequestMessage request,
+        string pattern,
+        IJsonConverter? jsonConverter = null,
+        JsonConverterOptions? jsonOptions = null)
+    {
+        var requestInfo = CreateRequestInfo(request, pattern);
+        var establishedJsonConverter =
+            jsonConverter ?? DefaultJsonConverter ?? new NewtonsoftJsonConverter();
+        var establishedJsonOptions = jsonOptions ?? DefaultJsonOptions;
+        return new WireMockRequestInfo<TRequest>(requestInfo.Request)
+        {
+            RouteArgs = requestInfo.RouteArgs,
+            Body = requestInfo.Request.GetBodyAsJson<TRequest>(
+                establishedJsonConverter, establishedJsonOptions),
+        };
+    }
+
+    private WireMockRouter Map(
+        string method, string pattern, Func<IRequestMessage, object?> requestHandler)
+    {
+        var matcher = new RegexMatcher(RoutePattern.ToRegex(pattern), ignoreCase: true);
+        var httpRequestHandler =
+            CreateHttpRequestHandler(requestHandler).UseMiddlewareCollection(MiddlewareCollection);
+        _server.Map(method, matcher, httpRequestHandler);
+        return this;
+    }
+}
--- a/src/WireMock.Net.Extensions.Routing/WireMockServerRouterBuilder.cs
+++ b/src/WireMock.Net.Extensions.Routing/WireMockServerRouterBuilder.cs
@@ -0,0 +1,73 @@
+// Copyright © WireMock.Net
+
+using System.Collections.Concurrent;
+using JsonConverter.Abstractions;
+using WireMock.Net.Extensions.Routing.Delegates;
+using WireMock.Server;
+
+namespace WireMock.Net.Extensions.Routing;
+
+/// <summary>
+/// Provides a builder for configuring and creating a <see cref="WireMockRouter"/> with middleware and JSON settings.
+/// </summary>
+/// <remarks>
+/// Initializes a new instance of the <see cref="WireMockServerRouterBuilder"/> class.
+/// </remarks>
+/// <param name="server">The WireMock.Net server instance.</param>
+public sealed class WireMockServerRouterBuilder(WireMockServer server)
+{
+    private readonly WireMockServer _server = server;
+
+    private readonly ConcurrentQueue<WireMockMiddleware> _middlewareCollection = new();
+
+    private IJsonConverter? _defaultJsonConverter;
+
+    private JsonConverterOptions? _defaultJsonOptions;
+
+    /// <summary>
+    /// Builds a <see cref="WireMockRouter"/> with the configured middleware and JSON settings.
+    /// </summary>
+    /// <returns>The configured <see cref="WireMockRouter"/>.</returns>
+    public WireMockRouter Build() =>
+        new(_server)
+        {
+            MiddlewareCollection = _middlewareCollection,
+            DefaultJsonConverter = _defaultJsonConverter,
+            DefaultJsonOptions = _defaultJsonOptions,
+        };
+
+    /// <summary>
+    /// Adds a middleware to the router builder.
+    /// </summary>
+    /// <param name="middleware">The middleware to add.</param>
+    /// <returns>The current <see cref="WireMockServerRouterBuilder"/> instance.</returns>
+    public WireMockServerRouterBuilder Use(WireMockMiddleware middleware)
+    {
+        _middlewareCollection.Enqueue(middleware);
+        return this;
+    }
+
+    /// <summary>
+    /// Sets the default <see cref="IJsonConverter"/>.
+    /// </summary>
+    /// <param name="defaultJsonConverter">the default <see cref="IJsonConverter"/></param>
+    /// <returns>The current <see cref="WireMockServerRouterBuilder"/> instance.</returns>
+    public WireMockServerRouterBuilder WithDefaultJsonConverter(
+        IJsonConverter? defaultJsonConverter)
+    {
+        _defaultJsonConverter = defaultJsonConverter;
+        return this;
+    }
+
+    /// <summary>
+    /// Sets the default <see cref="JsonConverterOptions"/> [optional].
+    /// </summary>
+    /// <param name="defaultJsonOptions">the default <see cref="JsonConverterOptions"/> [optional]</param>
+    /// <returns>The current <see cref="WireMockServerRouterBuilder"/> instance.</returns>
+    public WireMockServerRouterBuilder WithDefaultJsonOptions(
+        JsonConverterOptions? defaultJsonOptions)
+    {
+        _defaultJsonOptions = defaultJsonOptions;
+        return this;
+    }
+}
--- a/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.AtPath.cs
+++ b/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.AtPath.cs
@@ -0,0 +1,83 @@
+// Copyright © WireMock.Net
+
+using WireMock.Extensions;
+using WireMock.Matchers;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+#pragma warning disable CS1591
+public partial class WireMockAssertions
+{
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> AtAbsolutePath(string absolutePath, string because = "", params object[] becauseArgs)
+    {
+        _ = AtAbsolutePath(new ExactMatcher(true, absolutePath), because, becauseArgs);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, absolutePath);
+    }
+
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, IStringMatcher> AtAbsolutePath(IStringMatcher absolutePathMatcher, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => absolutePathMatcher.IsPerfectMatch(request.AbsolutePath));
+
+        var absolutePath = absolutePathMatcher.GetPatterns().FirstOrDefault().GetPattern();
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the absolute path {0}{reason}, but no calls were made.",
+                absolutePath
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the absolute path {0}{reason}, but didn't find it among the calls to {1}.",
+                _ => absolutePath,
+                requests => requests.Select(request => request.AbsolutePath)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, IStringMatcher>(this, absolutePathMatcher);
+    }
+
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> AtPath(string path, string because = "", params object[] becauseArgs)
+    {
+        _ = AtPath(new ExactMatcher(true, path), because, becauseArgs);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, path);
+    }
+
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, IStringMatcher> AtPath(IStringMatcher pathMatcher, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => pathMatcher.IsPerfectMatch(request.Path));
+
+        var path = pathMatcher.GetPatterns().FirstOrDefault().GetPattern();
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the path {0}{reason}, but no calls were made.",
+                path
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the path {0}{reason}, but didn't find it among the calls to {1}.",
+                _ => path,
+                requests => requests.Select(request => request.Path)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, IStringMatcher>(this, pathMatcher);
+    }
+}
--- a/src/WireMock.Net.GraphQL/Matchers/GraphQLMatcher.cs
+++ b/src/WireMock.Net.GraphQL/Matchers/GraphQLMatcher.cs
@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net

-#if GRAPHQL
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -14,17 +13,17 @@ using Newtonsoft.Json;
 using Stef.Validation;
 using WireMock.Exceptions;
 using WireMock.Extensions;
-using WireMock.Matchers.Models;
+using WireMock.GraphQL.Models;
 using WireMock.Models;
-using WireMock.Util;
+using WireMock.Models.GraphQL;
+using WireMock.Utils;

 namespace WireMock.Matchers;

 /// <summary>
 /// GrapQLMatcher Schema Matcher
 /// </summary>
-/// <inheritdoc cref="IStringMatcher"/>
-public class GraphQLMatcher : IStringMatcher
+public class GraphQLMatcher : IGraphQLMatcher
 {
    private sealed class GraphQLRequest
    {
@@ -54,7 +53,7 @@ public class GraphQLMatcher : IStringMatcher
    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
    public GraphQLMatcher(
-        AnyOf<string, StringPattern, ISchema> schema,
+        AnyOf<string, StringPattern, ISchemaData> schema,
        MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch,
        MatchOperator matchOperator = MatchOperator.Or
    ) : this(schema, null, matchBehaviour, matchOperator)
@@ -69,7 +68,7 @@ public class GraphQLMatcher : IStringMatcher
    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
    public GraphQLMatcher(
-        AnyOf<string, StringPattern, ISchema> schema,
+        AnyOf<string, StringPattern, ISchemaData> schema,
        IDictionary<string, Type>? customScalars,
        MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch,
        MatchOperator matchOperator = MatchOperator.Or
@@ -94,7 +93,7 @@ public class GraphQLMatcher : IStringMatcher
                break;

            case AnyOfType.Third:
-                _schema = schema.Third;
+                _schema = ((SchemaDataWrapper)schema.Third).Schema;
                break;

            default:
@@ -201,7 +200,7 @@ public class GraphQLMatcher : IStringMatcher
                    throw new WireMockException($"The GraphQL Scalar type '{scalarTypeDefinitionName}' is not defined in the CustomScalars dictionary.");
                }

-                // Create a this custom Scalar GraphType (extending the WireMockCustomScalarGraphType<{clrType}> class)
+                // Create a custom Scalar GraphType (extending the WireMockCustomScalarGraphType<{clrType}> class)
                var customScalarGraphType = ReflectionUtils.CreateGenericType(customScalarGraphTypeName, typeof(WireMockCustomScalarGraphType<>), clrType);
                schema.RegisterType(customScalarGraphType);
            }
@@ -209,5 +208,4 @@ public class GraphQLMatcher : IStringMatcher

        return schema;
    }
-}
-#endif
+}
--- a/src/WireMock.Net.GraphQL/Models/SchemaDataWrapper.cs
+++ b/src/WireMock.Net.GraphQL/Models/SchemaDataWrapper.cs
@@ -0,0 +1,18 @@
+// Copyright © WireMock.Net
+
+using GraphQL.Types;
+using WireMock.Models.GraphQL;
+
+namespace WireMock.Models;
+
+/// <summary>
+/// Represents a wrapper for schema data, providing access to the associated schema.
+/// </summary>
+/// <param name="schema"></param>
+public class SchemaDataWrapper(ISchema schema) : ISchemaData
+{
+    /// <summary>
+    /// Gets the schema associated with the current instance.
+    /// </summary>
+    public ISchema Schema { get; } = schema;
+}
--- a/src/WireMock.Net.Minimal/Matchers/Models/WireMockCustomScalarGraphType.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Models/WireMockCustomScalarGraphType.cs
@@ -1,10 +1,10 @@
 // Copyright © WireMock.Net

-#if GRAPHQL
 using System;
 using GraphQL.Types;

-namespace WireMock.Matchers.Models;
+// ReSharper disable once CheckNamespace
+namespace WireMock.GraphQL.Models;

 /// <inheritdoc />
 public abstract class WireMockCustomScalarGraphType<T> : ScalarGraphType
@@ -28,5 +28,4 @@ public abstract class WireMockCustomScalarGraphType<T> : ScalarGraphType

        return (T)Convert.ChangeType(value, typeof(T));
    }
-}
-#endif
+}
--- a/src/WireMock.Net.GraphQL/Properties/AssemblyInfo.cs
+++ b/src/WireMock.Net.GraphQL/Properties/AssemblyInfo.cs
@@ -0,0 +1,8 @@
+// Copyright © WireMock.Net
+
+using System.Runtime.CompilerServices;
+
+// [assembly: InternalsVisibleTo("WireMock.Net.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
+
+// Needed for Moq in the UnitTest project
+// [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
--- a/src/WireMock.Net.GraphQL/RequestBuilders/IRequestBuilderExtensions.cs
+++ b/src/WireMock.Net.GraphQL/RequestBuilders/IRequestBuilderExtensions.cs
@@ -0,0 +1,94 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+using GraphQL.Types;
+using Stef.Validation;
+using WireMock.Matchers;
+using WireMock.Matchers.Request;
+using WireMock.Models;
+using WireMock.Models.GraphQL;
+
+namespace WireMock.RequestBuilders;
+
+/// <summary>
+/// IRequestBuilderExtensions extensions for GraphQL.
+/// </summary>
+// ReSharper disable once InconsistentNaming
+public static class IRequestBuilderExtensions
+{
+    /// <summary>
+    /// WithBodyAsGraphQL: The GraphQL body as a string.
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="schema">The GraphQL schema.</param>
+    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithGraphQLSchema(this IRequestBuilder requestBuilder, string schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Guard.NotNull(requestBuilder).Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema));
+    }
+
+    /// <summary>
+    /// WithBodyAsGraphQL: The GraphQL schema as a string.
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="schema">The GraphQL schema.</param>
+    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. (optional)</param>
+    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithGraphQLSchema(this IRequestBuilder requestBuilder, string schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Guard.NotNull(requestBuilder).Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema, customScalars));
+    }
+
+    /// <summary>
+    /// WithBodyAsGraphQL: The GraphQL schema as a <see cref="ISchema"/>.
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="schema">The GraphQL schema.</param>
+    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithGraphQLSchema(this IRequestBuilder requestBuilder, ISchema schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Guard.NotNull(requestBuilder).Add(new RequestMessageGraphQLMatcher(matchBehaviour, new SchemaDataWrapper(schema)));
+    }
+
+    /// <summary>
+    /// WithBodyAsGraphQL: The GraphQL schema as a <see cref="ISchema"/>.
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="schema">The GraphQL schema.</param>
+    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. (optional)</param>
+    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithGraphQLSchema(this IRequestBuilder requestBuilder, ISchema schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Guard.NotNull(requestBuilder).Add(new RequestMessageGraphQLMatcher(matchBehaviour, new SchemaDataWrapper(schema), customScalars));
+    }
+
+    /// <summary>
+    /// WithBodyAsGraphQL: The GraphQL schema as a <see cref="ISchemaData"/>.
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="schema">The GraphQL schema.</param>
+    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithGraphQLSchema(this IRequestBuilder requestBuilder, ISchemaData schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Guard.NotNull(requestBuilder).Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema));
+    }
+
+    /// <summary>
+    /// WithBodyAsGraphQL: The GraphQL schema as a <see cref="ISchemaData"/>.
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="schema">The GraphQL schema.</param>
+    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. (optional)</param>
+    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithGraphQLSchema(this IRequestBuilder requestBuilder, ISchemaData schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Guard.NotNull(requestBuilder).Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema, customScalars));
+    }
+}
--- a/src/WireMock.Net.GraphQL/Utils/ReflectionUtils.cs
+++ b/src/WireMock.Net.GraphQL/Utils/ReflectionUtils.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;

-namespace WireMock.Util;
+namespace WireMock.Utils;

 internal static class ReflectionUtils
 {
--- a/src/WireMock.Net.GraphQL/WireMock.Net.GraphQL.csproj
+++ b/src/WireMock.Net.GraphQL/WireMock.Net.GraphQL.csproj
@@ -0,0 +1,47 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <Description>GraphQL support for WireMock.Net</Description>
+        <AssemblyTitle>WireMock.Net.Matchers.GraphQL</AssemblyTitle>
+        <Authors>Stef Heyenrath</Authors>
+        <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net8.0</TargetFrameworks>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <PackageTags>wiremock;matchers;matcher;graphql</PackageTags>
+        <RootNamespace>WireMock</RootNamespace>
+        <ProjectGuid>{B6269AAC-170A-4346-8B9A-444DED3D9A45}</ProjectGuid>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <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>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="GraphQL.NewtonsoftJson" Version="8.2.1" />
+    </ItemGroup>
+
+    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+        <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\WireMock.Net.Shared\WireMock.Net.Shared.csproj" />
+    </ItemGroup>
+
+    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+        <PackageReference Include="Nullable" Version="1.3.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+
+</Project>
--- a/src/WireMock.Net.Minimal/Mapping.cs
+++ b/src/WireMock.Net.Minimal/Mapping.cs
@@ -43,7 +43,7 @@ public class Mapping : IMapping
    public string? NextState { get; }

    /// <inheritdoc />
-    public int? StateTimes { get; }
+    public int? TimesInSameState { get; }

    /// <inheritdoc />
    public IRequestMatcher RequestMatcher { get; }
@@ -137,7 +137,7 @@ public class Mapping : IMapping
        Scenario = scenario;
        ExecutionConditionState = executionConditionState;
        NextState = nextState;
-        StateTimes = stateTimes;
+        TimesInSameState = stateTimes;
        Webhooks = webhooks;
        UseWebhooksFireAndForget = useWebhooksFireAndForget;
        TimeSettings = timeSettings;
--- a/src/WireMock.Net.Minimal/Owin/Mappers/OwinResponseMapper.cs
+++ b/src/WireMock.Net.Minimal/Owin/Mappers/OwinResponseMapper.cs
@@ -177,11 +177,10 @@ namespace WireMock.Owin.Mappers
                    var jsonBody = JsonConvert.SerializeObject(bodyData.BodyAsJson, new JsonSerializerSettings { Formatting = formatting, NullValueHandling = NullValueHandling.Ignore });
                    return (bodyData.Encoding ?? _utf8NoBom).GetBytes(jsonBody);

-#if PROTOBUF
                case BodyType.ProtoBuf:
                    var protoDefinitions = bodyData.ProtoDefinition?.Invoke().Texts;
-                    return await ProtoBufUtils.GetProtoBufMessageWithHeaderAsync(protoDefinitions, bodyData.ProtoBufMessageType, bodyData.BodyAsJson).ConfigureAwait(false);
-#endif
+                    var protoBufUtils = TypeLoader.LoadStaticInstance<IProtoBufUtils>();
+                    return await protoBufUtils.GetProtoBufMessageWithHeaderAsync(protoDefinitions, bodyData.ProtoBufMessageType, bodyData.BodyAsJson).ConfigureAwait(false);

                case BodyType.Bytes:
                    return bodyData.BodyAsBytes;
--- a/src/WireMock.Net.Minimal/Owin/WireMockMiddleware.cs
+++ b/src/WireMock.Net.Minimal/Owin/WireMockMiddleware.cs
@@ -299,7 +299,7 @@ namespace WireMock.Owin
            scenario.Counter++;

            // Only if the number of times this state is executed equals the required StateTimes, proceed to next state and reset the counter to 0
-            if (scenario.Counter == (mapping.StateTimes ?? 1))
+            if (scenario.Counter == (mapping.TimesInSameState ?? 1))
            {
                scenario.NextState = mapping.NextState;
                scenario.Counter = 0;
--- a/src/WireMock.Net.Minimal/RequestBuilders/IGraphQLRequestBuilder.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/IGraphQLRequestBuilder.cs
@@ -1,83 +0,0 @@
-// Copyright © WireMock.Net
-
-using System;
-using System.Collections.Generic;
-using WireMock.Matchers;
-
-namespace WireMock.RequestBuilders;
-
-/// <summary>
-/// The GraphQLRequestBuilder interface.
-/// </summary>
-public interface IGraphQLRequestBuilder : IMultiPartRequestBuilder
-{
-    /// <summary>
-    /// WithGraphQLSchema: The GraphQL schema as a string.
-    /// </summary>
-    /// <param name="schema">The GraphQL schema.</param>
-    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithGraphQLSchema(string schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithGraphQLSchema: The GraphQL schema as a string.
-    /// </summary>
-    /// <param name="schema">The GraphQL schema.</param>
-    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. (optional)</param>
-    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithGraphQLSchema(string schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithBodyAsGraphQL: The GraphQL schema as a string.
-    /// </summary>
-    /// <param name="schema">The GraphQL schema.</param>
-    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsGraphQL(string schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithBodyAsGraphQL: The GraphQL schema as a string.
-    /// </summary>
-    /// <param name="schema">The GraphQL schema.</param>
-    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. (optional)</param>
-    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsGraphQL(string schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-#if GRAPHQL
-    /// <summary>
-    /// WithGraphQLSchema: The GraphQL schema as a ISchema.
-    /// </summary>
-    /// <param name="schema">The GraphQL schema.</param>
-    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithGraphQLSchema(GraphQL.Types.ISchema schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithGraphQLSchema: The GraphQL schema as a ISchema.
-    /// </summary>
-    /// <param name="schema">The GraphQL schema.</param>
-    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. (optional)</param>
-    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithGraphQLSchema(GraphQL.Types.ISchema schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithBodyAsGraphQL: The GraphQL schema as a ISchema.
-    /// </summary>
-    /// <param name="schema">The GraphQL schema.</param>
-    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsGraphQL(GraphQL.Types.ISchema schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithBodyAsGraphQL: The GraphQL schema as a ISchema.
-    /// </summary>
-    /// <param name="schema">The GraphQL schema.</param>
-    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. (optional)</param>
-    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsGraphQL(GraphQL.Types.ISchema schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-#endif
-}
--- a/src/WireMock.Net.Minimal/RequestBuilders/IProtoBufRequestBuilder.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/IProtoBufRequestBuilder.cs
@@ -1,67 +0,0 @@
-// Copyright © WireMock.Net
-
-using System.Collections.Generic;
-using WireMock.Matchers;
-
-namespace WireMock.RequestBuilders;
-
-/// <summary>
-/// The ProtoBufRequestBuilder interface.
-/// </summary>
-public interface IProtoBufRequestBuilder : IGraphQLRequestBuilder
-{
-    /// <summary>
-    /// WithBodyAsProtoBuf
-    /// </summary>
-    /// <param name="protoDefinition">The proto definition as text.</param>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsProtoBuf(string protoDefinition, string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithBodyAsProtoBuf
-    /// </summary>
-    /// <param name="protoDefinition">The proto definition as text.</param>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="matcher">The matcher to use to match the ProtoBuf as (json) object.</param>
-    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsProtoBuf(string protoDefinition, string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithBodyAsProtoBuf
-    /// </summary>
-    /// <param name="protoDefinitions">The proto definitions as text.</param>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsProtoBuf(IReadOnlyList<string> protoDefinitions, string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithBodyAsProtoBuf
-    /// </summary>
-    /// <param name="protoDefinitions">The proto definitions as text.</param>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="matcher">The matcher to use to match the ProtoBuf as (json) object.</param>
-    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsProtoBuf(IReadOnlyList<string> protoDefinitions, string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithBodyAsProtoBuf
-    /// </summary>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsProtoBuf(string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithBodyAsProtoBuf
-    /// </summary>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="matcher">The matcher to use to match the ProtoBuf as (json) object.</param>
-    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsProtoBuf(string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-}
--- a/src/WireMock.Net.Minimal/RequestBuilders/IRequestBuilder.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/IRequestBuilder.cs
@@ -1,10 +0,0 @@
-// Copyright © WireMock.Net
-
-namespace WireMock.RequestBuilders;
-
-/// <summary>
-/// IRequestBuilder
-/// </summary>
-public interface IRequestBuilder : IClientIPRequestBuilder
-{
-}
--- a/src/WireMock.Net.Minimal/RequestBuilders/Request.WithBody.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/Request.WithBody.cs
@@ -98,10 +98,4 @@ public partial class Request
        _requestMatchers.Add(new RequestMessageBodyMatcher(Guard.NotNull(func)));
        return this;
    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsGraphQLSchema(string body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return WithGraphQLSchema(body, matchBehaviour);
-    }
 }
--- a/src/WireMock.Net.Minimal/RequestBuilders/Request.WithBodyAsProtoBuf.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/Request.WithBodyAsProtoBuf.cs
@@ -1,61 +0,0 @@
-// Copyright © WireMock.Net
-
-using System;
-using System.Collections.Generic;
-using WireMock.Matchers;
-using WireMock.Matchers.Request;
-using WireMock.Models;
-
-namespace WireMock.RequestBuilders;
-
-public partial class Request
-{
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsProtoBuf(string protoDefinition, string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return WithBodyAsProtoBuf([protoDefinition], messageType, matchBehaviour);
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsProtoBuf(string protoDefinition, string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return WithBodyAsProtoBuf([protoDefinition], messageType, matcher, matchBehaviour);
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsProtoBuf(IReadOnlyList<string> protoDefinitions, string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => new IdOrTexts(null, protoDefinitions), messageType));
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsProtoBuf(IReadOnlyList<string> protoDefinitions, string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => new IdOrTexts(null, protoDefinitions), messageType, matcher));
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsProtoBuf(string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, ProtoDefinitionFunc(), messageType));
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsProtoBuf(string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, ProtoDefinitionFunc(), messageType, matcher));
-    }
-
-    private Func<IdOrTexts> ProtoDefinitionFunc()
-    {
-        return () =>
-        {
-            if (Mapping.ProtoDefinition == null)
-            {
-                throw new InvalidOperationException($"No ProtoDefinition defined on mapping '{Mapping.Guid}'. Please use the WireMockServerSettings to define ProtoDefinitions.");
-            }
-
-            return Mapping.ProtoDefinition.Value;
-        };
-    }
-}
--- a/src/WireMock.Net.Minimal/RequestBuilders/Request.WithGraphQLSchema.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/Request.WithGraphQLSchema.cs
@@ -1,61 +0,0 @@
-// Copyright © WireMock.Net
-
-using System.Collections.Generic;
-using System;
-using WireMock.Matchers;
-using WireMock.Matchers.Request;
-
-namespace WireMock.RequestBuilders;
-
-public partial class Request
-{
-    /// <inheritdoc />
-    public IRequestBuilder WithGraphQLSchema(string schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return WithBodyAsGraphQL(schema, matchBehaviour);
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithGraphQLSchema(string schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return WithBodyAsGraphQL(schema, customScalars, matchBehaviour);
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsGraphQL(string schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema));
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsGraphQL(string schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema, customScalars));
-    }
-
-#if GRAPHQL
-    /// <inheritdoc />
-    public IRequestBuilder WithGraphQLSchema(GraphQL.Types.ISchema schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return WithBodyAsGraphQL(schema, matchBehaviour);
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithGraphQLSchema(GraphQL.Types.ISchema schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return WithBodyAsGraphQL(schema, customScalars, matchBehaviour);
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsGraphQL(GraphQL.Types.ISchema schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema));
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsGraphQL(GraphQL.Types.ISchema schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema, customScalars));
-    }
-#endif
-}
--- a/src/WireMock.Net.Minimal/RequestBuilders/Request.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/Request.cs
@@ -20,9 +20,7 @@ public partial class Request : RequestMessageCompositeMatcher, IRequestBuilder
 {
    private readonly IList<IRequestMatcher> _requestMatchers;

-    /// <summary>
-    /// The link back to the Mapping.
-    /// </summary>
+    /// <inheritdoc />
    public IMapping Mapping { get; set; } = null!;

    /// <summary>
@@ -73,6 +71,18 @@ public partial class Request : RequestMessageCompositeMatcher, IRequestBuilder
        return _requestMatchers.OfType<T>().FirstOrDefault(func);
    }

+    /// <inheritdoc />
+    public IRequestBuilder Add<T>(T requestMatcher) where T : IRequestMatcher
+    {
+        foreach (var existing in _requestMatchers.OfType<T>().ToArray())
+        {
+            _requestMatchers.Remove(existing);
+        }
+
+        _requestMatchers.Add(requestMatcher);
+        return this;
+    }
+
    internal bool TryGetProtoBufMatcher([NotNullWhen(true)] out IProtoBufMatcher? protoBufMatcher)
    {
        protoBufMatcher = GetRequestMessageMatcher<RequestMessageProtoBufMatcher>()?.Matcher;
@@ -85,15 +95,4 @@ public partial class Request : RequestMessageCompositeMatcher, IRequestBuilder
        protoBufMatcher = bodyMatcher?.Matchers?.OfType<IProtoBufMatcher>().FirstOrDefault();
        return protoBufMatcher != null;
    }
-
-    private IRequestBuilder Add<T>(T requestMatcher) where T : IRequestMatcher
-    {
-        foreach (var existing in _requestMatchers.OfType<T>().ToArray())
-        {
-            _requestMatchers.Remove(existing);
-        }
-
-        _requestMatchers.Add(requestMatcher);
-        return this;
-    }
 }
--- a/src/WireMock.Net.Minimal/ResponseBuilders/IResponseBuilder.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/IResponseBuilder.cs
@@ -1,10 +0,0 @@
-// Copyright © WireMock.Net
-
-namespace WireMock.ResponseBuilders;
-
-/// <summary>
-/// The ResponseBuilder interface.
-/// </summary>
-public interface IResponseBuilder : IProxyResponseBuilder
-{
-}
--- a/src/WireMock.Net.Minimal/ResponseBuilders/Response.WithBody.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/Response.WithBody.cs
@@ -1,12 +1,10 @@
 // Copyright © WireMock.Net

 using System;
-using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
 using JsonConverter.Abstractions;
 using Stef.Validation;
-using WireMock.Exceptions;
 using WireMock.Models;
 using WireMock.Types;
 using WireMock.Util;
@@ -235,72 +233,4 @@ public partial class Response

        return this;
    }
-
-    /// <inheritdoc />
-    public IResponseBuilder WithBodyAsProtoBuf(
-        string protoDefinition,
-        string messageType,
-        object value,
-        IJsonConverter? jsonConverter = null,
-        JsonConverterOptions? options = null
-    )
-    {
-        return WithBodyAsProtoBuf([protoDefinition], messageType, value, jsonConverter, options);
-    }
-
-    /// <inheritdoc />
-    public IResponseBuilder WithBodyAsProtoBuf(
-        IReadOnlyList<string> protoDefinitions,
-        string messageType,
-        object value,
-        IJsonConverter? jsonConverter = null,
-        JsonConverterOptions? options = null
-    )
-    {
-        Guard.NotNullOrEmpty(protoDefinitions);
-        Guard.NotNullOrWhiteSpace(messageType);
-        Guard.NotNull(value);
-
-#if !PROTOBUF
-        throw new NotSupportedException("The WithBodyAsProtoBuf method can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
-#else
-        ResponseMessage.BodyDestination = null;
-        ResponseMessage.BodyData = new BodyData
-        {
-            DetectedBodyType = BodyType.ProtoBuf,
-            BodyAsJson = value,
-            ProtoDefinition = () => new IdOrTexts(null, protoDefinitions),
-            ProtoBufMessageType = messageType
-        };
-
-        return this;
-#endif
-    }
-
-    /// <inheritdoc />
-    public IResponseBuilder WithBodyAsProtoBuf(
-        string messageType,
-        object value,
-        IJsonConverter? jsonConverter = null,
-        JsonConverterOptions? options = null
-    )
-    {
-        Guard.NotNullOrWhiteSpace(messageType);
-        Guard.NotNull(value);
-
-#if !PROTOBUF
-        throw new NotSupportedException("The WithBodyAsProtoBuf method can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
-#else
-        ResponseMessage.BodyDestination = null;
-        ResponseMessage.BodyData = new BodyData
-        {
-            DetectedBodyType = BodyType.ProtoBuf,
-            BodyAsJson = value,
-            ProtoDefinition = () => Mapping.ProtoDefinition ?? throw new WireMockException("ProtoDefinition cannot be resolved. You probably forgot to call .WithProtoDefinition(...) on the mapping."),
-            ProtoBufMessageType = messageType
-        };
-
-        return this;
-#endif
-    }
 }
--- a/src/WireMock.Net.Minimal/ResponseBuilders/Response.WithCallback.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/Response.WithCallback.cs
@@ -13,13 +13,13 @@ public partial class Response
    /// A delegate to execute to generate the response.
    /// </summary>
    [MemberNotNullWhen(true, nameof(WithCallbackUsed))]
-    public Func<IRequestMessage, ResponseMessage>? Callback { get; private set; }
+    public Func<IRequestMessage, IResponseMessage>? Callback { get; private set; }

    /// <summary>
    /// A delegate to execute to generate the response async.
    /// </summary>
    [MemberNotNullWhen(true, nameof(WithCallbackUsed))]
-    public Func<IRequestMessage, Task<ResponseMessage>>? CallbackAsync { get; private set; }
+    public Func<IRequestMessage, Task<IResponseMessage>>? CallbackAsync { get; private set; }

    /// <summary>
    /// Defines if the method WithCallback(...) is used.
@@ -27,7 +27,7 @@ public partial class Response
    public bool WithCallbackUsed { get; private set; }

    /// <inheritdoc />
-    public IResponseBuilder WithCallback(Func<IRequestMessage, ResponseMessage> callbackHandler)
+    public IResponseBuilder WithCallback(Func<IRequestMessage, IResponseMessage> callbackHandler)
    {
        Guard.NotNull(callbackHandler);

@@ -35,14 +35,14 @@ public partial class Response
    }

    /// <inheritdoc />
-    public IResponseBuilder WithCallback(Func<IRequestMessage, Task<ResponseMessage>> callbackHandler)
+    public IResponseBuilder WithCallback(Func<IRequestMessage, Task<IResponseMessage>> callbackHandler)
    {
        Guard.NotNull(callbackHandler);

        return WithCallbackInternal(true, callbackHandler);
    }

-    private IResponseBuilder WithCallbackInternal(bool withCallbackUsed, Func<IRequestMessage, ResponseMessage> callbackHandler)
+    private IResponseBuilder WithCallbackInternal(bool withCallbackUsed, Func<IRequestMessage, IResponseMessage> callbackHandler)
    {
        Guard.NotNull(callbackHandler);

@@ -52,7 +52,7 @@ public partial class Response
        return this;
    }

-    private IResponseBuilder WithCallbackInternal(bool withCallbackUsed, Func<IRequestMessage, Task<ResponseMessage>> callbackHandler)
+    private IResponseBuilder WithCallbackInternal(bool withCallbackUsed, Func<IRequestMessage, Task<IResponseMessage>> callbackHandler)
    {
        Guard.NotNull(callbackHandler);

--- a/src/WireMock.Net.Minimal/ResponseBuilders/Response.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/Response.cs
@@ -28,9 +28,7 @@ public partial class Response : IResponseBuilder

    private TimeSpan? _delay;

-    /// <summary>
-    /// The link back to the mapping.
-    /// </summary>
+    /// <inheritdoc />
    public IMapping Mapping { get; set; } = null!;

    /// <summary>
@@ -81,10 +79,8 @@ public partial class Response : IResponseBuilder
    /// </summary>
    public ReplaceNodeOptions TransformerReplaceNodeOptions { get; private set; }

-    /// <summary>
-    /// Gets the response message.
-    /// </summary>
-    public ResponseMessage ResponseMessage { get; }
+    /// <inheritdoc />
+    public IResponseMessage ResponseMessage { get; }

    /// <summary>
    /// Creates this instance.
@@ -226,7 +222,7 @@ public partial class Response : IResponseBuilder
            ).ConfigureAwait(false);
        }

-        ResponseMessage responseMessage;
+        IResponseMessage responseMessage;
        if (!WithCallbackUsed)
        {
            responseMessage = ResponseMessage;
--- a/src/WireMock.Net.Minimal/Serialization/MappingConverter.cs
+++ b/src/WireMock.Net.Minimal/Serialization/MappingConverter.cs
@@ -13,7 +13,6 @@ using WireMock.Constants;
 using WireMock.Extensions;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
-using WireMock.Models;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Types;
@@ -111,15 +110,13 @@ internal class MappingConverter(MatcherMapper mapper)
            sb.AppendLine($"        .WithHttpVersion({requestMessageHttpVersionMatcher.HttpVersion})");
        }

-#if GRAPHQL
        if (requestMessageGraphQLMatcher?.Matchers != null)
        {
-            if (requestMessageGraphQLMatcher.Matchers.OfType<GraphQLMatcher>().FirstOrDefault() is { } graphQLMatcher && graphQLMatcher.GetPatterns().Any())
+            if (requestMessageGraphQLMatcher.Matchers.OfType<IGraphQLMatcher>().FirstOrDefault() is { } graphQLMatcher && graphQLMatcher.GetPatterns().Any())
            {
                sb.AppendLine($"        .WithGraphQLSchema({GetString(graphQLMatcher)})");
            }
        }
-#endif

        if (requestMessageMultiPartMatcher?.Matchers != null)
        {
@@ -129,12 +126,10 @@ internal class MappingConverter(MatcherMapper mapper)
            }
        }

-#if PROTOBUF
        if (requestMessageProtoBufMatcher?.Matcher != null)
        {
            sb.AppendLine("        // .WithBodyAsProtoBuf() is not yet supported");
        }
-#endif

        if (requestMessageBodyMatcher?.Matchers != null)
        {
@@ -164,6 +159,16 @@ internal class MappingConverter(MatcherMapper mapper)
        // Guid
        sb.AppendLine($"    .WithGuid(\"{mapping.Guid}\")");

+        // Scenario + State
+        if (!string.IsNullOrEmpty(mapping.Scenario))
+        {
+            sb.AppendLine($"    .InScenario({ToCSharpStringLiteral(mapping.Scenario)})");
+        }
+        if (!string.IsNullOrEmpty(mapping.NextState))
+        {
+            sb.AppendLine($"    .WhenStateIs({ToCSharpStringLiteral(mapping.NextState)}, {ToCSharpIntLiteral(mapping.TimesInSameState)})");
+        }
+
        if (mapping.Probability != null)
        {
            sb.AppendLine($"    .WithProbability({mapping.Probability.Value.ToString(CultureInfoUtils.CultureInfoEnUS)})");
@@ -181,7 +186,7 @@ internal class MappingConverter(MatcherMapper mapper)
            sb.AppendLine($"        .WithStatusCode({(int)httpStatusCode})");
        }

-        if (response.ResponseMessage.Headers is { })
+        if (response.ResponseMessage.Headers != null)
        {
            foreach (var header in response.ResponseMessage.Headers)
            {
@@ -189,7 +194,7 @@ internal class MappingConverter(MatcherMapper mapper)
            }
        }

-        if (response.ResponseMessage.TrailingHeaders is { })
+        if (response.ResponseMessage.TrailingHeaders != null)
        {
            foreach (var header in response.ResponseMessage.TrailingHeaders)
            {
@@ -270,6 +275,7 @@ internal class MappingConverter(MatcherMapper mapper)
            Scenario = mapping.Scenario,
            WhenStateIs = mapping.ExecutionConditionState,
            SetStateTo = mapping.NextState,
+            TimesInSameState = !string.IsNullOrWhiteSpace(mapping.NextState) ? mapping.TimesInSameState : null,
            Data = mapping.Data,
            Probability = mapping.Probability,
            Request = new RequestModel
@@ -392,13 +398,11 @@ internal class MappingConverter(MatcherMapper mapper)
        {
            void AfterMap(MatcherModel matcherModel)
            {
-#if PROTOBUF
                // In case the ProtoDefinition is defined at the Mapping level, clear the Pattern at the Matcher level
-                if (bodyMatchers?.OfType<ProtoBufMatcher>().Any() == true && mappingModel.ProtoDefinition != null)
+                if (bodyMatchers?.OfType<IProtoBufMatcher>().Any() == true && mappingModel.ProtoDefinition != null)
                {
                    matcherModel.Pattern = null;
                }
-#endif
            }

            mappingModel.Request.Body = new BodyModel();
--- a/src/WireMock.Net.Minimal/Serialization/MatcherMapper.cs
+++ b/src/WireMock.Net.Minimal/Serialization/MatcherMapper.cs
@@ -10,6 +10,7 @@ using WireMock.Admin.Mappings;
 using WireMock.Extensions;
 using WireMock.Matchers;
 using WireMock.Models;
+using WireMock.Models.GraphQL;
 using WireMock.Settings;
 using WireMock.Util;

@@ -70,18 +71,18 @@ internal class MatcherMapper

            case nameof(ExactObjectMatcher):
                return CreateExactObjectMatcher(matchBehaviour, stringPatterns[0]);
-#if GRAPHQL
-            case nameof(GraphQLMatcher):
-                return new GraphQLMatcher(stringPatterns[0].GetPattern(), matcherModel.CustomScalars, matchBehaviour, matchOperator);
-#endif
+
+            case "GraphQLMatcher":
+                var patternAsString = stringPatterns[0].GetPattern();
+                var schema = new AnyOf<string, StringPattern, ISchemaData>(patternAsString);
+                return TypeLoader.LoadNewInstance<IGraphQLMatcher>(schema, matcherModel.CustomScalars, matchBehaviour, matchOperator);

            case "MimePartMatcher":
                return CreateMimePartMatcher(matchBehaviour, matcherModel);

-#if PROTOBUF
-            case nameof(ProtoBufMatcher):
+            case "ProtoBufMatcher":
                return CreateProtoBufMatcher(matchBehaviour, stringPatterns.GetPatterns(), matcherModel);
-#endif
+
            case nameof(RegexMatcher):
                return new RegexMatcher(matchBehaviour, stringPatterns, ignoreCase, useRegexExtended, matchOperator);

@@ -165,11 +166,10 @@ internal class MatcherMapper
            case XPathMatcher xpathMatcher:
                model.XmlNamespaceMap = xpathMatcher.XmlNamespaceMap;
                break;
-#if GRAPHQL
-            case GraphQLMatcher graphQLMatcher:
+
+            case IGraphQLMatcher graphQLMatcher:
                model.CustomScalars = graphQLMatcher.CustomScalars;
                break;
-#endif
        }

        switch (matcher)
@@ -209,7 +209,7 @@ internal class MatcherMapper
                break;

 #if PROTOBUF
-            case ProtoBufMatcher protoBufMatcher:
+            case IProtoBufMatcher protoBufMatcher:
                protoBufMatcher.ProtoDefinition().Value(id => model.Pattern = id, texts =>
                {
                    if (texts.Count == 1)
@@ -277,25 +277,23 @@ internal class MatcherMapper

    private IMimePartMatcher CreateMimePartMatcher(MatchBehaviour matchBehaviour, MatcherModel matcher)
    {
-        var contentTypeMatcher = Map(matcher?.ContentTypeMatcher) as IStringMatcher;
-        var contentDispositionMatcher = Map(matcher?.ContentDispositionMatcher) as IStringMatcher;
-        var contentTransferEncodingMatcher = Map(matcher?.ContentTransferEncodingMatcher) as IStringMatcher;
-        var contentMatcher = Map(matcher?.ContentMatcher);
+        var contentTypeMatcher = Map(matcher.ContentTypeMatcher) as IStringMatcher;
+        var contentDispositionMatcher = Map(matcher.ContentDispositionMatcher) as IStringMatcher;
+        var contentTransferEncodingMatcher = Map(matcher.ContentTransferEncodingMatcher) as IStringMatcher;
+        var contentMatcher = Map(matcher.ContentMatcher);

        return TypeLoader.LoadNewInstance<IMimePartMatcher>(matchBehaviour, contentTypeMatcher, contentDispositionMatcher, contentTransferEncodingMatcher, contentMatcher);
    }

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

-        return new ProtoBufMatcher(
-            () => ProtoDefinitionHelper.GetIdOrTexts(_settings, protoDefinitions.ToArray()),
+        return TypeLoader.LoadNewInstance<IProtoBufMatcher>(
+            () => ProtoDefinitionUtils.GetIdOrTexts(_settings, protoDefinitions.ToArray()),
            matcher.ProtoBufMessageType!,
            matchBehaviour ?? MatchBehaviour.AcceptOnMatch,
            objectMatcher
        );
    }
-#endif
 }
--- a/src/WireMock.Net.Minimal/Server/RespondWithAProvider.cs
+++ b/src/WireMock.Net.Minimal/Server/RespondWithAProvider.cs
@@ -356,12 +356,9 @@ internal class RespondWithAProvider : IRespondWithAProvider
    {
        Guard.NotNull(protoDefinitionOrId);

-#if PROTOBUF
-        ProtoDefinition = ProtoDefinitionHelper.GetIdOrTexts(_settings, protoDefinitionOrId);
+        ProtoDefinition = ProtoDefinitionUtils.GetIdOrTexts(_settings, protoDefinitionOrId);
+
        return this;
-#else
-        throw new NotSupportedException("The WithProtoDefinition method can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
-#endif
    }

    /// <inheritdoc />
--- a/src/WireMock.Net.Minimal/Server/WireMockServer.ConvertMapping.cs
+++ b/src/WireMock.Net.Minimal/Server/WireMockServer.ConvertMapping.cs
@@ -97,7 +97,7 @@ public partial class WireMockServer

            if (!string.IsNullOrEmpty(mappingModel.SetStateTo))
            {
-                respondProvider = respondProvider.WillSetStateTo(mappingModel.SetStateTo!);
+                respondProvider = respondProvider.WillSetStateTo(mappingModel.SetStateTo!, mappingModel.TimesInSameState);
            }
        }

@@ -241,13 +241,13 @@ public partial class WireMockServer
        if (requestModel.Body?.Matcher != null)
        {
            var bodyMatcher = _matcherMapper.Map(requestModel.Body.Matcher)!;
-#if PROTOBUF
+
            // If the BodyMatcher is a ProtoBufMatcher, and if ProtoDefinition is defined on Mapping-level, set the ProtoDefinition from that Mapping.
-            if (bodyMatcher is ProtoBufMatcher protoBufMatcher && mappingModel?.ProtoDefinition != null)
+            if (bodyMatcher is IProtoBufMatcher protoBufMatcher && mappingModel?.ProtoDefinition != null)
            {
-                protoBufMatcher.ProtoDefinition = () => ProtoDefinitionHelper.GetIdOrTexts(_settings, mappingModel.ProtoDefinition);
+                protoBufMatcher.ProtoDefinition = () => ProtoDefinitionUtils.GetIdOrTexts(_settings, mappingModel.ProtoDefinition);
            }
-#endif
+
            requestBuilder = requestBuilder.WithBody(bodyMatcher);
        }
        else if (requestModel.Body?.Matchers != null)
@@ -368,18 +368,19 @@ public partial class WireMockServer
        {
            if (responseModel.ProtoBufMessageType != null)
            {
+                var protoBufUtils = TypeLoader.LoadStaticInstance<IProtoBufUtils>();
+
                if (responseModel.ProtoDefinition != null)
                {
-                    responseBuilder = responseBuilder.WithBodyAsProtoBuf(responseModel.ProtoDefinition, responseModel.ProtoBufMessageType, responseModel.BodyAsJson);
+                    responseBuilder = protoBufUtils.UpdateResponseBuilder(responseBuilder, responseModel.ProtoBufMessageType, responseModel.BodyAsJson, responseModel.ProtoDefinition);
                }
                else if (responseModel.ProtoDefinitions != null)
                {
-                    responseBuilder = responseBuilder.WithBodyAsProtoBuf(responseModel.ProtoDefinitions, responseModel.ProtoBufMessageType, responseModel.BodyAsJson);
+                    responseBuilder = protoBufUtils.UpdateResponseBuilder(responseBuilder, responseModel.ProtoBufMessageType, responseModel.BodyAsJson, responseModel.ProtoDefinitions);
                }
                else
                {
-                    // ProtoDefinition(s) is/are defined at Mapping/Server level
-                    responseBuilder = responseBuilder.WithBodyAsProtoBuf(responseModel.ProtoBufMessageType, responseModel.BodyAsJson);
+                    responseBuilder = protoBufUtils.UpdateResponseBuilder(responseBuilder, responseModel.ProtoBufMessageType, responseModel.BodyAsJson);
                }
            }
            else
--- a/src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj
+++ b/src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj
@@ -125,16 +125,7 @@
        <PackageReference Include="Scriban.Signed" Version="5.5.0" />
    </ItemGroup>

-    <ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.3' and '$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'net452' and '$(TargetFramework)' != 'net46' and '$(TargetFramework)' != 'net461'">
-        <PackageReference Include="GraphQL.NewtonsoftJson" Version="8.2.1" />
-        <PackageReference Include="ProtoBufJsonConverter" Version="0.10.0" />
-    </ItemGroup>
-
    <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-        <!--<PackageReference Include="Nullable" Version="1.3.1">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>-->
        <PackageReference Include="System.ComponentModel" Version="4.3.0" />
    </ItemGroup>

@@ -156,16 +147,6 @@
        </Compile>
    </ItemGroup>

-    <ItemGroup>
-        <PackageReference Include="Handlebars.Net.Helpers" Version="2.5.2" />
-        <!--<PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.5.2" />-->
-        <PackageReference Include="Handlebars.Net.Helpers.Humanizer" Version="2.5.2" />
-        <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.5.2" />
-        <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.5.2" />
-        <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.5.2" />
-        <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.5.2" />
-    </ItemGroup>
-
    <ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.3' and '$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'net452' ">
        <PackageReference Include="Handlebars.Net.Helpers.Xslt" Version="2.5.2" />
    </ItemGroup>
--- a/src/WireMock.Net.ProtoBuf/Matchers/ProtoBufMatcher.cs
+++ b/src/WireMock.Net.ProtoBuf/Matchers/ProtoBufMatcher.cs
@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net

-#if PROTOBUF
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -24,19 +23,13 @@ public class ProtoBufMatcher : IProtoBufMatcher
    /// <inheritdoc />
    public MatchBehaviour MatchBehaviour { get; }

-    /// <summary>
-    /// The Func to define the proto definition as id or texts.
-    /// </summary>
-    public Func<IdOrTexts> ProtoDefinition { get; internal set; }
+    /// <inheritdoc />
+    public Func<IdOrTexts> ProtoDefinition { get; set; }

-    /// <summary>
-    /// The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".
-    /// </summary>
+    /// <inheritdoc />
    public string MessageType { get; }

-    /// <summary>
-    /// The Matcher to use (optional).
-    /// </summary>
+    /// <inheritdoc />
    public IObjectMatcher? Matcher { get; }

    private static readonly Converter ProtoBufToJsonConverter = SingletonFactory<Converter>.GetInstance();
@@ -122,5 +115,4 @@ public class ProtoBufMatcher : IProtoBufMatcher
            return null;
        }
    }
-}
-#endif
+}
--- a/src/WireMock.Net.ProtoBuf/Models/ProtoDefinitionData.cs
+++ b/src/WireMock.Net.ProtoBuf/Models/ProtoDefinitionData.cs
--- a/src/WireMock.Net.ProtoBuf/Properties/AssemblyInfo.cs
+++ b/src/WireMock.Net.ProtoBuf/Properties/AssemblyInfo.cs
@@ -0,0 +1,8 @@
+// Copyright © WireMock.Net
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("WireMock.Net.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
+
+// Needed for Moq in the UnitTest project
+// [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
--- a/src/WireMock.Net.ProtoBuf/RequestBuilders/IRequestBuilderExtensions.cs
+++ b/src/WireMock.Net.ProtoBuf/RequestBuilders/IRequestBuilderExtensions.cs
@@ -0,0 +1,108 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+using WireMock.Matchers;
+using WireMock.Matchers.Request;
+using WireMock.Models;
+
+namespace WireMock.RequestBuilders;
+
+/// <summary>
+/// IRequestBuilderExtensions extensions for ProtoBuf.
+/// </summary>
+// ReSharper disable once InconsistentNaming
+public static class IRequestBuilderExtensions
+{
+    /// <summary>
+    /// WithBodyAsProtoBuf
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="protoDefinition">The proto definition as text.</param>
+    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
+    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithBodyAsProtoBuf(this IRequestBuilder requestBuilder, string protoDefinition, string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return requestBuilder.WithBodyAsProtoBuf([protoDefinition], messageType, matchBehaviour);
+    }
+
+    /// <summary>
+    /// WithBodyAsProtoBuf
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="protoDefinition">The proto definition as text.</param>
+    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
+    /// <param name="matcher">The matcher to use to match the ProtoBuf as (json) object.</param>
+    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithBodyAsProtoBuf(this IRequestBuilder requestBuilder, string protoDefinition, string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return requestBuilder.WithBodyAsProtoBuf([protoDefinition], messageType, matcher, matchBehaviour);
+    }
+
+    /// <summary>
+    /// WithBodyAsProtoBuf
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="protoDefinitions">The proto definitions as text.</param>
+    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
+    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithBodyAsProtoBuf(this IRequestBuilder requestBuilder, IReadOnlyList<string> protoDefinitions, string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return requestBuilder.Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => new IdOrTexts(null, protoDefinitions), messageType));
+    }
+
+    /// <summary>
+    /// WithBodyAsProtoBuf
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="protoDefinitions">The proto definitions as text.</param>
+    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
+    /// <param name="matcher">The matcher to use to match the ProtoBuf as (json) object.</param>
+    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithBodyAsProtoBuf(this IRequestBuilder requestBuilder, IReadOnlyList<string> protoDefinitions, string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return requestBuilder.Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => new IdOrTexts(null, protoDefinitions), messageType, matcher));
+    }
+
+    /// <summary>
+    /// WithBodyAsProtoBuf
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
+    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithBodyAsProtoBuf(this IRequestBuilder requestBuilder, string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return requestBuilder.Add(new RequestMessageProtoBufMatcher(matchBehaviour, ProtoDefinitionFunc(requestBuilder), messageType));
+    }
+
+    /// <summary>
+    /// WithBodyAsProtoBuf
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
+    /// <param name="matcher">The matcher to use to match the ProtoBuf as (json) object.</param>
+    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithBodyAsProtoBuf(this IRequestBuilder requestBuilder, string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return requestBuilder.Add(new RequestMessageProtoBufMatcher(matchBehaviour, ProtoDefinitionFunc(requestBuilder), messageType, matcher));
+    }
+
+    private static Func<IdOrTexts> ProtoDefinitionFunc(IRequestBuilder requestBuilder)
+    {
+        return () =>
+        {
+            if (requestBuilder.Mapping.ProtoDefinition == null)
+            {
+                throw new InvalidOperationException($"No ProtoDefinition defined on mapping '{requestBuilder.Mapping.Guid}'. Please use the WireMockServerSettings to define ProtoDefinitions.");
+            }
+
+            return requestBuilder.Mapping.ProtoDefinition.Value;
+        };
+    }
+}
--- a/src/WireMock.Net.ProtoBuf/ResponseBuilders/IResponseBuilderExtensions.cs
+++ b/src/WireMock.Net.ProtoBuf/ResponseBuilders/IResponseBuilderExtensions.cs
@@ -0,0 +1,106 @@
+// Copyright © WireMock.Net
+
+using System.Collections.Generic;
+using JsonConverter.Abstractions;
+using Stef.Validation;
+using WireMock.Exceptions;
+using WireMock.Models;
+using WireMock.Types;
+using WireMock.Util;
+
+namespace WireMock.ResponseBuilders;
+
+/// <summary>
+/// Extensions for <see cref="IResponseBuilder"/> to implement WithBodyAsProtoBuf.
+/// </summary>
+public static class IResponseBuilderExtensions
+{
+    /// <summary>
+    /// WithBodyAsProtoBuf : Create a ProtoBuf byte[] response based on a proto definition, message type and the value.
+    /// </summary>
+    /// <param name="responseBuilder">The response builder.</param>
+    /// <param name="protoDefinition">The proto definition as text.</param>
+    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
+    /// <param name="value">The object to convert to protobuf byte[].</param>
+    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
+    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
+    /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+    public static IResponseBuilder WithBodyAsProtoBuf(
+        this IResponseBuilder responseBuilder,
+        string protoDefinition,
+        string messageType,
+        object value,
+        IJsonConverter? jsonConverter = null,
+        JsonConverterOptions? options = null
+    )
+    {
+        return responseBuilder.WithBodyAsProtoBuf([protoDefinition], messageType, value, jsonConverter, options);
+    }
+
+    /// <summary>
+    /// WithBodyAsProtoBuf : Create a ProtoBuf byte[] response based on proto definitions, message type and the value.
+    /// </summary>
+    /// <param name="responseBuilder">The response builder.</param>
+    /// <param name="protoDefinitions">The proto definition as text.</param>
+    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
+    /// <param name="value">The object to convert to protobuf byte[].</param>
+    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
+    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
+    /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+    public static IResponseBuilder WithBodyAsProtoBuf(
+        this IResponseBuilder responseBuilder,
+        IReadOnlyList<string> protoDefinitions,
+        string messageType,
+        object value,
+        IJsonConverter? jsonConverter = null,
+        JsonConverterOptions? options = null
+    )
+    {
+        Guard.NotNullOrEmpty(protoDefinitions);
+        Guard.NotNullOrWhiteSpace(messageType);
+        Guard.NotNull(value);
+
+        responseBuilder.ResponseMessage.BodyDestination = null;
+        responseBuilder.ResponseMessage.BodyData = new BodyData
+        {
+            DetectedBodyType = BodyType.ProtoBuf,
+            BodyAsJson = value,
+            ProtoDefinition = () => new IdOrTexts(null, protoDefinitions),
+            ProtoBufMessageType = messageType
+        };
+
+        return responseBuilder;
+    }
+
+    /// <summary>
+    /// WithBodyAsProtoBuf : Create a ProtoBuf byte[] response based on a proto definition, message type and the value.
+    /// </summary>
+    /// <param name="responseBuilder">The response builder.</param>
+    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
+    /// <param name="value">The object to convert to protobuf byte[].</param>
+    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
+    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
+    /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+    public static IResponseBuilder WithBodyAsProtoBuf(
+        this IResponseBuilder responseBuilder,
+        string messageType,
+        object value,
+        IJsonConverter? jsonConverter = null,
+        JsonConverterOptions? options = null
+    )
+    {
+        Guard.NotNullOrWhiteSpace(messageType);
+        Guard.NotNull(value);
+
+        responseBuilder.ResponseMessage.BodyDestination = null;
+        responseBuilder.ResponseMessage.BodyData = new BodyData
+        {
+            DetectedBodyType = BodyType.ProtoBuf,
+            BodyAsJson = value,
+            ProtoDefinition = () => responseBuilder.Mapping.ProtoDefinition ?? throw new WireMockException("ProtoDefinition cannot be resolved. You probably forgot to call .WithProtoDefinition(...) on the mapping."),
+            ProtoBufMessageType = messageType
+        };
+
+        return responseBuilder;
+    }
+}
--- a/src/WireMock.Net.ProtoBuf/Util/ProtoBufUtils.cs
+++ b/src/WireMock.Net.ProtoBuf/Util/ProtoBufUtils.cs
@@ -1,18 +1,18 @@
 // Copyright © WireMock.Net

-#if PROTOBUF
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using JsonConverter.Abstractions;
 using ProtoBufJsonConverter;
 using ProtoBufJsonConverter.Models;
+using WireMock.ResponseBuilders;

 namespace WireMock.Util;

-internal static class ProtoBufUtils
+internal class ProtoBufUtils : IProtoBufUtils
 {
-    internal static async Task<byte[]> GetProtoBufMessageWithHeaderAsync(
+    public async Task<byte[]> GetProtoBufMessageWithHeaderAsync(
        IReadOnlyList<string>? protoDefinitions,
        string? messageType,
        object? value,
@@ -33,5 +33,15 @@ internal static class ProtoBufUtils
            .GetInstance()
            .ConvertAsync(request, cancellationToken).ConfigureAwait(false);
    }
-}
-#endif
+
+    public IResponseBuilder UpdateResponseBuilder(IResponseBuilder responseBuilder, string protoBufMessageType, object bodyAsJson, params string[] protoDefinitions)
+    {
+        if (protoDefinitions.Length > 0)
+        {
+            return responseBuilder.WithBodyAsProtoBuf(protoDefinitions, protoBufMessageType, bodyAsJson);
+        }
+
+        // ProtoDefinition(s) is/are defined at Mapping/Server level
+        return responseBuilder.WithBodyAsProtoBuf(protoBufMessageType, bodyAsJson);
+    }
+}
--- a/src/WireMock.Net.ProtoBuf/Util/ProtoDefinitionDataHelper.cs
+++ b/src/WireMock.Net.ProtoBuf/Util/ProtoDefinitionDataHelper.cs
@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net

-#if PROTOBUF
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
@@ -9,14 +8,13 @@ using ProtoBufJsonConverter;
 using ProtoBufJsonConverter.Models;
 using Stef.Validation;
 using WireMock.Models;
-using WireMock.Settings;

 namespace WireMock.Util;

 /// <summary>
 /// Some helper methods for Proto Definitions.
 /// </summary>
-public static class ProtoDefinitionHelper
+internal static class ProtoDefinitionDataHelper
 {
    /// <summary>
    /// Builds a dictionary of ProtoDefinitions from a directory.
@@ -42,7 +40,7 @@ public static class ProtoDefinitionHelper

            // Build comment and get content from file.
            var comment = $"// {protoRelativePath}";
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET462
            var content = File.ReadAllText(filePath);
 #else
            var content = await File.ReadAllTextAsync(filePath, cancellationToken);
@@ -79,23 +77,4 @@ public static class ProtoDefinitionHelper

        return new ProtoDefinitionData(fileNameMappedToProtoDefinition);
    }
-
-    internal static IdOrTexts GetIdOrTexts(WireMockServerSettings settings, params string[] protoDefinitionOrId)
-    {
-        switch (protoDefinitionOrId.Length)
-        {
-            case 1:
-                var idOrText = protoDefinitionOrId[0];
-                if (settings.ProtoDefinitions?.TryGetValue(idOrText, out var protoDefinitions) == true)
-                {
-                    return new(idOrText, protoDefinitions);
-                }
-
-                return new(null, protoDefinitionOrId);
-
-            default:
-                return new(null, protoDefinitionOrId);
-        }
-    }
-}
-#endif
+}
--- a/src/WireMock.Net.ProtoBuf/Util/WireMockProtoFileResolver.cs
+++ b/src/WireMock.Net.ProtoBuf/Util/WireMockProtoFileResolver.cs
@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net

-#if PROTOBUF
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
@@ -30,10 +29,10 @@ internal class WireMockProtoFileResolver : IProtoFileResolver

        foreach (var extraProtoDefinition in protoDefinitions)
        {
-            var firstNonEmptyLine = extraProtoDefinition.Split(['\r', '\n']).FirstOrDefault(l => !string.IsNullOrEmpty(l));
+            var firstNonEmptyLine = extraProtoDefinition.Split('\r', '\n').FirstOrDefault(l => !string.IsNullOrEmpty(l));
            if (firstNonEmptyLine != null)
            {
-                if (TryGetValidPath(firstNonEmptyLine.TrimStart(['/', ' ']), out var validPath))
+                if (TryGetValidPath(firstNonEmptyLine.TrimStart('/', ' '), out var validPath))
                {
                    _files.Add(validPath, extraProtoDefinition);
                }
@@ -71,5 +70,4 @@ internal class WireMockProtoFileResolver : IProtoFileResolver
        validPath = null;
        return false;
    }
-}
-#endif
+}
--- a/src/WireMock.Net.ProtoBuf/WireMock.Net.ProtoBuf.csproj
+++ b/src/WireMock.Net.ProtoBuf/WireMock.Net.ProtoBuf.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <Description>ProtoBuf and gRPC support for WireMock.Net</Description>
+        <AssemblyTitle>WireMock.Net.ProtoBuf</AssemblyTitle>
+        <Authors>Stef Heyenrath</Authors>
+        <TargetFrameworks>netstandard2.1;net462;net6.0;net8.0</TargetFrameworks>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <PackageTags>wiremock;matchers;matcher;protobuf;grpc</PackageTags>
+        <RootNamespace>WireMock</RootNamespace>
+        <ProjectGuid>{B47413AA-55D3-49A7-896A-17ADBFF72407}</ProjectGuid>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <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>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="ProtoBufJsonConverter" Version="0.10.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\WireMock.Net.Shared\WireMock.Net.Shared.csproj" />
+    </ItemGroup>
+
+</Project>
--- a/src/WireMock.Net.Shared/Extensions/AnyOfExtensions.cs
+++ b/src/WireMock.Net.Shared/Extensions/AnyOfExtensions.cs
@@ -13,10 +13,10 @@ namespace WireMock.Extensions;
 public static class AnyOfExtensions
 {
    /// <summary>
-    /// Gets the pattern.
+    /// Gets the pattern as string value.
    /// </summary>
    /// <param name="value">AnyOf type</param>
-    /// <returns>string value</returns>
+    /// <returns>The string value</returns>
    public static string GetPattern(this AnyOf<string, StringPattern> value)
    {
        return value.IsFirst ? value.First : value.Second.Pattern;
--- a/src/WireMock.Net.Minimal/Extensions/StringExtensions.cs
+++ b/src/WireMock.Net.Minimal/Extensions/StringExtensions.cs
--- a/src/WireMock.Net.Minimal/IMapping.cs
+++ b/src/WireMock.Net.Minimal/IMapping.cs
@@ -68,7 +68,7 @@ public interface IMapping
    /// <summary>
    /// The number of times this match should be matched before the state will be changed to the next state.
    /// </summary>
-    int? StateTimes { get; }
+    int? TimesInSameState { get; }

    /// <summary>
    /// The RequestMatcher.
--- a/src/WireMock.Net.Shared/Matchers/Helpers/BodyDataMatchScoreCalculator.cs
+++ b/src/WireMock.Net.Shared/Matchers/Helpers/BodyDataMatchScoreCalculator.cs
@@ -34,14 +34,10 @@ internal static class BodyDataMatchScoreCalculator
            }
        }

-        if (matcher is ExactObjectMatcher exactObjectMatcher)
+        if (matcher is ExactObjectMatcher { Value: byte[] } exactObjectMatcher)
        {
            // If the body is a byte array, try to match.
-            var detectedBodyType = requestMessage.DetectedBodyType;
-            if (detectedBodyType is BodyType.Bytes or BodyType.String or BodyType.FormUrlEncoded)
-            {
-                return exactObjectMatcher.IsMatch(requestMessage.BodyAsBytes);
-            }
+            return exactObjectMatcher.IsMatch(requestMessage.BodyAsBytes);
        }

        // Check if the matcher is a IObjectMatcher
@@ -74,4 +70,4 @@ internal static class BodyDataMatchScoreCalculator

        return default;
    }
-}
+}
--- a/src/WireMock.Net.Shared/Matchers/IGraphQLMatcher.cs
+++ b/src/WireMock.Net.Shared/Matchers/IGraphQLMatcher.cs
@@ -0,0 +1,18 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+
+namespace WireMock.Matchers;
+
+/// <summary>
+/// GraphQLMatcher
+/// </summary>
+/// <inheritdoc cref="IStringMatcher"/>
+public interface IGraphQLMatcher : IStringMatcher
+{
+    /// <summary>
+    /// An optional dictionary defining the custom Scalar and the type.
+    /// </summary>
+    public IDictionary<string, Type>? CustomScalars { get; }
+}
--- a/src/WireMock.Net.Shared/Matchers/IProtoBufMatcher.cs
+++ b/src/WireMock.Net.Shared/Matchers/IProtoBufMatcher.cs
@@ -1,5 +1,8 @@
 // Copyright © WireMock.Net

+using System;
+using WireMock.Models;
+
 namespace WireMock.Matchers;

 /// <summary>
@@ -7,4 +10,18 @@ namespace WireMock.Matchers;
 /// </summary>
 public interface IProtoBufMatcher : IDecodeBytesMatcher, IBytesMatcher
 {
+    /// <summary>
+    /// The Func to define the proto definition as id or texts.
+    /// </summary>
+    Func<IdOrTexts> ProtoDefinition { get; set; }
+
+    /// <summary>
+    /// The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".
+    /// </summary>
+    string MessageType { get; }
+
+    /// <summary>
+    /// The Matcher to use (optional).
+    /// </summary>
+    IObjectMatcher? Matcher { get; }
 }
--- a/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageGraphQLMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageGraphQLMatcher.cs
@@ -3,8 +3,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using AnyOfTypes;
 using Stef.Validation;
+using WireMock.Models;
+using WireMock.Models.GraphQL;
 using WireMock.Types;
+using WireMock.Util;

 namespace WireMock.Matchers.Request;

@@ -34,18 +38,16 @@ public class RequestMessageGraphQLMatcher : IRequestMatcher
    {
    }

-#if GRAPHQL
    /// <summary>
    /// Initializes a new instance of the <see cref="RequestMessageGraphQLMatcher"/> class.
    /// </summary>
    /// <param name="matchBehaviour">The match behaviour.</param>
    /// <param name="schema">The schema.</param>
    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. [optional]</param>
-    public RequestMessageGraphQLMatcher(MatchBehaviour matchBehaviour, GraphQL.Types.ISchema schema, IDictionary<string, Type>? customScalars = null) :
-        this(CreateMatcherArray(matchBehaviour, new AnyOfTypes.AnyOf<string, WireMock.Models.StringPattern, GraphQL.Types.ISchema>(schema), customScalars))
+    public RequestMessageGraphQLMatcher(MatchBehaviour matchBehaviour, ISchemaData schema, IDictionary<string, Type>? customScalars = null) :
+        this(CreateMatcherArray(matchBehaviour, new AnyOf<string, StringPattern, ISchemaData>(schema), customScalars))
    {
    }
-#endif

    /// <summary>
    /// Initializes a new instance of the <see cref="RequestMessageGraphQLMatcher"/> class.
@@ -89,22 +91,16 @@ public class RequestMessageGraphQLMatcher : IRequestMatcher

    private IReadOnlyList<MatchResult> CalculateMatchResults(IRequestMessage requestMessage)
    {
-        return Matchers == null ? new[] { new MatchResult() } : Matchers.Select(matcher => CalculateMatchResult(requestMessage, matcher)).ToArray();
+        return Matchers == null ? [new MatchResult()] : Matchers.Select(matcher => CalculateMatchResult(requestMessage, matcher)).ToArray();
    }

-#if GRAPHQL
    private static IMatcher[] CreateMatcherArray(
        MatchBehaviour matchBehaviour,
-        AnyOfTypes.AnyOf<string, WireMock.Models.StringPattern, GraphQL.Types.ISchema> schema,
+        AnyOf<string, StringPattern, ISchemaData> schema,
        IDictionary<string, Type>? customScalars
    )
    {
-        return new[] { new GraphQLMatcher(schema, customScalars, matchBehaviour) }.Cast<IMatcher>().ToArray();
+        var graphQLMatcher = TypeLoader.LoadNewInstance<IGraphQLMatcher>(schema, customScalars, matchBehaviour, MatchOperator.Or);
+        return [graphQLMatcher];
    }
-#else
-    private static IMatcher[] CreateMatcherArray(MatchBehaviour matchBehaviour, object schema, IDictionary<string, Type>? customScalars)
-    {
-        throw new System.NotSupportedException("The GrapQLMatcher can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
-    }
-#endif
 }
--- a/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageProtoBufMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageProtoBufMatcher.cs
@@ -2,6 +2,7 @@

 using System;
 using WireMock.Models;
+using WireMock.Util;

 namespace WireMock.Matchers.Request;

@@ -24,11 +25,7 @@ public class RequestMessageProtoBufMatcher : IRequestMatcher
    /// <param name="matcher">The optional matcher to use to match the ProtoBuf as (json) object.</param>
    public RequestMessageProtoBufMatcher(MatchBehaviour matchBehaviour, Func<IdOrTexts> protoDefinition, string messageType, IObjectMatcher? matcher = null)
    {
-#if PROTOBUF
-        Matcher = new ProtoBufMatcher(protoDefinition, messageType, matchBehaviour, matcher);
-#else
-        throw new System.NotSupportedException("The ProtoBufMatcher can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
-#endif
+        Matcher = TypeLoader.LoadNewInstance<IProtoBufMatcher>(protoDefinition, messageType, matchBehaviour, matcher);
    }

    /// <inheritdoc />
--- a/src/WireMock.Net.Minimal/Models/GraphQLSchemaDetails.cs
+++ b/src/WireMock.Net.Minimal/Models/GraphQLSchemaDetails.cs
@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using AnyOfTypes;
 using Newtonsoft.Json;
+using WireMock.Models.GraphQL;

 namespace WireMock.Models;

@@ -22,17 +23,16 @@ public class GraphQLSchemaDetails
    /// </summary>
    public StringPattern? SchemaAsStringPattern { get; set; }

-#if GRAPHQL
    /// <summary>
-    /// The GraphQL schema as a <seealso cref="GraphQL.Types.ISchema"/>.
+    /// The GraphQL schema as a <seealso cref="ISchemaData"/>.
    /// </summary>
-    public GraphQL.Types.ISchema? SchemaAsISchema { get; set; }
+    public ISchemaData? SchemaAsISchemaData { get; set; }

    /// <summary>
    /// The GraphQL Schema.
    /// </summary>
    [JsonIgnore]
-    public AnyOf<string, StringPattern, GraphQL.Types.ISchema>? Schema
+    public AnyOf<string, StringPattern, ISchemaData>? Schema
    {
        get
        {
@@ -46,15 +46,14 @@ public class GraphQLSchemaDetails
                return SchemaAsStringPattern;
            }

-            if (SchemaAsISchema != null)
+            if (SchemaAsISchemaData != null)
            {
-                return new AnyOf<string, StringPattern, GraphQL.Types.ISchema>(SchemaAsISchema);
+                return new AnyOf<string, StringPattern, ISchemaData>(SchemaAsISchemaData);
            }

            return null;
        }
    }
-#endif

    /// <summary>
    /// The custom Scalars to define for this schema.
--- a/src/WireMock.Net.Shared/Properties/AssemblyInfo.cs
+++ b/src/WireMock.Net.Shared/Properties/AssemblyInfo.cs
@@ -4,6 +4,8 @@ using System.Runtime.CompilerServices;

 [assembly: InternalsVisibleTo("WireMock.Net.Minimal, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
 [assembly: InternalsVisibleTo("WireMock.Net.MimePart, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
+[assembly: InternalsVisibleTo("WireMock.Net.GraphQL, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
+[assembly: InternalsVisibleTo("WireMock.Net.ProtoBuf, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
 [assembly: InternalsVisibleTo("WireMock.Net.Matchers.CSharpCode, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
 // [assembly: InternalsVisibleTo("WireMock.Net.StandAlone, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
 [assembly: InternalsVisibleTo("WireMock.Net.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
--- a/src/WireMock.Net.Minimal/RequestBuilders/IBodyRequestBuilder.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/IBodyRequestBuilder.cs
@@ -10,7 +10,7 @@ namespace WireMock.RequestBuilders;
 /// <summary>
 /// The BodyRequestBuilder interface.
 /// </summary>
-public interface IBodyRequestBuilder : IProtoBufRequestBuilder
+public interface IBodyRequestBuilder : IMultiPartRequestBuilder
 {
    /// <summary>
    /// WithBody: IMatcher
@@ -52,7 +52,7 @@ public interface IBodyRequestBuilder : IProtoBufRequestBuilder
    IRequestBuilder WithBody(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);

    /// <summary>
-    /// WithBodyAsJson: A <see cref="JsonMatcher"/> will be used to match this object.
+    /// WithBodyAsJson: A JsonMatcher will be used to match this object.
    /// </summary>
    /// <param name="body">The body.</param>
    /// <param name="matchBehaviour">The match behaviour [default is AcceptOnMatch].</param>
@@ -93,12 +93,4 @@ public interface IBodyRequestBuilder : IProtoBufRequestBuilder
    /// <param name="func">The form-urlencoded values.</param>
    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
    IRequestBuilder WithBody(Func<IDictionary<string, string>?, bool> func);
-
-    /// <summary>
-    /// WithBodyAsGraphQLSchema: Body as GraphQL schema as a string.
-    /// </summary>
-    /// <param name="body">The GraphQL schema.</param>
-    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsGraphQLSchema(string body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 }
--- a/src/WireMock.Net.Minimal/RequestBuilders/IClientIPRequestBuilder.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/IClientIPRequestBuilder.cs
--- a/src/WireMock.Net.Minimal/RequestBuilders/ICookiesRequestBuilder.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/ICookiesRequestBuilder.cs
--- a/src/WireMock.Net.Minimal/RequestBuilders/IHeadersRequestBuilder.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/IHeadersRequestBuilder.cs
--- a/src/WireMock.Net.Minimal/RequestBuilders/IHttpVersionBuilder.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/IHttpVersionBuilder.cs
--- a/src/WireMock.Net.Minimal/RequestBuilders/IMethodRequestBuilder.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/IMethodRequestBuilder.cs
--- a/src/WireMock.Net.Minimal/RequestBuilders/IMultiPartRequestBuilder.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/IMultiPartRequestBuilder.cs
@@ -1,7 +1,6 @@
 // Copyright © WireMock.Net

 using WireMock.Matchers;
-using WireMock.Matchers.Request;

 namespace WireMock.RequestBuilders;

--- a/src/WireMock.Net.Minimal/RequestBuilders/IParamsRequestBuilder.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/IParamsRequestBuilder.cs
--- a/src/WireMock.Net.Shared/RequestBuilders/IRequestBuilder.cs
+++ b/src/WireMock.Net.Shared/RequestBuilders/IRequestBuilder.cs
@@ -0,0 +1,24 @@
+// Copyright © WireMock.Net
+
+using WireMock.Matchers.Request;
+
+namespace WireMock.RequestBuilders;
+
+/// <summary>
+/// IRequestBuilder
+/// </summary>
+public interface IRequestBuilder : IClientIPRequestBuilder
+{
+    /// <summary>
+    /// Adds a request matcher to the builder.
+    /// </summary>
+    /// <typeparam name="T">The type of the request matcher.</typeparam>
+    /// <param name="requestMatcher">The request matcher to add.</param>
+    /// <returns>The current <see cref="IRequestBuilder"/> instance.</returns>
+    IRequestBuilder Add<T>(T requestMatcher) where T : IRequestMatcher;
+
+    /// <summary>
+    /// The link back to the Mapping.
+    /// </summary>
+    IMapping Mapping { get; set; }
+}
--- a/src/WireMock.Net.Minimal/RequestBuilders/IUrlAndPathRequestBuilder.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/IUrlAndPathRequestBuilder.cs
--- a/src/WireMock.Net.Minimal/ResponseBuilders/BodyDestinationFormat.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/BodyDestinationFormat.cs
--- a/src/WireMock.Net.Minimal/ResponseBuilders/IBodyResponseBuilder.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/IBodyResponseBuilder.cs
@@ -1,7 +1,6 @@
 // Copyright © WireMock.Net

 using System;
-using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
 using JsonConverter.Abstractions;
@@ -84,7 +83,7 @@ public interface IBodyResponseBuilder : IFaultResponseBuilder
    IResponseBuilder WithBodyAsJson(Func<IRequestMessage, object> bodyFactory, Encoding? encoding = null);

    /// <summary>
-    /// WithBodyAsJson : Create a ... response based on a async callback function.
+    /// WithBodyAsJson : Create a ... response based on an async callback function.
    /// </summary>
    /// <param name="bodyFactory">The async delegate to build the body.</param>
    /// <param name="encoding">The body encoding.</param>
@@ -117,53 +116,4 @@ public interface IBodyResponseBuilder : IFaultResponseBuilder
    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
    /// <returns>A <see cref="IResponseBuilder"/>.</returns>
    IResponseBuilder WithBody(object body, Encoding? encoding, IJsonConverter jsonConverter, JsonConverterOptions? options = null);
-
-    /// <summary>
-    /// WithBodyAsProtoBuf : Create a ProtoBuf byte[] response based on a proto definition, message type and the value.
-    /// </summary>
-    /// <param name="protoDefinition">The proto definition as text.</param>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="value">The object to convert to protobuf byte[].</param>
-    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
-    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
-    /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-    IResponseBuilder WithBodyAsProtoBuf(
-        string protoDefinition,
-        string messageType,
-        object value,
-        IJsonConverter? jsonConverter = null,
-        JsonConverterOptions? options = null
-    );
-
-    /// <summary>
-    /// WithBodyAsProtoBuf : Create a ProtoBuf byte[] response based on proto definitions, message type and the value.
-    /// </summary>
-    /// <param name="protoDefinitions">The proto definition as text.</param>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="value">The object to convert to protobuf byte[].</param>
-    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
-    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
-    /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-    IResponseBuilder WithBodyAsProtoBuf(
-        IReadOnlyList<string> protoDefinitions,
-        string messageType,
-        object value,
-        IJsonConverter? jsonConverter = null,
-        JsonConverterOptions? options = null
-    );
-
-    /// <summary>
-    /// WithBodyAsProtoBuf : Create a ProtoBuf byte[] response based on a proto definition, message type and the value.
-    /// </summary>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="value">The object to convert to protobuf byte[].</param>
-    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
-    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
-    /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-    IResponseBuilder WithBodyAsProtoBuf(
-        string messageType,
-        object value,
-        IJsonConverter? jsonConverter = null,
-        JsonConverterOptions? options = null
-    );
 }
--- a/src/WireMock.Net.Minimal/ResponseBuilders/ICallbackResponseBuilder.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/ICallbackResponseBuilder.cs
@@ -17,12 +17,12 @@ public interface ICallbackResponseBuilder : IResponseProvider
    /// </summary>
    /// <returns>The <see cref="IResponseBuilder"/>.</returns>
    [PublicAPI]
-    IResponseBuilder WithCallback(Func<IRequestMessage, ResponseMessage> callbackHandler);
+    IResponseBuilder WithCallback(Func<IRequestMessage, IResponseMessage> callbackHandler);

    /// <summary>
    /// The async callback builder
    /// </summary>
    /// <returns>The <see cref="IResponseBuilder"/>.</returns>
    [PublicAPI]
-    IResponseBuilder WithCallback(Func<IRequestMessage, Task<ResponseMessage>> callbackHandler);
+    IResponseBuilder WithCallback(Func<IRequestMessage, Task<IResponseMessage>> callbackHandler);
 }
--- a/src/WireMock.Net.Minimal/ResponseBuilders/IDelayResponseBuilder.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/IDelayResponseBuilder.cs
--- a/src/WireMock.Net.Minimal/ResponseBuilders/IFaultRequestBuilder.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/IFaultRequestBuilder.cs
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stef Heyenrath	358590918e	1.11.2	2025-08-27 10:25:31 +02:00
Stef Heyenrath	32afea5d30	Revert JetBrains.Annotations and add System.Text.RegularExpressions to solve CVE (#1355 )	2025-08-27 10:04:36 +02:00
Stef Heyenrath	50b3d58a01	1.11.1	2025-08-27 08:47:58 +02:00
Stef Heyenrath	35bf5e94a5	Add System.Net.Http again to solve CVE warning (#1354 )	2025-08-27 08:45:24 +02:00
Stef Heyenrath	9fcc9ade10	Add additional try-catch to TypeLoader logic (#1352 )	2025-08-27 08:33:01 +02:00
Stef Heyenrath	865bbf2432	WireMock.Net.ProtoBuf: fix version	2025-08-26 15:42:23 +02:00
Stef Heyenrath	560540099e	1.11.0	2025-08-26 07:58:04 +02:00
Stef Heyenrath	e5c4605020	Create WireMock.Net.ProtoBuf project (#1350 ) * Create WireMock.Net.ProtoBuf project * ok * Update Directory.Build.props Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-08-26 07:55:02 +02:00
Stef Heyenrath	124d29c86a	1.10.1	2025-08-22 19:58:00 +02:00
Stef Heyenrath	08117e870b	Add AtPath and AtAbsolutePath to Assertions projects (#1349 ) * Add AtPath and AtAbsolutePath to Assertions projects * tst	2025-08-22 19:40:59 +02:00
Stef Heyenrath	ddb181cc52	WireMock.Net.Extensions.Routing	2025-08-18 20:47:10 +02:00
Stef Heyenrath	10fdd24fca	1.10.0	2025-08-18 20:22:49 +02:00
Gennadii Saltyshchak	be2ea67b89	Add new package WireMock.Net.Extensions.Routing which provides minimal-API-style routing for WireMock.Net (#1344 ) * Add new package WireMock.Net.Extensions.Routing * Update documentation for WireMock.Net.Extensions.Routing * Cleanup imports * Add header to all source files inside WireMock.Net.Extensions.Routing * Add header to all source files inside WireMock.Net.Extensions.Routing.Tests * Revert unintended changes * Remove redundant build configurations * Remove incorrect links from documentation * Update nuget package references * Revert unintended changes * Migrate to AwesomeAssertions * Remove redundant project reference * Adjust formatting * Migrate to primary constructor * Refactoring: rename delegate parameter * Abstract over JSON converter * Replace WireMock with WireMock.Net in comments * Move local functions to the bottom of the methods	2025-08-18 19:52:42 +02:00
Stef Heyenrath	60eb519ae2	1.9.1	2025-08-17 10:11:48 +02:00
Stef Heyenrath	22ed94918a	Fix generating source code for Scenario and State (#1347 ) * Fix generating source code for Scenario and State * Update src/WireMock.Net.Minimal/Serialization/MappingConverter.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/WireMock.Net.Minimal/Serialization/MappingConverter.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * . --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-08-17 10:06:39 +02:00
Stef Heyenrath	faffc56484	Add TimesInSameState to MappingModel (#1345 ) * Add TimesInSameState to MappingModel * fix tests	2025-08-11 08:46:18 +02:00
Stef Heyenrath	a5558777e2	1.9.0	2025-08-10 19:07:24 +02:00
Stef Heyenrath	6722ca40ba	Update feature_request.md	2025-08-10 19:02:24 +02:00
Stef Heyenrath	0597a73e0e	Create GraphQL project (#1334 ) * Create new project for GraphQL * ... * . * ok? * Update src/WireMock.Net.Shared/Extensions/AnyOfExtensions.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * -- * ... --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-08-10 19:00:22 +02:00
Stef Heyenrath	0d510cdde8	1.8.18	2025-08-04 18:03:44 +02:00
Stef Heyenrath	52a396beef	1.8.18	2025-08-04 18:03:23 +02:00
Sam Fields	6ccfe68686	Fixes an issue with matching JSON bodies as bytes (#1339 ) * Fixes an issue with matching JSON bodies as bytes * Adding tests for exact object matching * Simplify the check for byte data	2025-08-02 20:11:13 +02:00