1.4.9

WithProxy() should save the new mapping (#600 )
* WithProxy should save the new mapping * fix ut * .
2026-01-13 05:50:36 +01:00 · 2021-03-31 18:23:49 +02:00 · 2021-03-31 18:17:27 +02:00 · 2021-03-24 17:20:31 +00:00 · 2021-03-24 18:15:31 +01:00 · 2021-03-21 09:22:18 +01:00
109 changed files with 3963 additions and 2795 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,38 @@
+# 1.4.9 (31 March 2021)
+- [#600](https://github.com/WireMock-Net/WireMock.Net/pull/600) - WithProxy() should save the new mapping [bug] contributed by [StefH](https://github.com/StefH)
+
+# 1.4.8 (24 March 2021)
+- [#591](https://github.com/WireMock-Net/WireMock.Net/pull/591) - Webhook [feature] contributed by [StefH](https://github.com/StefH)
+- [#589](https://github.com/WireMock-Net/WireMock.Net/issues/589) - How to send a request to a specific URL after sending response [feature]
+
+# 1.4.7 (21 March 2021)
+- [#594](https://github.com/WireMock-Net/WireMock.Net/pull/594) - Add possibility to the WithBody() to use IBodyData [feature] contributed by [StefH](https://github.com/StefH)
+- [#595](https://github.com/WireMock-Net/WireMock.Net/pull/595) - Use Handlebars.Net.Helpers Version=&quot;2.1.2&quot; [feature] contributed by [StefH](https://github.com/StefH)
+- [#597](https://github.com/WireMock-Net/WireMock.Net/pull/597) - Remove 2 second delay from first response and add IPv6 address support [bug, feature] contributed by [benagain](https://github.com/benagain)
+
+# 1.4.6 (26 February 2021)
+- [#587](https://github.com/WireMock-Net/WireMock.Net/pull/587) - Fix WithCallback logic when using other fluent builder statements [bug] contributed by [StefH](https://github.com/StefH)
+- [#569](https://github.com/WireMock-Net/WireMock.Net/issues/569) - WithCallback circumvent the rest of the builder [bug]
+
+# 1.4.5 (11 February 2021)
+- [#585](https://github.com/WireMock-Net/WireMock.Net/pull/585) - Fix response date header [bug] contributed by [wolf8196](https://github.com/wolf8196)
+
+# 1.4.4 (09 February 2021)
+- [#581](https://github.com/WireMock-Net/WireMock.Net/pull/581) - Use new Handlebars.Net.Helpers [feature] contributed by [StefH](https://github.com/StefH)
+- [#582](https://github.com/WireMock-Net/WireMock.Net/pull/582) - Add Xamarin UI tests [feature] contributed by [StefH](https://github.com/StefH)
+- [#568](https://github.com/WireMock-Net/WireMock.Net/issues/568) - [Question] Dates in response templates [feature]
+
+# 1.4.3 (05 February 2021)
+- [#570](https://github.com/WireMock-Net/WireMock.Net/pull/570) - Bump log4net from 2.0.8 to 2.0.10 in /examples/WireMock.Net.StandAlone.NETCoreApp [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#571](https://github.com/WireMock-Net/WireMock.Net/pull/571) - Bump log4net from 2.0.8 to 2.0.10 in /examples/WireMock.Net.Console.NETCoreApp2 [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#572](https://github.com/WireMock-Net/WireMock.Net/pull/572) - Bump log4net from 2.0.8 to 2.0.10 in /examples/WireMock.Net.Console.NETCoreApp [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#573](https://github.com/WireMock-Net/WireMock.Net/pull/573) - Bump log4net from 2.0.8 to 2.0.10 in /examples/WireMock.Net.Console.Net461.Classic [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#574](https://github.com/WireMock-Net/WireMock.Net/pull/574) - Bump log4net from 2.0.8 to 2.0.10 in /examples/WireMock.Net.Console.Net452.Classic [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#575](https://github.com/WireMock-Net/WireMock.Net/pull/575) - Bump log4net from 2.0.8 to 2.0.10 in /examples/WireMock.Net.StandAlone.Net452 [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#576](https://github.com/WireMock-Net/WireMock.Net/pull/576) - Bump log4net from 2.0.8 to 2.0.10 in /examples/WireMock.Net.Service [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#579](https://github.com/WireMock-Net/WireMock.Net/pull/579) - Net5 issue [bug] contributed by [StefH](https://github.com/StefH)
+- [#577](https://github.com/WireMock-Net/WireMock.Net/issues/577) - WireMock.Net will not run with certain .net5 dependencies installed in the project [bug]
+
 # 1.4.2 (24 January 2021)
 - [#566](https://github.com/WireMock-Net/WireMock.Net/pull/566) - Do not save Mappings when SaveMappingForStatusCodePattern does not match [bug] contributed by [StefH](https://github.com/StefH)
 - [#565](https://github.com/WireMock-Net/WireMock.Net/issues/565) - NullReferenceException [bug]
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <VersionPrefix>1.4.1</VersionPrefix>
+    <VersionPrefix>1.4.9</VersionPrefix>
    <PackageReleaseNotes>See CHANGELOG.md</PackageReleaseNotes>
    <PackageIconUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/WireMock.Net-Logo.png</PackageIconUrl>
    <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
--- a/GitHubReleaseNotes.txt
+++ b/GitHubReleaseNotes.txt
@@ -1,3 +1,3 @@
 https://github.com/StefH/GitHubReleaseNotes

-GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc --version 1.4.2
+GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc --version 1.4.9
--- a/Solution.sln
+++ b/Solution.sln
@@ -78,7 +78,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-WireMock", "src\dotn
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NET5", "examples\WireMock.Net.Console.NET5\WireMock.Net.Console.NET5.csproj", "{3F8CF0AE-5F24-4A54-89E7-A3EE829DB5F8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Matchers.CSharpCode", "src\WireMock.Net.Matchers.CSharpCode\WireMock.Net.Matchers.CSharpCode.csproj", "{6437CE56-8AB9-4D6D-90F1-70CC5BBE1572}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Matchers.CSharpCode", "src\WireMock.Net.Matchers.CSharpCode\WireMock.Net.Matchers.CSharpCode.csproj", "{B6269AAC-170A-4346-8B9A-444DED3D9A44}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Net472.Classic", "examples\WireMock.Net.Console.Net472.Classic\WireMock.Net.Console.Net472.Classic.csproj", "{6580580B-1EFD-4922-B0EC-FF290DB279EE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -194,10 +196,14 @@ Global
 		{3F8CF0AE-5F24-4A54-89E7-A3EE829DB5F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3F8CF0AE-5F24-4A54-89E7-A3EE829DB5F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3F8CF0AE-5F24-4A54-89E7-A3EE829DB5F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6437CE56-8AB9-4D6D-90F1-70CC5BBE1572}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6437CE56-8AB9-4D6D-90F1-70CC5BBE1572}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6437CE56-8AB9-4D6D-90F1-70CC5BBE1572}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6437CE56-8AB9-4D6D-90F1-70CC5BBE1572}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6269AAC-170A-4346-8B9A-444DED3D9A44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-444DED3D9A44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-444DED3D9A44}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6269AAC-170A-4346-8B9A-444DED3D9A44}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6580580B-1EFD-4922-B0EC-FF290DB279EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6580580B-1EFD-4922-B0EC-FF290DB279EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6580580B-1EFD-4922-B0EC-FF290DB279EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6580580B-1EFD-4922-B0EC-FF290DB279EE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -230,7 +236,8 @@ Global
 		{925E421A-1B3F-4202-B48F-734743573A4B} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{40BF24B5-12E6-4610-9489-138798632E28} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{3F8CF0AE-5F24-4A54-89E7-A3EE829DB5F8} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
-		{6437CE56-8AB9-4D6D-90F1-70CC5BBE1572} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{B6269AAC-170A-4346-8B9A-444DED3D9A44} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{6580580B-1EFD-4922-B0EC-FF290DB279EE} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}
--- a/examples/WireMock.Net.Console.NET5/WireMock.Net.Console.NET5.csproj
+++ b/examples/WireMock.Net.Console.NET5/WireMock.Net.Console.NET5.csproj
@@ -28,10 +28,10 @@

  <ItemGroup>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="Handlebars.Net.Helpers" Version="1.1.0" />
-    <PackageReference Include="log4net" Version="2.0.8" />
+    <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
+    <PackageReference Include="log4net" Version="2.0.12" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <!--<PackageReference Include="Microsoft.CodeAnalysis.Scripting.Common" Version="3.4.0" />-->
  </ItemGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj
+++ b/examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj
@@ -19,8 +19,13 @@

  <ItemGroup>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="Handlebars.Net" Version="1.9.5" />
-    <PackageReference Include="log4net" Version="2.0.8" />
+    <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.*" />
+    <PackageReference Include="log4net" Version="2.0.10" />
    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
  </ItemGroup>

--- a/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj
+++ b/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj
@@ -1,60 +1,65 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\WireMock.Net.Console.Net452.Classic\MainApp.cs" Link="MainApp.cs" />
-    <Compile Include="..\WireMock.Net.Console.Net452.Classic\CustomFileSystemFileHandler.cs" Link="CustomFileSystemFileHandler.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="__admin\mappings\*.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Remove="__admin\mappings\1.cs" />
-  </ItemGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\WireMock.Net.Console.Net452.Classic\MainApp.cs" Link="MainApp.cs" />
+    <Compile Include="..\WireMock.Net.Console.Net452.Classic\CustomFileSystemFileHandler.cs" Link="CustomFileSystemFileHandler.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="__admin\mappings\*.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="__admin\mappings\1.cs" />
+  </ItemGroup>
+
  <ItemGroup>
    <Content Remove="__admin\mappings\wiremock-petstore-openapi3.json" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="__admin\mappings\array.json" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="Handlebars.Net" Version="1.9.5" />
-    <PackageReference Include="log4net" Version="2.0.8" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="log4net.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="nlog.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="__admin\mappings\791a3f31-6946-4ce7-8e6f-0237c7443275.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="__admin\mappings\791a3f31-6946-4ce7-8e6f-0237c7443275.json">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </None>
-    <None Update="__admin\mappings\MyXmlResponse.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="__admin\mappings\array.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+    <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.*" />
+    <PackageReference Include="log4net" Version="2.0.10" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="log4net.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="nlog.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="__admin\mappings\791a3f31-6946-4ce7-8e6f-0237c7443275.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="__admin\mappings\791a3f31-6946-4ce7-8e6f-0237c7443275.json">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </None>
+    <None Update="__admin\mappings\MyXmlResponse.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
    <None Update="__admin\mappings\wiremock-petstore-openapi3.json">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
+    </None>
+  </ItemGroup>
+
 </Project>
--- a/examples/WireMock.Net.Console.NETCoreApp3/WireMock.Net.Console.NETCoreApp3.csproj
+++ b/examples/WireMock.Net.Console.NETCoreApp3/WireMock.Net.Console.NETCoreApp3.csproj
@@ -28,10 +28,14 @@

  <ItemGroup>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="Handlebars.Net.Helpers" Version="1.1.0" />
-    <PackageReference Include="log4net" Version="2.0.8" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <!--<PackageReference Include="Microsoft.CodeAnalysis.Scripting.Common" Version="3.4.0" />-->
+    <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.*" />
+    <PackageReference Include="log4net" Version="2.0.12" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
  </ItemGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.Console.Net452.Classic/App.config
+++ b/examples/WireMock.Net.Console.Net452.Classic/App.config
@@ -1,6 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
-    </startup>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+    </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="HandlebarsDotNet.Helpers.Core" publicKeyToken="00d131fae0c250bc" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
--- a/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
+++ b/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
@@ -64,7 +64,7 @@ namespace WireMock.Net.ConsoleApplication
                HandlebarsRegistrationCallback = (handlebarsContext, fileSystemHandler) =>
                {
                    var transformer = new CustomNameTransformer();
-                    handlebarsContext.RegisterHelper(transformer.Name, transformer.Render);
+                    // handlebarsContext.RegisterHelper(transformer.Name, transformer.Render); TODO
                },

                // Uncomment below if you want to use the CustomFileSystemFileHandler
@@ -280,7 +280,7 @@ namespace WireMock.Net.ConsoleApplication
                    .WithBody("hi"));

            server
-                .Given(Request.Create().WithPath("/data").UsingPost().WithBody(b => b.Contains("e")))
+                .Given(Request.Create().WithPath("/data").UsingPost().WithBody(b => b != null && b.Contains("e")))
                .AtPriority(999)
                .RespondWith(Response.Create()
                    .WithStatusCode(201)
--- a/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj
+++ b/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj
@@ -1,100 +1,111 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{668F689E-57B4-422E-8846-C0FF643CA268}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>WireMock.Net.ConsoleApplication</RootNamespace>
-    <AssemblyName>WireMock.Net.ConsoleApplication</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>..\..\WireMock.Net-Logo.ico</ApplicationIcon>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Handlebars, Version=1.9.5.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.1.9.5\lib\net452\Handlebars.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.XML" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CustomFileSystemFileHandler.cs" />
-    <Compile Include="MainApp.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="log4net.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
-    <Content Include="__admin\mappings\11111110-a633-40e8-a244-5cb80bc0ab66.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="__admin\mappings\873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj">
-      <Project>{b6269aac-170a-4346-8b9a-579ded3d9a94}</Project>
-      <Name>WireMock.Net.Abstractions</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
-      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
-      <Name>WireMock.Net</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{668F689E-57B4-422E-8846-C0FF643CA268}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>WireMock.Net.ConsoleApplication</RootNamespace>
+    <AssemblyName>WireMock.Net.ConsoleApplication</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>..\..\WireMock.Net-Logo.ico</ApplicationIcon>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Handlebars, Version=2.0.4.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.2.0.4\lib\net452\Handlebars.dll</HintPath>
+    </Reference>
+    <Reference Include="Handlebars.Net.Helpers, Version=2.1.1.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.1.1-preview-01\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.1.1.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.1.1-preview-01\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.XML" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CustomFileSystemFileHandler.cs" />
+    <Compile Include="MainApp.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="log4net.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
+    <Content Include="__admin\mappings\11111110-a633-40e8-a244-5cb80bc0ab66.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <None Include="__admin\mappings\873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj">
+      <Project>{b6269aac-170a-4346-8b9a-579ded3d9a94}</Project>
+      <Name>WireMock.Net.Abstractions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
+      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
+      <Name>WireMock.Net</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
  </Target>
  <Target Name="AfterBuild">
  </Target>
-  -->
+  -->
 </Project>
--- a/examples/WireMock.Net.Console.Net452.Classic/packages.config
+++ b/examples/WireMock.Net.Console.Net452.Classic/packages.config
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Handlebars.Net" version="1.9.5" targetFramework="net452" />
-  <package id="log4net" version="2.0.8" targetFramework="net452" />
-  <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
-  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net452" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Handlebars.Net" version="2.0.4" targetFramework="net452" />
+  <package id="Handlebars.Net.Helpers" version="2.1.1-preview-01" targetFramework="net452" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.1.1-preview-01" targetFramework="net452" />
+  <package id="log4net" version="2.0.12" targetFramework="net452" />
+  <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
+  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net452" />
+  <package id="System.ValueTuple" version="4.3.0" targetFramework="net452" />
 </packages>
--- a/examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj
+++ b/examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj
@@ -1,89 +1,100 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{1261BB9B-A7D4-456C-8985-3CE560361B8E}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>WireMock.Net.Console.Net461.Classic</RootNamespace>
-    <AssemblyName>WireMock.Net.Console.Net461.Classic</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>WireMock.Net.ConsoleApplication.Program</StartupObject>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Handlebars, Version=1.9.5.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.1.9.5\lib\net452\Handlebars.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\WireMock.Net.Console.Net452.Classic\CustomFileSystemFileHandler.cs">
-      <Link>CustomFileSystemFileHandler.cs</Link>
-    </Compile>
-    <Compile Include="..\WireMock.Net.Console.Net452.Classic\MainApp.cs">
-      <Link>MainApp.cs</Link>
-    </Compile>
-    <Compile Include="..\WireMock.Net.Console.Net452.Classic\Program.cs">
-      <Link>Program.cs</Link>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\WireMock.Net.Console.Net452.Classic\log4net.config">
-      <Link>log4net.config</Link>
-    </None>
-    <None Include="App.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj">
-      <Project>{b6269aac-170a-4346-8b9a-579ded3d9a94}</Project>
-      <Name>WireMock.Net.Abstractions</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
-      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
-      <Name>WireMock.Net</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{1261BB9B-A7D4-456C-8985-3CE560361B8E}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>WireMock.Net.Console.Net461.Classic</RootNamespace>
+    <AssemblyName>WireMock.Net.Console.Net461.Classic</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>WireMock.Net.ConsoleApplication.Program</StartupObject>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Handlebars, Version=2.0.4.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.2.0.4\lib\net46\Handlebars.dll</HintPath>
+    </Reference>
+    <Reference Include="Handlebars.Net.Helpers, Version=2.1.1.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.1.1-preview-01\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.1.1.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.1.1-preview-01\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\WireMock.Net.Console.Net452.Classic\CustomFileSystemFileHandler.cs">
+      <Link>CustomFileSystemFileHandler.cs</Link>
+    </Compile>
+    <Compile Include="..\WireMock.Net.Console.Net452.Classic\MainApp.cs">
+      <Link>MainApp.cs</Link>
+    </Compile>
+    <Compile Include="..\WireMock.Net.Console.Net452.Classic\Program.cs">
+      <Link>Program.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\WireMock.Net.Console.Net452.Classic\log4net.config">
+      <Link>log4net.config</Link>
+    </None>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj">
+      <Project>{b6269aac-170a-4346-8b9a-579ded3d9a94}</Project>
+      <Name>WireMock.Net.Abstractions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
+      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
+      <Name>WireMock.Net</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
--- a/examples/WireMock.Net.Console.Net461.Classic/packages.config
+++ b/examples/WireMock.Net.Console.Net461.Classic/packages.config
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Handlebars.Net" version="1.9.5" targetFramework="net461" />
-  <package id="log4net" version="2.0.8" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
-  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Handlebars.Net" version="2.0.4" targetFramework="net461" />
+  <package id="Handlebars.Net.Helpers" version="2.1.1-preview-01" targetFramework="net461" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.1.1-preview-01" targetFramework="net461" />
+  <package id="log4net" version="2.0.12" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
+  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.3.0" targetFramework="net461" />
 </packages>
--- a/examples/WireMock.Net.Console.Net472.Classic/App.config
+++ b/examples/WireMock.Net.Console.Net472.Classic/App.config
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Cng" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.AspNetCore.Server.IIS" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.6.0" newVersion="2.2.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Configuration" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
--- a/examples/WireMock.Net.Console.Net472.Classic/Properties/AssemblyInfo.cs
+++ b/examples/WireMock.Net.Console.Net472.Classic/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("WireMock.Net.Console.Net461.Classic")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("WireMock.Net.Console.Net461.Classic")]
+[assembly: AssemblyCopyright("Copyright © Stef Heyenrath  2018")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("1261bb9b-a7d4-456c-8985-3ce560361b8e")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
--- a/examples/WireMock.Net.Console.Net472.Classic/WireMock.Net.Console.Net472.Classic.csproj
+++ b/examples/WireMock.Net.Console.Net472.Classic/WireMock.Net.Console.Net472.Classic.csproj
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props" Condition="Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{6580580B-1EFD-4922-B0EC-FF290DB279EE}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>WireMock.Net.Console.Net461.Classic</RootNamespace>
+    <AssemblyName>WireMock.Net.Console.Net461.Classic</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>WireMock.Net.ConsoleApplication.Program</StartupObject>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Fare, Version=2.1.0.0, Culture=neutral, PublicKeyToken=ea68d375bf33a7c8, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Fare.2.1.1\lib\net35\Fare.dll</HintPath>
+    </Reference>
+    <Reference Include="Handlebars, Version=2.0.4.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.2.0.4\lib\net46\Handlebars.dll</HintPath>
+    </Reference>
+    <Reference Include="Handlebars.Net.Helpers, Version=2.1.1.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.1.1-preview-01\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.1.1.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.1.1-preview-01\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="JmesPath.Net, Version=1.0.125.0, Culture=neutral, PublicKeyToken=b29d616b7f4faff0, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\JmesPath.Net.1.0.125\lib\net45\JmesPath.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Authentication.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Authentication.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Authentication.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Authentication.Core, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Authentication.Core.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Authentication.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Connections.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Connections.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Connections.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Diagnostics, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Diagnostics.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Diagnostics.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Diagnostics.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Diagnostics.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Diagnostics.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.HostFiltering, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.HostFiltering.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.HostFiltering.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Hosting, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Hosting.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Hosting.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Hosting.Server.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.Server.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Http, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Http.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Http.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Http.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Http.Extensions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Http.Extensions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Http.Features, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Http.Features.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Features.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.HttpOverrides, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.HttpOverrides.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.HttpOverrides.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Routing, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Routing.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Routing.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Routing.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Routing.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Routing.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Server.IIS, Version=2.2.6.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\lib\netstandard2.0\Microsoft.AspNetCore.Server.IIS.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Server.IISIntegration, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Core, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.Core.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Https, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.Https.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.Https.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNetCore.WebUtilities, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.WebUtilities.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.WebUtilities.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.5.0.0\lib\net461\Microsoft.Extensions.Configuration.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Binder.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration.CommandLine, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.CommandLine.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.CommandLine.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.EnvironmentVariables.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.EnvironmentVariables.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration.FileExtensions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.FileExtensions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.FileExtensions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration.Json, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Json.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration.UserSecrets, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.2.2.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.FileProviders.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.FileProviders.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.FileProviders.Physical, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.FileProviders.Physical.2.2.0\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Physical.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.FileSystemGlobbing, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.FileSystemGlobbing.2.2.0\lib\netstandard2.0\Microsoft.Extensions.FileSystemGlobbing.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Hosting.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Hosting.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Hosting.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Configuration, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Configuration.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Configuration.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Console, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Console.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Console.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Debug, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Debug.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Debug.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.EventSource, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.EventSource.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.EventSource.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.ObjectPool, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.ObjectPool.2.2.0\lib\netstandard2.0\Microsoft.Extensions.ObjectPool.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Options, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Options.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Primitives, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Primitives.5.0.0\lib\net461\Microsoft.Extensions.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Net.Http.Headers, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Net.Http.Headers.2.2.0\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="RandomDataGenerator, Version=1.0.12.0, Culture=neutral, PublicKeyToken=ae5c571d29a3b8d9, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\RandomDataGenerator.Net.1.0.12\lib\net45\RandomDataGenerator.dll</HintPath>
+    </Reference>
+    <Reference Include="Scriban.Signed, Version=2.1.4.0, Culture=neutral, PublicKeyToken=5675fb69b15f2433, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Scriban.Signed.2.1.4\lib\net45\Scriban.Signed.dll</HintPath>
+    </Reference>
+    <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ComponentModel.Annotations.4.5.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.5.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Pipelines, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.IO.Pipelines.4.5.3\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Linq.Dynamic.Core, Version=1.0.12.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.0.12\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata, Version=1.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Cng, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.Cng.4.5.0\lib\net47\System.Security.Cryptography.Cng.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Principal.Windows, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Principal.Windows.4.5.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Encodings.Web, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Text.Encodings.Web.4.5.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+    <Reference Include="XPath2, Version=1.1.0.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XPath2.1.1.0\lib\net40\XPath2.dll</HintPath>
+    </Reference>
+    <Reference Include="XPath2.Extensions, Version=1.1.0.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XPath2.Extensions.1.1.0\lib\net40\XPath2.Extensions.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\WireMock.Net.Console.Net452.Classic\CustomFileSystemFileHandler.cs">
+      <Link>CustomFileSystemFileHandler.cs</Link>
+    </Compile>
+    <Compile Include="..\WireMock.Net.Console.Net452.Classic\MainApp.cs">
+      <Link>MainApp.cs</Link>
+    </Compile>
+    <Compile Include="..\WireMock.Net.Console.Net452.Classic\Program.cs">
+      <Link>Program.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\WireMock.Net.Console.Net452.Classic\log4net.config">
+      <Link>log4net.config</Link>
+    </None>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj">
+      <Project>{b6269aac-170a-4346-8b9a-579ded3d9a94}</Project>
+      <Name>WireMock.Net.Abstractions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
+      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
+      <Name>WireMock.Net</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\build\netstandard2.0\Microsoft.AspNetCore.Server.IIS.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\build\netstandard2.0\Microsoft.AspNetCore.Server.IIS.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.2.0\build\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.2.0\build\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.targets'))" />
+  </Target>
+  <Import Project="..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets" Condition="Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets')" />
+  <Import Project="..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\build\netstandard2.0\Microsoft.AspNetCore.Server.IIS.targets" Condition="Exists('..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\build\netstandard2.0\Microsoft.AspNetCore.Server.IIS.targets')" />
+  <Import Project="..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.2.0\build\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.targets" Condition="Exists('..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.2.0\build\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.targets')" />
+</Project>
--- a/examples/WireMock.Net.Console.Net472.Classic/packages.config
+++ b/examples/WireMock.Net.Console.Net472.Classic/packages.config
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Fare" version="2.1.1" targetFramework="net472" />
+  <package id="Handlebars.Net" version="2.0.4" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers" version="2.1.1-preview-01" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.1.1-preview-01" targetFramework="net472" />
+  <package id="JmesPath.Net" version="1.0.125" targetFramework="net472" />
+  <package id="log4net" version="2.0.12" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Authentication.Abstractions" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Authentication.Core" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Connections.Abstractions" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Diagnostics" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Diagnostics.Abstractions" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.HostFiltering" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Hosting" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Hosting.Abstractions" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Hosting.Server.Abstractions" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Http" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Http.Abstractions" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Http.Extensions" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Http.Features" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.HttpOverrides" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Routing" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Routing.Abstractions" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Server.IIS" version="2.2.6" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Server.IISIntegration" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Server.Kestrel" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Server.Kestrel.Core" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Server.Kestrel.Https" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.AspNetCore.WebUtilities" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.CSharp" version="4.5.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Configuration" version="5.0.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Configuration.Abstractions" version="5.0.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Configuration.Binder" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Configuration.CommandLine" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Configuration.EnvironmentVariables" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Configuration.FileExtensions" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Configuration.Json" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Configuration.UserSecrets" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.FileProviders.Abstractions" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.FileProviders.Physical" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.FileSystemGlobbing" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Hosting.Abstractions" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Logging" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Logging.Configuration" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Logging.Console" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Logging.Debug" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Logging.EventSource" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.ObjectPool" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Options" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Options.ConfigurationExtensions" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Primitives" version="5.0.0" targetFramework="net472" />
+  <package id="Microsoft.Net.Http.Headers" version="2.2.0" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
+  <package id="RandomDataGenerator.Net" version="1.0.12" targetFramework="net472" />
+  <package id="Scriban.Signed" version="2.1.4" targetFramework="net472" />
+  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
+  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net472" />
+  <package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net472" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.5.0" targetFramework="net472" />
+  <package id="System.IO.Pipelines" version="4.5.3" targetFramework="net472" />
+  <package id="System.Linq.Dynamic.Core" version="1.0.12" targetFramework="net472" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net472" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
+  <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net472" />
+  <package id="System.Security.Cryptography.Cng" version="4.5.0" targetFramework="net472" />
+  <package id="System.Security.Principal.Windows" version="4.5.0" targetFramework="net472" />
+  <package id="System.Text.Encodings.Web" version="4.5.0" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net472" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
+  <package id="WireMock.Net" version="1.4.2" targetFramework="net472" />
+  <package id="WireMock.Net.Abstractions" version="1.4.2" targetFramework="net472" />
+  <package id="XPath2" version="1.1.0" targetFramework="net472" />
+  <package id="XPath2.Extensions" version="1.1.0" targetFramework="net472" />
+</packages>
--- a/examples/WireMock.Net.Service/WireMock.Net.Service.csproj
+++ b/examples/WireMock.Net.Service/WireMock.Net.Service.csproj
@@ -32,11 +32,8 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Handlebars, Version=1.9.5.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.1.9.5\lib\net452\Handlebars.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.Owin, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.Owin.2.0.2\lib\net45\Microsoft.Owin.dll</HintPath>
@@ -57,6 +54,7 @@
      <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
    </Reference>
    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
    <Reference Include="System.Configuration.Install" />
    <Reference Include="System.Core" />
    <Reference Include="System.Management" />
--- a/examples/WireMock.Net.Service/packages.config
+++ b/examples/WireMock.Net.Service/packages.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Handlebars.Net" version="1.9.5" targetFramework="net452" />
-  <package id="log4net" version="2.0.8" targetFramework="net452" />
+  <package id="log4net" version="2.0.12" targetFramework="net452" />
  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
  <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net452" />
--- a/examples/WireMock.Net.StandAlone.NETCoreApp/Program.cs
+++ b/examples/WireMock.Net.StandAlone.NETCoreApp/Program.cs
@@ -10,6 +10,7 @@ using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
 using WireMock.Settings;
+using WireMock.Util;

 namespace WireMock.Net.StandAlone.NETCoreApp
 {
@@ -34,11 +35,20 @@ namespace WireMock.Net.StandAlone.NETCoreApp

            _server = WireMockServer.Start(settings);

-            //_server
-            //    .Given(Request.Create()
-            //        .UsingAnyMethod())
-            //    .RespondWith(Response.Create()
-            //        .WithProxy("https://www.google.com"));
+            _server.Given(Request.Create().WithPath("/api/sap")
+                .UsingPost()
+                .WithBody((IBodyData xmlData) => {
+                    //xmlData is always null
+                    return true;
+                }))
+                .RespondWith(Response.Create().WithStatusCode(System.Net.HttpStatusCode.OK));
+
+            _server
+                .Given(Request.Create()
+                    .UsingAnyMethod())
+                .RespondWith(Response.Create()
+                    .WithTransformer()
+                    .WithBody("{{Random Type=\"Integer\" Min=100 Max=999999}} {{DateTime.Now}} {{DateTime.Now \"yyyy-MMM\"}} {{String.Format (DateTime.Now) \"MMM-dd\"}}"));

            Console.WriteLine($"{DateTime.UtcNow} Press Ctrl+C to shut down");

--- a/examples/WireMock.Net.StandAlone.NETCoreApp/Properties/launchSettings.json
+++ b/examples/WireMock.Net.StandAlone.NETCoreApp/Properties/launchSettings.json
@@ -2,7 +2,7 @@
  "profiles": {
    "WireMock.Net.StandAlone.NETCoreApp": {
      "commandName": "Project",
-      "commandLineArgs": "--Urls https://localhost:10080 --WireMockLogger WireMockConsoleLogger"
+      "commandLineArgs": "--Urls http://localhost:9091 --WireMockLogger WireMockConsoleLogger"
    }
  }
 }
--- a/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj
+++ b/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj
@@ -8,7 +8,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.8" />
+    <PackageReference Include="log4net" Version="2.0.10" />
  </ItemGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj
+++ b/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj
@@ -39,8 +39,8 @@
    <StartupObject>WireMock.Net.StandAlone.Net452.Program</StartupObject>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.4.0.0\lib\net451\Microsoft.Owin.Host.HttpListener.dll</HintPath>
@@ -49,12 +49,14 @@
      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
    <Reference Include="System.Core" />
    <Reference Include="System.Net.Http" />
    <Reference Include="System.Net.Http.Formatting, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll</HintPath>
    </Reference>
    <Reference Include="System.Numerics" />
+    <Reference Include="System.Web" />
    <Reference Include="System.Xml" />
    <Reference Include="System.Xml.Linq" />
  </ItemGroup>
--- a/examples/WireMock.Net.StandAlone.Net452/packages.config
+++ b/examples/WireMock.Net.StandAlone.Net452/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.8" targetFramework="net452" />
+  <package id="log4net" version="2.0.12" targetFramework="net452" />
  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.6" targetFramework="net452" />
  <package id="Microsoft.Owin.Host.HttpListener" version="4.0.0" targetFramework="net452" />
  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs
@@ -52,5 +52,10 @@ namespace WireMock.Admin.Mappings
        /// Saves this mapping as a static mapping file.
        /// </summary>
        public bool? SaveToFile { get; set; }
+
+        /// <summary>
+        /// The Webhook.
+        /// </summary>
+        public WebhookModel Webhook { get; set; }
    }
 }
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/ResponseModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/ResponseModel.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using WireMock.Types;

 namespace WireMock.Admin.Mappings
 {
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/WebhookModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/WebhookModel.cs
@@ -0,0 +1,13 @@
+namespace WireMock.Admin.Mappings
+{
+    /// <summary>
+    /// The Webhook
+    /// </summary>
+    public class WebhookModel
+    {
+        /// <summary>
+        /// The Webhook Request.
+        /// </summary>
+        public WebhookRequestModel Request { get; set; }
+    }
+}
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/WebhookRequestModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/WebhookRequestModel.cs
@@ -0,0 +1,45 @@
+using System.Collections.Generic;
+
+namespace WireMock.Admin.Mappings
+{
+    /// <summary>
+    /// RequestModel
+    /// </summary>
+    public class WebhookRequestModel
+    {
+        /// <summary>
+        /// Gets or sets the Url.
+        /// </summary>
+        public string Url { get; set; }
+
+        /// <summary>
+        /// The methods
+        /// </summary>
+        public string Method { get; set; }
+
+        /// <summary>
+        /// Gets or sets the headers.
+        /// </summary>
+        public IDictionary<string, string> Headers { get; set; }
+
+        /// <summary>
+        /// Gets or sets the body.
+        /// </summary>
+        public string Body { get; set; }
+
+        /// <summary>
+        /// Gets or sets the body (as JSON object).
+        /// </summary>
+        public object BodyAsJson { get; set; }
+
+        /// <summary>
+        /// Use ResponseMessage Transformer.
+        /// </summary>
+        public bool? UseTransformer { get; set; }
+
+        /// <summary>
+        /// Gets the type of the transformer.
+        /// </summary>
+        public string TransformerType { get; set; }
+    }
+}
--- a/src/WireMock.Net.Abstractions/Models/IBodyData.cs
+++ b/src/WireMock.Net.Abstractions/Models/IBodyData.cs
--- a/src/WireMock.Net.Abstractions/Models/IWebhook.cs
+++ b/src/WireMock.Net.Abstractions/Models/IWebhook.cs
@@ -0,0 +1,13 @@
+namespace WireMock.Models
+{
+    /// <summary>
+    /// IWebhook
+    /// </summary>
+    public interface IWebhook
+    {
+        /// <summary>
+        /// Request
+        /// </summary>
+        IWebhookRequest Request { get; set; }
+    }
+}
--- a/src/WireMock.Net.Abstractions/Models/IWebhookRequest.cs
+++ b/src/WireMock.Net.Abstractions/Models/IWebhookRequest.cs
@@ -0,0 +1,42 @@
+using System.Collections.Generic;
+using WireMock.Types;
+using WireMock.Util;
+
+namespace WireMock.Models
+{
+    /// <summary>
+    /// IWebhookRequest
+    /// </summary>
+    public interface IWebhookRequest
+    {
+        /// <summary>
+        /// The Webhook Url.
+        /// </summary>
+        string Url { get; set; }
+
+        /// <summary>
+        /// The method to use.
+        /// </summary>
+        string Method { get; set; }
+
+        /// <summary>
+        /// The Headers to send.
+        /// </summary>
+        IDictionary<string, WireMockList<string>> Headers { get; }
+
+        /// <summary>
+        /// The body to send.
+        /// </summary>
+        IBodyData BodyData { get; set; }
+
+        /// <summary>
+        /// Use Transformer.
+        /// </summary>
+        bool? UseTransformer { get; set; }
+
+        /// <summary>
+        /// The transformer type.
+        /// </summary>
+        TransformerType TransformerType { get; set; }
+    }
+}
--- a/src/WireMock.Net/Http/HttpClientBuilder.cs
+++ b/src/WireMock.Net/Http/HttpClientBuilder.cs
@@ -7,7 +7,7 @@ namespace WireMock.Http
 {
    internal static class HttpClientBuilder
    {
-        public static HttpClient Build(IProxyAndRecordSettings settings)
+        public static HttpClient Build(IHttpClientSettings settings)
        {
 #if NETSTANDARD || NETCOREAPP3_1 || NET5_0
            var handler = new HttpClientHandler
--- a/src/WireMock.Net/Http/HttpKnownHeaderNames.cs
+++ b/src/WireMock.Net/Http/HttpKnownHeaderNames.cs
@@ -19,7 +19,7 @@ namespace WireMock.Http
            Connection,
            ContentLength,
            ContentType,
-            Date,
+            Date, // RFC1123Pattern
            Expect,
            Host,
            IfModifiedSince,
--- a/src/WireMock.Net/Http/WebhookSender.cs
+++ b/src/WireMock.Net/Http/WebhookSender.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using WireMock.Models;
+using WireMock.Settings;
+using WireMock.Transformers;
+using WireMock.Transformers.Handlebars;
+using WireMock.Transformers.Scriban;
+using WireMock.Types;
+using WireMock.Util;
+using WireMock.Validation;
+
+namespace WireMock.Http
+{
+    internal class WebhookSender
+    {
+        private const string ClientIp = "::1";
+
+        private readonly IWireMockServerSettings _settings;
+
+        public WebhookSender(IWireMockServerSettings settings)
+        {
+            _settings = settings ?? throw new ArgumentNullException(nameof(settings));
+        }
+
+        public Task<HttpResponseMessage> SendAsync([NotNull] HttpClient client, [NotNull] IWebhookRequest request, [NotNull] RequestMessage originalRequestMessage, [NotNull] ResponseMessage originalResponseMessage)
+        {
+            Check.NotNull(client, nameof(client));
+            Check.NotNull(request, nameof(request));
+            Check.NotNull(originalRequestMessage, nameof(originalRequestMessage));
+            Check.NotNull(originalResponseMessage, nameof(originalResponseMessage));
+
+            IBodyData bodyData;
+            IDictionary<string, WireMockList<string>> headers;
+            if (request.UseTransformer == true)
+            {
+                ITransformer responseMessageTransformer;
+                switch (request.TransformerType)
+                {
+                    case TransformerType.Handlebars:
+                        var factoryHandlebars = new HandlebarsContextFactory(_settings.FileSystemHandler, _settings.HandlebarsRegistrationCallback);
+                        responseMessageTransformer = new Transformer(factoryHandlebars);
+                        break;
+
+                    case TransformerType.Scriban:
+                    case TransformerType.ScribanDotLiquid:
+                        var factoryDotLiquid = new ScribanContextFactory(_settings.FileSystemHandler, request.TransformerType);
+                        responseMessageTransformer = new Transformer(factoryDotLiquid);
+                        break;
+
+                    default:
+                        throw new NotImplementedException($"TransformerType '{request.TransformerType}' is not supported.");
+                }
+
+                (bodyData, headers) = responseMessageTransformer.Transform(originalRequestMessage, originalResponseMessage, request.BodyData, request.Headers);
+            }
+            else
+            {
+                bodyData = request.BodyData;
+                headers = request.Headers;
+            }
+
+            // Create RequestMessage
+            var requestMessage = new RequestMessage(
+                new UrlDetails(request.Url),
+                request.Method,
+                ClientIp,
+                bodyData,
+                headers?.ToDictionary(x => x.Key, x => x.Value.ToArray())
+            )
+            {
+                DateTime = DateTime.UtcNow
+            };
+
+            // Create HttpRequestMessage
+            var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, request.Url);
+
+            // Call the URL
+            return client.SendAsync(httpRequestMessage);
+        }
+    }
+}
--- a/src/WireMock.Net/IMapping.cs
+++ b/src/WireMock.Net/IMapping.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Threading.Tasks;
 using WireMock.Matchers.Request;
+using WireMock.Models;
 using WireMock.ResponseProviders;
 using WireMock.Settings;

@@ -93,12 +94,17 @@ namespace WireMock
        /// </value>
        bool LogMapping { get; }

+        /// <summary>
+        /// The Webhook.
+        /// </summary>
+        IWebhook Webhook { get; }
+
        /// <summary>
        /// ProvideResponseAsync
        /// </summary>
        /// <param name="requestMessage">The request message.</param>
-        /// <returns>The <see cref="ResponseMessage"/>.</returns>
-        Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage);
+        /// <returns>The <see cref="ResponseMessage"/> including a new (optional) <see cref="IMapping"/>.</returns>
+        Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage);

        /// <summary>
        /// Gets the RequestMatchResult based on the RequestMessage.
--- a/src/WireMock.Net/Mapping.cs
+++ b/src/WireMock.Net/Mapping.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
+using WireMock.Admin.Mappings;
 using WireMock.Matchers.Request;
+using WireMock.Models;
 using WireMock.ResponseProviders;
 using WireMock.Settings;

@@ -54,6 +56,9 @@ namespace WireMock
        /// <inheritdoc cref="IMapping.LogMapping" />
        public bool LogMapping => !(Provider is DynamicResponseProvider || Provider is DynamicAsyncResponseProvider);

+        /// <inheritdoc cref="IMapping.Webhook" />
+        public IWebhook Webhook { get; }
+
        /// <summary>
        /// Initializes a new instance of the <see cref="Mapping"/> class.
        /// </summary>
@@ -68,6 +73,7 @@ namespace WireMock
        /// <param name="executionConditionState">State in which the current mapping can occur. [Optional]</param>
        /// <param name="nextState">The next state which will occur after the current mapping execution. [Optional]</param>
        /// <param name="stateTimes">Only when the current state is executed this number, the next state which will occur. [Optional]</param>
+        /// <param name="webhook">The Webhook. [Optional]</param>
        public Mapping(
            Guid guid,
            [CanBeNull] string title,
@@ -79,7 +85,8 @@ namespace WireMock
            [CanBeNull] string scenario,
            [CanBeNull] string executionConditionState,
            [CanBeNull] string nextState,
-            [CanBeNull] int? stateTimes)
+            [CanBeNull] int? stateTimes,
+            [CanBeNull] IWebhook webhook)
        {
            Guid = guid;
            Title = title;
@@ -92,10 +99,11 @@ namespace WireMock
            ExecutionConditionState = executionConditionState;
            NextState = nextState;
            StateTimes = stateTimes;
+            Webhook = webhook;
        }

        /// <inheritdoc cref="IMapping.ProvideResponseAsync" />
-        public async Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage)
+        public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage)
        {
            return await Provider.ProvideResponseAsync(requestMessage, Settings);
        }
--- a/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs
@@ -2,6 +2,7 @@ using JetBrains.Annotations;
 using System;
 using System.Linq;
 using WireMock.Types;
+using WireMock.Util;
 using WireMock.Validation;

 namespace WireMock.Matchers.Request
@@ -26,6 +27,11 @@ namespace WireMock.Matchers.Request
        /// </summary>
        public Func<object, bool> JsonFunc { get; }

+        /// <summary>
+        /// The body data function for BodyData
+        /// </summary>
+        public Func<IBodyData, bool> BodyDataFunc { get; }
+
        /// <summary>
        /// The matchers.
        /// </summary>
@@ -88,6 +94,16 @@ namespace WireMock.Matchers.Request
            JsonFunc = func;
        }

+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+        /// </summary>
+        /// <param name="func">The function.</param>
+        public RequestMessageBodyMatcher([NotNull] Func<IBodyData, bool> func)
+        {
+            Check.NotNull(func, nameof(func));
+            BodyDataFunc = func;
+        }
+
        /// <summary>
        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
        /// </summary>
@@ -158,6 +174,11 @@ namespace WireMock.Matchers.Request
                return MatchScores.ToScore(DataFunc(requestMessage?.BodyData?.BodyAsBytes));
            }

+            if (BodyDataFunc != null)
+            {
+                return MatchScores.ToScore(BodyDataFunc(requestMessage?.BodyData));
+            }
+
            return MatchScores.Mismatch;
        }
    }
--- a/src/WireMock.Net/Models/BodyData.cs
+++ b/src/WireMock.Net/Models/BodyData.cs
--- a/src/WireMock.Net/Models/Webhook.cs
+++ b/src/WireMock.Net/Models/Webhook.cs
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using JetBrains.Annotations;
+using WireMock.Types;
+
+namespace WireMock.Models
+{
+    /// <summary>
+    /// Webhook
+    /// </summary>
+    public class Webhook : IWebhook
+    {
+        /// <inheritdoc cref="IWebhook.Request"/>
+        public IWebhookRequest Request { get; set; }
+    }
+}
--- a/src/WireMock.Net/Models/WebhookRequest.cs
+++ b/src/WireMock.Net/Models/WebhookRequest.cs
@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using WireMock.Types;
+using WireMock.Util;
+
+namespace WireMock.Models
+{
+    /// <summary>
+    /// WebhookRequest
+    /// </summary>
+    public class WebhookRequest : IWebhookRequest
+    {
+        /// <inheritdoc cref="IWebhookRequest.Url"/>
+        public string Url { get; set; }
+
+        /// <inheritdoc cref="IWebhookRequest.Method"/>
+        public string Method { get; set; }
+
+        /// <inheritdoc cref="IWebhookRequest.Headers"/>
+        public IDictionary<string, WireMockList<string>> Headers { get; set; }
+
+        /// <inheritdoc cref="IWebhookRequest.BodyData"/>
+        public IBodyData BodyData { get; set; }
+
+        /// <inheritdoc cref="IWebhookRequest.UseTransformer"/>
+        public bool? UseTransformer { get; set; }
+
+        /// <inheritdoc cref="IWebhookRequest.TransformerType"/>
+        public TransformerType TransformerType { get; set; }
+    }
+}
--- a/src/WireMock.Net/Owin/AspNetCoreSelfHost.NETStandard.cs
+++ b/src/WireMock.Net/Owin/AspNetCoreSelfHost.NETStandard.cs
@@ -24,7 +24,7 @@ namespace WireMock.Owin
            {
                if (urlDetail.IsHttps)
                {
-                    kestrelOptions.Listen(System.Net.IPAddress.Any, urlDetail.Port, listenOptions =>
+                    kestrelOptions.ListenAnyIP(urlDetail.Port, listenOptions =>
                    {
                        if (wireMockMiddlewareOptions.CustomCertificateDefined)
                        {
@@ -45,7 +45,7 @@ namespace WireMock.Owin
                }
                else
                {
-                    kestrelOptions.Listen(System.Net.IPAddress.Any, urlDetail.Port);
+                    kestrelOptions.ListenAnyIP(urlDetail.Port);
                }
            }
        }
--- a/src/WireMock.Net/Owin/AspNetCoreSelfHost.cs
+++ b/src/WireMock.Net/Owin/AspNetCoreSelfHost.cs
@@ -106,7 +106,7 @@ namespace WireMock.Owin

                    foreach (string address in addresses)
                    {
-                        Urls.Add(address.Replace("0.0.0.0", "localhost"));
+                        Urls.Add(address.Replace("0.0.0.0", "localhost").Replace("[::]", "localhost"));

                        PortUtils.TryExtract(address, out bool isHttps, out string protocol, out string host, out int port);
                        Ports.Add(port);
--- a/src/WireMock.Net/Owin/Mappers/OwinRequestMapper.cs
+++ b/src/WireMock.Net/Owin/Mappers/OwinRequestMapper.cs
@@ -53,7 +53,7 @@ namespace WireMock.Owin.Mappers
                }
            }

-            BodyData body = null;
+            IBodyData body = null;
            if (request.Body != null && BodyParser.ShouldParseBody(method, options.AllowBodyForAllHttpMethods == true))
            {
                var bodyParserSettings = new BodyParserSettings
--- a/src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs
+++ b/src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs
@@ -1,177 +1,194 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using RandomDataGenerator.FieldOptions;
-using RandomDataGenerator.Randomizers;
-using WireMock.Http;
-using WireMock.ResponseBuilders;
-using WireMock.Types;
-using WireMock.Validation;
-#if !USE_ASPNETCORE
-using IResponse = Microsoft.Owin.IOwinResponse;
-#else
-using Microsoft.AspNetCore.Http;
-using IResponse = Microsoft.AspNetCore.Http.HttpResponse;
-#endif
-
-namespace WireMock.Owin.Mappers
-{
-    /// <summary>
-    /// OwinResponseMapper
-    /// </summary>
-    internal class OwinResponseMapper : IOwinResponseMapper
-    {
-        private readonly IRandomizerNumber<double> _randomizerDouble = RandomizerFactory.GetRandomizer(new FieldOptionsDouble { Min = 0, Max = 1 });
-        private readonly IRandomizerBytes _randomizerBytes = RandomizerFactory.GetRandomizer(new FieldOptionsBytes { Min = 100, Max = 200 });
-        private readonly IWireMockMiddlewareOptions _options;
-        private readonly Encoding _utf8NoBom = new UTF8Encoding(false);
-
-        // https://msdn.microsoft.com/en-us/library/78h415ay(v=vs.110).aspx
-#if !USE_ASPNETCORE
-        private static readonly IDictionary<string, Action<IResponse, WireMockList<string>>> ResponseHeadersToFix = new Dictionary<string, Action<IResponse, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase) {
-#else
-        private static readonly IDictionary<string, Action<IResponse, WireMockList<string>>> ResponseHeadersToFix = new Dictionary<string, Action<IResponse, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase) {
-#endif
-            { HttpKnownHeaderNames.ContentType, (r, v) => r.ContentType = v.FirstOrDefault() }
-        };
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="options">The IWireMockMiddlewareOptions.</param>
-        public OwinResponseMapper(IWireMockMiddlewareOptions options)
-        {
-            Check.NotNull(options, nameof(options));
-
-            _options = options;
-        }
-
-        /// <inheritdoc cref="IOwinResponseMapper.MapAsync"/>
-        public async Task MapAsync(ResponseMessage responseMessage, IResponse response)
-        {
-            if (responseMessage == null)
-            {
-                return;
-            }
-
-            byte[] bytes;
-            switch (responseMessage.FaultType)
-            {
-                case FaultType.EMPTY_RESPONSE:
-                    bytes = IsFault(responseMessage) ? new byte[0] : GetNormalBody(responseMessage);
-                    break;
-
-                case FaultType.MALFORMED_RESPONSE_CHUNK:
-                    bytes = GetNormalBody(responseMessage) ?? new byte[0];
-                    if (IsFault(responseMessage))
-                    {
-                        bytes = bytes.Take(bytes.Length / 2).Union(_randomizerBytes.Generate()).ToArray();
-                    }
-
-                    break;
-
-                default:
-                    bytes = GetNormalBody(responseMessage);
-                    break;
-            }
-
-            var statusCodeType = responseMessage.StatusCode?.GetType();
-
-            switch (statusCodeType)
-            {
-                case Type typeAsIntOrEnum when typeAsIntOrEnum == typeof(int) || typeAsIntOrEnum == typeof(int?) || typeAsIntOrEnum.GetTypeInfo().IsEnum:
-                    response.StatusCode = MapStatusCode((int)responseMessage.StatusCode);
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using RandomDataGenerator.FieldOptions;
+using RandomDataGenerator.Randomizers;
+using WireMock.Http;
+using WireMock.ResponseBuilders;
+using WireMock.Types;
+using WireMock.Validation;
+#if !USE_ASPNETCORE
+using IResponse = Microsoft.Owin.IOwinResponse;
+#else
+using Microsoft.AspNetCore.Http;
+using IResponse = Microsoft.AspNetCore.Http.HttpResponse;
+#endif
+
+namespace WireMock.Owin.Mappers
+{
+    /// <summary>
+    /// OwinResponseMapper
+    /// </summary>
+    internal class OwinResponseMapper : IOwinResponseMapper
+    {
+        private readonly IRandomizerNumber<double> _randomizerDouble = RandomizerFactory.GetRandomizer(new FieldOptionsDouble { Min = 0, Max = 1 });
+        private readonly IRandomizerBytes _randomizerBytes = RandomizerFactory.GetRandomizer(new FieldOptionsBytes { Min = 100, Max = 200 });
+        private readonly IWireMockMiddlewareOptions _options;
+        private readonly Encoding _utf8NoBom = new UTF8Encoding(false);
+
+        // https://msdn.microsoft.com/en-us/library/78h415ay(v=vs.110).aspx
+#if !USE_ASPNETCORE
+        private static readonly IDictionary<string, Action<IResponse, WireMockList<string>>> ResponseHeadersToFix = new Dictionary<string, Action<IResponse, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase) {
+#else
+        private static readonly IDictionary<string, Action<IResponse, WireMockList<string>>> ResponseHeadersToFix = new Dictionary<string, Action<IResponse, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase) {
+#endif
+            { HttpKnownHeaderNames.ContentType, (r, v) => r.ContentType = v.FirstOrDefault() }
+        };
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="options">The IWireMockMiddlewareOptions.</param>
+        public OwinResponseMapper(IWireMockMiddlewareOptions options)
+        {
+            Check.NotNull(options, nameof(options));
+
+            _options = options;
+        }
+
+        /// <inheritdoc cref="IOwinResponseMapper.MapAsync"/>
+        public async Task MapAsync(ResponseMessage responseMessage, IResponse response)
+        {
+            if (responseMessage == null)
+            {
+                return;
+            }
+
+            byte[] bytes;
+            switch (responseMessage.FaultType)
+            {
+                case FaultType.EMPTY_RESPONSE:
+                    bytes = IsFault(responseMessage) ? new byte[0] : GetNormalBody(responseMessage);
                    break;

-                case Type typeAsString when typeAsString == typeof(string):
-                    // Note: this case will also match on null 
-                    int.TryParse(responseMessage.StatusCode as string, out int result);
-                    response.StatusCode = MapStatusCode(result);
-                    break;
-
-                default:
-                    break;
-            }
-
-            SetResponseHeaders(responseMessage, response);
-
-            if (bytes != null)
-            {
-                await response.Body.WriteAsync(bytes, 0, bytes.Length);
-            }
-        }
-
-        private int MapStatusCode(int code)
-        {
-            if (_options.AllowOnlyDefinedHttpStatusCodeInResponse == true && !Enum.IsDefined(typeof(HttpStatusCode), code))
-            {
-                return (int)HttpStatusCode.OK;
-            }
-
-            return code;
-        }
-
-        private bool IsFault(ResponseMessage responseMessage)
-        {
-            return responseMessage.FaultPercentage == null || _randomizerDouble.Generate() <= responseMessage.FaultPercentage;
-        }
-
-        private byte[] GetNormalBody(ResponseMessage responseMessage)
-        {
-            byte[] bytes = null;
-            switch (responseMessage.BodyData?.DetectedBodyType)
-            {
-                case BodyType.String:
-                    bytes = (responseMessage.BodyData.Encoding ?? _utf8NoBom).GetBytes(responseMessage.BodyData.BodyAsString);
-                    break;
-
-                case BodyType.Json:
-                    Formatting formatting = responseMessage.BodyData.BodyAsJsonIndented == true
-                        ? Formatting.Indented
-                        : Formatting.None;
-                    string jsonBody = JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson, new JsonSerializerSettings { Formatting = formatting, NullValueHandling = NullValueHandling.Ignore });
-                    bytes = (responseMessage.BodyData.Encoding ?? _utf8NoBom).GetBytes(jsonBody);
-                    break;
-
-                case BodyType.Bytes:
-                    bytes = responseMessage.BodyData.BodyAsBytes;
-                    break;
-
-                case BodyType.File:
-                    bytes = _options.FileSystemHandler.ReadResponseBodyAsFile(responseMessage.BodyData.BodyAsFile);
-                    break;
-            }
-
-            return bytes;
-        }
-
-        private void SetResponseHeaders(ResponseMessage responseMessage, IResponse response)
-        {
-            // Set headers
-            foreach (var pair in responseMessage.Headers)
-            {
-                if (ResponseHeadersToFix.ContainsKey(pair.Key))
-                {
-                    ResponseHeadersToFix[pair.Key]?.Invoke(response, pair.Value);
-                }
-                else
-                {
-                    // Check if this response header can be added (#148 and #227)
-                    if (!HttpKnownHeaderNames.IsRestrictedResponseHeader(pair.Key))
-                    {
-#if !USE_ASPNETCORE
-                        response.Headers.AppendValues(pair.Key, pair.Value.ToArray());
-#else
-                        response.Headers.Append(pair.Key, pair.Value.ToArray());
-#endif
-                    }
-                }
-            }
-        }
-    }
+                case FaultType.MALFORMED_RESPONSE_CHUNK:
+                    bytes = GetNormalBody(responseMessage) ?? new byte[0];
+                    if (IsFault(responseMessage))
+                    {
+                        bytes = bytes.Take(bytes.Length / 2).Union(_randomizerBytes.Generate()).ToArray();
+                    }
+
+                    break;
+
+                default:
+                    bytes = GetNormalBody(responseMessage);
+                    break;
+            }
+
+            var statusCodeType = responseMessage.StatusCode?.GetType();
+
+            switch (statusCodeType)
+            {
+                case Type typeAsIntOrEnum when typeAsIntOrEnum == typeof(int) || typeAsIntOrEnum == typeof(int?) || typeAsIntOrEnum.GetTypeInfo().IsEnum:
+                    response.StatusCode = MapStatusCode((int)responseMessage.StatusCode);
+                    break;
+
+                case Type typeAsString when typeAsString == typeof(string):
+                    // Note: this case will also match on null 
+                    int.TryParse(responseMessage.StatusCode as string, out int result);
+                    response.StatusCode = MapStatusCode(result);
+                    break;
+
+                default:
+                    break;
+            }
+
+            SetResponseHeaders(responseMessage, response);
+
+            if (bytes != null)
+            {
+                await response.Body.WriteAsync(bytes, 0, bytes.Length);
+            }
+        }
+
+        private int MapStatusCode(int code)
+        {
+            if (_options.AllowOnlyDefinedHttpStatusCodeInResponse == true && !Enum.IsDefined(typeof(HttpStatusCode), code))
+            {
+                return (int)HttpStatusCode.OK;
+            }
+
+            return code;
+        }
+
+        private bool IsFault(ResponseMessage responseMessage)
+        {
+            return responseMessage.FaultPercentage == null || _randomizerDouble.Generate() <= responseMessage.FaultPercentage;
+        }
+
+        private byte[] GetNormalBody(ResponseMessage responseMessage)
+        {
+            byte[] bytes = null;
+            switch (responseMessage.BodyData?.DetectedBodyType)
+            {
+                case BodyType.String:
+                    bytes = (responseMessage.BodyData.Encoding ?? _utf8NoBom).GetBytes(responseMessage.BodyData.BodyAsString);
+                    break;
+
+                case BodyType.Json:
+                    Formatting formatting = responseMessage.BodyData.BodyAsJsonIndented == true
+                        ? Formatting.Indented
+                        : Formatting.None;
+                    string jsonBody = JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson, new JsonSerializerSettings { Formatting = formatting, NullValueHandling = NullValueHandling.Ignore });
+                    bytes = (responseMessage.BodyData.Encoding ?? _utf8NoBom).GetBytes(jsonBody);
+                    break;
+
+                case BodyType.Bytes:
+                    bytes = responseMessage.BodyData.BodyAsBytes;
+                    break;
+
+                case BodyType.File:
+                    bytes = _options.FileSystemHandler.ReadResponseBodyAsFile(responseMessage.BodyData.BodyAsFile);
+                    break;
+            }
+
+            return bytes;
+        }
+
+        private static void SetResponseHeaders(ResponseMessage responseMessage, IResponse response)
+        {
+            // Force setting the Date header (#577)
+            AppendResponseHeader(
+                response,
+                HttpKnownHeaderNames.Date,
+                new[]
+                {
+                    DateTime.UtcNow.ToString(CultureInfo.InvariantCulture.DateTimeFormat.RFC1123Pattern, CultureInfo.InvariantCulture)
+                });
+
+            // Set other headers
+            foreach (var item in responseMessage.Headers)
+            {
+                var headerName = item.Key;
+                var value = item.Value;
+                if (ResponseHeadersToFix.ContainsKey(headerName))
+                {
+                    ResponseHeadersToFix[headerName]?.Invoke(response, value);
+                }
+                else
+                {
+                    // Check if this response header can be added (#148 and #227)
+                    if (!HttpKnownHeaderNames.IsRestrictedResponseHeader(headerName))
+                    {
+                        AppendResponseHeader(response, headerName, value.ToArray());
+                    }
+                }
+            }
+        }
+
+        private static void AppendResponseHeader(IResponse response, string headerName, string[] values)
+        {
+#if !USE_ASPNETCORE
+            response.Headers.AppendValues(headerName, values);
+#else
+            response.Headers.Append(headerName, values);
+#endif
+        }
+    }
 }
--- a/src/WireMock.Net/Owin/WireMockMiddleware.cs
+++ b/src/WireMock.Net/Owin/WireMockMiddleware.cs
@@ -9,6 +9,7 @@ using WireMock.Serialization;
 using WireMock.Types;
 using WireMock.Validation;
 using WireMock.ResponseBuilders;
+using WireMock.Settings;
 #if !USE_ASPNETCORE
 using Microsoft.Owin;
 using IContext = Microsoft.Owin.IOwinContext;
@@ -128,15 +129,16 @@ namespace WireMock.Owin
                    await Task.Delay(_options.RequestProcessingDelay.Value);
                }

-                response = await targetMapping.ProvideResponseAsync(request);
+                var (theResponse, theOptionalNewMapping) = await targetMapping.ProvideResponseAsync(request);
+                response = theResponse;

                var responseBuilder = targetMapping.Provider as Response;

-                if (!targetMapping.IsAdminInterface)
+                if (!targetMapping.IsAdminInterface && theOptionalNewMapping != null)
                {
                    if (responseBuilder?.ProxyAndRecordSettings?.SaveMapping == true || targetMapping?.Settings?.ProxyAndRecordSettings?.SaveMapping == true)
                    {
-                        _options.Mappings.TryAdd(targetMapping.Guid, targetMapping);
+                        _options.Mappings.TryAdd(theOptionalNewMapping.Guid, theOptionalNewMapping);
                    }

                    if (responseBuilder?.ProxyAndRecordSettings?.SaveMappingToFile == true || targetMapping?.Settings?.ProxyAndRecordSettings?.SaveMappingToFile == true)
@@ -145,7 +147,7 @@ namespace WireMock.Owin
                        var mappingConverter = new MappingConverter(matcherMapper);
                        var mappingToFileSaver = new MappingToFileSaver(targetMapping.Settings, mappingConverter);

-                        mappingToFileSaver.SaveMappingToFile(targetMapping);
+                        mappingToFileSaver.SaveMappingToFile(theOptionalNewMapping);
                    }
                }

@@ -153,6 +155,11 @@ namespace WireMock.Owin
                {
                    UpdateScenarioState(targetMapping);
                }
+
+                if (!targetMapping.IsAdminInterface && targetMapping.Webhook != null)
+                {
+                    await SendToWebhookAsync(targetMapping, request, response).ConfigureAwait(false);
+                }
            }
            catch (Exception ex)
            {
@@ -184,6 +191,21 @@ namespace WireMock.Owin
            await CompletedTask;
        }

+        private async Task SendToWebhookAsync(IMapping mapping, RequestMessage request, ResponseMessage response)
+        {
+            var httpClientForWebhook = HttpClientBuilder.Build(mapping.Settings.WebhookSettings ?? new WebhookSettings());
+            var webhookSender = new WebhookSender(mapping.Settings);
+
+            try
+            {
+                await webhookSender.SendAsync(httpClientForWebhook, mapping.Webhook.Request, request, response).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                _options.Logger.Error($"Sending message to Webhook Mapping '{mapping.Guid}' failed. Exception: {ex}");
+            }
+        }
+
        private void UpdateScenarioState(IMapping mapping)
        {
            var scenario = _options.Scenarios[mapping.Scenario];
--- a/src/WireMock.Net/Proxy/ProxyHelper.cs
+++ b/src/WireMock.Net/Proxy/ProxyHelper.cs
@@ -1,111 +1,111 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-using HandlebarsDotNet.Helpers.Validation;
-using JetBrains.Annotations;
-using WireMock.Http;
-using WireMock.Matchers;
-using WireMock.RequestBuilders;
-using WireMock.ResponseBuilders;
-using WireMock.Settings;
-using WireMock.Types;
-using WireMock.Util;
-
-namespace WireMock.Proxy
-{
-    internal class ProxyHelper
-    {
-        private readonly IWireMockServerSettings _settings;
-
-        public ProxyHelper([NotNull] IWireMockServerSettings settings)
-        {
-            Guard.NotNull(settings, nameof(settings));
-            _settings = settings;
-        }
-
-        public async Task<(ResponseMessage ResponseMessage, IMapping Mapping)> SendAsync(
-            [NotNull] IProxyAndRecordSettings proxyAndRecordSettings,
-            [NotNull] HttpClient client,
-            [NotNull] RequestMessage requestMessage,
-            [NotNull] string url)
-        {
-            Guard.NotNull(client, nameof(client));
-            Guard.NotNull(requestMessage, nameof(requestMessage));
-            Guard.NotNull(url, nameof(url));
-
-            var originalUri = new Uri(requestMessage.Url);
-            var requiredUri = new Uri(url);
-
-            // Create HttpRequestMessage
-            var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, url);
-
-            // Call the URL
-            var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead);
-
-            // Create ResponseMessage
-            bool deserializeJson = !_settings.DisableJsonBodyParsing.GetValueOrDefault(false);
-            bool decompressGzipAndDeflate = !_settings.DisableRequestBodyDecompressing.GetValueOrDefault(false);
-
-            var responseMessage = await HttpResponseMessageHelper.CreateAsync(httpResponseMessage, requiredUri, originalUri, deserializeJson, decompressGzipAndDeflate);
-
-            IMapping mapping = null;
-            if (HttpStatusRangeParser.IsMatch(proxyAndRecordSettings.SaveMappingForStatusCodePattern, responseMessage.StatusCode) &&
-                (proxyAndRecordSettings.SaveMapping || proxyAndRecordSettings.SaveMappingToFile))
-            {
-                mapping = ToMapping(proxyAndRecordSettings, requestMessage, responseMessage);
-            }
-
-            return (responseMessage, mapping);
-        }
-
-        private IMapping ToMapping(IProxyAndRecordSettings proxyAndRecordSettings, RequestMessage requestMessage, ResponseMessage responseMessage)
-        {
-            string[] excludedHeaders = proxyAndRecordSettings.ExcludedHeaders ?? new string[] { };
-            string[] excludedCookies = proxyAndRecordSettings.ExcludedCookies ?? new string[] { };
-
-            var request = Request.Create();
-            request.WithPath(requestMessage.Path);
-            request.UsingMethod(requestMessage.Method);
-
-            requestMessage.Query.Loop((key, value) => request.WithParam(key, false, value.ToArray()));
-            requestMessage.Cookies.Loop((key, value) =>
-            {
-                if (!excludedCookies.Contains(key, StringComparer.OrdinalIgnoreCase))
-                {
-                    request.WithCookie(key, value);
-                }
-            });
-
-            var allExcludedHeaders = new List<string>(excludedHeaders) { "Cookie" };
-            requestMessage.Headers.Loop((key, value) =>
-            {
-                if (!allExcludedHeaders.Contains(key, StringComparer.OrdinalIgnoreCase))
-                {
-                    request.WithHeader(key, value.ToArray());
-                }
-            });
-
-            bool throwExceptionWhenMatcherFails = _settings.ThrowExceptionWhenMatcherFails == true;
-            switch (requestMessage.BodyData?.DetectedBodyType)
-            {
-                case BodyType.Json:
-                    request.WithBody(new JsonMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsJson, true, throwExceptionWhenMatcherFails));
-                    break;
-
-                case BodyType.String:
-                    request.WithBody(new ExactMatcher(MatchBehaviour.AcceptOnMatch, throwExceptionWhenMatcherFails, requestMessage.BodyData.BodyAsString));
-                    break;
-
-                case BodyType.Bytes:
-                    request.WithBody(new ExactObjectMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsBytes, throwExceptionWhenMatcherFails));
-                    break;
-            }
-
-            var response = Response.Create(responseMessage);
-
-            return new Mapping(Guid.NewGuid(), string.Empty, null, _settings, request, response, 0, null, null, null, null);
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using WireMock.Http;
+using WireMock.Matchers;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Settings;
+using WireMock.Types;
+using WireMock.Util;
+using WireMock.Validation;
+
+namespace WireMock.Proxy
+{
+    internal class ProxyHelper
+    {
+        private readonly IWireMockServerSettings _settings;
+
+        public ProxyHelper([NotNull] IWireMockServerSettings settings)
+        {
+            Check.NotNull(settings, nameof(settings));
+            _settings = settings;
+        }
+
+        public async Task<(ResponseMessage Message, IMapping Mapping)> SendAsync(
+            [NotNull] IProxyAndRecordSettings proxyAndRecordSettings,
+            [NotNull] HttpClient client,
+            [NotNull] RequestMessage requestMessage,
+            [NotNull] string url)
+        {
+            Check.NotNull(client, nameof(client));
+            Check.NotNull(requestMessage, nameof(requestMessage));
+            Check.NotNull(url, nameof(url));
+
+            var originalUri = new Uri(requestMessage.Url);
+            var requiredUri = new Uri(url);
+
+            // Create HttpRequestMessage
+            var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, url);
+
+            // Call the URL
+            var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead);
+
+            // Create ResponseMessage
+            bool deserializeJson = !_settings.DisableJsonBodyParsing.GetValueOrDefault(false);
+            bool decompressGzipAndDeflate = !_settings.DisableRequestBodyDecompressing.GetValueOrDefault(false);
+
+            var responseMessage = await HttpResponseMessageHelper.CreateAsync(httpResponseMessage, requiredUri, originalUri, deserializeJson, decompressGzipAndDeflate);
+
+            IMapping mapping = null;
+            if (HttpStatusRangeParser.IsMatch(proxyAndRecordSettings.SaveMappingForStatusCodePattern, responseMessage.StatusCode) &&
+                (proxyAndRecordSettings.SaveMapping || proxyAndRecordSettings.SaveMappingToFile))
+            {
+                mapping = ToMapping(proxyAndRecordSettings, requestMessage, responseMessage);
+            }
+
+            return (responseMessage, mapping);
+        }
+
+        private IMapping ToMapping(IProxyAndRecordSettings proxyAndRecordSettings, RequestMessage requestMessage, ResponseMessage responseMessage)
+        {
+            string[] excludedHeaders = proxyAndRecordSettings.ExcludedHeaders ?? new string[] { };
+            string[] excludedCookies = proxyAndRecordSettings.ExcludedCookies ?? new string[] { };
+
+            var request = Request.Create();
+            request.WithPath(requestMessage.Path);
+            request.UsingMethod(requestMessage.Method);
+
+            requestMessage.Query.Loop((key, value) => request.WithParam(key, false, value.ToArray()));
+            requestMessage.Cookies.Loop((key, value) =>
+            {
+                if (!excludedCookies.Contains(key, StringComparer.OrdinalIgnoreCase))
+                {
+                    request.WithCookie(key, value);
+                }
+            });
+
+            var allExcludedHeaders = new List<string>(excludedHeaders) { "Cookie" };
+            requestMessage.Headers.Loop((key, value) =>
+            {
+                if (!allExcludedHeaders.Contains(key, StringComparer.OrdinalIgnoreCase))
+                {
+                    request.WithHeader(key, value.ToArray());
+                }
+            });
+
+            bool throwExceptionWhenMatcherFails = _settings.ThrowExceptionWhenMatcherFails == true;
+            switch (requestMessage.BodyData?.DetectedBodyType)
+            {
+                case BodyType.Json:
+                    request.WithBody(new JsonMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsJson, true, throwExceptionWhenMatcherFails));
+                    break;
+
+                case BodyType.String:
+                    request.WithBody(new ExactMatcher(MatchBehaviour.AcceptOnMatch, throwExceptionWhenMatcherFails, requestMessage.BodyData.BodyAsString));
+                    break;
+
+                case BodyType.Bytes:
+                    request.WithBody(new ExactObjectMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsBytes, throwExceptionWhenMatcherFails));
+                    break;
+            }
+
+            var response = Response.Create(responseMessage);
+
+            return new Mapping(Guid.NewGuid(), string.Empty, null, _settings, request, response, 0, null, null, null, null, null);
+        }
+    }
 }
--- a/src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs
+++ b/src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs
@@ -2,7 +2,8 @@
 using System;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
-
+using WireMock.Util;
+
 namespace WireMock.RequestBuilders
 {
    /// <summary>
@@ -63,10 +64,17 @@ namespace WireMock.RequestBuilders
        IRequestBuilder WithBody([NotNull] Func<byte[], bool> func);

        /// <summary>
-        /// WithBody: func (object)
+        /// WithBody: func (json object)
        /// </summary>
        /// <param name="func">The function.</param>
        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
        IRequestBuilder WithBody([NotNull] Func<object, bool> func);
+
+        /// <summary>
+        /// WithBody: func (BodyData object)
+        /// </summary>
+        /// <param name="func">The function.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] Func<IBodyData, bool> func);
    }
 }
--- a/src/WireMock.Net/RequestBuilders/Request.WithBody.cs
+++ b/src/WireMock.Net/RequestBuilders/Request.WithBody.cs
@@ -3,6 +3,7 @@
 using System;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
+using WireMock.Util;
 using WireMock.Validation;

 namespace WireMock.RequestBuilders
@@ -71,5 +72,14 @@ namespace WireMock.RequestBuilders
            _requestMatchers.Add(new RequestMessageBodyMatcher(func));
            return this;
        }
+
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(Func{IBodyData, bool})"/>
+        public IRequestBuilder WithBody(Func<IBodyData, bool> func)
+        {
+            Check.NotNull(func, nameof(func));
+
+            _requestMatchers.Add(new RequestMessageBodyMatcher(func));
+            return this;
+        }
    }
 }
--- a/src/WireMock.Net/RequestMessage.cs
+++ b/src/WireMock.Net/RequestMessage.cs
@@ -101,7 +101,7 @@ namespace WireMock
        /// <param name="bodyData">The BodyData.</param>
        /// <param name="headers">The headers.</param>
        /// <param name="cookies">The cookies.</param>
-        public RequestMessage([NotNull] UrlDetails urlDetails, [NotNull] string method, [NotNull] string clientIP, [CanBeNull] BodyData bodyData = null, [CanBeNull] IDictionary<string, string[]> headers = null, [CanBeNull] IDictionary<string, string> cookies = null)
+        public RequestMessage([NotNull] UrlDetails urlDetails, [NotNull] string method, [NotNull] string clientIP, [CanBeNull] IBodyData bodyData = null, [CanBeNull] IDictionary<string, string[]> headers = null, [CanBeNull] IDictionary<string, string> cookies = null)
        {
            Check.NotNull(urlDetails, nameof(urlDetails));
            Check.NotNull(method, nameof(method));
--- a/src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs
+++ b/src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs
@@ -1,7 +1,8 @@
 using JetBrains.Annotations;
 using System;
 using System.Text;
-
+using System.Threading.Tasks;
+
 namespace WireMock.ResponseBuilders
 {
    /// <summary>
@@ -27,6 +28,15 @@ namespace WireMock.ResponseBuilders
        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
        IResponseBuilder WithBody([NotNull] Func<RequestMessage, string> bodyFactory, [CanBeNull] string destination = BodyDestinationFormat.SameAsSource, [CanBeNull] Encoding encoding = null);

+        /// <summary>
+        /// WithBody : Create a ... response based on a callback function.
+        /// </summary>
+        /// <param name="bodyFactory">The async delegate to build the body.</param>
+        /// <param name="destination">The Body Destination format (SameAsSource, String or Bytes).</param>
+        /// <param name="encoding">The body encoding.</param>
+        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+        IResponseBuilder WithBody([NotNull] Func<RequestMessage, Task<string>> bodyFactory, [CanBeNull] string destination = BodyDestinationFormat.SameAsSource, [CanBeNull] Encoding encoding = null);
+
        /// <summary>
        /// WithBody : Create a ... response based on a bytearray.
        /// </summary>
--- a/src/WireMock.Net/ResponseBuilders/Response.cs
+++ b/src/WireMock.Net/ResponseBuilders/Response.cs
@@ -167,7 +167,7 @@ namespace WireMock.ResponseBuilders
        {
            Check.NotNull(bodyFactory, nameof(bodyFactory));

-            return WithCallbackInternal(false, req => new ResponseMessage
+            return WithCallbackInternal(true, req => new ResponseMessage
            {
                BodyData = new BodyData
                {
@@ -178,6 +178,22 @@ namespace WireMock.ResponseBuilders
            });
        }

+        /// <inheritdoc cref="IBodyResponseBuilder.WithBody(Func{RequestMessage, Task{string}}, string, Encoding)"/>
+        public IResponseBuilder WithBody(Func<RequestMessage, Task<string>> bodyFactory, string destination = BodyDestinationFormat.SameAsSource, Encoding encoding = null)
+        {
+            Check.NotNull(bodyFactory, nameof(bodyFactory));
+
+            return WithCallbackInternal(true, async req => new ResponseMessage
+            {
+                BodyData = new BodyData
+                {
+                    DetectedBodyType = BodyType.String,
+                    BodyAsString = await bodyFactory(req),
+                    Encoding = encoding ?? Encoding.UTF8
+                }
+            });
+        }
+
        /// <inheritdoc cref="IBodyResponseBuilder.WithBody(byte[], string, Encoding)"/>
        public IResponseBuilder WithBody(byte[] body, string destination = BodyDestinationFormat.SameAsSource, Encoding encoding = null)
        {
@@ -319,7 +335,7 @@ namespace WireMock.ResponseBuilders
        }

        /// <inheritdoc cref="IResponseProvider.ProvideResponseAsync(RequestMessage, IWireMockServerSettings)"/>
-        public async Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
+        public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
        {
            Check.NotNull(requestMessage, nameof(requestMessage));
            Check.NotNull(settings, nameof(settings));
@@ -345,18 +361,16 @@ namespace WireMock.ResponseBuilders

                var proxyHelper = new ProxyHelper(settings);

-                var (proxyResponseMessage, _) = await proxyHelper.SendAsync(
+                return await proxyHelper.SendAsync(
                    ProxyAndRecordSettings,
                    _httpClientForProxy,
                    requestMessage,
                    requestMessage.ProxyUrl
                );
-
-                return proxyResponseMessage;
            }

            ResponseMessage responseMessage;
-            if (Callback == null && CallbackAsync == null)
+            if (!WithCallbackUsed)
            {
                responseMessage = ResponseMessage;
            }
@@ -371,16 +385,16 @@ namespace WireMock.ResponseBuilders
                    responseMessage = await CallbackAsync(requestMessage);
                }

-                if (!WithCallbackUsed)
+                // Copy StatusCode from ResponseMessage (if defined)
+                if (ResponseMessage.StatusCode != null)
                {
-                    // Copy StatusCode from ResponseMessage
                    responseMessage.StatusCode = ResponseMessage.StatusCode;
+                }

-                    // Copy Headers from ResponseMessage (if defined)
-                    if (ResponseMessage.Headers != null)
-                    {
-                        responseMessage.Headers = ResponseMessage.Headers;
-                    }
+                // Copy Headers from ResponseMessage (if defined)
+                if (ResponseMessage.Headers != null)
+                {
+                    responseMessage.Headers = ResponseMessage.Headers;
                }
            }

@@ -404,7 +418,7 @@ namespace WireMock.ResponseBuilders
                        throw new NotImplementedException($"TransformerType '{TransformerType}' is not supported.");
                }

-                return responseMessageTransformer.Transform(requestMessage, responseMessage, UseTransformerForBodyAsFile);
+                return (responseMessageTransformer.Transform(requestMessage, responseMessage, UseTransformerForBodyAsFile), null);
            }

            if (!UseTransformer && ResponseMessage.BodyData?.BodyAsFileIsCached == true)
@@ -412,7 +426,7 @@ namespace WireMock.ResponseBuilders
                ResponseMessage.BodyData.BodyAsBytes = settings.FileSystemHandler.ReadResponseBodyAsFile(responseMessage.BodyData.BodyAsFile);
            }

-            return responseMessage;
+            return (responseMessage, null);
        }
    }
 }
--- a/src/WireMock.Net/ResponseProviders/DynamicAsyncResponseProvider.cs
+++ b/src/WireMock.Net/ResponseProviders/DynamicAsyncResponseProvider.cs
@@ -13,9 +13,9 @@ namespace WireMock.ResponseProviders
            _responseMessageFunc = responseMessageFunc;
        }

-        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
+        public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
        {
-            return _responseMessageFunc(requestMessage);
+            return (await _responseMessageFunc(requestMessage), null);
        }
    }
 }
--- a/src/WireMock.Net/ResponseProviders/DynamicResponseProvider.cs
+++ b/src/WireMock.Net/ResponseProviders/DynamicResponseProvider.cs
@@ -13,9 +13,10 @@ namespace WireMock.ResponseProviders
            _responseMessageFunc = responseMessageFunc;
        }

-        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
+        public Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
        {
-            return Task.FromResult(_responseMessageFunc(requestMessage));
+            (ResponseMessage responseMessage, IMapping mapping) result = (_responseMessageFunc(requestMessage), null);
+            return Task.FromResult(result);
        }
    }
 }
--- a/src/WireMock.Net/ResponseProviders/IResponseProvider.cs
+++ b/src/WireMock.Net/ResponseProviders/IResponseProvider.cs
@@ -16,7 +16,7 @@ namespace WireMock.ResponseProviders
        /// </summary>
        /// <param name="requestMessage">The request.</param>
        /// <param name="settings">The WireMockServerSettings.</param>
-        /// <returns>The <see cref="ResponseMessage"/>.</returns>
-        Task<ResponseMessage> ProvideResponseAsync([NotNull] RequestMessage requestMessage, [NotNull] IWireMockServerSettings settings);
+        /// <returns>The <see cref="ResponseMessage"/> including a new (optional) <see cref="IMapping"/>.</returns>
+        Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync([NotNull] RequestMessage requestMessage, [NotNull] IWireMockServerSettings settings);
    }
 }
--- a/src/WireMock.Net/ResponseProviders/ProxyAsyncResponseProvider.cs
+++ b/src/WireMock.Net/ResponseProviders/ProxyAsyncResponseProvider.cs
@@ -15,9 +15,9 @@ namespace WireMock.ResponseProviders
            _settings = settings;
        }

-        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
+        public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
        {
-            return _responseMessageFunc(requestMessage, _settings);
+            return (await _responseMessageFunc(requestMessage, _settings), null);
        }
    }
 }
--- a/src/WireMock.Net/Serialization/MappingConverter.cs
+++ b/src/WireMock.Net/Serialization/MappingConverter.cs
@@ -84,7 +84,8 @@ namespace WireMock.Serialization
                Response = new ResponseModel
                {
                    Delay = (int?)response.Delay?.TotalMilliseconds
-                }
+                },
+                Webhook = WebhookMapper.Map(mapping.Webhook)
            };

            if (bodyMatcher?.Matchers != null)
--- a/src/WireMock.Net/Serialization/WebhookMapper.cs
+++ b/src/WireMock.Net/Serialization/WebhookMapper.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using WireMock.Admin.Mappings;
+using WireMock.Http;
+using WireMock.Models;
+using WireMock.Types;
+using WireMock.Util;
+
+namespace WireMock.Serialization
+{
+    internal static class WebhookMapper
+    {
+        public static IWebhook Map(WebhookModel model)
+        {
+            var webhook = new Webhook
+            {
+                Request = new WebhookRequest
+                {
+                    Url = model.Request.Url,
+                    Method = model.Request.Method,
+                    Headers = model.Request.Headers?.ToDictionary(x => x.Key, x => new WireMockList<string>(x.Value)) ?? new Dictionary<string, WireMockList<string>>()
+                }
+            };
+
+            if (model.Request.UseTransformer == true)
+            {
+                webhook.Request.UseTransformer = true;
+                if (!Enum.TryParse<TransformerType>(model.Request.TransformerType, out var transformerType))
+                {
+                    transformerType = TransformerType.Handlebars;
+                }
+                webhook.Request.TransformerType = transformerType;
+            }
+
+            IEnumerable<string> contentTypeHeader = null;
+            if (webhook.Request.Headers.Any(header => string.Equals(header.Key, HttpKnownHeaderNames.ContentType, StringComparison.OrdinalIgnoreCase)))
+            {
+                contentTypeHeader = webhook.Request.Headers.First(header => string.Equals(header.Key, HttpKnownHeaderNames.ContentType, StringComparison.OrdinalIgnoreCase)).Value;
+            }
+
+            if (model.Request.Body != null)
+            {
+                webhook.Request.BodyData = new BodyData
+                {
+                    BodyAsString = model.Request.Body,
+                    DetectedBodyType = BodyType.String,
+                    DetectedBodyTypeFromContentType = BodyParser.DetectBodyTypeFromContentType(contentTypeHeader?.FirstOrDefault())
+                };
+            }
+            else if (model.Request.BodyAsJson != null)
+            {
+                webhook.Request.BodyData = new BodyData
+                {
+                    BodyAsJson = model.Request.BodyAsJson,
+                    DetectedBodyType = BodyType.Json,
+                    DetectedBodyTypeFromContentType = BodyParser.DetectBodyTypeFromContentType(contentTypeHeader?.FirstOrDefault())
+                };
+            }
+
+            return webhook;
+        }
+
+        public static WebhookModel Map(IWebhook webhook)
+        {
+            if (webhook?.Request == null)
+            {
+                return null;
+            }
+
+            var model = new WebhookModel
+            {
+                Request = new WebhookRequestModel
+                {
+                    Url = webhook.Request.Url,
+                    Method = webhook.Request.Method,
+                    Headers = webhook.Request.Headers?.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                    UseTransformer = webhook.Request.UseTransformer,
+                    TransformerType = webhook.Request.UseTransformer == true ? webhook.Request.TransformerType.ToString() : null
+                }
+            };
+
+            if (webhook.Request.BodyData != null)
+            {
+                switch (webhook.Request.BodyData.DetectedBodyType)
+                {
+                    case BodyType.String:
+                        model.Request.Body = webhook.Request.BodyData.BodyAsString;
+                        break;
+
+                    case BodyType.Json:
+                        model.Request.BodyAsJson = webhook.Request.BodyData.BodyAsJson;
+                        break;
+
+                    default:
+                        break;
+                }
+            }
+
+            return model;
+        }
+    }
+}
--- a/src/WireMock.Net/Server/IRespondWithAProvider.cs
+++ b/src/WireMock.Net/Server/IRespondWithAProvider.cs
@@ -1,5 +1,9 @@
 using System;
+using System.Collections.Generic;
+using JetBrains.Annotations;
+using WireMock.Models;
 using WireMock.ResponseProviders;
+using WireMock.Types;

 namespace WireMock.Server
 {
@@ -97,5 +101,50 @@ namespace WireMock.Server
        /// <param name="times">The number of times this match should be matched before the state will be changed to the specified one. Default value is 1.</param>
        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
        IRespondWithAProvider WillSetStateTo(int state, int? times = 1);
+
+        /// <summary>
+        /// Add a Webbook to call after the response has been generated.
+        /// </summary>
+        /// <param name="webhook">The Webhook</param>
+        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+        IRespondWithAProvider WithWebhook(IWebhook webhook);
+
+        /// <summary>
+        /// Add a Webbook to call after the response has been generated.
+        /// </summary>
+        /// <param name="url">The Webhook Url</param>
+        /// <param name="method">The method to use. [optional]</param>
+        /// <param name="headers">The Headers to send. [optional]</param>
+        /// <param name="body">The body (as string) to send. [optional]</param>
+        /// <param name="useTransformer">Use Transformer. [optional]</param>
+        /// <param name="transformerType">The transformer type. [optional]</param>
+        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+        IRespondWithAProvider WithWebhook(
+            [NotNull] string url,
+            [CanBeNull] string method = "post",
+            [CanBeNull] IDictionary<string, WireMockList<string>> headers = null,
+            [CanBeNull] string body = null,
+            bool useTransformer = true,
+            TransformerType transformerType = TransformerType.Handlebars
+        );
+
+        /// <summary>
+        /// Add a Webbook to call after the response has been generated.
+        /// </summary>
+        /// <param name="url">The Webhook Url</param>
+        /// <param name="method">The method to use. [optional]</param>
+        /// <param name="headers">The Headers to send. [optional]</param>
+        /// <param name="body">The body (as json) to send. [optional]</param>
+        /// <param name="useTransformer">Use Transformer. [optional]</param>
+        /// <param name="transformerType">The transformer type. [optional]</param>
+        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+        IRespondWithAProvider WithWebhook(
+            [NotNull] string url,
+            [CanBeNull] string method = "post",
+            [CanBeNull] IDictionary<string, WireMockList<string>> headers = null,
+            [CanBeNull] object body = null,
+            bool useTransformer = true,
+            TransformerType transformerType = TransformerType.Handlebars
+        );
    }
 }
--- a/src/WireMock.Net/Server/RespondWithAProvider.cs
+++ b/src/WireMock.Net/Server/RespondWithAProvider.cs
@@ -1,10 +1,15 @@
 // This source file is based on mock4net by Alexandre Victoor which is licensed under the Apache 2.0 License.
 // For more details see 'mock4net/LICENSE.txt' and 'mock4net/readme.md' in this project root.
 using System;
+using System.Collections.Generic;
+using JetBrains.Annotations;
 using WireMock.Matchers.Request;
+using WireMock.Models;
 using WireMock.ResponseProviders;
 using WireMock.Settings;
-
+using WireMock.Types;
+using WireMock.Util;
+
 namespace WireMock.Server
 {
    /// <summary>
@@ -26,6 +31,8 @@ namespace WireMock.Server

        public Guid Guid { get; private set; } = Guid.NewGuid();

+        public IWebhook Webhook { get; private set; }
+
        /// <summary>
        /// Initializes a new instance of the <see cref="RespondWithAProvider"/> class.
        /// </summary>
@@ -47,7 +54,7 @@ namespace WireMock.Server
        /// <param name="provider">The provider.</param>
        public void RespondWith(IResponseProvider provider)
        {
-            _registrationCallback(new Mapping(Guid, _title, _path, _settings, _requestMatcher, provider, _priority, _scenario, _executionConditionState, _nextState, _timesInSameState), _saveToFile);
+            _registrationCallback(new Mapping(Guid, _title, _path, _settings, _requestMatcher, provider, _priority, _scenario, _executionConditionState, _nextState, _timesInSameState, Webhook), _saveToFile);
        }

        /// <see cref="IRespondWithAProvider.WithGuid(string)"/>
@@ -140,5 +147,81 @@ namespace WireMock.Server
        {
            return WillSetStateTo(state.ToString(), times);
        }
+
+        /// <see cref="IRespondWithAProvider.WithWebhook(IWebhook)"/>
+        public IRespondWithAProvider WithWebhook(IWebhook webhook)
+        {
+            Webhook = webhook;
+
+            return this;
+        }
+
+        /// <see cref="IRespondWithAProvider.WithWebhook(string,string, IDictionary{string, WireMockList{string}}, string, bool, TransformerType)"/>
+        public IRespondWithAProvider WithWebhook(
+            [NotNull] string url,
+            [CanBeNull] string method = "post",
+            [CanBeNull] IDictionary<string, WireMockList<string>> headers = null,
+            [CanBeNull] string body = null,
+            bool useTransformer = true,
+            TransformerType transformerType = TransformerType.Handlebars)
+        {
+            Webhook = InitWebhook(url, method, headers, useTransformer, transformerType);
+
+            if (body != null)
+            {
+                Webhook.Request.BodyData = new BodyData
+                {
+                    BodyAsString = body,
+                    DetectedBodyType = BodyType.String,
+                    DetectedBodyTypeFromContentType = BodyType.String
+                };
+            }
+
+            return this;
+        }
+
+        /// <see cref="IRespondWithAProvider.WithWebhook(string, string, IDictionary{string, WireMockList{string}}, object, bool, TransformerType)"/>
+        public IRespondWithAProvider WithWebhook(
+            [NotNull] string url,
+            [CanBeNull] string method = "post",
+            [CanBeNull] IDictionary<string, WireMockList<string>> headers = null,
+            [CanBeNull] object body = null,
+            bool useTransformer = true,
+            TransformerType transformerType = TransformerType.Handlebars)
+        {
+            Webhook = InitWebhook(url, method, headers, useTransformer, transformerType);
+
+            if (body != null)
+            {
+                Webhook.Request.BodyData = new BodyData
+                {
+                    BodyAsJson = body,
+                    DetectedBodyType = BodyType.Json,
+                    DetectedBodyTypeFromContentType = BodyType.Json
+                };
+            }
+
+            return this;
+        }
+
+        private IWebhook InitWebhook(
+            string url,
+            string method,
+            IDictionary<string, WireMockList<string>> headers,
+            bool useTransformer,
+            TransformerType transformerType)
+        {
+            return new Webhook
+            {
+                Request = new WebhookRequest
+                {
+                    Url = url,
+                    Method = method ?? "post",
+                    Headers = headers,
+                    UseTransformer = useTransformer,
+                    TransformerType = transformerType
+                }
+            };
+        }
    }
 }
--- a/src/WireMock.Net/Server/WireMockServer.Admin.cs
+++ b/src/WireMock.Net/Server/WireMockServer.Admin.cs
@@ -470,6 +470,11 @@ namespace WireMock.Server
                respondProvider = respondProvider.WillSetStateTo(mappingModel.SetStateTo);
            }

+            if (mappingModel.Webhook?.Request != null)
+            {
+                respondProvider = respondProvider.WithWebhook(WebhookMapper.Map(mappingModel.Webhook));
+            }
+
            respondProvider.RespondWith(responseBuilder);

            return respondProvider.Guid;
--- a/src/WireMock.Net/Settings/HttpClientSettings.cs
+++ b/src/WireMock.Net/Settings/HttpClientSettings.cs
@@ -0,0 +1,17 @@
+namespace WireMock.Settings
+{
+    /// <summary>
+    /// HttpClientSettings
+    /// </summary>
+    public class HttpClientSettings : IHttpClientSettings
+    {
+        /// <inheritdoc cref="IHttpClientSettings.ClientX509Certificate2ThumbprintOrSubjectName"/>
+        public string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }
+
+        /// <inheritdoc cref="IHttpClientSettings.WebProxySettings"/>
+        public IWebProxySettings WebProxySettings { get; set; }
+
+        /// <inheritdoc cref="IHttpClientSettings.AllowAutoRedirect"/>
+        public bool? AllowAutoRedirect { get; set; }
+    }
+}
--- a/src/WireMock.Net/Settings/IHttpClientSettings.cs
+++ b/src/WireMock.Net/Settings/IHttpClientSettings.cs
@@ -0,0 +1,24 @@
+namespace WireMock.Settings
+{
+    /// <summary>
+    /// IHttpClientSettings
+    /// </summary>
+    public interface IHttpClientSettings
+    {
+        /// <summary>
+        /// The clientCertificate thumbprint or subject name fragment to use.
+        /// Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
+        /// </summary>
+        string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }
+
+        /// <summary>
+        /// Defines the WebProxySettings.
+        /// </summary>
+        IWebProxySettings WebProxySettings { get; set; }
+
+        /// <summary>
+        /// Proxy requests should follow redirection (30x).
+        /// </summary>
+        bool? AllowAutoRedirect { get; set; }
+    }
+}
--- a/src/WireMock.Net/Settings/IProxyAndRecordSettings.cs
+++ b/src/WireMock.Net/Settings/IProxyAndRecordSettings.cs
@@ -5,7 +5,7 @@ namespace WireMock.Settings
    /// <summary>
    /// IProxyAndRecordSettings
    /// </summary>
-    public interface IProxyAndRecordSettings
+    public interface IProxyAndRecordSettings : IHttpClientSettings
    {
        /// <summary>
        /// The URL to proxy.
@@ -29,12 +29,6 @@ namespace WireMock.Settings
        /// </summary>
        bool SaveMappingToFile { get; set; }

-        /// <summary>
-        /// The clientCertificate thumbprint or subject name fragment to use.
-        /// Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
-        /// </summary>
-        string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }
-
        /// <summary>
        /// Defines a list from headers which will be excluded from the saved mappings.
        /// </summary>
@@ -44,15 +38,5 @@ namespace WireMock.Settings
        /// Defines a list of cookies which will be excluded from the saved mappings.
        /// </summary>
        string[] ExcludedCookies { get; set; }
-
-        /// <summary>
-        /// Defines the WebProxySettings.
-        /// </summary>
-        IWebProxySettings WebProxySettings { get; set; }
-
-        /// <summary>
-        /// Proxy requests should follow redirection (30x).
-        /// </summary>
-        bool? AllowAutoRedirect { get; set; }
    }
 }
--- a/src/WireMock.Net/Settings/IWebhookSettings.cs
+++ b/src/WireMock.Net/Settings/IWebhookSettings.cs
@@ -0,0 +1,9 @@
+namespace WireMock.Settings
+{
+    /// <summary>
+    /// IWebhookSettings
+    /// </summary>
+    public interface IWebhookSettings : IHttpClientSettings
+    {
+    }
+}
--- a/src/WireMock.Net/Settings/IWireMockServerSettings.cs
+++ b/src/WireMock.Net/Settings/IWireMockServerSettings.cs
@@ -186,5 +186,11 @@ namespace WireMock.Settings
        /// </summary>
        [PublicAPI]
        bool CustomCertificateDefined { get; }
+
+        /// <summary>
+        /// Defines the global IWebhookSettingsto use
+        /// </summary>
+        [PublicAPI]
+        IWebhookSettings WebhookSettings { get; set; }
    }
 }
--- a/src/WireMock.Net/Settings/ProxyAndRecordSettings.cs
+++ b/src/WireMock.Net/Settings/ProxyAndRecordSettings.cs
@@ -5,7 +5,7 @@ namespace WireMock.Settings
    /// <summary>
    /// ProxyAndRecordSettings
    /// </summary>
-    public class ProxyAndRecordSettings : IProxyAndRecordSettings
+    public class ProxyAndRecordSettings : HttpClientSettings, IProxyAndRecordSettings
    {
        /// <summary>
        /// The URL to proxy.
@@ -32,13 +32,6 @@ namespace WireMock.Settings
        [PublicAPI]
        public string SaveMappingForStatusCodePattern { get; set; } = "*";

-        /// <summary>
-        /// The clientCertificate thumbprint or subject name fragment to use.
-        /// Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
-        /// </summary>
-        [PublicAPI]
-        public string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }
-
        /// <inheritdoc cref="IProxyAndRecordSettings.ExcludedHeaders"/>
        [PublicAPI]
        public string[] ExcludedHeaders { get; set; }
@@ -46,13 +39,5 @@ namespace WireMock.Settings
        /// <inheritdoc cref="IProxyAndRecordSettings.ExcludedCookies"/>
        [PublicAPI]
        public string[] ExcludedCookies { get; set; }
-
-        /// <inheritdoc cref="IProxyAndRecordSettings.WebProxySettings"/>
-        [PublicAPI]
-        public IWebProxySettings WebProxySettings { get; set; }
-
-        /// <inheritdoc cref="IProxyAndRecordSettings.AllowAutoRedirect"/>
-        [PublicAPI]
-        public bool? AllowAutoRedirect { get; set; }
    }
 }
--- a/src/WireMock.Net/Settings/WebhookSettings.cs
+++ b/src/WireMock.Net/Settings/WebhookSettings.cs
@@ -0,0 +1,9 @@
+namespace WireMock.Settings
+{
+    /// <summary>
+    /// WebhookSettings
+    /// </summary>
+    public class WebhookSettings : HttpClientSettings, IWebhookSettings
+    {
+    }
+}
--- a/src/WireMock.Net/Settings/WireMockServerSettings.cs
+++ b/src/WireMock.Net/Settings/WireMockServerSettings.cs
@@ -129,5 +129,9 @@ namespace WireMock.Settings
        /// <inheritdoc cref="IWireMockServerSettings.CustomCertificateDefined"/>
        [PublicAPI]
        public bool CustomCertificateDefined => CertificateSettings?.IsDefined == true;
+
+        /// <inheritdoc cref="IWireMockServerSettings.WebhookSettings"/>
+        [PublicAPI]
+        public IWebhookSettings WebhookSettings { get; set; }
    }
 }
--- a/src/WireMock.Net/Transformers/Handlebars/FileHelpers.cs
+++ b/src/WireMock.Net/Transformers/Handlebars/FileHelpers.cs
@@ -0,0 +1,27 @@
+using System;
+using HandlebarsDotNet;
+using HandlebarsDotNet.Helpers.Attributes;
+using HandlebarsDotNet.Helpers.Enums;
+using HandlebarsDotNet.Helpers.Helpers;
+using WireMock.Handlers;
+
+namespace WireMock.Transformers.Handlebars
+{
+    internal class FileHelpers : BaseHelpers, IHelpers
+    {
+        private readonly IFileSystemHandler _fileSystemHandler;
+
+        public FileHelpers(IHandlebars context, IFileSystemHandler fileSystemHandler) : base(context)
+        {
+            _fileSystemHandler = fileSystemHandler ?? throw new ArgumentNullException(nameof(fileSystemHandler));
+        }
+
+        [HandlebarsWriter(WriterType.String, usage: HelperUsage.Both, passContext: true, name: "File")]
+        public string Read(Context context, string path)
+        {
+            var templateFunc = Context.Compile(path);
+            string transformed = templateFunc(context.Value);
+            return _fileSystemHandler.ReadResponseBodyAsString(transformed);
+        }
+    }
+}
--- a/src/WireMock.Net/Transformers/Handlebars/HandlebarsContext.cs
+++ b/src/WireMock.Net/Transformers/Handlebars/HandlebarsContext.cs
@@ -1,6 +1,6 @@
 using HandlebarsDotNet;
 using WireMock.Handlers;
-
+
 namespace WireMock.Transformers.Handlebars
 {
    internal class HandlebarsContext : IHandlebarsContext
@@ -12,7 +12,6 @@ namespace WireMock.Transformers.Handlebars
        public string ParseAndRender(string text, object model)
        {
            var template = Handlebars.Compile(text);
-
            return template(model);
        }
    }
--- a/src/WireMock.Net/Transformers/Handlebars/HandlebarsContextFactory.cs
+++ b/src/WireMock.Net/Transformers/Handlebars/HandlebarsContextFactory.cs
@@ -7,11 +7,6 @@ namespace WireMock.Transformers.Handlebars
 {
    internal class HandlebarsContextFactory : ITransformerContextFactory
    {
-        private static readonly HandlebarsConfiguration HandlebarsConfiguration = new HandlebarsConfiguration
-        {
-            UnresolvedBindingFormatter = "{0}"
-        };
-
        private readonly IFileSystemHandler _fileSystemHandler;
        private readonly Action<IHandlebars, IFileSystemHandler> _action;

@@ -23,7 +18,7 @@ namespace WireMock.Transformers.Handlebars

        public ITransformerContext Create()
        {
-            var handlebars = HandlebarsDotNet.Handlebars.Create(HandlebarsConfiguration);
+            var handlebars = HandlebarsDotNet.Handlebars.Create();

            WireMockHandlebarsHelpers.Register(handlebars, _fileSystemHandler);

--- a/src/WireMock.Net/Transformers/Handlebars/HandlebarsFile.cs
+++ b/src/WireMock.Net/Transformers/Handlebars/HandlebarsFile.cs
@@ -1,41 +0,0 @@
-using HandlebarsDotNet;
-using System;
-using WireMock.Handlers;
-using WireMock.Validation;
-
-namespace WireMock.Transformers.Handlebars
-{
-    internal static class HandlebarsFile
-    {
-        public static void Register(IHandlebars handlebarsContext, IFileSystemHandler fileSystemHandler)
-        {
-            handlebarsContext.RegisterHelper("File", (writer, context, arguments) =>
-            {
-                string value = ParseArgumentAndReadFileFragment(handlebarsContext, context, fileSystemHandler, arguments);
-                writer.Write(value);
-            });
-
-            handlebarsContext.RegisterHelper("File", (writer, options, context, arguments) =>
-            {
-                string value = ParseArgumentAndReadFileFragment(handlebarsContext, context, fileSystemHandler, arguments);
-                options.Template(writer, value);
-            });
-        }
-
-        private static string ParseArgumentAndReadFileFragment(IHandlebars handlebarsContext, dynamic context, IFileSystemHandler fileSystemHandler, object[] arguments)
-        {
-            Check.Condition(arguments, args => args.Length == 1, nameof(arguments));
-            Check.NotNull(arguments[0], "arguments[0]");
-
-            switch (arguments[0])
-            {
-                case string path:
-                    var templateFunc = handlebarsContext.Compile(path);
-                    string transformed = templateFunc(context);
-                    return fileSystemHandler.ReadResponseBodyAsString(transformed);
-            }
-
-            throw new NotSupportedException($"The value '{arguments[0]}' with type '{arguments[0]?.GetType()}' cannot be used in Handlebars File.");
-        }
-    }
-}
--- a/src/WireMock.Net/Transformers/Handlebars/HandlebarsJsonPath.cs
+++ b/src/WireMock.Net/Transformers/Handlebars/HandlebarsJsonPath.cs
@@ -1,79 +0,0 @@
-using HandlebarsDotNet;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections;
-using System.Linq;
-using WireMock.Util;
-using WireMock.Validation;
-
-namespace WireMock.Transformers.Handlebars
-{
-    internal static class HandlebarsJsonPath
-    {
-        public static void Register(IHandlebars handlebarsContext)
-        {
-            handlebarsContext.RegisterHelper("JsonPath.SelectToken", (writer, context, arguments) =>
-            {
-                (JToken valueToProcess, string jsonPath) = ParseArguments(arguments);
-
-                try
-                {
-                    var result = valueToProcess.SelectToken(jsonPath);
-                    writer.WriteSafeString(result);
-                }
-                catch (JsonException)
-                {
-                    // Ignore JsonException
-                }
-            });
-
-            handlebarsContext.RegisterHelper("JsonPath.SelectTokens", (writer, options, context, arguments) =>
-            {
-                (JToken valueToProcess, string jsonPath) = ParseArguments(arguments);
-
-                try
-                {
-                    var values = valueToProcess.SelectTokens(jsonPath);
-                    if (values != null)
-                    {
-                        options.Template(writer, values.ToDictionary(value => value.Path, value => value));
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore JsonException
-                }
-            });
-        }
-
-        private static (JToken valueToProcess, string jsonpath) ParseArguments(object[] arguments)
-        {
-            Check.Condition(arguments, args => args.Length == 2, nameof(arguments));
-            Check.NotNull(arguments[0], "arguments[0]");
-            Check.NotNullOrEmpty(arguments[1] as string, "arguments[1]");
-
-            JToken valueToProcess;
-
-            switch (arguments[0])
-            {
-                case JToken tokenValue:
-                    valueToProcess = tokenValue;
-                    break;
-
-                case string stringValue:
-                    valueToProcess = JsonUtils.Parse(stringValue);
-                    break;
-
-                case IEnumerable enumerableValue:
-                    valueToProcess = JArray.FromObject(enumerableValue);
-                    break;
-
-                default:
-                    throw new NotSupportedException($"The value '{arguments[0]}' with type '{arguments[0]?.GetType()}' cannot be used in Handlebars JsonPath.");
-            }
-
-            return (valueToProcess, (string)arguments[1]);
-        }
-    }
-}
--- a/src/WireMock.Net/Transformers/Handlebars/HandlebarsLinq.cs
+++ b/src/WireMock.Net/Transformers/Handlebars/HandlebarsLinq.cs
@@ -1,86 +0,0 @@
-using System;
-using System.Linq;
-using System.Linq.Dynamic.Core;
-using System.Linq.Dynamic.Core.Exceptions;
-using HandlebarsDotNet;
-using Newtonsoft.Json.Linq;
-using WireMock.Util;
-using WireMock.Validation;
-
-namespace WireMock.Transformers.Handlebars
-{
-    internal static class HandlebarsLinq
-    {
-        public static void Register(IHandlebars handlebarsContext)
-        {
-            handlebarsContext.RegisterHelper("Linq", (writer, context, arguments) =>
-            {
-                (JToken valueToProcess, string linqStatement) = ParseArguments(arguments);
-
-                try
-                {
-                    object result = ExecuteDynamicLinq(valueToProcess, linqStatement);
-                    writer.WriteSafeString(result);
-                }
-                catch (ParseException)
-                {
-                    // Ignore ParseException
-                }
-            });
-
-            handlebarsContext.RegisterHelper("Linq", (writer, options, context, arguments) =>
-            {
-                (JToken valueToProcess, string linqStatement) = ParseArguments(arguments);
-
-                try
-                {
-                    var result = ExecuteDynamicLinq(valueToProcess, linqStatement);
-                    options.Template(writer, result);
-                }
-                catch (ParseException)
-                {
-                    // Ignore ParseException
-                }
-            });
-        }
-
-        private static dynamic ExecuteDynamicLinq(JToken value, string linqStatement)
-        {
-            // Convert a single object to a Queryable JObject-list with 1 entry.
-            var queryable1 = new[] { value }.AsQueryable();
-
-            // Generate the DynamicLinq select statement.
-            string dynamicSelect = JsonUtils.GenerateDynamicLinqStatement(value);
-
-            // Execute DynamicLinq Select statement.
-            var queryable2 = queryable1.Select(dynamicSelect);
-
-            // Execute the Select(...) method and get first result with FirstOrDefault().
-            return queryable2.Select(linqStatement).FirstOrDefault();
-        }
-
-        private static (JToken valueToProcess, string linqStatement) ParseArguments(object[] arguments)
-        {
-            Check.Condition(arguments, args => args.Length == 2, nameof(arguments));
-            Check.NotNull(arguments[0], "arguments[0]");
-            Check.NotNullOrEmpty(arguments[1] as string, "arguments[1]");
-
-            JToken valueToProcess;
-            switch (arguments[0])
-            {
-                case string jsonAsString:
-                    valueToProcess = new JValue(jsonAsString);
-                    break;
-
-                case JToken jsonAsJObject:
-                    valueToProcess = jsonAsJObject;
-                    break;
-
-                default:
-                    throw new NotSupportedException($"The value '{arguments[0]}' with type '{arguments[0]?.GetType()}' cannot be used in Handlebars Linq.");
-            }
-
-            return (valueToProcess, (string) arguments[1]);
-        }
-    }
-}
--- a/src/WireMock.Net/Transformers/Handlebars/HandlebarsRandom.cs
+++ b/src/WireMock.Net/Transformers/Handlebars/HandlebarsRandom.cs
@@ -1,113 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using HandlebarsDotNet;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using RandomDataGenerator.FieldOptions;
-using RandomDataGenerator.Randomizers;
-using WireMock.Validation;
-
-namespace WireMock.Transformers.Handlebars
-{
-    internal static class HandlebarsRandom
-    {
-        public static void Register(IHandlebars handlebarsContext)
-        {
-            handlebarsContext.RegisterHelper("Random", (writer, context, arguments) =>
-            {
-                object value = GetRandomValue(arguments);
-                writer.Write(value);
-            });
-
-            handlebarsContext.RegisterHelper("Random", (writer, options, context, arguments) =>
-            {
-                object value = GetRandomValue(arguments);
-                options.Template(writer, value);
-            });
-        }
-
-        private static object GetRandomValue(object[] arguments)
-        {
-            var fieldOptions = GetFieldOptionsFromArguments(arguments);
-            dynamic randomizer = RandomizerFactory.GetRandomizerAsDynamic(fieldOptions);
-
-            // Format DateTime as ISO 8601
-            if (fieldOptions is IFieldOptionsDateTime)
-            {
-                DateTime? date = randomizer.Generate();
-                return date?.ToString("s", CultureInfo.InvariantCulture);
-            }
-
-            // If the IFieldOptionsGuid defines Uppercase, use the 'GenerateAsString' method.
-            if (fieldOptions is IFieldOptionsGuid fieldOptionsGuid)
-            {
-                return fieldOptionsGuid.Uppercase ? randomizer.GenerateAsString() : randomizer.Generate();
-            }
-
-            return randomizer.Generate();
-        }
-
-        private static FieldOptionsAbstract GetFieldOptionsFromArguments(object[] arguments)
-        {
-            Check.Condition(arguments, args => args.Length > 0, nameof(arguments));
-            Check.NotNull(arguments[0], "arguments[0]");
-
-            var properties = (Dictionary<string, object>)arguments[0];
-            var newProperties = new Dictionary<string, object>();
-
-            foreach (KeyValuePair<string, object> property in properties.Where(p => p.Key != "Type"))
-            {
-                if (property.Value.GetType().Name == "UndefinedBindingResult")
-                {
-                    if (TryParseSpecialValue(property.Value, out object parsedValue))
-                    {
-                        newProperties.Add(property.Key, parsedValue);
-                    }
-                }
-                else
-                {
-                    newProperties.Add(property.Key, property.Value);
-                }
-            }
-
-            return FieldOptionsFactory.GetFieldOptions((string)properties["Type"], newProperties);
-        }
-
-        /// <summary>
-        /// In case it's an UndefinedBindingResult, just try to convert the value using Json
-        /// This logic adds functionality like parsing an array
-        /// </summary>
-        /// <param name="value">The property value</param>
-        /// <param name="parsedValue">The parsed value</param>
-        /// <returns>true in case parsing is ok, else false</returns>
-        private static bool TryParseSpecialValue(object value, out object parsedValue)
-        {
-            parsedValue = null;
-            string propertyValueAsString = value.ToString();
-
-            try
-            {
-                JToken jToken = JToken.Parse(propertyValueAsString);
-                switch (jToken)
-                {
-                    case JArray jTokenArray:
-                        parsedValue = jTokenArray.ToObject<string[]>().ToList(); // Just convert to a String List to enable Random StringList
-                        break;
-
-                    default:
-                        return jToken.ToObject<dynamic>();
-                }
-
-                return true;
-            }
-            catch (JsonException)
-            {
-                // Ignore and don't add this value
-            }
-
-            return false;
-        }
-    }
-}
--- a/src/WireMock.Net/Transformers/Handlebars/HandlebarsRegex.cs
+++ b/src/WireMock.Net/Transformers/Handlebars/HandlebarsRegex.cs
@@ -1,64 +0,0 @@
-using System;
-using System.Linq;
-using System.Text.RegularExpressions;
-using HandlebarsDotNet;
-using WireMock.Util;
-using WireMock.Validation;
-
-namespace WireMock.Transformers.Handlebars
-{
-    internal static class HandlebarsRegex
-    {
-        public static void Register(IHandlebars handlebarsContext)
-        {
-            handlebarsContext.RegisterHelper("Regex.Match", (writer, context, arguments) =>
-            {
-                (string stringToProcess, string regexPattern, object defaultValue) = ParseArguments(arguments);
-
-                Match match = Regex.Match(stringToProcess, regexPattern);
-
-                if (match.Success)
-                {
-                    writer.WriteSafeString(match.Value);
-                }
-                else if (defaultValue != null)
-                {
-                    writer.WriteSafeString(defaultValue);
-                }
-            });
-
-            handlebarsContext.RegisterHelper("Regex.Match", (writer, options, context, arguments) =>
-            {
-                (string stringToProcess, string regexPattern, object defaultValue) = ParseArguments(arguments);
-
-                var regex = new Regex(regexPattern);
-                var namedGroups = RegexUtils.GetNamedGroups(regex, stringToProcess);
-                if (namedGroups.Any())
-                {
-                    options.Template(writer, namedGroups);
-                }
-                else if (defaultValue != null)
-                {
-                    options.Template(writer, defaultValue);
-                }
-            });
-        }
-
-        private static (string stringToProcess, string regexPattern, object defaultValue) ParseArguments(object[] arguments)
-        {
-            Check.Condition(arguments, args => args.Length == 2 || args.Length == 3, nameof(arguments));
-
-            string ParseAsString(object arg)
-            {
-                if (arg is string argAsString)
-                {
-                    return argAsString;
-                }
-
-                throw new NotSupportedException($"The value '{arg}' with type '{arg?.GetType()}' cannot be used in Handlebars Regex.");
-            }
-
-            return (ParseAsString(arguments[0]), ParseAsString(arguments[1]), arguments.Length == 3 ? arguments[2] : null);
-        }
-    }
-}
--- a/src/WireMock.Net/Transformers/Handlebars/HandlebarsXPath.cs
+++ b/src/WireMock.Net/Transformers/Handlebars/HandlebarsXPath.cs
@@ -1,102 +0,0 @@
-using HandlebarsDotNet;
-using System;
-using System.Text;
-using System.Xml;
-using System.Xml.XPath;
-using WireMock.Validation;
-#if !NETSTANDARD1_3
-using Wmhelp.XPath2;
-#endif
-
-namespace WireMock.Transformers.Handlebars
-{
-    internal static class HandlebarsXPath
-    {
-        public static void Register(IHandlebars handlebarsContext)
-        {
-            handlebarsContext.RegisterHelper("XPath.SelectSingleNode", (writer, context, arguments) =>
-            {
-                (XPathNavigator nav, string xpath) = ParseArguments(arguments);
-
-                try
-                {
-#if NETSTANDARD1_3
-                    var result = nav.SelectSingleNode(xpath);
-#else
-                    var result = nav.XPath2SelectSingleNode(xpath);
-#endif
-                    writer.WriteSafeString(result.OuterXml);
-                }
-                catch (Exception)
-                {
-                    // Ignore Exception
-                }
-            });
-
-            handlebarsContext.RegisterHelper("XPath.SelectNodes", (writer, context, arguments) =>
-            {
-                (XPathNavigator nav, string xpath) = ParseArguments(arguments);
-
-                try
-                {
-#if NETSTANDARD1_3
-                    var result = nav.Select(xpath);
-#else
-                    var result = nav.XPath2SelectNodes(xpath);
-#endif
-                    var resultXml = new StringBuilder();
-                    foreach (XPathNavigator node in result)
-                    {
-                        resultXml.Append(node.OuterXml);
-                    }
-
-                    writer.WriteSafeString(resultXml);
-                }
-                catch (Exception)
-                {
-                    // Ignore Exception
-                }
-            });
-
-            handlebarsContext.RegisterHelper("XPath.Evaluate", (writer, context, arguments) =>
-            {
-                (XPathNavigator nav, string xpath) = ParseArguments(arguments);
-
-                try
-                {
-#if NETSTANDARD1_3
-                    var result = nav.Evaluate(xpath);
-#else
-                    var result = nav.XPath2Evaluate(xpath);
-#endif
-                    writer.WriteSafeString(result);
-                }
-                catch (Exception)
-                {
-                    // Ignore Exception
-                }
-            });
-        }
-
-        private static (XPathNavigator nav, string xpath) ParseArguments(object[] arguments)
-        {
-            Check.Condition(arguments, args => args.Length == 2, nameof(arguments));
-            Check.NotNull(arguments[0], "arguments[0]");
-            Check.NotNullOrEmpty(arguments[1] as string, "arguments[1]");
-
-            XPathNavigator nav;
-
-            switch (arguments[0])
-            {
-                case string stringValue:
-                    nav = new XmlDocument { InnerXml = stringValue }.CreateNavigator();
-                    break;
-
-                default:
-                    throw new NotSupportedException($"The value '{arguments[0]}' with type '{arguments[0]?.GetType()}' cannot be used in Handlebars XPath.");
-            }
-
-            return (nav, (string)arguments[1]);
-        }
-    }
-}
--- a/src/WireMock.Net/Transformers/Handlebars/HandlebarsXeger.cs
+++ b/src/WireMock.Net/Transformers/Handlebars/HandlebarsXeger.cs
@@ -1,39 +0,0 @@
-using System;
-using Fare;
-using HandlebarsDotNet;
-using WireMock.Validation;
-
-namespace WireMock.Transformers.Handlebars
-{
-    internal static class HandlebarsXeger
-    {
-        public static void Register(IHandlebars handlebarsContext)
-        {
-            handlebarsContext.RegisterHelper("Xeger", (writer, context, arguments) =>
-            {
-                string value = ParseArgumentAndGenerate(arguments);
-                writer.Write(value);
-            });
-
-            handlebarsContext.RegisterHelper("Xeger", (writer, options, context, arguments) =>
-            {
-                string value = ParseArgumentAndGenerate(arguments);
-                options.Template(writer, value);
-            });
-        }
-
-        private static string ParseArgumentAndGenerate(object[] arguments)
-        {
-            Check.Condition(arguments, args => args.Length == 1, nameof(arguments));
-            Check.NotNull(arguments[0], "arguments[0]");
-
-            switch (arguments[0])
-            {
-                case string pattern:
-                    return new Xeger(pattern).Generate();
-            }
-
-            throw new NotSupportedException($"The value '{arguments[0]}' with type '{arguments[0]?.GetType()}' cannot be used in Handlebars Xeger.");
-        }
-    }
-}
--- a/src/WireMock.Net/Transformers/Handlebars/WireMockHandlebarsHelpers.cs
+++ b/src/WireMock.Net/Transformers/Handlebars/WireMockHandlebarsHelpers.cs
@@ -1,30 +1,36 @@
-using HandlebarsDotNet;
-using HandlebarsDotNet.Helpers;
-using WireMock.Handlers;
-
-namespace WireMock.Transformers.Handlebars
-{
-    internal static class WireMockHandlebarsHelpers
-    {
-        public static void Register(IHandlebars handlebarsContext, IFileSystemHandler fileSystemHandler)
-        {
-            // Register https://github.com/StefH/Handlebars.Net.Helpers
-            HandlebarsHelpers.Register(handlebarsContext);
-
-            // Register WireMock.Net specific helpers
-            HandlebarsRegex.Register(handlebarsContext);
-
-            HandlebarsJsonPath.Register(handlebarsContext);
-
-            HandlebarsLinq.Register(handlebarsContext);
-
-            HandlebarsRandom.Register(handlebarsContext);
-
-            HandlebarsXeger.Register(handlebarsContext);
-
-            HandlebarsXPath.Register(handlebarsContext);
-
-            HandlebarsFile.Register(handlebarsContext, fileSystemHandler);
-        }
-    }
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using HandlebarsDotNet;
+using HandlebarsDotNet.Helpers;
+using HandlebarsDotNet.Helpers.Helpers;
+using WireMock.Handlers;
+
+namespace WireMock.Transformers.Handlebars
+{
+    internal static class WireMockHandlebarsHelpers
+    {
+        public static void Register(IHandlebars handlebarsContext, IFileSystemHandler fileSystemHandler)
+        {
+            // Register https://github.com/StefH/Handlebars.Net.Helpers
+            HandlebarsHelpers.Register(handlebarsContext, o =>
+            {
+                o.CustomHelperPaths = new string[]
+                {
+                    Directory.GetCurrentDirectory()
+#if !NETSTANDARD1_3
+                    , Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
+#endif
+                }
+                .Distinct()
+                .ToList();
+
+                o.CustomHelpers = new Dictionary<string, IHelpers>
+                {
+                    { "File", new FileHelpers(handlebarsContext, fileSystemHandler) }
+                };
+            });
+        }
+    }
 }
--- a/src/WireMock.Net/Transformers/ITransformer.cs
+++ b/src/WireMock.Net/Transformers/ITransformer.cs
@@ -1,7 +1,13 @@
-namespace WireMock.Transformers
+using System.Collections.Generic;
+using WireMock.Types;
+using WireMock.Util;
+
+namespace WireMock.Transformers
 {
    interface ITransformer
    {
        ResponseMessage Transform(RequestMessage requestMessage, ResponseMessage original, bool useTransformerForBodyAsFile);
+
+        (IBodyData BodyData, IDictionary<string, WireMockList<string>> Headers) Transform(RequestMessage originalRequestMessage, ResponseMessage originalResponseMessage, IBodyData bodyData, IDictionary<string, WireMockList<string>> headers);
    }
 }
--- a/src/WireMock.Net/Transformers/Transformer.cs
+++ b/src/WireMock.Net/Transformers/Transformer.cs
@@ -1,227 +1,265 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using JetBrains.Annotations;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using WireMock.Types;
-using WireMock.Util;
-using WireMock.Validation;
-
-namespace WireMock.Transformers.Handlebars
-{
-    internal class Transformer : ITransformer
-    {
-        private readonly ITransformerContextFactory _factory;
-
-        public Transformer([NotNull] ITransformerContextFactory factory)
-        {
-            Check.NotNull(factory, nameof(factory));
-
-            _factory = factory;
-        }
-
-        public ResponseMessage Transform(RequestMessage requestMessage, ResponseMessage original, bool useTransformerForBodyAsFile)
-        {
-            var handlebarsContext = _factory.Create();
-
-            var responseMessage = new ResponseMessage();
-
-            var model = new { request = requestMessage };
-
-            switch (original.BodyData?.DetectedBodyType)
-            {
-                case BodyType.Json:
-                    TransformBodyAsJson(handlebarsContext, model, original, responseMessage);
-                    break;
-
-                case BodyType.File:
-                    TransformBodyAsFile(handlebarsContext, model, original, responseMessage, useTransformerForBodyAsFile);
-                    break;
-
-                case BodyType.String:
-                    responseMessage.BodyOriginal = original.BodyData.BodyAsString;
-                    TransformBodyAsString(handlebarsContext, model, original, responseMessage);
-                    break;
-            }
-
-            responseMessage.FaultType = original.FaultType;
-            responseMessage.FaultPercentage = original.FaultPercentage;
-
-            // Headers
-            var newHeaders = new Dictionary<string, WireMockList<string>>();
-            foreach (var header in original.Headers)
-            {
-                var headerKey = handlebarsContext.ParseAndRender(header.Key, model);
-                var templateHeaderValues = header.Value
-                    .Select(text => handlebarsContext.ParseAndRender(text, model))
-                    .ToArray();
-
-                newHeaders.Add(headerKey, new WireMockList<string>(templateHeaderValues));
-            }
-
-            responseMessage.Headers = newHeaders;
-
-            switch (original.StatusCode)
-            {
-                case int statusCodeAsInteger:
-                    responseMessage.StatusCode = statusCodeAsInteger;
-                    break;
-
-                case string statusCodeAsString:
-                    responseMessage.StatusCode = handlebarsContext.ParseAndRender(statusCodeAsString, model);
-                    break;
-            }
-
-            return responseMessage;
-        }
-
-        private static void TransformBodyAsJson(ITransformerContext handlebarsContext, object model, ResponseMessage original, ResponseMessage responseMessage)
-        {
-            JToken jToken;
-            switch (original.BodyData.BodyAsJson)
-            {
-                case JObject bodyAsJObject:
-                    jToken = bodyAsJObject.DeepClone();
-                    WalkNode(handlebarsContext, jToken, model);
-                    break;
-
-                case Array bodyAsArray:
-                    jToken = JArray.FromObject(bodyAsArray);
-                    WalkNode(handlebarsContext, jToken, model);
-                    break;
-
-                case string bodyAsString:
-                    jToken = ReplaceSingleNode(handlebarsContext, bodyAsString, model);
-                    break;
-
-                default:
-                    jToken = JObject.FromObject(original.BodyData.BodyAsJson);
-                    WalkNode(handlebarsContext, jToken, model);
-                    break;
-            }
-
-            responseMessage.BodyData = new BodyData
-            {
-                Encoding = original.BodyData.Encoding,
-                DetectedBodyType = original.BodyData.DetectedBodyType,
-                DetectedBodyTypeFromContentType = original.BodyData.DetectedBodyTypeFromContentType,
-                BodyAsJson = jToken
-            };
-        }
-
-        private static JToken ReplaceSingleNode(ITransformerContext handlebarsContext, string stringValue, object model)
-        {
-            string transformedString = handlebarsContext.ParseAndRender(stringValue, model);
-
-            if (!string.Equals(stringValue, transformedString))
-            {
-                const string property = "_";
-                JObject dummy = JObject.Parse($"{{ \"{property}\": null }}");
-                JToken node = dummy[property];
-
-                ReplaceNodeValue(node, transformedString);
-
-                return dummy[property];
-            }
-
-            return stringValue;
-        }
-
-        private static void WalkNode(ITransformerContext handlebarsContext, JToken node, object model)
-        {
-            if (node.Type == JTokenType.Object)
-            {
-                // In case of Object, loop all children. Do a ToArray() to avoid `Collection was modified` exceptions.
-                foreach (JProperty child in node.Children<JProperty>().ToArray())
-                {
-                    WalkNode(handlebarsContext, child.Value, model);
-                }
-            }
-            else if (node.Type == JTokenType.Array)
-            {
-                // In case of Array, loop all items. Do a ToArray() to avoid `Collection was modified` exceptions.
-                foreach (JToken child in node.Children().ToArray())
-                {
-                    WalkNode(handlebarsContext, child, model);
-                }
-            }
-            else if (node.Type == JTokenType.String)
-            {
-                // In case of string, try to transform the value.
-                string stringValue = node.Value<string>();
-                if (string.IsNullOrEmpty(stringValue))
-                {
-                    return;
-                }
-
-                string transformedString = handlebarsContext.ParseAndRender(stringValue, model);
-                if (!string.Equals(stringValue, transformedString))
-                {
-                    ReplaceNodeValue(node, transformedString);
-                }
-            }
-        }
-
-        private static void ReplaceNodeValue(JToken node, string stringValue)
-        {
-            if (bool.TryParse(stringValue, out bool valueAsBoolean))
-            {
-                node.Replace(valueAsBoolean);
-                return;
-            }
-
-            JToken value;
-            try
-            {
-                // Try to convert this string into a JsonObject
-                value = JToken.Parse(stringValue);
-            }
-            catch (JsonException)
-            {
-                // Ignore JsonException and just keep string value and convert to JToken
-                value = stringValue;
-            }
-
-            node.Replace(value);
-        }
-
-        private static void TransformBodyAsString(ITransformerContext handlebarsContext, object model, ResponseMessage original, ResponseMessage responseMessage)
-        {
-            responseMessage.BodyData = new BodyData
-            {
-                Encoding = original.BodyData.Encoding,
-                DetectedBodyType = original.BodyData.DetectedBodyType,
-                DetectedBodyTypeFromContentType = original.BodyData.DetectedBodyTypeFromContentType,
-                BodyAsString = handlebarsContext.ParseAndRender(original.BodyData.BodyAsString, model)
-            };
-        }
-
-        private void TransformBodyAsFile(ITransformerContext handlebarsContext, object model, ResponseMessage original, ResponseMessage responseMessage, bool useTransformerForBodyAsFile)
-        {
-            string transformedBodyAsFilename = handlebarsContext.ParseAndRender(original.BodyData.BodyAsFile, model);
-
-            if (!useTransformerForBodyAsFile)
-            {
-                responseMessage.BodyData = new BodyData
-                {
-                    DetectedBodyType = original.BodyData.DetectedBodyType,
-                    DetectedBodyTypeFromContentType = original.BodyData.DetectedBodyTypeFromContentType,
-                    BodyAsFile = transformedBodyAsFilename
-                };
-            }
-            else
-            {
-                string text = handlebarsContext.FileSystemHandler.ReadResponseBodyAsString(transformedBodyAsFilename);
-
-                responseMessage.BodyData = new BodyData
-                {
-                    DetectedBodyType = BodyType.String,
-                    DetectedBodyTypeFromContentType = original.BodyData.DetectedBodyTypeFromContentType,
-                    BodyAsString = handlebarsContext.ParseAndRender(text, model),
-                    BodyAsFile = transformedBodyAsFilename
-                };
-            }
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using JetBrains.Annotations;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using WireMock.Types;
+using WireMock.Util;
+
+namespace WireMock.Transformers.Handlebars
+{
+    internal class Transformer : ITransformer
+    {
+        private readonly ITransformerContextFactory _factory;
+
+        public Transformer([NotNull] ITransformerContextFactory factory)
+        {
+            _factory = factory ?? throw new ArgumentNullException(nameof(factory));
+        }
+
+        public (IBodyData BodyData, IDictionary<string, WireMockList<string>> Headers) Transform(RequestMessage originalRequestMessage, ResponseMessage originalResponseMessage, IBodyData bodyData, IDictionary<string, WireMockList<string>> headers)
+        {
+            var transformerContext = _factory.Create();
+
+            var model = new
+            {
+                request = originalRequestMessage,
+                response = originalResponseMessage
+            };
+
+            IBodyData newBodyData = null;
+            if (bodyData?.DetectedBodyType != null)
+            {
+                newBodyData = TransformBodyData(transformerContext, model, bodyData, false);
+            }
+
+            return (newBodyData, TransformHeaders(transformerContext, model, headers));
+        }
+
+        public ResponseMessage Transform(RequestMessage requestMessage, ResponseMessage original, bool useTransformerForBodyAsFile)
+        {
+            var transformerContext = _factory.Create();
+
+            var responseMessage = new ResponseMessage();
+
+            var model = new
+            {
+                request = requestMessage
+            };
+
+            if (original.BodyData?.DetectedBodyType != null)
+            {
+                responseMessage.BodyData = TransformBodyData(transformerContext, model, original.BodyData, useTransformerForBodyAsFile);
+
+                if (original.BodyData.DetectedBodyType == BodyType.String)
+                {
+                    responseMessage.BodyOriginal = original.BodyData.BodyAsString;
+                }
+            }
+
+            responseMessage.FaultType = original.FaultType;
+            responseMessage.FaultPercentage = original.FaultPercentage;
+
+            responseMessage.Headers = TransformHeaders(transformerContext, model, original.Headers);
+
+            switch (original.StatusCode)
+            {
+                case int statusCodeAsInteger:
+                    responseMessage.StatusCode = statusCodeAsInteger;
+                    break;
+
+                case string statusCodeAsString:
+                    responseMessage.StatusCode = transformerContext.ParseAndRender(statusCodeAsString, model);
+                    break;
+            }
+
+            return responseMessage;
+        }
+
+        private static IBodyData TransformBodyData(ITransformerContext transformerContext, object model, IBodyData original, bool useTransformerForBodyAsFile)
+        {
+            switch (original?.DetectedBodyType)
+            {
+                case BodyType.Json:
+                    return TransformBodyAsJson(transformerContext, model, original);
+
+                case BodyType.File:
+                    return TransformBodyAsFile(transformerContext, model, original, useTransformerForBodyAsFile);
+
+                case BodyType.String:
+                    return TransformBodyAsString(transformerContext, model, original);
+
+                default:
+                    return null;
+            }
+        }
+
+        private static IDictionary<string, WireMockList<string>> TransformHeaders(ITransformerContext transformerContext, object model, IDictionary<string, WireMockList<string>> original)
+        {
+            if (original == null)
+            {
+                return new Dictionary<string, WireMockList<string>>();
+            }
+
+            var newHeaders = new Dictionary<string, WireMockList<string>>();
+            foreach (var header in original)
+            {
+                var headerKey = transformerContext.ParseAndRender(header.Key, model);
+                var templateHeaderValues = header.Value.Select(text => transformerContext.ParseAndRender(text, model)).ToArray();
+
+                newHeaders.Add(headerKey, new WireMockList<string>(templateHeaderValues));
+            }
+
+            return newHeaders;
+        }
+
+        private static IBodyData TransformBodyAsJson(ITransformerContext handlebarsContext, object model, IBodyData original)
+        {
+            JToken jToken;
+            switch (original.BodyAsJson)
+            {
+                case JObject bodyAsJObject:
+                    jToken = bodyAsJObject.DeepClone();
+                    WalkNode(handlebarsContext, jToken, model);
+                    break;
+
+                case Array bodyAsArray:
+                    jToken = JArray.FromObject(bodyAsArray);
+                    WalkNode(handlebarsContext, jToken, model);
+                    break;
+
+                case string bodyAsString:
+                    jToken = ReplaceSingleNode(handlebarsContext, bodyAsString, model);
+                    break;
+
+                default:
+                    jToken = JObject.FromObject(original.BodyAsJson);
+                    WalkNode(handlebarsContext, jToken, model);
+                    break;
+            }
+
+            return new BodyData
+            {
+                Encoding = original.Encoding,
+                DetectedBodyType = original.DetectedBodyType,
+                DetectedBodyTypeFromContentType = original.DetectedBodyTypeFromContentType,
+                BodyAsJson = jToken
+            };
+        }
+
+        private static JToken ReplaceSingleNode(ITransformerContext handlebarsContext, string stringValue, object model)
+        {
+            string transformedString = handlebarsContext.ParseAndRender(stringValue, model);
+
+            if (!string.Equals(stringValue, transformedString))
+            {
+                const string property = "_";
+                JObject dummy = JObject.Parse($"{{ \"{property}\": null }}");
+                JToken node = dummy[property];
+
+                ReplaceNodeValue(node, transformedString);
+
+                return dummy[property];
+            }
+
+            return stringValue;
+        }
+
+        private static void WalkNode(ITransformerContext handlebarsContext, JToken node, object model)
+        {
+            if (node.Type == JTokenType.Object)
+            {
+                // In case of Object, loop all children. Do a ToArray() to avoid `Collection was modified` exceptions.
+                foreach (JProperty child in node.Children<JProperty>().ToArray())
+                {
+                    WalkNode(handlebarsContext, child.Value, model);
+                }
+            }
+            else if (node.Type == JTokenType.Array)
+            {
+                // In case of Array, loop all items. Do a ToArray() to avoid `Collection was modified` exceptions.
+                foreach (JToken child in node.Children().ToArray())
+                {
+                    WalkNode(handlebarsContext, child, model);
+                }
+            }
+            else if (node.Type == JTokenType.String)
+            {
+                // In case of string, try to transform the value.
+                string stringValue = node.Value<string>();
+                if (string.IsNullOrEmpty(stringValue))
+                {
+                    return;
+                }
+
+                string transformedString = handlebarsContext.ParseAndRender(stringValue, model);
+                if (!string.Equals(stringValue, transformedString))
+                {
+                    ReplaceNodeValue(node, transformedString);
+                }
+            }
+        }
+
+        private static void ReplaceNodeValue(JToken node, string stringValue)
+        {
+            if (bool.TryParse(stringValue, out bool valueAsBoolean))
+            {
+                node.Replace(valueAsBoolean);
+                return;
+            }
+
+            JToken value;
+            try
+            {
+                // Try to convert this string into a JsonObject
+                value = JToken.Parse(stringValue);
+            }
+            catch (JsonException)
+            {
+                // Ignore JsonException and just keep string value and convert to JToken
+                value = stringValue;
+            }
+
+            node.Replace(value);
+        }
+
+        private static IBodyData TransformBodyAsString(ITransformerContext handlebarsContext, object model, IBodyData original)
+        {
+            return new BodyData
+            {
+                Encoding = original.Encoding,
+                DetectedBodyType = original.DetectedBodyType,
+                DetectedBodyTypeFromContentType = original.DetectedBodyTypeFromContentType,
+                BodyAsString = handlebarsContext.ParseAndRender(original.BodyAsString, model)
+            };
+        }
+
+        private static IBodyData TransformBodyAsFile(ITransformerContext handlebarsContext, object model, IBodyData original, bool useTransformerForBodyAsFile)
+        {
+            string transformedBodyAsFilename = handlebarsContext.ParseAndRender(original.BodyAsFile, model);
+
+            if (!useTransformerForBodyAsFile)
+            {
+                return new BodyData
+                {
+                    DetectedBodyType = original.DetectedBodyType,
+                    DetectedBodyTypeFromContentType = original.DetectedBodyTypeFromContentType,
+                    BodyAsFile = transformedBodyAsFilename
+                };
+            }
+            else
+            {
+                string text = handlebarsContext.FileSystemHandler.ReadResponseBodyAsString(transformedBodyAsFilename);
+
+                return new BodyData
+                {
+                    DetectedBodyType = BodyType.String,
+                    DetectedBodyTypeFromContentType = original.DetectedBodyTypeFromContentType,
+                    BodyAsString = handlebarsContext.ParseAndRender(text, model),
+                    BodyAsFile = transformedBodyAsFilename
+                };
+            }
+        }
+    }
 }
--- a/src/WireMock.Net/WireMock.Net.csproj
+++ b/src/WireMock.Net/WireMock.Net.csproj
@@ -1,134 +1,133 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <Description>Lightweight Http Mocking Server for .Net, inspired by WireMock from the Java landscape.</Description>
-    <AssemblyTitle>WireMock.Net</AssemblyTitle>
-    <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyName>WireMock.Net</AssemblyName>
-    <PackageId>WireMock.Net</PackageId>
-    <PackageTags>tdd;mock;http;wiremock;test;server;unittest</PackageTags>
-    <RootNamespace>WireMock</RootNamespace>
-    <ProjectGuid>{D3804228-91F4-4502-9595-39584E5A01AD}</ProjectGuid>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <!--<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>-->
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>WireMock.Net.snk</AssemblyOriginatorKeyFile>
-    <!--<DelaySign>true</DelaySign>-->
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-  </PropertyGroup>
-
-  <!--<ItemGroup>
-    <None Include="WireMock.Net-Logo.png" Pack="true" PackagePath="../../"/>
-  </ItemGroup>-->
-
-  <!-- https://github.com/aspnet/RoslynCodeDomProvider/issues/51 -->
-  <!-- This is needed else we cannot build net452 in Azure DevOps Pipeline -->
-  <!--<Target Name="CheckIfShouldKillVBCSCompiler" />-->
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <!--<PathMap>$(MSBuildProjectDirectory)=/</PathMap>-->
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
-    <CodeAnalysisRuleSet>WireMock.Net.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
-    <DefineConstants>NETSTANDARD;USE_ASPNETCORE</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'netcoreapp2.2' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0'">
-    <DefineConstants>USE_ASPNETCORE</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
-    <DefineConstants>USE_ASPNETCORE;NET46</DefineConstants>
-  </PropertyGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Lightweight Http Mocking Server for .Net, inspired by WireMock from the Java landscape.</Description>
+    <AssemblyTitle>WireMock.Net</AssemblyTitle>
+    <Authors>Stef Heyenrath</Authors>
+    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>WireMock.Net</AssemblyName>
+    <PackageId>WireMock.Net</PackageId>
+    <PackageTags>tdd;mock;http;wiremock;test;server;unittest</PackageTags>
+    <RootNamespace>WireMock</RootNamespace>
+    <ProjectGuid>{D3804228-91F4-4502-9595-39584E5A01AD}</ProjectGuid>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <!--<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>-->
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>WireMock.Net.snk</AssemblyOriginatorKeyFile>
+    <!--<DelaySign>true</DelaySign>-->
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+  </PropertyGroup>
+
+  <!--<ItemGroup>
+    <None Include="WireMock.Net-Logo.png" Pack="true" PackagePath="../../"/>
+  </ItemGroup>-->
+
+  <!-- https://github.com/aspnet/RoslynCodeDomProvider/issues/51 -->
+  <!-- This is needed else we cannot build net452 in Azure DevOps Pipeline -->
+  <!--<Target Name="CheckIfShouldKillVBCSCompiler" />-->
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <!--<PathMap>$(MSBuildProjectDirectory)=/</PathMap>-->
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
+    <CodeAnalysisRuleSet>WireMock.Net.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
+    <DefineConstants>NETSTANDARD;USE_ASPNETCORE</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'netcoreapp2.2' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0'">
+    <DefineConstants>USE_ASPNETCORE</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
+    <DefineConstants>USE_ASPNETCORE;NET46</DefineConstants>
+  </PropertyGroup>
+
+	<ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.12" />
+    <PackageReference Include="RandomDataGenerator.Net" Version="1.0.12" />
+    <PackageReference Include="JmesPath.Net" Version="1.0.125" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="7.8.0.7320">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
+    <PackageReference Include="XPath2.Extensions" Version="1.1.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net452' ">
+    <!-- Required for WebRequestHandler -->
+    <Reference Include="System.Net.Http.WebRequest" />
+
+    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="Scriban.Signed" Version="2.1.4" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
+    <PackageReference Include="Microsoft.Owin" Version="4.0.0" />
+    <PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="4.0.0" />
+    <PackageReference Include="Microsoft.Owin.Hosting" Version="4.0.0" />
+    <PackageReference Include="System.Net.Http" Version="4.3.3" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="Scriban.Signed" Version="2.1.4" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <PackageReference Include="Scriban.Signed" Version="2.1.4" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
+
+    <!-- https://github.com/WireMock-Net/WireMock.Net/issues/507 -->
+    <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="1.1.3" />
+    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
+    <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="Scriban.Signed" Version="2.1.4" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' ">
+    <PackageReference Include="Scriban.Signed" Version="3.3.2" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
+
+    <!-- https://github.com/WireMock-Net/WireMock.Net/issues/507 -->
+    <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0'">
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Scriban.Signed" Version="3.3.2" />
+  </ItemGroup>
+
  <ItemGroup>
-    <Compile Remove="Transformers\Scriban\ScribanTransformer.cs" />
-    <Compile Remove="Transformers\Scriban\WireMockListAccessor.cs" />
-    <Compile Remove="Transformers\Scriban\WireMockTemplateContext.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.12" />
-    <PackageReference Include="RandomDataGenerator.Net" Version="1.0.12" />
-    <PackageReference Include="JmesPath.Net" Version="1.0.125" />
-    <PackageReference Include="Handlebars.Net.Helpers" Version="1.1.0" />
-	  <!--<PackageReference Include="DotLiquid" Version="2.0.366" />-->
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="7.8.0.7320">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
-    <PackageReference Include="XPath2.Extensions" Version="1.1.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net452' ">
-    <!-- Required for WebRequestHandler -->
-    <Reference Include="System.Net.Http.WebRequest" />
-
-    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="Scriban.Signed" Version="2.1.4" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
-    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
-    <PackageReference Include="Microsoft.Owin" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Owin.Hosting" Version="4.0.0" />
-    <PackageReference Include="System.Net.Http" Version="4.3.3" />
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="Scriban.Signed" Version="2.1.4" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <PackageReference Include="Scriban.Signed" Version="2.1.4" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-
-    <!-- https://github.com/WireMock-Net/WireMock.Net/issues/507 -->
-    <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="1.1.3" />
-    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
-    <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="Scriban.Signed" Version="2.1.4" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' ">
-    <PackageReference Include="Scriban.Signed" Version="3.3.2" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-
-    <!-- https://github.com/WireMock-Net/WireMock.Net/issues/507 -->
-    <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0'">
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Scriban.Signed" Version="3.3.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
-  </ItemGroup>
+    <PackageReference Include="Handlebars.Net.Helpers" Version="2.1.2" />
+    <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.1.2" />
+    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.1.2" />
+    <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.1.2" />
+    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.1.2" />
+    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.1.2" />
+
+    <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
+  </ItemGroup>
 </Project>
--- a/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs
+++ b/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs
@@ -108,23 +108,6 @@ namespace WireMock.Net.Tests.Owin.Mappers
            _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once);
        }

-        [Fact]
-        public async Task OwinResponseMapper_MapAsync_Null_StatusCode_When_AllowOnlyDefinedHttpStatusCodeInResponseSet_Is_True()
-        {
-            // Arrange
-            _optionsMock.SetupGet(o => o.AllowOnlyDefinedHttpStatusCodeInResponse).Returns(true);
-            var responseMessage = new ResponseMessage
-            {
-                StatusCode = null
-            };
-
-            // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object);
-
-            // Assert
-            _responseMock.VerifyNoOtherCalls();
-        }
-
        [Fact]
        public async Task OwinResponseMapper_MapAsync_StatusCode_Is_Null()
        {
@@ -138,7 +121,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
            await _sut.MapAsync(responseMessage, _responseMock.Object);

            // Assert
-            _responseMock.VerifyNoOtherCalls();
+            _responseMock.VerifySet(r => r.StatusCode = It.IsAny<int>(), Times.Never);
        }

        [Theory]
--- a/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs
+++ b/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs
@@ -13,7 +13,6 @@ using WireMock.Matchers;
 using System.Collections.Generic;
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Requests;
-using WireMock.ResponseProviders;
 using WireMock.Settings;
 using FluentAssertions;
 using WireMock.Handlers;
@@ -177,7 +176,8 @@ namespace WireMock.Net.Tests.Owin
            _mappingMock.SetupGet(m => m.Provider).Returns(responseBuilder);
            _mappingMock.SetupGet(m => m.Settings).Returns(settings);

-            _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny<RequestMessage>())).ReturnsAsync(new ResponseMessage());
+            var newMappingFromProxy = new Mapping(Guid.NewGuid(), "", null, settings, Request.Create(), Response.Create(), 0, null, null, null, null, null);
+            _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny<RequestMessage>())).ReturnsAsync((new ResponseMessage(), newMappingFromProxy));

            var requestBuilder = Request.Create().UsingAnyMethod();
            _mappingMock.SetupGet(m => m.RequestMatcher).Returns(requestBuilder);
@@ -230,7 +230,8 @@ namespace WireMock.Net.Tests.Owin
            _mappingMock.SetupGet(m => m.Provider).Returns(responseBuilder);
            _mappingMock.SetupGet(m => m.Settings).Returns(settings);

-            _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny<RequestMessage>())).ReturnsAsync(new ResponseMessage());
+            var newMappingFromProxy = new Mapping(Guid.NewGuid(), "", null, settings, Request.Create(), Response.Create(), 0, null, null, null, null, null);
+            _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny<RequestMessage>())).ReturnsAsync((new ResponseMessage(), newMappingFromProxy));

            var requestBuilder = Request.Create().UsingAnyMethod();
            _mappingMock.SetupGet(m => m.RequestMatcher).Returns(requestBuilder);
--- a/test/WireMock.Net.Tests/RequestWithBodyTests.cs
+++ b/test/WireMock.Net.Tests/RequestWithBodyTests.cs
@@ -54,6 +54,25 @@ namespace WireMock.Net.Tests
            Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

+        [Fact]
+        public void Request_WithBody_FuncBodyData()
+        {
+            // Assign
+            var requestBuilder = Request.Create().UsingAnyMethod().WithBody((IBodyData b) => b != null);
+
+            // Act
+            var body = new BodyData
+            {
+                BodyAsJson = 123,
+                DetectedBodyType = BodyType.Json
+            };
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body);
+
+            // Assert
+            var requestMatchResult = new RequestMatchResult();
+            Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        }
+
        [Fact]
        public void Request_WithBody_FuncByteArray()
        {
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs
@@ -18,13 +18,13 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var responseMessage = new ResponseMessage { StatusCode = 500 };
            var request = new RequestMessage(new UrlDetails("http://localhost"), "GET", "::1");

-            var response = Response.Create(() => responseMessage);
+            var responseBuilder = Response.Create(() => responseMessage);

            // Act
-            var providedResponse = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(providedResponse).Equals(responseMessage);
+            Check.That(response.Message).Equals(responseMessage);
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs
@@ -40,15 +40,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body);

-            var response = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.String, Encoding.ASCII);
+            var responseBuilder = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.String, Encoding.ASCII);

            // act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // then
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("01");
-            Check.That(responseMessage.BodyData.BodyAsBytes).IsNull();
-            Check.That(responseMessage.BodyData.Encoding).Equals(Encoding.ASCII);
+            Check.That(response.Message.BodyData.BodyAsString).Equals("01");
+            Check.That(response.Message.BodyData.BodyAsBytes).IsNull();
+            Check.That(response.Message.BodyData.Encoding).Equals(Encoding.ASCII);
        }

        [Fact]
@@ -62,15 +62,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body);

-            var response = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.SameAsSource, Encoding.ASCII);
+            var responseBuilder = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.SameAsSource, Encoding.ASCII);

            // act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // then
-            Check.That(responseMessage.BodyData.BodyAsBytes).ContainsExactly(new byte[] { 48, 49 });
-            Check.That(responseMessage.BodyData.BodyAsString).IsNull();
-            Check.That(responseMessage.BodyData.Encoding).IsNull();
+            Check.That(response.Message.BodyData.BodyAsBytes).ContainsExactly(new byte[] { 48, 49 });
+            Check.That(response.Message.BodyData.BodyAsString).IsNull();
+            Check.That(response.Message.BodyData.Encoding).IsNull();
        }

        [Fact]
@@ -84,14 +84,14 @@ namespace WireMock.Net.Tests.ResponseBuilders
            };
            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body);

-            var response = Response.Create().WithBody("test", null, Encoding.ASCII);
+            var responseBuilder = Response.Create().WithBody("test", null, Encoding.ASCII);

            // act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // then
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("test");
-            Check.That(responseMessage.BodyData.Encoding).Equals(Encoding.ASCII);
+            Check.That(response.Message.BodyData.BodyAsString).Equals("test");
+            Check.That(response.Message.BodyData.Encoding).Equals(Encoding.ASCII);
        }

        [Fact]
@@ -106,14 +106,14 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body);

            object x = new { value = "test" };
-            var response = Response.Create().WithBodyAsJson(x, Encoding.ASCII);
+            var responseBuilder = Response.Create().WithBodyAsJson(x, Encoding.ASCII);

            // act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // then
-            Check.That(responseMessage.BodyData.BodyAsJson).Equals(x);
-            Check.That(responseMessage.BodyData.Encoding).Equals(Encoding.ASCII);
+            Check.That(response.Message.BodyData.BodyAsJson).Equals(x);
+            Check.That(response.Message.BodyData.Encoding).Equals(Encoding.ASCII);
        }

        [Fact]
@@ -128,14 +128,14 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body);

            object x = new { message = "Hello" };
-            var response = Response.Create().WithBodyAsJson(x, true);
+            var responseBuilder = Response.Create().WithBodyAsJson(x, true);

            // act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // then
-            Check.That(responseMessage.BodyData.BodyAsJson).Equals(x);
-            Check.That(responseMessage.BodyData.BodyAsJsonIndented).IsEqualTo(true);
+            Check.That(response.Message.BodyData.BodyAsJson).Equals(x);
+            Check.That(response.Message.BodyData.BodyAsJsonIndented).IsEqualTo(true);
        }

        [Fact]
@@ -144,16 +144,16 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost"), "GET", ClientIp);

-            var response = Response.Create().WithBody("r", BodyDestinationFormat.SameAsSource, Encoding.ASCII);
+            var responseBuilder = Response.Create().WithBody("r", BodyDestinationFormat.SameAsSource, Encoding.ASCII);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsBytes).IsNull();
-            Check.That(responseMessage.BodyData.BodyAsJson).IsNull();
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("r");
-            Check.That(responseMessage.BodyData.Encoding).Equals(Encoding.ASCII);
+            Check.That(response.Message.BodyData.BodyAsBytes).IsNull();
+            Check.That(response.Message.BodyData.BodyAsJson).IsNull();
+            Check.That(response.Message.BodyData.BodyAsString).Equals("r");
+            Check.That(response.Message.BodyData.Encoding).Equals(Encoding.ASCII);
        }

        [Fact]
@@ -162,16 +162,16 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost"), "GET", ClientIp);

-            var response = Response.Create().WithBody("r", BodyDestinationFormat.Bytes, Encoding.ASCII);
+            var responseBuilder = Response.Create().WithBody("r", BodyDestinationFormat.Bytes, Encoding.ASCII);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).IsNull();
-            Check.That(responseMessage.BodyData.BodyAsJson).IsNull();
-            Check.That(responseMessage.BodyData.BodyAsBytes).IsNotNull();
-            Check.That(responseMessage.BodyData.Encoding).Equals(Encoding.ASCII);
+            Check.That(response.Message.BodyData.BodyAsString).IsNull();
+            Check.That(response.Message.BodyData.BodyAsJson).IsNull();
+            Check.That(response.Message.BodyData.BodyAsBytes).IsNotNull();
+            Check.That(response.Message.BodyData.Encoding).Equals(Encoding.ASCII);
        }

        [Fact]
@@ -180,16 +180,16 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost"), "GET", ClientIp);

-            var response = Response.Create().WithBody("{ \"value\": 42 }", BodyDestinationFormat.Json, Encoding.ASCII);
+            var responseBuilder = Response.Create().WithBody("{ \"value\": 42 }", BodyDestinationFormat.Json, Encoding.ASCII);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).IsNull();
-            Check.That(responseMessage.BodyData.BodyAsBytes).IsNull();
-            Check.That(((dynamic)responseMessage.BodyData.BodyAsJson).value).Equals(42);
-            Check.That(responseMessage.BodyData.Encoding).Equals(Encoding.ASCII);
+            Check.That(response.Message.BodyData.BodyAsString).IsNull();
+            Check.That(response.Message.BodyData.BodyAsBytes).IsNull();
+            Check.That(((dynamic)response.Message.BodyData.BodyAsJson).value).Equals(42);
+            Check.That(response.Message.BodyData.Encoding).Equals(Encoding.ASCII);
        }

        [Fact]
@@ -198,23 +198,52 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost/test"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithStatusCode(500)
                .WithHeader("H1", "X1")
                .WithHeader("H2", "X2")
                .WithBody(req => $"path: {req.Path}");

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).IsEqualTo("path: /test");
-            Check.That(responseMessage.BodyData.BodyAsBytes).IsNull();
-            Check.That(responseMessage.BodyData.BodyAsJson).IsNull();
-            Check.That(responseMessage.BodyData.Encoding.CodePage).Equals(Encoding.UTF8.CodePage);
-            Check.That(responseMessage.StatusCode).IsEqualTo(500);
-            Check.That(responseMessage.Headers["H1"].ToString()).IsEqualTo("X1");
-            Check.That(responseMessage.Headers["H2"].ToString()).IsEqualTo("X2");
+            Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("path: /test");
+            Check.That(response.Message.BodyData.BodyAsBytes).IsNull();
+            Check.That(response.Message.BodyData.BodyAsJson).IsNull();
+            Check.That(response.Message.BodyData.Encoding.CodePage).Equals(Encoding.UTF8.CodePage);
+            Check.That(response.Message.StatusCode).IsEqualTo(500);
+            Check.That(response.Message.Headers["H1"].ToString()).IsEqualTo("X1");
+            Check.That(response.Message.Headers["H2"].ToString()).IsEqualTo("X2");
+        }
+
+        [Fact]
+        public async Task Response_ProvideResponse_WithBody_FuncAsync()
+        {
+            // Assign
+            var request = new RequestMessage(new UrlDetails("http://localhost/test"), "GET", ClientIp);
+
+            var responseBuilder = Response.Create()
+                .WithStatusCode(500)
+                .WithHeader("H1", "X1")
+                .WithHeader("H2", "X2")
+                .WithBody(async req =>
+                {
+                    await Task.Delay(1);
+                    return $"path: {req.Path}";
+                });
+
+            // Act
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+
+            // Assert
+            Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("path: /test");
+            Check.That(response.Message.BodyData.BodyAsBytes).IsNull();
+            Check.That(response.Message.BodyData.BodyAsJson).IsNull();
+            Check.That(response.Message.BodyData.Encoding.CodePage).Equals(Encoding.UTF8.CodePage);
+            Check.That(response.Message.StatusCode).IsEqualTo(500);
+            Check.That(response.Message.Headers["H1"].ToString()).IsEqualTo("X1");
+            Check.That(response.Message.Headers["H2"].ToString()).IsEqualTo("X2");
        }

        [Fact]
@@ -227,25 +256,25 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var request1 = new RequestMessage(new UrlDetails($"http://localhost/test?id={request1Id}"), "GET", ClientIp);
            var request2 = new RequestMessage(new UrlDetails($"http://localhost/test?id={request2Id}"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithStatusCode(200)
                .WithBodyAsJson(JObject.Parse("{ \"id\": \"{{request.query.id}}\" }"))
                .WithTransformer();

            // Act
-            var response1Message = await response.ProvideResponseAsync(request1, _settings);
-            var response2Message = await response.ProvideResponseAsync(request2, _settings);
+            var response1 = await responseBuilder.ProvideResponseAsync(request1, _settings);
+            var response2 = await responseBuilder.ProvideResponseAsync(request2, _settings);

            // Assert
-            Check.That(((JToken)response1Message.BodyData.BodyAsJson).SelectToken("id")?.Value<int>()).IsEqualTo(request1Id);
-            Check.That(response1Message.BodyData.BodyAsBytes).IsNull();
-            Check.That(response1Message.BodyData.BodyAsString).IsNull();
-            Check.That(response1Message.StatusCode).IsEqualTo(200);
+            Check.That(((JToken)response1.Message.BodyData.BodyAsJson).SelectToken("id")?.Value<int>()).IsEqualTo(request1Id);
+            Check.That(response1.Message.BodyData.BodyAsBytes).IsNull();
+            Check.That(response1.Message.BodyData.BodyAsString).IsNull();
+            Check.That(response1.Message.StatusCode).IsEqualTo(200);

-            Check.That(((JToken)response2Message.BodyData.BodyAsJson).SelectToken("id")?.Value<int>()).IsEqualTo(request2Id);
-            Check.That(response2Message.BodyData.BodyAsBytes).IsNull();
-            Check.That(response2Message.BodyData.BodyAsString).IsNull();
-            Check.That(response2Message.StatusCode).IsEqualTo(200);
+            Check.That(((JToken)response2.Message.BodyData.BodyAsJson).SelectToken("id")?.Value<int>()).IsEqualTo(request2Id);
+            Check.That(response2.Message.BodyData.BodyAsBytes).IsNull();
+            Check.That(response2.Message.BodyData.BodyAsString).IsNull();
+            Check.That(response2.Message.StatusCode).IsEqualTo(200);
        }

        [Fact]
@@ -256,12 +285,12 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request1 = new RequestMessage(new UrlDetails("http://localhost/__admin/files/filename.txt"), "PUT", ClientIp, bodyDataAsFile);

-            var response = Response.Create().WithStatusCode(200).WithBody(fileContents);
+            var responseBuilder = Response.Create().WithStatusCode(200).WithBody(fileContents);

-            var provideResponseAsync = await response.ProvideResponseAsync(request1, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request1, _settings);

-            Check.That(provideResponseAsync.StatusCode).IsEqualTo(200);
-            Check.That(provideResponseAsync.BodyData.BodyAsString).Contains(fileContents);
+            Check.That(response.Message.StatusCode).IsEqualTo(200);
+            Check.That(response.Message.BodyData.BodyAsString).Contains(fileContents);
        }

        [Fact]
@@ -272,12 +301,12 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request1 = new RequestMessage(new UrlDetails("http://localhost/__admin/files/filename.txt"), "GET", ClientIp, bodyDataAsFile);

-            var response = Response.Create().WithStatusCode(200).WithBody(fileContents);
+            var responseBuilder = Response.Create().WithStatusCode(200).WithBody(fileContents);

-            var provideResponseAsync = await response.ProvideResponseAsync(request1, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request1, _settings);

-            Check.That(provideResponseAsync.StatusCode).IsEqualTo(200);
-            Check.That(provideResponseAsync.BodyData.BodyAsString).Contains(fileContents);
+            Check.That(response.Message.StatusCode).IsEqualTo(200);
+            Check.That(response.Message.BodyData.BodyAsString).Contains(fileContents);
        }

        [Fact]
@@ -288,12 +317,12 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request1 = new RequestMessage(new UrlDetails("http://localhost/__admin/files/filename.txt"), "DELETE", ClientIp, bodyDataAsFile);

-            var response = Response.Create().WithStatusCode(200).WithBody("File deleted.");
+            var responseBuilder = Response.Create().WithStatusCode(200).WithBody("File deleted.");

-            var provideResponseAsync = await response.ProvideResponseAsync(request1, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request1, _settings);

-            Check.That(provideResponseAsync.StatusCode).IsEqualTo(200);
-            Check.That(provideResponseAsync.BodyData.BodyAsString).Contains("File deleted.");
+            Check.That(response.Message.StatusCode).IsEqualTo(200);
+            Check.That(response.Message.BodyData.BodyAsString).Contains("File deleted.");
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs
@@ -1,4 +1,6 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Net;
+using System.Threading.Tasks;
 using FluentAssertions;
 using Moq;
 using WireMock.Handlers;
@@ -31,7 +33,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
        {
            // Assign
            var requestMessage = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1");
-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithCallback(async request =>
                {
                    await Task.Delay(1);
@@ -48,11 +50,11 @@ namespace WireMock.Net.Tests.ResponseBuilders
                });

            // Act
-            var responseMessage = await response.ProvideResponseAsync(requestMessage, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings);

            // Assert
-            responseMessage.BodyData.BodyAsString.Should().Be("/fooBar");
-            responseMessage.StatusCode.Should().Be(302);
+            response.Message.BodyData.BodyAsString.Should().Be("/fooBar");
+            response.Message.StatusCode.Should().Be(302);
        }

        [Fact]
@@ -60,7 +62,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
        {
            // Assign
            var requestMessage = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1");
-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithCallback(request => new ResponseMessage
                {
                    BodyData = new BodyData
@@ -72,11 +74,43 @@ namespace WireMock.Net.Tests.ResponseBuilders
                });

            // Act
-            var responseMessage = await response.ProvideResponseAsync(requestMessage, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings);

            // Assert
-            responseMessage.BodyData.BodyAsString.Should().Be("/fooBar");
-            responseMessage.StatusCode.Should().Be(302);
+            response.Message.BodyData.BodyAsString.Should().Be("/fooBar");
+            response.Message.StatusCode.Should().Be(302);
+        }
+
+        [Fact]
+        public async Task Response_WithCallback_And_WithStatusCode_And_WithHeader()
+        {
+            // Assign
+            var header = "X-UserId";
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1");
+            var responseBuilder = Response.Create()
+                .WithCallback(request => new ResponseMessage
+                {
+                    BodyData = new BodyData
+                    {
+                        DetectedBodyType = BodyType.String,
+                        BodyAsString = request.Path + "Bar"
+                    },
+                    StatusCode = HttpStatusCode.NotFound,
+                    Headers = new Dictionary<string, WireMockList<string>>
+                    {
+                        { header, new WireMockList<string>("NA") }
+                    }
+                })
+                .WithStatusCode(HttpStatusCode.Accepted)
+                .WithHeader(header, "Stef");
+
+            // Act
+            var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings);
+
+            // Assert
+            response.Message.BodyData.BodyAsString.Should().Be("/fooBar");
+            response.Message.StatusCode.Should().Be(HttpStatusCode.Accepted);
+            response.Message.Headers[header].Should().ContainSingle("Stef");
        }

        [Fact]
@@ -84,7 +118,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
        {
            // Assign
            var requestMessage = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1");
-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithCallback(request => new ResponseMessage
                {
                    BodyData = new BodyData
@@ -97,11 +131,11 @@ namespace WireMock.Net.Tests.ResponseBuilders
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(requestMessage, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings);

            // Assert
-            responseMessage.BodyData.BodyAsString.Should().Be("/fooBar");
-            responseMessage.StatusCode.Should().Be(302);
+            response.Message.BodyData.BodyAsString.Should().Be("/fooBar");
+            response.Message.StatusCode.Should().Be(302);
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs
@@ -21,12 +21,12 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var request = new RequestMessage(new UrlDetails("http://localhost/fault"), "GET", ClientIp);

            // Act
-            var response = Response.Create().WithFault(faultType);
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseBuilder = Response.Create().WithFault(faultType);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            responseMessage.FaultType.Should().Be(faultType);
-            responseMessage.FaultPercentage.Should().BeNull();
+            response.Message.FaultType.Should().Be(faultType);
+            response.Message.FaultPercentage.Should().BeNull();
        }

        [Theory]
@@ -37,12 +37,12 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var request = new RequestMessage(new UrlDetails("http://localhost/fault"), "GET", ClientIp);

            // Act
-            var response = Response.Create().WithFault(faultType, percentage);
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseBuilder = Response.Create().WithFault(faultType, percentage);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            responseMessage.FaultType.Should().Be(faultType);
-            responseMessage.FaultPercentage.Should().Be(percentage);
+            response.Message.FaultType.Should().Be(faultType);
+            response.Message.FaultPercentage.Should().Be(percentage);
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs
@@ -1,99 +1,99 @@
-using System;
-using System.Threading.Tasks;
-using Moq;
-using Newtonsoft.Json.Linq;
-using NFluent;
-using WireMock.Handlers;
-using WireMock.Models;
-using WireMock.ResponseBuilders;
-using WireMock.Settings;
-using Xunit;
-
-namespace WireMock.Net.Tests.ResponseBuilders
-{
-    public class ResponseWithHandlebarsFileTests
-    {
-        private readonly Mock<IFileSystemHandler> _filesystemHandlerMock;
-        private readonly WireMockServerSettings _settings = new WireMockServerSettings();
-        private const string ClientIp = "::1";
-
-        public ResponseWithHandlebarsFileTests()
-        {
-            _filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
-            _filesystemHandlerMock.Setup(fs => fs.ReadResponseBodyAsString(It.IsAny<string>())).Returns("abc");
-
-            _settings.FileSystemHandler = _filesystemHandlerMock.Object;
-        }
-
-        [Fact]
-        public async Task Response_ProvideResponseAsync_Handlebars_File()
-        {
-            // Assign
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new
-                {
-                    Data = "{{File \"x.json\"}}"
-                })
-                .WithTransformer();
-
-            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
-            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
-            Check.That(j["Data"].Value<string>()).Equals("abc");
-
-            // Verify
-            _filesystemHandlerMock.Verify(fs => fs.ReadResponseBodyAsString("x.json"), Times.Once);
-            _filesystemHandlerMock.VerifyNoOtherCalls();
-        }
-
-        [Fact]
-        public async Task Response_ProvideResponseAsync_Handlebars_File_Replace()
-        {
-            // Assign
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234?id=x"), "GET", ClientIp);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new
-                {
-                    Data = "{{File \"{{request.query.id}}.json\"}}"
-                })
-                .WithTransformer();
-
-            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
-            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
-            Check.That(j["Data"].Value<string>()).Equals("abc");
-
-            // Verify
-            _filesystemHandlerMock.Verify(fs => fs.ReadResponseBodyAsString("x.json"), Times.Once);
-            _filesystemHandlerMock.VerifyNoOtherCalls();
-        }
-
-        [Fact]
-        public void Response_ProvideResponseAsync_Handlebars_File_WithMissingArgument_ThrowsArgumentOutOfRangeException()
-        {
-            // Assign
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new
-                {
-                    Data = "{{File}}"
-                })
-                .WithTransformer();
-
-            // Act
-            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settings)).Throws<ArgumentOutOfRangeException>();
-
-            // Verify
-            _filesystemHandlerMock.Verify(fs => fs.ReadResponseBodyAsString(It.IsAny<string>()), Times.Never);
-            _filesystemHandlerMock.VerifyNoOtherCalls();
-        }
-    }
+using System.Threading.Tasks;
+using HandlebarsDotNet;
+using Moq;
+using Newtonsoft.Json.Linq;
+using NFluent;
+using WireMock.Handlers;
+using WireMock.Models;
+using WireMock.ResponseBuilders;
+using WireMock.Settings;
+using Xunit;
+
+namespace WireMock.Net.Tests.ResponseBuilders
+{
+    public class ResponseWithHandlebarsFileTests
+    {
+        private readonly Mock<IFileSystemHandler> _filesystemHandlerMock;
+        private readonly WireMockServerSettings _settings = new WireMockServerSettings();
+        private const string ClientIp = "::1";
+
+        public ResponseWithHandlebarsFileTests()
+        {
+            _filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
+            _filesystemHandlerMock.Setup(fs => fs.ReadResponseBodyAsString(It.IsAny<string>())).Returns("abc");
+
+            _settings.FileSystemHandler = _filesystemHandlerMock.Object;
+        }
+
+        [Fact]
+        public async Task Response_ProvideResponseAsync_Handlebars_File()
+        {
+            // Assign
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);
+
+            var responseBuilder = Response.Create()
+                .WithBodyAsJson(new
+                {
+                    Data = "{{File \"x.json\"}}"
+                })
+                .WithTransformer();
+
+            // Act
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+
+            // Assert
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
+            Check.That(j["Data"].Value<string>()).Equals("abc");
+
+            // Verify
+            _filesystemHandlerMock.Verify(fs => fs.ReadResponseBodyAsString("x.json"), Times.Once);
+            _filesystemHandlerMock.VerifyNoOtherCalls();
+        }
+
+        [Fact]
+        public async Task Response_ProvideResponseAsync_Handlebars_File_Replace()
+        {
+            // Assign
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234?id=x"), "GET", ClientIp);
+
+            var responseBuilder = Response.Create()
+                .WithBodyAsJson(new
+                {
+                    Data = "{{File \"{{request.query.id}}.json\"}}"
+                })
+                .WithTransformer();
+
+            // Act
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+
+            // Assert
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
+            Check.That(j["Data"].Value<string>()).Equals("abc");
+
+            // Verify
+            _filesystemHandlerMock.Verify(fs => fs.ReadResponseBodyAsString("x.json"), Times.Once);
+            _filesystemHandlerMock.VerifyNoOtherCalls();
+        }
+
+        [Fact]
+        public void Response_ProvideResponseAsync_Handlebars_File_WithMissingArgument_Throws_HandlebarsException()
+        {
+            // Assign
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);
+
+            var responseBuilder = Response.Create()
+                .WithBodyAsJson(new
+                {
+                    Data = "{{File}}"
+                })
+                .WithTransformer();
+
+            // Act
+            Check.ThatAsyncCode(() => responseBuilder.ProvideResponseAsync(request, _settings)).Throws<HandlebarsException>();
+
+            // Verify
+            _filesystemHandlerMock.Verify(fs => fs.ReadResponseBodyAsString(It.IsAny<string>()), Times.Never);
+            _filesystemHandlerMock.VerifyNoOtherCalls();
+        }
+    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs
@@ -34,15 +34,15 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("{{String.Uppercase request.body}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("ABC");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("ABC");
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs
@@ -71,16 +71,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/json")
                .WithBodyAsJson(new { x = "{{JsonPath.SelectToken request.body \"$.Manufacturers[?(@.Name == 'Acme Co')]\"}}" })
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
            Check.That(j["x"]).IsNotNull();
            Check.That(j["x"]["Name"].ToString()).Equals("Acme Co");
        }
@@ -97,16 +97,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/json")
                .WithBodyAsJson(new { x = "{{JsonPath.SelectToken request.body \"..Price\"}}" })
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
            Check.That(j["x"].Value<long>()).Equals(99);
        }

@@ -151,16 +151,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/json")
                .WithBody("{{JsonPath.SelectToken request.body \"$.Manufacturers[?(@.Name == 'Acme Co')]\"}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals($"{{{Environment.NewLine}  \"Name\": \"Acme Co\",{Environment.NewLine}  \"Products\": [{Environment.NewLine}    {{{Environment.NewLine}      \"Name\": \"Anvil\",{Environment.NewLine}      \"Price\": 50{Environment.NewLine}    }}{Environment.NewLine}  ]{Environment.NewLine}}}");
+            Check.That(response.Message.BodyData.BodyAsString).Equals($"{{{Environment.NewLine}  \"Name\": \"Acme Co\",{Environment.NewLine}  \"Products\": [{Environment.NewLine}    {{{Environment.NewLine}      \"Name\": \"Anvil\",{Environment.NewLine}      \"Price\": 50{Environment.NewLine}    }}{Environment.NewLine}  ]{Environment.NewLine}}}");
        }

        [Fact]
@@ -204,16 +204,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/json")
                .WithBody("{{JsonPath.SelectToken request.bodyAsJson \"$.Manufacturers[?(@.Name == 'Acme Co')]\"}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals($"{{{Environment.NewLine}  \"Name\": \"Acme Co\",{Environment.NewLine}  \"Products\": [{Environment.NewLine}    {{{Environment.NewLine}      \"Name\": \"Anvil\",{Environment.NewLine}      \"Price\": 50{Environment.NewLine}    }}{Environment.NewLine}  ]{Environment.NewLine}}}");
+            Check.That(response.Message.BodyData.BodyAsString).Equals($"{{{Environment.NewLine}  \"Name\": \"Acme Co\",{Environment.NewLine}  \"Products\": [{Environment.NewLine}    {{{Environment.NewLine}      \"Name\": \"Anvil\",{Environment.NewLine}      \"Price\": 50{Environment.NewLine}    }}{Environment.NewLine}  ]{Environment.NewLine}}}");
        }

        [Fact]
@@ -257,16 +257,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/json")
                .WithBody("{{#JsonPath.SelectTokens request.body \"$..Products[?(@.Price >= 50)].Name\"}}{{#each this}}%{{@index}}:{{this}}%{{/each}}{{/JsonPath.SelectTokens}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%");
        }

        [Fact]
@@ -310,16 +310,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/json")
                .WithBody("{{#JsonPath.SelectTokens request.bodyAsJson \"$..Products[?(@.Price >= 50)].Name\"}}{{#each this}}%{{@index}}:{{this}}%{{/each}}{{/JsonPath.SelectTokens}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%");
        }

        [Fact]
@@ -339,13 +339,13 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/json")
                .WithBody("{{#JsonPath.SelectTokens request.body \"$..Products[?(@.Price >= 50)].Name\"}}{{id}} {{value}},{{/JsonPath.SelectTokens}}")
                .WithTransformer();

            // Act
-            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settings)).Throws<ArgumentNullException>();
+            Check.ThatAsyncCode(() => responseBuilder.ProvideResponseAsync(request, _settings)).Throws<ArgumentNullException>();
        }

        [Fact]
@@ -364,15 +364,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, bodyData);

            string jsonPath = "\"$.MyUniqueNumber\"";
-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithTransformer()
                .WithBodyFromFile(@"c:\\{{JsonPath.SelectToken request.body " + jsonPath + "}}\\test.json"); // why use a \\ here ?

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsFile).Equals(@"c:\1\test.json");
+            Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.json");
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs
@@ -1,249 +1,249 @@
-using System;
-using System.Threading.Tasks;
-using Moq;
-using Newtonsoft.Json.Linq;
-using NFluent;
-using WireMock.Handlers;
-using WireMock.Models;
-using WireMock.ResponseBuilders;
-using WireMock.Settings;
-using WireMock.Types;
-using WireMock.Util;
-using Xunit;
-
-namespace WireMock.Net.Tests.ResponseBuilders
-{
-    public class ResponseWithHandlebarsLinqTests
-    {
-        private readonly Mock<IFileSystemHandler> _filesystemHandlerMock;
-        private readonly WireMockServerSettings _settings = new WireMockServerSettings();
-
-        public ResponseWithHandlebarsLinqTests()
-        {
-            _filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
-            _filesystemHandlerMock.Setup(fs => fs.ReadResponseBodyAsString(It.IsAny<string>())).Returns("abc");
-
-            _settings.FileSystemHandler = _filesystemHandlerMock.Object;
-        }
-
-        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_Linq1_String0()
-        {
-            // Assign
-            var body = new BodyData();
-
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234/pathtest"), "POST", "::1", body);
-
-            var response = Response.Create()
-                .WithHeader("Content-Type", "application/json")
-                .WithBodyAsJson(new { x = "{{Linq request.Path 'it'}}" })
-                .WithTransformer();
-
-            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
-            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
-            Check.That(j["x"]).IsNotNull();
-            Check.That(j["x"].ToString()).Equals("/pathtest");
-        }
-
-        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_Linq1_String1()
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsJson = new JObject
-                {
-                    { "Id", new JValue(9) },
-                    { "Name", new JValue("Test") }
-                },
-                DetectedBodyType = BodyType.Json
-            };
-
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
-
-            var response = Response.Create()
-                .WithHeader("Content-Type", "application/json")
-                .WithBodyAsJson(new { x = "{{Linq request.bodyAsJson 'it.Name + \"_123\"' }}" })
-                .WithTransformer();
-
-            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
-            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
-            Check.That(j["x"]).IsNotNull();
-            Check.That(j["x"].ToString()).Equals("Test_123");
-        }
-
-        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_Linq1_String2()
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsJson = new JObject
-                {
-                    { "Id", new JValue(9) },
-                    { "Name", new JValue("Test") }
-                },
-                DetectedBodyType = BodyType.Json
-            };
-
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
-
-            var response = Response.Create()
-                .WithHeader("Content-Type", "application/json")
-                .WithBodyAsJson(new { x = "{{Linq request.bodyAsJson 'new(it.Name + \"_123\" as N, it.Id as I)' }}" })
-                .WithTransformer();
-
-            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
-            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
-            Check.That(j["x"]).IsNotNull();
-            Check.That(j["x"].ToString()).Equals("{ N = Test_123, I = 9 }");
-        }
-
-        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_Linq2_Object()
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsJson = new JObject
-                {
-                    { "Id", new JValue(9) },
-                    { "Name", new JValue("Test") }
-                },
-                DetectedBodyType = BodyType.Json
-            };
-
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
-
-            var response = Response.Create()
-                .WithHeader("Content-Type", "application/json")
-                .WithBodyAsJson(new { x = "{{#Linq request.bodyAsJson 'new(it.Name + \"_123\" as N, it.Id as I)' }}{{this}}{{/Linq}}" })
-                .WithTransformer();
-
-            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
-            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
-            Check.That(j["x"]).IsNotNull();
-            Check.That(j["x"].ToString()).Equals("{ N = Test_123, I = 9 }");
-        }
-
-        [Fact]
-        public void Response_ProvideResponse_Handlebars_Linq_Throws_NotSupportedException()
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsJson = new { x = "x" },
-                DetectedBodyType = BodyType.Json
-            };
-
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new { x = "{{Linq request.bodyAsJson 1}}" })
-                .WithTransformer();
-
-            // Act
-            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settings)).Throws<NotSupportedException>();
-        }
-
-        [Fact]
-        public void Response_ProvideResponse_Handlebars_Linq1_Throws_ArgumentNullException()
-        {
-            // Assign
-            var body = new BodyData();
-
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new { x = "{{Linq request.body 'Name'}}" })
-                .WithTransformer();
-
-            // Act
-            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settings)).Throws<ArgumentNullException>();
-        }
-
-        [Fact]
-        public void Response_ProvideResponse_Handlebars_Linq1_Throws_ArgumentException()
-        {
-            // Assign
-            var body = new BodyData();
-
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new { x = "{{Linq request.bodyAsJson}} ''" })
-                .WithTransformer();
-
-            // Act
-            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settings)).Throws<ArgumentException>();
-        }
-
-        [Fact]
-        public async void Response_ProvideResponse_Handlebars_Linq1_ParseError_Returns_Empty()
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsJson = new JObject
-                {
-                    { "Id", new JValue(9) },
-                    { "Name", new JValue("Test") }
-                },
-                DetectedBodyType = BodyType.Json
-            };
-
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new { x = "{{Linq request.bodyAsJson '---' }}" })
-                .WithTransformer();
-
-            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
-            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
-            Check.That(j["x"].ToString()).IsEmpty();
-        }
-
-        [Fact]
-        public async void Response_ProvideResponse_Handlebars_Linq2_ParseError_Returns_Empty()
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsJson = new JObject
-                {
-                    { "Id", new JValue(9) },
-                    { "Name", new JValue("Test") }
-                },
-                DetectedBodyType = BodyType.Json
-            };
-
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new { x = "{{#Linq request.bodyAsJson '---' }}{{this}}{{/Linq}}" })
-                .WithTransformer();
-
-            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
-            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
-            Check.That(j["x"].ToString()).IsEmpty();
-        }
-    }
+using System;
+using System.Threading.Tasks;
+using FluentAssertions;
+using HandlebarsDotNet;
+using Moq;
+using Newtonsoft.Json.Linq;
+using NFluent;
+using WireMock.Handlers;
+using WireMock.Models;
+using WireMock.ResponseBuilders;
+using WireMock.Settings;
+using WireMock.Types;
+using WireMock.Util;
+using Xunit;
+
+namespace WireMock.Net.Tests.ResponseBuilders
+{
+    public class ResponseWithHandlebarsLinqTests
+    {
+        private readonly Mock<IFileSystemHandler> _filesystemHandlerMock;
+        private readonly WireMockServerSettings _settings = new WireMockServerSettings();
+
+        public ResponseWithHandlebarsLinqTests()
+        {
+            _filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
+            _filesystemHandlerMock.Setup(fs => fs.ReadResponseBodyAsString(It.IsAny<string>())).Returns("abc");
+
+            _settings.FileSystemHandler = _filesystemHandlerMock.Object;
+        }
+
+        [Fact]
+        public async Task Response_ProvideResponse_Handlebars_Linq1_String0()
+        {
+            // Assign
+            var body = new BodyData();
+
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234/pathtest"), "POST", "::1", body);
+
+            var responseBuilder = Response.Create()
+                .WithHeader("Content-Type", "application/json")
+                .WithBodyAsJson(new { x = "{{Linq request.Path 'it'}}" })
+                .WithTransformer();
+
+            // Act
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+
+            // Assert
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
+            Check.That(j["x"]).IsNotNull();
+            Check.That(j["x"].ToString()).Equals("/pathtest");
+        }
+
+        [Fact]
+        public async Task Response_ProvideResponse_Handlebars_Linq1_String1()
+        {
+            // Assign
+            var body = new BodyData
+            {
+                BodyAsJson = new JObject
+                {
+                    { "Id", new JValue(9) },
+                    { "Name", new JValue("Test") }
+                },
+                DetectedBodyType = BodyType.Json
+            };
+
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
+
+            var responseBuilder = Response.Create()
+                .WithHeader("Content-Type", "application/json")
+                .WithBodyAsJson(new { x = "{{Linq request.bodyAsJson 'it.Name + \"_123\"' }}" })
+                .WithTransformer();
+
+            // Act
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+
+            // Assert
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
+            Check.That(j["x"]).IsNotNull();
+            Check.That(j["x"].ToString()).Equals("Test_123");
+        }
+
+        [Fact]
+        public async Task Response_ProvideResponse_Handlebars_Linq1_String2()
+        {
+            // Assign
+            var body = new BodyData
+            {
+                BodyAsJson = new JObject
+                {
+                    { "Id", new JValue(9) },
+                    { "Name", new JValue("Test") }
+                },
+                DetectedBodyType = BodyType.Json
+            };
+
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
+
+            var responseBuilder = Response.Create()
+                .WithHeader("Content-Type", "application/json")
+                .WithBodyAsJson(new { x = "{{Linq request.bodyAsJson 'new(it.Name + \"_123\" as N, it.Id as I)' }}" })
+                .WithTransformer();
+
+            // Act
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+
+            // Assert
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
+            Check.That(j["x"]).IsNotNull();
+            Check.That(j["x"].ToString()).Equals("{ N = Test_123, I = 9 }");
+        }
+
+        [Fact]
+        public async Task Response_ProvideResponse_Handlebars_Linq2_Object()
+        {
+            // Assign
+            var body = new BodyData
+            {
+                BodyAsJson = new JObject
+                {
+                    { "Id", new JValue(9) },
+                    { "Name", new JValue("Test") }
+                },
+                DetectedBodyType = BodyType.Json
+            };
+
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
+
+            var responseBuilder = Response.Create()
+                .WithHeader("Content-Type", "application/json")
+                .WithBodyAsJson(new { x = "{{#Linq request.bodyAsJson 'new(it.Name + \"_123\" as N, it.Id as I)' }}{{this}}{{/Linq}}" })
+                .WithTransformer();
+
+            // Act
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+
+            // Assert
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
+            Check.That(j["x"]).IsNotNull();
+            Check.That(j["x"].ToString()).Equals("{ N = Test_123, I = 9 }");
+        }
+
+        [Fact]
+        public void Response_ProvideResponse_Handlebars_Linq_Throws_ArgumentException()
+        {
+            // Assign
+            var body = new BodyData
+            {
+                BodyAsJson = new { x = "x" },
+                DetectedBodyType = BodyType.Json
+            };
+
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
+
+            var responseBuilder = Response.Create()
+                .WithBodyAsJson(new { x = "{{Linq request.bodyAsJson 1}}" })
+                .WithTransformer();
+
+            // Act
+            Check.ThatAsyncCode(() => responseBuilder.ProvideResponseAsync(request, _settings)).Throws<ArgumentException>();
+        }
+
+        [Fact]
+        public void Response_ProvideResponse_Handlebars_Linq1_Throws_ArgumentNullException()
+        {
+            // Assign
+            var body = new BodyData();
+
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
+
+            var responseBuilder = Response.Create()
+                .WithBodyAsJson(new { x = "{{Linq request.body 'Name'}}" })
+                .WithTransformer();
+
+            // Act
+            Check.ThatAsyncCode(() => responseBuilder.ProvideResponseAsync(request, _settings)).Throws<ArgumentNullException>();
+        }
+
+        [Fact]
+        public void Response_ProvideResponse_Handlebars_Linq1_Throws_HandlebarsException()
+        {
+            // Assign
+            var body = new BodyData();
+
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
+
+            var responseBuilder = Response.Create()
+                .WithBodyAsJson(new { x = "{{Linq request.bodyAsJson}} ''" })
+                .WithTransformer();
+
+            // Act
+            Check.ThatAsyncCode(() => responseBuilder.ProvideResponseAsync(request, _settings)).Throws<HandlebarsException>();
+        }
+
+        [Fact]
+        public void Response_ProvideResponse_Handlebars_Linq1_ParseError_Throws_ExceptionMessage()
+        {
+            // Assign
+            var body = new BodyData
+            {
+                BodyAsJson = new JObject
+                {
+                    { "Id", new JValue(9) },
+                    { "Name", new JValue("Test") }
+                },
+                DetectedBodyType = BodyType.Json
+            };
+
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
+
+            var responseBuilder = Response.Create()
+                .WithBodyAsJson(new { x = "{{Linq request.bodyAsJson '---' }}" })
+                .WithTransformer();
+
+            // Act
+            Func<Task> a = async () => await responseBuilder.ProvideResponseAsync(request, _settings);
+
+            // Assert
+            a.Should().Throw<HandlebarsException>();
+        }
+
+        [Fact]
+        public void Response_ProvideResponse_Handlebars_Linq2_ParseError_Throws_ExceptionMessage()
+        {
+            // Assign
+            var body = new BodyData
+            {
+                BodyAsJson = new JObject
+                {
+                    { "Id", new JValue(9) },
+                    { "Name", new JValue("Test") }
+                },
+                DetectedBodyType = BodyType.Json
+            };
+
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
+
+            var responseBuilder = Response.Create()
+                .WithBodyAsJson(new { x = "{{#Linq request.bodyAsJson '---' }}{{this}}{{/Linq}}" })
+                .WithTransformer();
+
+            // Act
+            Func<Task> a = async () => await responseBuilder.ProvideResponseAsync(request, _settings);
+
+            // Assert
+            a.Should().Throw<HandlebarsException>();
+        }
+    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs
@@ -32,7 +32,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBodyAsJson(new
                {
                    Text = "{{Random Type=\"Text\" Min=8 Max=20}}",
@@ -43,10 +43,10 @@ namespace WireMock.Net.Tests.ResponseBuilders
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
            Check.That(j["Text"].Value<string>()).IsNotEmpty();
            Check.That(j["Integer"].Value<int>()).IsEqualTo(1000);
            Check.That(j["Long"].Value<long>()).IsStrictlyGreaterThan(77777777).And.IsStrictlyLessThan(99999999);
@@ -58,7 +58,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBodyAsJson(new
                {
                    Value = "{{Random Type=\"Boolean\"}}"
@@ -66,10 +66,10 @@ namespace WireMock.Net.Tests.ResponseBuilders
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
            Check.That(j["Value"].Type).IsEqualTo(JTokenType.Boolean);
        }

@@ -79,7 +79,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBodyAsJson(new
                {
                    Guid1 = "{{Random Type=\"Guid\" Uppercase=false}}",
@@ -88,10 +88,10 @@ namespace WireMock.Net.Tests.ResponseBuilders
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
            string guid1 = j["Guid1"].Value<string>();
            Check.That(guid1.ToUpper()).IsNotEqualTo(guid1);
            string guid2 = j["Guid2"].Value<string>();
@@ -104,7 +104,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBodyAsJson(new
                {
                    StringValue = "{{Random Type=\"StringList\" Values=[\"a\", \"b\", \"c\"]}}"
@@ -112,10 +112,10 @@ namespace WireMock.Net.Tests.ResponseBuilders
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
            string value = j["StringValue"].Value<string>();
            Check.That(new[] { "a", "b", "c" }.Contains(value)).IsTrue();
        }
@@ -126,7 +126,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBodyAsJson(new
                {
                    Integer = "{{#Random Type=\"Integer\" Min=10000000 Max=99999999}}{{this}}{{/Random}}",
@@ -134,10 +134,10 @@ namespace WireMock.Net.Tests.ResponseBuilders
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
            Check.That(j["Integer"].Value<int>()).IsStrictlyGreaterThan(10000000).And.IsStrictlyLessThan(99999999);
        }
    }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs
@@ -35,15 +35,15 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
-                .WithBody("{{Regex.Match request.body \"^(?<x>\\w+)$\"}}")
+            var responseBuilder = Response.Create()
+                .WithBody("{{Regex.Match request.body \"^(\\w+)$\"}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("abc");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("abc");
        }

        [Fact]
@@ -54,15 +54,15 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("{{Regex.Match request.body \"^?0$\"}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("");
        }

        [Fact]
@@ -73,15 +73,15 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("{{Regex.Match request.body \"^?0$\" \"d\"}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("d");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("d");
        }

        [Fact]
@@ -92,15 +92,15 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("{{#Regex.Match request.body \"^(?<proto>\\w+)://[^/]+?(?<port>\\d+)/?\"}}{{this.port}}-{{this.proto}}{{/Regex.Match}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("5000-https");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("5000-https");
        }

        [Fact]
@@ -111,15 +111,15 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("{{#Regex.Match request.body \"^(?<proto>\\w+)://[^/]+?(?<port>\\d+)/?\"}}{{this}}{{/Regex.Match}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("");
        }

        [Fact]
@@ -130,15 +130,15 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("{{#Regex.Match request.body \"^(?<proto>\\w+)://[^/]+?(?<port>\\d+)/?\" \"x\"}}{{this}}{{/Regex.Match}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("x");
+            Check.That(response.Message.BodyData.BodyAsString).Equals("x");
        }

        [Fact]
@@ -149,12 +149,12 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBody("{{#Regex.Match request.bodyAsJson \"^(?<proto>\\w+)://[^/]+?(?<port>\\d+)/?\"}}{{/Regex.Match}}")
                .WithTransformer();

            // Act and Assert
-            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settings)).Throws<NotSupportedException>();
+            Check.ThatAsyncCode(() => responseBuilder.ProvideResponseAsync(request, _settings)).Throws<ArgumentNullException>();
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs
@@ -46,16 +46,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/xml")
                .WithBody("<response>{{XPath.SelectSingleNode request.body \"/todo-list/todo-item[1]\"}}</response>")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            var nav = new XmlDocument { InnerXml = responseMessage.BodyData.BodyAsString }.CreateNavigator();
+            var nav = new XmlDocument { InnerXml = response.Message.BodyData.BodyAsString }.CreateNavigator();
            var node = nav.XPath2SelectSingleNode("/response/todo-item");
            Check.That(node.Value).Equals("abc");
            Check.That(node.GetAttribute("id", "")).Equals("a1");
@@ -77,16 +77,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/xml")
                .WithBody("{{XPath.SelectSingleNode request.body \"/todo-list/todo-item[1]/text()\"}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).IsEqualTo("abc");
+            Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("abc");
        }

        [Fact]
@@ -105,16 +105,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/xml")
                .WithBody("<response>{{XPath.SelectNodes request.body \"/todo-list/todo-item\"}}</response>")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            var nav = new XmlDocument { InnerXml = responseMessage.BodyData.BodyAsString }.CreateNavigator();
+            var nav = new XmlDocument { InnerXml = response.Message.BodyData.BodyAsString }.CreateNavigator();
            var nodes = nav.XPath2SelectNodes("/response/todo-item");
            Check.That(nodes.Count + 1).IsEqualTo(3);
        }
@@ -135,16 +135,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/xml")
                .WithBody("{{XPath.Evaluate request.body \"boolean(/todo-list[count(todo-item) = 3])\"}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).IsEqualIgnoringCase("True");
+            Check.That(response.Message.BodyData.BodyAsString).IsEqualIgnoringCase("True");
        }

        [Fact]
@@ -163,16 +163,16 @@ namespace WireMock.Net.Tests.ResponseBuilders

            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithHeader("Content-Type", "application/xml")
                .WithBody("{{XPath.Evaluate request.body \"string(/todo-list/todo-item[1]/@id)\"}}")
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).IsEqualTo("a1");
+            Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("a1");
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXegerTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXegerTests.cs
@@ -31,19 +31,19 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBodyAsJson(new
                {
-                    Number = "{{Xeger \"[1-9]{1}\\d{3}\"}}",
-                    Postcode = "{{Xeger \"[1-9][0-9]{3}[A-Z]{2}\"}}"
+                    Number = "{{Xeger.Generate \"[1-9]{1}\\d{3}\"}}",
+                    Postcode = "{{Xeger.Generate \"[1-9][0-9]{3}[A-Z]{2}\"}}"
                })
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
            Check.That(j["Number"].Value<int>()).IsStrictlyGreaterThan(1000).And.IsStrictlyLessThan(9999);
            Check.That(j["Postcode"].Value<string>()).IsNotEmpty();
        }
@@ -54,19 +54,19 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);

-            var response = Response.Create()
+            var responseBuilder = Response.Create()
                .WithBodyAsJson(new
                {
-                    Number = "{{#Xeger \"[1-9]{1}\\d{3}\"}}{{this}}{{/Xeger}}",
-                    Postcode = "{{#Xeger \"[1-9][0-9]{3}[A-Z]{2}\"}}{{this}}{{/Xeger}}"
+                    Number = "{{#Xeger.Generate \"[1-9]{1}\\d{3}\"}}{{this}}{{/Xeger.Generate}}",
+                    Postcode = "{{#Xeger.Generate \"[1-9][0-9]{3}[A-Z]{2}\"}}{{this}}{{/Xeger.Generate}}"
                })
                .WithTransformer();

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
+            JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
            Check.That(j["Number"].Value<int>()).IsStrictlyGreaterThan(1000).And.IsStrictlyLessThan(9999);
            Check.That(j["Postcode"].Value<string>()).IsNotEmpty();
        }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs
@@ -28,7 +28,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var response = await builder.ProvideResponseAsync(requestMock, _settings);

            // Assert
-            Check.That(response.Headers[headerName].ToString()).Equals(headerValue);
+            Check.That(response.Message.Headers[headerName].ToString()).Equals(headerValue);
        }

        [Theory]
@@ -44,7 +44,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var response = await builder.ProvideResponseAsync(requestMock, _settings);

            // Assert
-            Check.That(response.Headers[headerName].ToArray()).Equals(headerValues);
+            Check.That(response.Message.Headers[headerName].ToArray()).Equals(headerValues);
        }

        [Fact]
@@ -59,7 +59,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
            var responseMessage = await response.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.Headers["h"]).ContainsExactly("x");
+            Check.That(responseMessage.Message.Headers["h"]).ContainsExactly("x");
        }

        [Fact]
@@ -68,13 +68,13 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost"), "GET", ClientIp);
            var headers = new Dictionary<string, string[]> { { "h", new[] { "x" } } };
-            var response = Response.Create().WithHeaders(headers);
+            var responseBuilder = Response.Create().WithHeaders(headers);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.Headers["h"]).ContainsExactly("x");
+            Check.That(response.Message.Headers["h"]).ContainsExactly("x");
        }

        [Fact]
@@ -83,13 +83,13 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var request = new RequestMessage(new UrlDetails("http://localhost"), "GET", ClientIp);
            var headers = new Dictionary<string, WireMockList<string>> { { "h", new WireMockList<string>("x") } };
-            var response = Response.Create().WithHeaders(headers);
+            var builder = Response.Create().WithHeaders(headers);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await builder.ProvideResponseAsync(request, _settings);

            // Assert
-            Check.That(responseMessage.Headers["h"]).ContainsExactly("x");
+            Check.That(response.Message.Headers["h"]).ContainsExactly("x");
        }
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs
@@ -46,16 +46,16 @@ namespace WireMock.Net.Tests.ResponseBuilders
            // Assign
            var headers = new Dictionary<string, string[]> { { "Content-Type", new[] { "application/xml" } } };
            var request = new RequestMessage(new UrlDetails($"{_server.Urls[0]}{prepend}/{_guid}{append}"), "POST", ClientIp, new BodyData { DetectedBodyType = BodyType.Json, BodyAsJson = new { a = 1 } }, headers);
-            var response = Response.Create().WithProxy(_server.Urls[0]);
+            var responseBuilder = Response.Create().WithProxy(_server.Urls[0]);

            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings);

            // Assert
            Check.That(request.ProxyUrl).IsNotNull();
-            Check.That(responseMessage.BodyData.BodyAsString).IsEqualTo(expectedBody);
-            Check.That(responseMessage.StatusCode).IsEqualTo(201);
-            Check.That(responseMessage.Headers["Content-Type"].ToString()).IsEqualTo("application/json");
+            Check.That(response.Message.BodyData.BodyAsString).IsEqualTo(expectedBody);
+            Check.That(response.Message.StatusCode).IsEqualTo(201);
+            Check.That(response.Message.Headers["Content-Type"].ToString()).IsEqualTo("application/json");
        }

        [Fact]
@@ -72,12 +72,12 @@ namespace WireMock.Net.Tests.ResponseBuilders
                    Password = "y"
                }
            };
-            var response = Response.Create().WithProxy(settings);
+            var responseBuilder = Response.Create().WithProxy(settings);

            // Act
            var request = new RequestMessage(new UrlDetails($"{_server.Urls[0]}/{_guid}"), "GET", ClientIp);

-            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settings)).Throws<HttpRequestException>();
+            Check.ThatAsyncCode(() => responseBuilder.ProvideResponseAsync(request, _settings)).Throws<HttpRequestException>();
        }

        public void Dispose()
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stef Heyenrath	dc078b57ea	1.4.9	2021-03-31 18:23:49 +02:00
Stef Heyenrath	8140b37095	WithProxy() should save the new mapping (#600 ) * WithProxy should save the new mapping * fix ut * .	2021-03-31 18:17:27 +02:00
Stef Heyenrath	2ad060bbd4	1.4.8	2021-03-24 17:20:31 +00:00
Stef Heyenrath	d758301e4f	Webhook (#591 ) Webhook	2021-03-24 18:15:31 +01:00
Stef Heyenrath	cee73023c7	1.4.7	2021-03-21 09:22:18 +01:00
Ben Arnold	6f7d2c83f5	Remove an approximate two second delay in response to the first request from a new socket connection, only occuring on some Windows 10 machines. (#597 ) A side-effect of this fix is that is also allows connections to IPv6 addresses.	2021-03-21 09:12:19 +01:00
Stef Heyenrath	2fb0f92a2d	Use Handlebars.Net.Helpers Version="2.1.2" (#595 )	2021-03-19 15:17:39 +01:00
Stef Heyenrath	ddf2b49240	wip (#594 )	2021-03-18 14:29:13 +01:00
Stef Heyenrath	3617e95db6	1.4.6	2021-02-26 12:37:54 +00:00
Stef Heyenrath	aa8510fab3	Fix WithCallback logic when using other fluent builder statements (#587 )	2021-02-26 13:10:25 +01:00
Stef Heyenrath	e23249c144	1.4.5	2021-02-11 11:03:09 +00:00
Roman Vovk	7a8f4c3630	Fix response date header (#585 )	2021-02-11 11:49:24 +01:00
Stef Heyenrath	ddcf2b29a3	coverlet	2021-02-09 20:43:24 +01:00
Stef Heyenrath	23709fa587	Use new Handlebars.Net.Helpers (#581 )	2021-02-09 20:35:44 +01:00
Stef Heyenrath	3b0dc46771	Add Xamarin UI tests (#582 ) * xam * . * .	2021-02-06 11:54:39 +01:00
Stef Heyenrath	f6ebb1c256	1.4.3	2021-02-05 18:59:25 +01:00
Stef Heyenrath	e4071b9c6a	Net5 issue (#579 ) * 472 * . * . * p * buffers * 3 * Fix date * fix	2021-02-02 22:21:30 +01:00
Stef Heyenrath	48c50e8207	update WireMock.Net.Console.NET5	2021-01-31 15:55:03 +01:00
dependabot[bot]	acee016dec	Bump log4net in /examples/WireMock.Net.Console.NETCoreApp2 (#571 ) Bumps [log4net](https://github.com/apache/logging-log4net) from 2.0.8 to 2.0.10. - [Release notes](https://github.com/apache/logging-log4net/releases) - [Changelog](https://github.com/apache/logging-log4net/blob/master/ReleaseInstructions.txt) - [Commits](https://github.com/apache/logging-log4net/compare/rel/2.0.8...rel/2.0.10) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-30 09:16:25 +01:00
dependabot[bot]	951f8e5508	Bump log4net in /examples/WireMock.Net.Console.NETCoreApp (#572 ) Bumps [log4net](https://github.com/apache/logging-log4net) from 2.0.8 to 2.0.10. - [Release notes](https://github.com/apache/logging-log4net/releases) - [Changelog](https://github.com/apache/logging-log4net/blob/master/ReleaseInstructions.txt) - [Commits](https://github.com/apache/logging-log4net/compare/rel/2.0.8...rel/2.0.10) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-30 09:16:12 +01:00
dependabot[bot]	1a021a7cff	Bump log4net in /examples/WireMock.Net.Console.Net461.Classic (#573 ) Bumps [log4net](https://github.com/apache/logging-log4net) from 2.0.8 to 2.0.10. - [Release notes](https://github.com/apache/logging-log4net/releases) - [Changelog](https://github.com/apache/logging-log4net/blob/master/ReleaseInstructions.txt) - [Commits](https://github.com/apache/logging-log4net/compare/rel/2.0.8...rel/2.0.10) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-30 09:15:58 +01:00
dependabot[bot]	ced9fc58f5	Bump log4net in /examples/WireMock.Net.Console.Net452.Classic (#574 ) Bumps [log4net](https://github.com/apache/logging-log4net) from 2.0.8 to 2.0.10. - [Release notes](https://github.com/apache/logging-log4net/releases) - [Changelog](https://github.com/apache/logging-log4net/blob/master/ReleaseInstructions.txt) - [Commits](https://github.com/apache/logging-log4net/compare/rel/2.0.8...rel/2.0.10) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-30 09:15:45 +01:00
dependabot[bot]	24ae9a7dad	Bump log4net in /examples/WireMock.Net.StandAlone.Net452 (#575 ) Bumps [log4net](https://github.com/apache/logging-log4net) from 2.0.8 to 2.0.10. - [Release notes](https://github.com/apache/logging-log4net/releases) - [Changelog](https://github.com/apache/logging-log4net/blob/master/ReleaseInstructions.txt) - [Commits](https://github.com/apache/logging-log4net/compare/rel/2.0.8...rel/2.0.10) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-30 09:15:32 +01:00
dependabot[bot]	919b28fa36	Bump log4net in /examples/WireMock.Net.StandAlone.NETCoreApp (#570 ) Bumps [log4net](https://github.com/apache/logging-log4net) from 2.0.8 to 2.0.10. - [Release notes](https://github.com/apache/logging-log4net/releases) - [Changelog](https://github.com/apache/logging-log4net/blob/master/ReleaseInstructions.txt) - [Commits](https://github.com/apache/logging-log4net/compare/rel/2.0.8...rel/2.0.10) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-30 09:15:17 +01:00
dependabot[bot]	5de2ea44e3	Bump log4net from 2.0.8 to 2.0.10 in /examples/WireMock.Net.Service (#576 ) Bumps [log4net](https://github.com/apache/logging-log4net) from 2.0.8 to 2.0.10. - [Release notes](https://github.com/apache/logging-log4net/releases) - [Changelog](https://github.com/apache/logging-log4net/blob/master/ReleaseInstructions.txt) - [Commits](https://github.com/apache/logging-log4net/compare/rel/2.0.8...rel/2.0.10) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-01-30 09:15:02 +01:00
Stef Heyenrath	ebb9f128c5	Update Directory.Build.props 1.4.2	2021-01-24 19:27:02 +01:00