1.1.5.0

Fixed StatusCode = null or < 0 (#406 )
* . * fix tests * responseModel.StatusCode is int statusCodeAsInt && statusCodeAsInt > 0 * < 0
2026-01-11 22:30:41 +01:00 · 2020-01-25 17:58:44 +01:00 · 2020-01-25 17:51:38 +01:00 · 2020-01-25 15:28:43 +01:00 · 2020-01-25 15:25:47 +01:00 · 2020-01-25 13:54:09 +01:00
159 changed files with 3314 additions and 2434 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,38 @@
+# 1.1.5.0 (25 January 2020)
+- [#405](https://github.com/WireMock-Net/WireMock.Net/pull/405) - Fix logging an Exception Message (linux docker on azure) [bug] contributed by [StefH](https://github.com/StefH)
+- [#406](https://github.com/WireMock-Net/WireMock.Net/pull/406) - Fixed StatusCode = null or &lt; 0 contributed by [StefH](https://github.com/StefH)
+
+# 1.1.3.0 (22 January 2020)
+- [#403](https://github.com/WireMock-Net/WireMock.Net/pull/403) - Fix for invalid cast exception contributed by [kashifsoofi](https://github.com/kashifsoofi)
+- [#402](https://github.com/WireMock-Net/WireMock.Net/issues/402) - Invalid Cast Exception  [bug]
+
+# 1.1.2.0 (09 January 2020)
+- [#399](https://github.com/WireMock-Net/WireMock.Net/pull/399) - ResponseModel.StatusCode is deserialized as either string or long. [bug] contributed by [vitaliydavydiak](https://github.com/vitaliydavydiak)
+- [#400](https://github.com/WireMock-Net/WireMock.Net/issues/400) - StatusCode not built correctly when loaded from mapping file. [bug]
+
+# 1.1.1.0 (09 January 2020)
+- [#398](https://github.com/WireMock-Net/WireMock.Net/pull/398) - Feature/xpath transformer [feature] contributed by [kashifsoofi](https://github.com/kashifsoofi)
+- [#397](https://github.com/WireMock-Net/WireMock.Net/issues/397) - Question/Feature: Add support for selecting XPath in response template [feature]
+
+# 1.1.0.0 (27 December 2019)
+- [#363](https://github.com/WireMock-Net/WireMock.Net/pull/363) - WireMock.Net version 1.1.x contributed by [StefH](https://github.com/StefH)
+
+# 1.0.43.0 (26 December 2019)
+- [#385](https://github.com/WireMock-Net/WireMock.Net/pull/385) - StatusCode as string [feature] contributed by [StefH](https://github.com/StefH)
+- [#380](https://github.com/WireMock-Net/WireMock.Net/issues/380) - StatusCode is defined as integer (string is not possible) [bug]
+- [#382](https://github.com/WireMock-Net/WireMock.Net/issues/382) - Return same request body [feature]
+
+# 1.0.42.0 (15 December 2019)
+- [#391](https://github.com/WireMock-Net/WireMock.Net/pull/391) - Correctly support DateTime pattern as string in ExactMatcher [bug] contributed by [StefH](https://github.com/StefH)
+- [#383](https://github.com/WireMock-Net/WireMock.Net/issues/383) - ExactMatcher does not accept ISO8601 DateTime? [bug]
+
+# 1.0.41.0 (14 December 2019)
+- [#392](https://github.com/WireMock-Net/WireMock.Net/pull/392) - Fix array in JsonMatcher [bug] contributed by [StefH](https://github.com/StefH)
+- [#390](https://github.com/WireMock-Net/WireMock.Net/issues/390) - JsonMatcher does not match a body containing an array of strings [bug]
+
 # 1.0.40.0 (09 December 2019)
 - [#389](https://github.com/WireMock-Net/WireMock.Net/pull/389) - Fix QueryStringParser [bug] contributed by [StefH](https://github.com/StefH)
+- [#387](https://github.com/WireMock-Net/WireMock.Net/issues/387) - Query string parameter value which contains %26 does not work with ExactMatcher [bug]

 # 1.0.39.0 (07 December 2019)
 - [#370](https://github.com/WireMock-Net/WireMock.Net/pull/370) - Add WebProxySettings (use when proxying requests) [feature] contributed by [StefH](https://github.com/StefH)
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <VersionPrefix>1.0.40</VersionPrefix>
+    <VersionPrefix>1.1.4</VersionPrefix>
  </PropertyGroup>

  <Choose>
--- a/GitHubReleaseNotes.txt
+++ b/GitHubReleaseNotes.txt
@@ -1,3 +1,3 @@
 https://github.com/StefH/GitHubReleaseNotes

-GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc --version 1.0.40.0
+GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc --version 1.1.5.0
--- a/README.md
+++ b/README.md
@@ -28,13 +28,14 @@ A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) w
 | &nbsp;&nbsp;**Sonar Coverage** | [![Sonar Coverage](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=coverage)](https://sonarcloud.io/component_measures?id=wiremock&metric=coverage) |
 | &nbsp;&nbsp;**Codecov** | [![codecov](https://codecov.io/gh/WireMock-Net/WireMock.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/WireMock-Net/WireMock.Net) |
 | &nbsp;&nbsp;**Coveralls** | [![Coverage Status](https://coveralls.io/repos/github/WireMock-Net/WireMock.Net/badge.svg?branch=master)](https://coveralls.io/github/WireMock-Net/WireMock.Net?branch=master) |
-| |
-| ***NuGet*** | &nbsp; |
-| &nbsp;&nbsp;**WireMock.Net** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |
-| &nbsp;&nbsp;**WireMock.Net.StandAlone** | [![NuGet Badge WireMock.Net.StandAlone](https://buildstats.info/nuget/WireMock.Net.StandAlone)](https://www.nuget.org/packages/WireMock.Net.StandAlone) |
-| ***MyGet (previews)*** | &nbsp; |
-| &nbsp;&nbsp;**WireMock.Net** | [![MyGet Badge WireMock.Net](https://buildstats.info/myget/wiremock-net/WireMock.Net)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net) |
-| &nbsp;&nbsp;**WireMock.Net.StandAlone** | [![MyGet Badge WireMock.Net.StandAlone](https://buildstats.info/myget/wiremock-net/WireMock.Net.StandAlone)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.StandAlone) |
+
+### NuGet packages
+
+| | Official | Preview |
+| - | - | - |
+| &nbsp;&nbsp;**WireMock.Net** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |  [![MyGet Badge WireMock.Net](https://buildstats.info/myget/wiremock-net/WireMock.Net)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net)
+| &nbsp;&nbsp;**WireMock.Net.StandAlone** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net.StandAlone)](https://www.nuget.org/packages/WireMock.Net.StandAlone) |  [![MyGet Badge WireMock.Net.StandAlone](https://buildstats.info/myget/wiremock-net/WireMock.Net.StandAlone)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.StandAlone)
+| &nbsp;&nbsp;**WireMock.Net.RestClient** | [![NuGet Badge WireMock.Net.RestClient](https://buildstats.info/nuget/WireMock.Net.RestClient)](https://www.nuget.org/packages/WireMock.Net.RestClient) | [![MyGet Badge WireMock.Net.RestClient](https://buildstats.info/myget/wiremock-net/WireMock.Net.RestClient)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.RestClient)

 ## Development
 For the supported frameworks and build information, see [this](https://github.com/WireMock-Net/WireMock.Net/wiki/Development-Information) page.
--- a/Solution.sln
+++ b/Solution.sln
@@ -1,16 +1,17 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
-VisualStudioVersion = 16.0.29512.175
+VisualStudioVersion = 16.0.29709.97
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EF242EDF-7133-4277-9A0C-18744DE08707}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{197A0EE3-94E5-4807-BBCF-2F1BCA28A6AE}"
 	ProjectSection(SolutionItems) = preProject
 		.runsettings = .runsettings
+		azure-pipelines-ci-linux.yml = azure-pipelines-ci-linux.yml
+		azure-pipelines-ci.yml = azure-pipelines-ci.yml
 		azure-pipelines-linux.yml = azure-pipelines-linux.yml
 		azure-pipelines-nuget.yml = azure-pipelines-nuget.yml
-		azure-pipelines.yml = azure-pipelines.yml
 		build-info.md = build-info.md
 		CHANGELOG.md = CHANGELOG.md
 		Directory.Build.props = Directory.Build.props
@@ -36,14 +37,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.Proxy.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Client", "examples\WireMock.Net.Client\WireMock.Net.Client.csproj", "{058D4B6C-C03E-49D0-91DB-A535B058FA0D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.StandAlone", "src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj", "{B6269AAC-170A-43D5-8B9A-579DED3D9A95}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.StandAlone.NETCoreApp", "examples\WireMock.Net.StandAlone.NETCoreApp\WireMock.Net.StandAlone.NETCoreApp.csproj", "{10E16614-61CA-48D8-8BDD-664C13913DED}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.StandAlone.Net452", "examples\WireMock.Net.StandAlone.Net452\WireMock.Net.StandAlone.Net452.csproj", "{668F689E-57B4-422E-8846-C0FF643CA999}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B6269AAC-170A-43D5-8B9A-579DED3D9A95} = {B6269AAC-170A-43D5-8B9A-579DED3D9A95}
-	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.WebApplication.NETCore2", "examples\WireMock.Net.WebApplication\WireMock.Net.WebApplication.NETCore2.csproj", "{049539C1-7A66-4559-AD7A-B1C73B97CBB0}"
 EndProject
@@ -61,82 +57,174 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Net452
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NETCoreApp2", "examples\WireMock.Net.Console.NETCoreApp2\WireMock.Net.Console.NETCoreApp2.csproj", "{83645809-9E01-4E81-8733-BA9497554ABF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.RequestLogTest", "examples\WireMock.Net.Console.RequestLogTest\WireMock.Net.Console.RequestLogTest.csproj", "{A9D039B9-7509-4CF1-9EFD-87EB82998575}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.RestClient", "src\WireMock.Net.RestClient\WireMock.Net.RestClient.csproj", "{B6269AAC-170A-43D6-8B9A-579DED3D9A96}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Abstractions", "src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj", "{B6269AAC-170A-4346-8B9A-579DED3D9A94}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.StandAlone", "src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj", "{B6269AAC-170A-43D5-8B9A-579DED3D9A95}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.RequestLogTest", "examples\WireMock.Net.Console.RequestLogTest\WireMock.Net.Console.RequestLogTest.csproj", "{A9D039B9-7509-4CF1-9EFD-87EB82998575}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug|x64.Build.0 = Debug|Any CPU
 		{D3804228-91F4-4502-9595-39584E5A01AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D3804228-91F4-4502-9595-39584E5A01AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E5A01AD}.Release|x64.ActiveCfg = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E5A01AD}.Release|x64.Build.0 = Release|Any CPU
 		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug|x64.Build.0 = Debug|Any CPU
 		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Release|x64.ActiveCfg = Release|Any CPU
+		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Release|x64.Build.0 = Release|Any CPU
 		{FE281639-B014-4C8A-96FA-141164A74713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FE281639-B014-4C8A-96FA-141164A74713}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE281639-B014-4C8A-96FA-141164A74713}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FE281639-B014-4C8A-96FA-141164A74713}.Debug|x64.Build.0 = Debug|Any CPU
 		{FE281639-B014-4C8A-96FA-141164A74713}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FE281639-B014-4C8A-96FA-141164A74713}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FE281639-B014-4C8A-96FA-141164A74713}.Release|x64.ActiveCfg = Release|Any CPU
+		{FE281639-B014-4C8A-96FA-141164A74713}.Release|x64.Build.0 = Release|Any CPU
 		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug|x64.Build.0 = Debug|Any CPU
 		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Release|x64.ActiveCfg = Release|Any CPU
+		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Release|x64.Build.0 = Release|Any CPU
 		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Debug|x64.Build.0 = Debug|Any CPU
 		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Release|Any CPU.Build.0 = Release|Any CPU
+		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Release|x64.ActiveCfg = Release|Any CPU
+		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Release|x64.Build.0 = Release|Any CPU
 		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug|x64.Build.0 = Debug|Any CPU
 		{10E16614-61CA-48D8-8BDD-664C13913DED}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{10E16614-61CA-48D8-8BDD-664C13913DED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10E16614-61CA-48D8-8BDD-664C13913DED}.Release|x64.ActiveCfg = Release|Any CPU
+		{10E16614-61CA-48D8-8BDD-664C13913DED}.Release|x64.Build.0 = Release|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug|x64.Build.0 = Debug|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA999}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA999}.Release|Any CPU.Build.0 = Release|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA999}.Release|x64.ActiveCfg = Release|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA999}.Release|x64.Build.0 = Release|Any CPU
 		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug|x64.Build.0 = Debug|Any CPU
 		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Release|x64.ActiveCfg = Release|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Release|x64.Build.0 = Release|Any CPU
 		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|x64.ActiveCfg = Debug|x64
+		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|x64.Build.0 = Debug|x64
 		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|x64.ActiveCfg = Release|x64
+		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|x64.Build.0 = Release|x64
 		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug|x64.Build.0 = Debug|Any CPU
 		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Release|x64.ActiveCfg = Release|Any CPU
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Release|x64.Build.0 = Release|Any CPU
 		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Debug|x64.Build.0 = Debug|Any CPU
 		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Release|x64.ActiveCfg = Release|Any CPU
+		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Release|x64.Build.0 = Release|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|x64.Build.0 = Debug|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|x64.ActiveCfg = Release|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|x64.Build.0 = Release|Any CPU
 		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug|x64.Build.0 = Debug|Any CPU
 		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Release|x64.ActiveCfg = Release|Any CPU
+		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Release|x64.Build.0 = Release|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|x64.Build.0 = Debug|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.Build.0 = Release|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|x64.ActiveCfg = Release|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|x64.Build.0 = Release|Any CPU
 		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug|x64.Build.0 = Debug|Any CPU
 		{83645809-9E01-4E81-8733-BA9497554ABF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{83645809-9E01-4E81-8733-BA9497554ABF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83645809-9E01-4E81-8733-BA9497554ABF}.Release|x64.ActiveCfg = Release|Any CPU
+		{83645809-9E01-4E81-8733-BA9497554ABF}.Release|x64.Build.0 = Release|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug|x64.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Release|x64.ActiveCfg = Release|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Release|x64.Build.0 = Release|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Debug|x64.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Release|x64.ActiveCfg = Release|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Release|x64.Build.0 = Release|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug|x64.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Release|x64.ActiveCfg = Release|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Release|x64.Build.0 = Release|Any CPU
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|x64.Build.0 = Debug|Any CPU
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Release|x64.ActiveCfg = Release|Any CPU
+		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -147,7 +235,6 @@ Global
 		{FE281639-B014-4C8A-96FA-141164A74713} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{1995E414-F197-4AB4-90C2-68D806B5AF59} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{058D4B6C-C03E-49D0-91DB-A535B058FA0D} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
-		{B6269AAC-170A-43D5-8B9A-579DED3D9A95} = {EF242EDF-7133-4277-9A0C-18744DE08707}
 		{10E16614-61CA-48D8-8BDD-664C13913DED} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{668F689E-57B4-422E-8846-C0FF643CA999} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{049539C1-7A66-4559-AD7A-B1C73B97CBB0} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
@@ -158,6 +245,9 @@ Global
 		{1261BB9B-A7D4-456C-8985-3CE560361B8E} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{668F689E-57B4-422E-8846-C0FF643CA268} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{83645809-9E01-4E81-8733-BA9497554ABF} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96} = {EF242EDF-7133-4277-9A0C-18744DE08707}
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94} = {EF242EDF-7133-4277-9A0C-18744DE08707}
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95} = {EF242EDF-7133-4277-9A0C-18744DE08707}
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
--- a/azure-pipelines-ci-linux.yml
+++ b/azure-pipelines-ci-linux.yml
@@ -0,0 +1,13 @@
+pool:
+  vmImage: 'Ubuntu 16.04'
+
+variables:
+  buildConfiguration: 'Release'
+
+steps:
+- script: |
+    dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration $(buildConfiguration) --framework netcoreapp2.1 --logger trx
+- task: PublishTestResults@2
+  inputs:
+    testRunner: VSTest
+    testResultsFiles: '**/*.trx'
--- a/azure-pipelines-ci.yml
+++ b/azure-pipelines-ci.yml
--- a/azure-pipelines-linux.yml
+++ b/azure-pipelines-linux.yml
@@ -1,13 +1,23 @@
+trigger:
+- none
+
 pool:
  vmImage: 'Ubuntu 16.04'

 variables:
+  buildProjects: '**/src/**/*.csproj'
  buildConfiguration: 'Release'

 steps:
- script: |
-    dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration $(buildConfiguration) --framework netcoreapp2.1 --logger trx
- task: PublishTestResults@2
+- task: DotNetCoreCLI@2
+  displayName: Build Release
  inputs:
-    testRunner: VSTest
-    testResultsFiles: '**/*.trx'
+    command: 'build'
+    arguments: /p:Configuration=$(buildConfiguration)
+    projects: $(buildProjects)
+
+- task: PublishBuildArtifacts@1
+  displayName: Publish Artifacts
+  condition: succeeded()
+  inputs:
+    PathtoPublish: '$(Build.ArtifactStagingDirectory)'
--- a/examples/WireMock.Net.Client/Program.cs
+++ b/examples/WireMock.Net.Client/Program.cs
@@ -12,8 +12,8 @@ namespace WireMock.Net.Client
    {
        static async Task Main(string[] args)
        {
-            // Create an implementation of the IFluentMockServerAdmin and pass in the base URL for the API.
-            var api = RestClient.For<IFluentMockServerAdmin>("http://localhost:9091");
+            // Create an implementation of the IWireMockAdminApi and pass in the base URL for the API.
+            var api = RestClient.For<IWireMockAdminApi>("http://localhost:9091");

            // Set BASIC Auth
            var value = Convert.ToBase64String(Encoding.ASCII.GetBytes("a:b"));
--- a/examples/WireMock.Net.Client/WireMock.Net.Client.csproj
+++ b/examples/WireMock.Net.Client/WireMock.Net.Client.csproj
@@ -8,10 +8,12 @@

  <ItemGroup>
    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="RestEase" Version="1.4.7" />
+    <PackageReference Include="RestEase" Version="1.4.10" />
  </ItemGroup>

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

--- a/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj
+++ b/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj
@@ -18,6 +18,10 @@
    </Content>
  </ItemGroup>

+  <ItemGroup>
+    <Compile Remove="__admin\mappings\1.cs" />
+  </ItemGroup>
+
  <ItemGroup>
    <None Remove="__admin\mappings\array.json" />
  </ItemGroup>
--- a/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
+++ b/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
@@ -39,7 +39,7 @@ namespace WireMock.Net.ConsoleApplication
            string url2 = "http://localhost:9092/";
            string url3 = "https://localhost:9443/";

-            var server = FluentMockServer.Start(new FluentMockServerSettings
+            var server = WireMockServer.Start(new WireMockServerSettings
            {
                AllowCSharpCodeMatcher = true,
                Urls = new[] { url1, url2, url3 },
@@ -64,7 +64,7 @@ namespace WireMock.Net.ConsoleApplication
                // Uncomment below if you want to use the CustomFileSystemFileHandler
                // FileSystemHandler = new CustomFileSystemFileHandler()
            });
-            System.Console.WriteLine("FluentMockServer listening at {0}", string.Join(",", server.Urls));
+            System.Console.WriteLine("WireMockServer listening at {0}", string.Join(",", server.Urls));

            server.SetBasicAuthentication("a", "b");

@@ -468,6 +468,7 @@ namespace WireMock.Net.ConsoleApplication
                        DateTimeNowToString = DateTime.Now.ToString("s", CultureInfo.InvariantCulture),
                        Guid1 = "{{Random Type=\"Guid\" Uppercase=false}}",
                        Guid2 = "{{Random Type=\"Guid\"}}",
+                        Guid3 = "{{Random Type=\"Guid\" Format=\"X\"}}",
                        Boolean = "{{Random Type=\"Boolean\"}}",
                        Integer = "{{Random Type=\"Integer\" Min=1000 Max=9999}}",
                        Long = "{{#Random Type=\"Long\" Min=10000000 Max=99999999}}{{this}}{{/Random}}",
--- 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
@@ -80,9 +80,9 @@
    </None>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj">
-      <Project>{b6269aac-170a-43d5-8b9a-579ded3d9a95}</Project>
-      <Name>WireMock.Net.StandAlone</Name>
+    <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>
--- 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
@@ -76,9 +76,9 @@
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj">
-      <Project>{b6269aac-170a-43d5-8b9a-579ded3d9a95}</Project>
-      <Name>WireMock.Net.StandAlone</Name>
+    <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>
--- a/examples/WireMock.Net.Console.Proxy.NETCoreApp2/Program.cs
+++ b/examples/WireMock.Net.Console.Proxy.NETCoreApp2/Program.cs
@@ -17,7 +17,7 @@ namespace WireMock.Net.Console.Proxy.NETCoreApp2
            RunTestDifferentPort().Wait(20000); // prints "1"
            RunTestDifferentPort().Wait(20000); // prints "1"

-            var server = FluentMockServer.Start(new FluentMockServerSettings
+            var server = WireMockServer.Start(new WireMockServerSettings
            {
                Urls = new[] { "http://localhost:9091", "https://localhost:9443" },
                StartAdminInterface = true,
@@ -44,7 +44,7 @@ namespace WireMock.Net.Console.Proxy.NETCoreApp2

        private static async Task RunTestDifferentPort()
        {
-            var server = FluentMockServer.Start();
+            var server = WireMockServer.Start();

            server.Given(Request.Create().WithPath("/").UsingGet())
                .RespondWith(Response.Create().WithStatusCode(200).WithBody("Hello"));
--- a/examples/WireMock.Net.Console.Proxy.NETCoreApp2/WireMock.Net.Console.Proxy.NETCoreApp2.csproj
+++ b/examples/WireMock.Net.Console.Proxy.NETCoreApp2/WireMock.Net.Console.Proxy.NETCoreApp2.csproj
@@ -11,7 +11,6 @@
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj" />
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
  </ItemGroup>

--- a/examples/WireMock.Net.Console.Proxy.Net452/Program.cs
+++ b/examples/WireMock.Net.Console.Proxy.Net452/Program.cs
@@ -11,7 +11,7 @@ namespace WireMock.Net.Console.Proxy.Net452
        static void Main(string[] args)
        {
            string[] urls = { "http://localhost:9091/", "https://localhost:9443/" };
-            var server = FluentMockServer.Start(new FluentMockServerSettings
+            var server = WireMockServer.Start(new WireMockServerSettings
            {
                Urls = urls,
                StartAdminInterface = true,
--- a/examples/WireMock.Net.Console.Proxy.Net452/WireMock.Net.Console.Proxy.Net452.csproj
+++ b/examples/WireMock.Net.Console.Proxy.Net452/WireMock.Net.Console.Proxy.Net452.csproj
@@ -92,10 +92,6 @@
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj">
-      <Project>{b6269aac-170a-43d5-8b9a-579ded3d9a95}</Project>
-      <Name>WireMock.Net.StandAlone</Name>
-    </ProjectReference>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
      <Name>WireMock.Net</Name>
--- a/examples/WireMock.Net.Console.Record.NETCoreApp/Program.cs
+++ b/examples/WireMock.Net.Console.Record.NETCoreApp/Program.cs
@@ -8,7 +8,7 @@ namespace WireMock.Net.Console.Proxy.NETCoreApp
    {
        static void Main(params string[] args)
        {
-            var server = FluentMockServer.Start(new FluentMockServerSettings
+            var server = WireMockServer.Start(new WireMockServerSettings
            {
                Urls = new[] { "http://localhost:9091/", "https://localhost:9443/" },
                StartAdminInterface = true,
--- a/examples/WireMock.Net.Service/Program.cs
+++ b/examples/WireMock.Net.Service/Program.cs
@@ -3,7 +3,6 @@ using System;
 using System.IO;
 using System.ServiceProcess;
 using WireMock.Net.Service;
-using WireMock.Net.StandAlone;
 using WireMock.Server;
 using WireMock.Settings;

@@ -12,7 +11,7 @@ namespace Wiremock.Net.Service
    public static class Program
    {
        #region Nested classes to support running as service
-        public const string ServiceName = "Wiremock.Net.Service";
+        public const string ServiceName = "WireMock.Net.Service";

        public class Service : ServiceBase
        {
@@ -33,7 +32,7 @@ namespace Wiremock.Net.Service
        }
        #endregion

-        private static FluentMockServer _server;
+        private static WireMockServer _server;

        static void Main(string[] args)
        {
@@ -64,7 +63,7 @@ namespace Wiremock.Net.Service

        private static void Start()
        {
-            _server = StandAloneApp.Start(new FluentMockServerSettings
+            _server = WireMockServer.Start(new WireMockServerSettings
            {
                Urls = new[] { "http://*:9091/" },
                StartAdminInterface = true,
--- a/examples/WireMock.Net.Service/WireMock.Net.Service.csproj
+++ b/examples/WireMock.Net.Service/WireMock.Net.Service.csproj
@@ -47,18 +47,12 @@
    <Reference Include="Microsoft.Owin.Hosting, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.Owin.Hosting.2.0.2\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
    </Reference>
-    <Reference Include="MimeKitLite, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MimeKitLite.2.0.1\lib\net45\MimeKitLite.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="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
    </Reference>
-    <Reference Include="RestEase, Version=1.4.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\RestEase.1.4.7\lib\net45\RestEase.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>
@@ -86,8 +80,8 @@
    <Reference Include="System.Data" />
    <Reference Include="System.Net.Http" />
    <Reference Include="System.Xml" />
-    <Reference Include="XPath2, Version=1.0.7.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XPath2.1.0.6.1\lib\net40\XPath2.dll</HintPath>
+    <Reference Include="XPath2, Version=1.0.9.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XPath2.1.0.10\lib\net40\XPath2.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
@@ -121,9 +115,9 @@
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj">
-      <Project>{b6269aac-170a-43d5-8b9a-579ded3d9a95}</Project>
-      <Name>WireMock.Net.StandAlone</Name>
+    <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>
--- a/examples/WireMock.Net.Service/WireMockLog4NetLogger.cs
+++ b/examples/WireMock.Net.Service/WireMockLog4NetLogger.cs
@@ -1,4 +1,5 @@
-using log4net;
+using System;
+using log4net;
 using Newtonsoft.Json;
 using Wiremock.Net.Service;
 using WireMock.Admin.Requests;
@@ -30,6 +31,11 @@ namespace WireMock.Net.Service
            Log.ErrorFormat(formatString, args);
        }

+        public void Error(string message, Exception exception)
+        {
+            Log.Error(message, exception);
+        }
+
        public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
        {
            string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
--- a/examples/WireMock.Net.Service/packages.config
+++ b/examples/WireMock.Net.Service/packages.config
@@ -9,11 +9,9 @@
  <package id="Microsoft.Owin" version="2.0.2" targetFramework="net452" />
  <package id="Microsoft.Owin.Host.HttpListener" version="2.0.2" targetFramework="net452" />
  <package id="Microsoft.Owin.Hosting" version="2.0.2" targetFramework="net452" />
-  <package id="MimeKitLite" version="2.0.1" targetFramework="net452" />
  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
  <package id="Owin" version="1.0" targetFramework="net452" />
-  <package id="RestEase" version="1.4.7" targetFramework="net452" />
  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net452" />
  <package id="System.Net.Http" version="4.3.3" targetFramework="net452" />
-  <package id="XPath2" version="1.0.6.1" targetFramework="net452" />
+  <package id="XPath2" version="1.0.10" targetFramework="net452" />
 </packages>
--- a/examples/WireMock.Net.StandAlone.NETCoreApp/Program.cs
+++ b/examples/WireMock.Net.StandAlone.NETCoreApp/Program.cs
@@ -1,11 +1,13 @@
 using System;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Threading;
 using log4net;
 using log4net.Config;
 using log4net.Repository;
 using WireMock.Server;
+using WireMock.Settings;

 namespace WireMock.Net.StandAlone.NETCoreApp
 {
@@ -15,13 +17,16 @@ namespace WireMock.Net.StandAlone.NETCoreApp
        // private static readonly ILog Log = LogManager.GetLogger(typeof(Program));

        private static int sleepTime = 30000;
-        private static FluentMockServer _server;
+        private static WireMockServer _server;

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

-            _server = StandAloneApp.Start(args, new WireMockLog4NetLogger());
+            var settings = WireMockServerSettingsParser.ParseArguments(args, new WireMockLog4NetLogger());
+            settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
+
+            _server = WireMockServer.Start(settings);

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

--- a/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj
+++ b/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj
@@ -12,7 +12,8 @@
  </ItemGroup>

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

  <ItemGroup>
--- a/examples/WireMock.Net.StandAlone.NETCoreApp/WireMockLog4NetLogger.cs
+++ b/examples/WireMock.Net.StandAlone.NETCoreApp/WireMockLog4NetLogger.cs
@@ -1,6 +1,6 @@
-using log4net;
+using System;
+using log4net;
 using Newtonsoft.Json;
-using WireMock.Admin.Requests;
 using WireMock.Logging;

 namespace WireMock.Net.StandAlone.NETCoreApp
@@ -29,6 +29,11 @@ namespace WireMock.Net.StandAlone.NETCoreApp
            Log.ErrorFormat(formatString, args);
        }

+        public void Error(string message, Exception exception)
+        {
+            Log.Error(message, exception);
+        }
+
        public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
        {
            string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
--- a/examples/WireMock.Net.StandAlone.Net452/Program.cs
+++ b/examples/WireMock.Net.StandAlone.Net452/Program.cs
@@ -1,6 +1,9 @@
 using System;
 using System.IO;
+using System.Linq;
 using log4net.Config;
+using WireMock.Server;
+using WireMock.Settings;

 namespace WireMock.Net.StandAlone.Net452
 {
@@ -10,7 +13,10 @@ namespace WireMock.Net.StandAlone.Net452
        {
            XmlConfigurator.Configure(new FileInfo("log4net.config"));

-            StandAloneApp.Start(args);
+            var settings = WireMockServerSettingsParser.ParseArguments(args);
+            settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
+
+            WireMockServer.Start(settings);

            Console.WriteLine("Press any key to stop the server");
            Console.ReadKey();
--- a/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj
+++ b/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj
@@ -70,9 +70,9 @@
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj">
-      <Project>{b6269aac-170a-43d5-8b9a-579ded3d9a95}</Project>
-      <Name>WireMock.Net.StandAlone</Name>
+    <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>
--- a/examples/WireMock.Net.StandAlone.Net461/Program.cs
+++ b/examples/WireMock.Net.StandAlone.Net461/Program.cs
@@ -1,6 +1,7 @@
 using System;
-using WireMock.RequestBuilders;
-using WireMock.ResponseBuilders;
+using System.Linq;
+using WireMock.Server;
+using WireMock.Settings;

 namespace WireMock.Net.StandAlone.Net461
 {
@@ -8,9 +9,10 @@ namespace WireMock.Net.StandAlone.Net461
    {
        static void Main(string[] args)
        {
-            var server = StandAloneApp.Start(args);
-            server.Given(Request.Create())
-                .RespondWith(Response.Create().WithProxy("http://10.10.66.65"));
+            var settings = WireMockServerSettingsParser.ParseArguments(args);
+            settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
+
+            WireMockServer.Start(settings);

            Console.WriteLine("Press any key to stop the server");
            Console.ReadKey();
--- a/examples/WireMock.Net.StandAlone.Net461/WireMock.Net.StandAlone.Net461.csproj
+++ b/examples/WireMock.Net.StandAlone.Net461/WireMock.Net.StandAlone.Net461.csproj
@@ -204,8 +204,8 @@
    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
    </Reference>
-    <Reference Include="RestEase, Version=1.4.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\RestEase.1.4.7\lib\net45\RestEase.dll</HintPath>
+    <Reference Include="RestEase, Version=1.4.10.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\RestEase.1.4.10\lib\net45\RestEase.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>
@@ -231,6 +231,7 @@
    <Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath>
    </Reference>
+    <Reference Include="System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
    <Reference Include="System.Net.Http.Formatting, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.4\lib\net45\System.Net.Http.Formatting.dll</HintPath>
    </Reference>
@@ -279,12 +280,6 @@
    </Reference>
    <Reference Include="System.Xml" />
    <Reference Include="System.Xml.Linq" />
-    <Reference Include="WireMock.Net, Version=1.0.4.20, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\WireMock.Net.1.0.4.20\lib\net461\WireMock.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="WireMock.Net.StandAlone, Version=1.0.4.20, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\WireMock.Net.StandAlone.1.0.4.20\lib\net46\WireMock.Net.StandAlone.dll</HintPath>
-    </Reference>
    <Reference Include="XPath2, Version=1.0.7.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
      <HintPath>..\..\packages\XPath2.1.0.6.1\lib\net40\XPath2.dll</HintPath>
    </Reference>
@@ -301,6 +296,16 @@
      <SubType>Designer</SubType>
    </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" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
--- a/examples/WireMock.Net.StandAlone.Net461/packages.config
+++ b/examples/WireMock.Net.StandAlone.Net461/packages.config
@@ -59,7 +59,7 @@
  <package id="MimeKitLite" version="2.0.7" targetFramework="net461" />
  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
  <package id="Owin" version="1.0" targetFramework="net461" />
-  <package id="RestEase" version="1.4.7" targetFramework="net461" />
+  <package id="RestEase" version="1.4.10" targetFramework="net461" />
  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
  <package id="System.Buffers" version="4.5.0" targetFramework="net461" />
  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
@@ -78,7 +78,5 @@
  <package id="System.Security.Principal.Windows" version="4.5.1" targetFramework="net461" />
  <package id="System.Text.Encodings.Web" version="4.5.0" targetFramework="net461" />
  <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
-  <package id="WireMock.Net" version="1.0.4.20" targetFramework="net461" />
-  <package id="WireMock.Net.StandAlone" version="1.0.4.20" targetFramework="net461" />
  <package id="XPath2" version="1.0.6.1" targetFramework="net461" />
 </packages>
--- a/examples/WireMock.Net.WebApplication/Program.cs
+++ b/examples/WireMock.Net.WebApplication/Program.cs
@@ -43,9 +43,9 @@ namespace WireMock.Net.WebApplication
            // Add access to generic IConfigurationRoot
            serviceCollection.AddSingleton(configuration);

-            // Add access to IFluentMockServerSettings
-            var settings = configuration.GetSection("FluentMockServerSettings").Get<FluentMockServerSettings>();
-            serviceCollection.AddSingleton<IFluentMockServerSettings>(settings);
+            // Add access to WireMockServerSettings
+            var settings = configuration.GetSection("WireMockServerSettings").Get<WireMockServerSettings>();
+            serviceCollection.AddSingleton<WireMockServerSettings>(settings);

            // Add services
            serviceCollection.AddTransient<IWireMockService, WireMockService>();
--- a/examples/WireMock.Net.WebApplication/WireMock.Net.WebApplication.NETCore2.csproj
+++ b/examples/WireMock.Net.WebApplication/WireMock.Net.WebApplication.NETCore2.csproj
@@ -22,7 +22,7 @@
  </ItemGroup>

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

--- a/examples/WireMock.Net.WebApplication/WireMockService.cs
+++ b/examples/WireMock.Net.WebApplication/WireMockService.cs
@@ -1,9 +1,9 @@
 using System.Threading;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
-using WireMock.Admin.Requests;
 using WireMock.Logging;
-using WireMock.Net.StandAlone;
+using WireMock.Models.Requests;
+using WireMock.Server;
 using WireMock.Settings;

 namespace WireMock.Net.WebApplication
@@ -13,7 +13,7 @@ namespace WireMock.Net.WebApplication
        private static int sleepTime = 30000;

        private readonly ILogger _logger;
-        private readonly IFluentMockServerSettings _settings;
+        private readonly WireMockServerSettings _settings;

        private class Logger : IWireMockLogger
        {
@@ -51,7 +51,7 @@ namespace WireMock.Net.WebApplication
            }
        }

-        public WireMockService(ILogger logger, IFluentMockServerSettings settings)
+        public WireMockService(ILogger logger, WireMockServerSettings settings)
        {
            _logger = logger;
            _settings = settings;
@@ -63,7 +63,7 @@ namespace WireMock.Net.WebApplication
        {
            _logger.LogInformation("WireMock.Net server starting");

-            StandAloneApp.Start(_settings);
+            WireMockServer.Start(_settings);

            _logger.LogInformation($"WireMock.Net server settings {JsonConvert.SerializeObject(_settings)}");

--- a/examples/WireMock.Net.WebApplication/appsettings.json
+++ b/examples/WireMock.Net.WebApplication/appsettings.json
@@ -12,7 +12,7 @@
      }
    }
  },
-  "FluentMockServerSettings": {
+  "WireMockServerSettings": {
    "AdminUsername": "a",
    "AdminPassword": "b",
    "StartAdminInterface": true
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/BodyModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/BodyModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/ClientIPModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/ClientIPModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/CookieModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/CookieModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/EncodingModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/EncodingModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/FaultModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/FaultModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/HeaderModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/HeaderModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/MatcherModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/MatcherModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/ParamModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/ParamModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/PathModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/PathModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/RequestModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/RequestModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/ResponseModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/ResponseModel.cs
@@ -10,7 +10,7 @@ namespace WireMock.Admin.Mappings
        /// <summary>
        /// Gets or sets the HTTP status.
        /// </summary>
-        public int? StatusCode { get; set; }
+        public object StatusCode { get; set; }

        /// <summary>
        /// Gets or sets the body destination (SameAsSource, String or Bytes).
@@ -22,11 +22,6 @@ namespace WireMock.Admin.Mappings
        /// </summary>
        public string Body { get; set; }

-        /// <summary>
-        /// Gets or sets the body.
-        /// </summary>
-        public string BodyFromBase64 { get; set; }
-
        /// <summary>
        /// Gets or sets the body (as JSON object).
        /// </summary>
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/StatusModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/StatusModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/UrlModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/UrlModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/WebProxyModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/WebProxyModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Requests/LogEntryModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Requests/LogEntryModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Requests/LogRequestMatchModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Requests/LogRequestMatchModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Requests/LogRequestModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Requests/LogRequestModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using WireMock.Admin.Mappings;
-using WireMock.Util;
+using WireMock.Types;

 namespace WireMock.Admin.Requests
 {
--- a/src/WireMock.Net.Abstractions/Admin/Requests/LogResponseModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Requests/LogResponseModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using WireMock.Admin.Mappings;
-using WireMock.Util;
+using WireMock.Types;

 namespace WireMock.Admin.Requests
 {
@@ -12,7 +12,7 @@ namespace WireMock.Admin.Requests
        /// <summary>
        /// Gets or sets the status code.
        /// </summary>
-        public int StatusCode { get; set; } = 200;
+        public object StatusCode { get; set; } = 200;

        /// <summary>
        /// Gets the headers.
--- a/src/WireMock.Net.Abstractions/Admin/Scenarios/ScenarioStateModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Scenarios/ScenarioStateModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Settings/SettingsModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Settings/SettingsModel.cs
--- a/src/WireMock.Net.Abstractions/Handlers/IFileSystemHandler.cs
+++ b/src/WireMock.Net.Abstractions/Handlers/IFileSystemHandler.cs
--- a/src/WireMock.Net.Abstractions/Logging/IWireMockLogger.cs
+++ b/src/WireMock.Net.Abstractions/Logging/IWireMockLogger.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System;
+using JetBrains.Annotations;
 using WireMock.Admin.Requests;

 namespace WireMock.Logging
@@ -45,6 +46,14 @@ namespace WireMock.Logging
        [StringFormatMethod("formatString")]
        void Error([NotNull] string formatString, [NotNull] params object[] args);

+        /// <summary>
+        /// Writes the message at the Error level using the specified exception. 
+        /// </summary>
+        /// <param name="message">The message.</param>
+        /// <param name="exception">The exception.</param>
+        [PublicAPI]
+        void Error([NotNull] string message, [NotNull] Exception exception);
+
        /// <summary>
        /// Writes the LogEntryModel (LogRequestModel, LogResponseModel and more).
        /// </summary>
--- a/src/WireMock.Net.Abstractions/Types/BodyType.cs
+++ b/src/WireMock.Net.Abstractions/Types/BodyType.cs
@@ -1,4 +1,4 @@
-namespace WireMock.Util
+namespace WireMock.Types
 {
    /// <summary>
    /// The BodyType
--- a/src/WireMock.Net.Abstractions/Types/WireMockList.cs
+++ b/src/WireMock.Net.Abstractions/Types/WireMockList.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;

-namespace WireMock.Util
+namespace WireMock.Types
 {
    /// <summary>
    /// A special List which overrides the ToString() to return first value.
--- a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
+++ b/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
@@ -0,0 +1,46 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Commonly used interfaces, models, enumerations and types.</Description>
+    <AssemblyTitle>WireMock.Net.Abstractions</AssemblyTitle>
+    <Authors>Stef Heyenrath</Authors>
+    <TargetFrameworks>netstandard1.0;netstandard2.0;net45</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>WireMock.Net.Abstractions</AssemblyName>
+    <PackageId>WireMock.Net.Abstractions</PackageId>
+    <PackageTags>wiremock;interfaces;models;classes;enumerations;types</PackageTags>
+    <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>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
+    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+    <RootNamespace>WireMock</RootNamespace>
+    <!--<DebugType>full</DebugType>
+    <IncludeSource>True</IncludeSource>
+    <IncludeSymbols>True</IncludeSymbols>-->
+    <ProjectGuid>{B6269AAC-170A-4346-8B9A-579DED3D9A94}</ProjectGuid>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+    <!--<DelaySign>true</DelaySign>-->
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <PathMap>$(MSBuildProjectDirectory)=/</PathMap>
+    <!--<GeneratePackageOnBuild>true</GeneratePackageOnBuild>-->
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
--- a/src/WireMock.Net/Client/IFluentMockServerAdmin.cs
+++ b/src/WireMock.Net/Client/IFluentMockServerAdmin.cs
@@ -5,6 +5,7 @@ using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Requests;
+using WireMock.Admin.Scenarios;
 using WireMock.Admin.Settings;

 namespace WireMock.Client
@@ -12,7 +13,8 @@ namespace WireMock.Client
    /// <summary>
    /// The RestEase interface which defines all admin commands.
    /// </summary>
-    public interface IFluentMockServerAdmin
+    [BasePath("__admin")]
+    public interface IWireMockAdminApi
    {
        /// <summary>
        /// Authentication header
@@ -24,14 +26,14 @@ namespace WireMock.Client
        /// Get the settings.
        /// </summary>
        /// <returns>SettingsModel</returns>
-        [Get("__admin/settings")]
+        [Get("settings")]
        Task<SettingsModel> GetSettingsAsync();

        /// <summary>
        /// Update the settings.
        /// </summary>
        /// <param name="settings">SettingsModel</param>
-        [Put("__admin/settings")]
+        [Put("settings")]
        [Header("Content-Type", "application/json")]
        Task<StatusModel> PutSettingsAsync([Body] SettingsModel settings);

@@ -39,7 +41,7 @@ namespace WireMock.Client
        /// Update the settings
        /// </summary>
        /// <param name="settings">SettingsModel</param>
-        [Post("__admin/settings")]
+        [Post("settings")]
        [Header("Content-Type", "application/json")]
        Task<StatusModel> PostSettingsAsync([Body] SettingsModel settings);

@@ -47,14 +49,14 @@ namespace WireMock.Client
        /// Get the mappings.
        /// </summary>
        /// <returns>MappingModels</returns>
-        [Get("__admin/mappings")]
+        [Get("mappings")]
        Task<IList<MappingModel>> GetMappingsAsync();

        /// <summary>
        /// Add a new mapping.
        /// </summary>
        /// <param name="mapping">MappingModel</param>
-        [Post("__admin/mappings")]
+        [Post("mappings")]
        [Header("Content-Type", "application/json")]
        Task<StatusModel> PostMappingAsync([Body] MappingModel mapping);

@@ -62,14 +64,14 @@ namespace WireMock.Client
        /// Add new mappings.
        /// </summary>
        /// <param name="mappings">MappingModels</param>
-        [Post("__admin/mappings")]
+        [Post("mappings")]
        [Header("Content-Type", "application/json")]
        Task<StatusModel> PostMappingsAsync([Body] IList<MappingModel> mappings);

        /// <summary>
        /// Delete all mappings.
        /// </summary>
-        [Delete("__admin/mappings")]
+        [Delete("mappings")]
        Task<StatusModel> DeleteMappingsAsync();

        /// <summary>
@@ -84,7 +86,7 @@ namespace WireMock.Client
        /// </summary>
        /// <param name="guid">The Guid</param>
        /// <returns>MappingModel</returns>
-        [Get("__admin/mappings/{guid}")]
+        [Get("mappings/{guid}")]
        Task<MappingModel> GetMappingAsync([Path] Guid guid);

        /// <summary>
@@ -92,7 +94,7 @@ namespace WireMock.Client
        /// </summary>
        /// <param name="guid">The Guid</param>
        /// <param name="mapping">MappingModel</param>
-        [Put("__admin/mappings/{guid}")]
+        [Put("mappings/{guid}")]
        [Header("Content-Type", "application/json")]
        Task<StatusModel> PutMappingAsync([Path] Guid guid, [Body] MappingModel mapping);

@@ -100,32 +102,32 @@ namespace WireMock.Client
        /// Delete a mapping based on the guid
        /// </summary>
        /// <param name="guid">The Guid</param>
-        [Delete("__admin/mappings/{guid}")]
+        [Delete("mappings/{guid}")]
        Task<StatusModel> DeleteMappingAsync([Path] Guid guid);

        /// <summary>
        /// Save the mappings
        /// </summary>
-        [Post("__admin/mappings/save")]
+        [Post("mappings/save")]
        Task<StatusModel> SaveMappingAsync();

        /// <summary>
        /// Get the requests.
        /// </summary>
        /// <returns>LogRequestModels</returns>
-        [Get("__admin/requests")]
+        [Get("requests")]
        Task<IList<LogEntryModel>> GetRequestsAsync();

        /// <summary>
        /// Delete all requests.
        /// </summary>
-        [Delete("__admin/requests")]
+        [Delete("requests")]
        Task<StatusModel> DeleteRequestsAsync();

        /// <summary>
        /// Delete (reset) all requests.
        /// </summary>
-        [Post("__admin/requests/reset")]
+        [Post("requests/reset")]
        Task<StatusModel> ResetRequestsAsync();

        /// <summary>
@@ -133,40 +135,40 @@ namespace WireMock.Client
        /// </summary>
        /// <param name="guid">The Guid</param>
        /// <returns>MappingModel</returns>
-        [Get("__admin/requests/{guid}")]
+        [Get("requests/{guid}")]
        Task<LogEntryModel> GetRequestAsync([Path] Guid guid);

        /// <summary>
        /// Delete a request based on the guid
        /// </summary>
        /// <param name="guid">The Guid</param>
-        [Delete("__admin/requests/{guid}")]
+        [Delete("requests/{guid}")]
        Task<StatusModel> DeleteRequestAsync([Path] Guid guid);

        /// <summary>
        /// Find a request based on the criteria
        /// </summary>
        /// <param name="model">The RequestModel</param>
-        [Post("__admin/requests/find")]
+        [Post("requests/find")]
        [Header("Content-Type", "application/json")]
        Task<IList<LogEntryModel>> FindRequestsAsync([Body] RequestModel model);

        /// <summary>
        /// Get all scenarios
        /// </summary>
-        [Get("__admin/scenarios")]
-        Task<IList<ScenarioState>> GetScenariosAsync();
+        [Get("scenarios")]
+        Task<IList<ScenarioStateModel>> GetScenariosAsync();

        /// <summary>
        /// Delete (reset) all scenarios
        /// </summary>
-        [Delete("__admin/scenarios")]
+        [Delete("scenarios")]
        Task<StatusModel> DeleteScenariosAsync();

        /// <summary>
        /// Delete (reset) all scenarios
        /// </summary>
-        [Post("__admin/scenarios")]
+        [Post("scenarios")]
        Task<StatusModel> ResetScenariosAsync();

        /// <summary>
@@ -174,7 +176,7 @@ namespace WireMock.Client
        /// </summary>
        /// <param name="filename">The filename</param>
        /// <param name="body">The body</param>
-        [Post("__admin/files/{filename}")]
+        [Post("files/{filename}")]
        Task<StatusModel> PostFileAsync([Path] string filename, [Body] string body);

        /// <summary>
@@ -182,28 +184,28 @@ namespace WireMock.Client
        /// </summary>
        /// <param name="filename">The filename</param>
        /// <param name="body">The body</param>
-        [Put("__admin/files/{filename}")]
+        [Put("files/{filename}")]
        Task<StatusModel> PutFileAsync([Path] string filename, [Body] string body);

        /// <summary>
        /// Get the content of an existing File
        /// </summary>
        /// <param name="filename">The filename</param>
-        [Get("__admin/files/{filename}")]
+        [Get("files/{filename}")]
        Task<string> GetFileAsync([Path] string filename);

        /// <summary>
        /// Delete an existing File
        /// </summary>
        /// <param name="filename">The filename</param>
-        [Delete("__admin/files/{filename}")]
+        [Delete("files/{filename}")]
        Task<StatusModel> DeleteFileAsync([Path] string filename);

        /// <summary>
        /// Check if a file exists
        /// </summary>
        /// <param name="filename">The filename</param>
-        [Head("__admin/files/{filename}")]
+        [Head("files/{filename}")]
        Task FileExistsAsync([Path] string filename);
    }
 }
--- a/src/WireMock.Net.RestClient/WireMock.Net.RestClient.csproj
+++ b/src/WireMock.Net.RestClient/WireMock.Net.RestClient.csproj
@@ -0,0 +1,48 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>A RestClient using RestEase to access the admin interface.</Description>
+    <AssemblyTitle>WireMock.Net.RestClient</AssemblyTitle>
+    <Authors>Stef Heyenrath</Authors>
+    <TargetFrameworks>netstandard1.1;netstandard2.0;net45</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>WireMock.Net.RestClient</AssemblyName>
+    <PackageId>WireMock.Net.RestClient</PackageId>
+    <PackageTags>wiremock;rest;client;restclient;restease;rest;json</PackageTags>
+    <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>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
+    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+    <RootNamespace>WireMock.Client</RootNamespace>
+    <!--<DebugType>full</DebugType>
+    <IncludeSource>True</IncludeSource>
+    <IncludeSymbols>True</IncludeSymbols>-->
+    <ProjectGuid>{B6269AAC-170A-43D6-8B9A-579DED3D9A96}</ProjectGuid>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+    <!--<DelaySign>true</DelaySign>-->
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <PathMap>$(MSBuildProjectDirectory)=/</PathMap>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="RestEase" Version="1.4.10" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/src/WireMock.Net.StandAlone/StandAloneApp.cs
+++ b/src/WireMock.Net.StandAlone/StandAloneApp.cs
@@ -17,11 +17,11 @@ namespace WireMock.Net.StandAlone
        /// </summary>
        /// <param name="settings">The FluentMockServerSettings</param>
        [PublicAPI]
-        public static FluentMockServer Start([NotNull] IFluentMockServerSettings settings)
+        public static WireMockServer Start([NotNull] IWireMockServerSettings settings)
        {
            Check.NotNull(settings, nameof(settings));

-            var server = FluentMockServer.Start(settings);
+            var server = WireMockServer.Start(settings);

            settings.Logger.Info("WireMock.Net server listening at {0}", string.Join(",", server.Urls));

@@ -34,73 +34,11 @@ namespace WireMock.Net.StandAlone
        /// <param name="args">The commandline arguments</param>
        /// <param name="logger">The logger</param>
        [PublicAPI]
-        public static FluentMockServer Start([NotNull] string[] args, [CanBeNull] IWireMockLogger logger = null)
+        public static WireMockServer Start([NotNull] string[] args, [CanBeNull] IWireMockLogger logger = null)
        {
            Check.NotNull(args, nameof(args));

-            var parser = new SimpleCommandLineParser();
-            parser.Parse(args);
-
-            var settings = new FluentMockServerSettings
-            {
-                StartAdminInterface = parser.GetBoolValue("StartAdminInterface", true),
-                ReadStaticMappings = parser.GetBoolValue("ReadStaticMappings"),
-                WatchStaticMappings = parser.GetBoolValue("WatchStaticMappings"),
-                WatchStaticMappingsInSubdirectories = parser.GetBoolValue("WatchStaticMappingsInSubdirectories"),
-                AllowPartialMapping = parser.GetBoolValue("AllowPartialMapping"),
-                AdminUsername = parser.GetStringValue("AdminUsername"),
-                AdminPassword = parser.GetStringValue("AdminPassword"),
-                MaxRequestLogCount = parser.GetIntValue("MaxRequestLogCount"),
-                RequestLogExpirationDuration = parser.GetIntValue("RequestLogExpirationDuration"),
-                AllowCSharpCodeMatcher = parser.GetBoolValue("AllowCSharpCodeMatcher"),
-                AllowBodyForAllHttpMethods = parser.GetBoolValue("AllowBodyForAllHttpMethods")
-            };
-
-            if (logger != null)
-            {
-                settings.Logger = logger;
-            }
-
-            if (parser.GetStringValue("WireMockLogger") == "WireMockConsoleLogger")
-            {
-                settings.Logger = new WireMockConsoleLogger();
-            }
-
-            if (parser.Contains("Port"))
-            {
-                settings.Port = parser.GetIntValue("Port");
-            }
-            else
-            {
-                settings.Urls = parser.GetValues("Urls", new[] { "http://*:9091/" });
-            }
-
-            string proxyURL = parser.GetStringValue("ProxyURL");
-            if (!string.IsNullOrEmpty(proxyURL))
-            {
-                settings.ProxyAndRecordSettings = new ProxyAndRecordSettings
-                {
-                    Url = proxyURL,
-                    SaveMapping = parser.GetBoolValue("SaveMapping"),
-                    SaveMappingToFile = parser.GetBoolValue("SaveMappingToFile"),
-                    SaveMappingForStatusCodePattern = parser.GetStringValue("SaveMappingForStatusCodePattern"),
-                    ClientX509Certificate2ThumbprintOrSubjectName = parser.GetStringValue("ClientX509Certificate2ThumbprintOrSubjectName"),
-                    BlackListedHeaders = parser.GetValues("BlackListedHeaders"),
-                    BlackListedCookies = parser.GetValues("BlackListedCookies"),
-                    AllowAutoRedirect = parser.GetBoolValue("AllowAutoRedirect")
-                };
-
-                string proxyAddress = parser.GetStringValue("WebProxyAddress");
-                if (!string.IsNullOrEmpty(proxyAddress))
-                {
-                    settings.ProxyAndRecordSettings.WebProxySettings = new WebProxySettings
-                    {
-                        Address = proxyAddress,
-                        UserName = parser.GetStringValue("WebProxyUserName"),
-                        Password = parser.GetStringValue("WebProxyPassword")
-                    };
-                }
-            }
+            var settings = WireMockServerSettingsParser.ParseArguments(args);

            settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));

--- a/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj
+++ b/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj
@@ -1,60 +1,60 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
-    <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
-    <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net451;net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyName>WireMock.Net.StandAlone</AssemblyName>
-    <PackageId>WireMock.Net.StandAlone</PackageId>
-    <PackageTags>tdd;mock;http;wiremock;test;server;unittest</PackageTags>
-    <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>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
-    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
-    <RootNamespace>WireMock.Net.StandAlone</RootNamespace>
-    <!--<DebugType>full</DebugType>
-    <IncludeSource>True</IncludeSource>
-    <IncludeSymbols>True</IncludeSymbols>-->
-    <ProjectGuid>{B6269AAC-170A-43D5-8B9A-579DED3D9A95}</ProjectGuid>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <CodeAnalysisRuleSet>WireMock.Net.StandAlone.ruleset</CodeAnalysisRuleSet>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
-    <!--<DelaySign>true</DelaySign>-->
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <PathMap>$(MSBuildProjectDirectory)=/</PathMap>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' ">
-    <DefineConstants>NETSTANDARD;USE_ASPNETCORE</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
-    <DefineConstants>USE_ASPNETCORE;NET46</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2018.2.1">
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="7.8.0.7320">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\WireMock.Net\WireMock.Net.csproj" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
+    <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
+    <Authors>Stef Heyenrath</Authors>
+    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>WireMock.Net.StandAlone</AssemblyName>
+    <PackageId>WireMock.Net.StandAlone</PackageId>
+    <PackageTags>tdd;mock;http;wiremock;test;server;unittest</PackageTags>
+    <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>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
+    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+    <RootNamespace>WireMock.Net.StandAlone</RootNamespace>
+    <!--<DebugType>full</DebugType>
+    <IncludeSource>True</IncludeSource>
+    <IncludeSymbols>True</IncludeSymbols>-->
+    <ProjectGuid>{B6269AAC-170A-43D5-8B9A-579DED3D9A95}</ProjectGuid>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    <CodeAnalysisRuleSet>WireMock.Net.StandAlone.ruleset</CodeAnalysisRuleSet>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+    <!--<DelaySign>true</DelaySign>-->
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+  </PropertyGroup>
+  
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <PathMap>$(MSBuildProjectDirectory)=/</PathMap>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' ">
+    <DefineConstants>NETSTANDARD;USE_ASPNETCORE</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
+    <DefineConstants>USE_ASPNETCORE;NET46</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" Version="2018.2.1">
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="7.8.0.7320">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\WireMock.Net\WireMock.Net.csproj" />
+  </ItemGroup>
 </Project>
--- a/src/WireMock.Net/Http/HttpRequestMessageHelper.cs
+++ b/src/WireMock.Net/Http/HttpRequestMessageHelper.cs
@@ -1,11 +1,11 @@
-using System;
+using JetBrains.Annotations;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using JetBrains.Annotations;
-using Newtonsoft.Json;
-using WireMock.Util;
+using WireMock.Types;
 using WireMock.Validation;

 namespace WireMock.Http
--- a/src/WireMock.Net/IMapping.cs
+++ b/src/WireMock.Net/IMapping.cs
@@ -62,9 +62,9 @@ namespace WireMock
        IResponseProvider Provider { get; }

        /// <summary>
-        /// The FluentMockServerSettings.
+        /// The WireMockServerSettings.
        /// </summary>
-        IFluentMockServerSettings Settings { get; }
+        IWireMockServerSettings Settings { get; }

        /// <summary>
        /// Is State started ?
--- a/src/WireMock.Net/Logging/WireMockConsoleLogger.cs
+++ b/src/WireMock.Net/Logging/WireMockConsoleLogger.cs
@@ -1,5 +1,5 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
+using System;
 using WireMock.Admin.Requests;

 namespace WireMock.Logging
@@ -36,12 +36,27 @@ namespace WireMock.Logging
            Console.WriteLine(Format("Warn", formatString, args));
        }

-        /// <see cref="IWireMockLogger.Error"/>
+        /// <see cref="IWireMockLogger.Error(string, object[])"/>
        public void Error(string formatString, params object[] args)
        {
            Console.WriteLine(Format("Error", formatString, args));
        }

+        /// <see cref="IWireMockLogger.Error(string, Exception)"/>
+        public void Error(string formatString, Exception exception)
+        {
+            Console.WriteLine(Format("Error", formatString, exception.Message));
+
+            if (exception is AggregateException ae)
+            {
+                ae.Handle(ex =>
+                {
+                    Console.WriteLine(Format("Error", "Exception {0}", exception.Message));
+                    return true;
+                });
+            }
+        }
+
        /// <see cref="IWireMockLogger.DebugRequestResponse"/>
        public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
        {
--- a/src/WireMock.Net/Logging/WireMockNullLogger.cs
+++ b/src/WireMock.Net/Logging/WireMockNullLogger.cs
@@ -1,4 +1,5 @@
-using WireMock.Admin.Requests;
+using System;
+using WireMock.Admin.Requests;

 namespace WireMock.Logging
 {
@@ -26,12 +27,18 @@ namespace WireMock.Logging
            // Log nothing
        }

-        /// <see cref="IWireMockLogger.Error"/>
+        /// <see cref="IWireMockLogger.Error(string, object[])"/>
        public void Error(string formatString, params object[] args)
        {
            // Log nothing
        }

+        /// <see cref="IWireMockLogger.Error(string, Exception)"/>
+        public void Error(string formatString, Exception exception)
+        {
+            // Log nothing
+        }
+
        /// <see cref="IWireMockLogger.DebugRequestResponse"/>
        public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
        {
--- a/src/WireMock.Net/Mapping.cs
+++ b/src/WireMock.Net/Mapping.cs
@@ -1,6 +1,6 @@
-using JetBrains.Annotations;
-using System;
+using System;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using WireMock.Matchers.Request;
 using WireMock.ResponseProviders;
 using WireMock.Settings;
@@ -40,7 +40,7 @@ namespace WireMock
        public IResponseProvider Provider { get; }

        /// <inheritdoc cref="IMapping.Settings" />
-        public IFluentMockServerSettings Settings { get; }
+        public IWireMockServerSettings Settings { get; }

        /// <inheritdoc cref="IMapping.IsStartState" />
        public bool IsStartState => Scenario == null || Scenario != null && NextState != null && ExecutionConditionState == null;
@@ -57,7 +57,7 @@ namespace WireMock
        /// <param name="guid">The unique identifier.</param>
        /// <param name="title">The unique title (can be null).</param>
        /// <param name="path">The full file path from this mapping title (can be null).</param>
-        /// <param name="settings">The FluentMockServerSettings.</param>
+        /// <param name="settings">The WireMockServerSettings.</param>
        /// <param name="requestMatcher">The request matcher.</param>
        /// <param name="provider">The provider.</param>
        /// <param name="priority">The priority for this mapping.</param>
@@ -65,7 +65,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>
        public Mapping(Guid guid, [CanBeNull] string title, [CanBeNull] string path,
-            [NotNull] IFluentMockServerSettings settings, [NotNull] IRequestMatcher requestMatcher, [NotNull] IResponseProvider provider,
+            [NotNull] IWireMockServerSettings settings, [NotNull] IRequestMatcher requestMatcher, [NotNull] IResponseProvider provider,
            int priority, [CanBeNull] string scenario, [CanBeNull] string executionConditionState, [CanBeNull] string nextState)
        {
            Guid = guid;
--- a/src/WireMock.Net/Matchers/JsonMatcher.cs
+++ b/src/WireMock.Net/Matchers/JsonMatcher.cs
@@ -1,6 +1,7 @@
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System.Collections;
 using System.Linq;
 using WireMock.Util;
 using WireMock.Validation;
@@ -85,7 +86,7 @@ namespace WireMock.Matchers
                    // Check if JToken or object
                    JToken jtokenInput = input is JToken tokenInput ? tokenInput : JObject.FromObject(input);

-                    // Check if JToken or string or object
+                    // Check if JToken, string, IEnumerable or object
                    JToken jtokenValue;
                    switch (Value)
                    {
@@ -97,6 +98,10 @@ namespace WireMock.Matchers
                            jtokenValue = JsonUtils.Parse(stringValue);
                            break;

+                        case IEnumerable enumerableValue:
+                            jtokenValue = JArray.FromObject(enumerableValue);
+                            break;
+
                        default:
                            jtokenValue = JObject.FromObject(Value);
                            break;
--- a/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs
@@ -1,7 +1,7 @@
 using JetBrains.Annotations;
 using System;
 using System.Linq;
-using WireMock.Util;
+using WireMock.Types;
 using WireMock.Validation;

 namespace WireMock.Matchers.Request
--- a/src/WireMock.Net/Matchers/Request/RequestMessageHeaderMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageHeaderMatcher.cs
@@ -1,8 +1,8 @@
-using System;
+using JetBrains.Annotations;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using JetBrains.Annotations;
-using WireMock.Util;
+using WireMock.Types;
 using WireMock.Validation;

 namespace WireMock.Matchers.Request
--- a/src/WireMock.Net/Matchers/Request/RequestMessageParamMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageParamMatcher.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using WireMock.Util;
+using WireMock.Types;
 using WireMock.Validation;

 namespace WireMock.Matchers.Request
--- a/src/WireMock.Net/Owin/GlobalExceptionMiddleware.cs
+++ b/src/WireMock.Net/Owin/GlobalExceptionMiddleware.cs
@@ -63,7 +63,7 @@ namespace WireMock.Owin
            }
            catch (Exception ex)
            {
-                _options.Logger.Error("HttpStatusCode set to 500 {0}", ex);
+                _options.Logger.Error("HttpStatusCode set to 500", ex);
                await _responseMapper.MapAsync(ResponseMessageBuilder.Create(JsonConvert.SerializeObject(ex), 500), ctx.Response);
            }
        }
--- a/src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs
+++ b/src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs
@@ -9,6 +9,7 @@ using RandomDataGenerator.Randomizers;
 using WireMock.Handlers;
 using WireMock.Http;
 using WireMock.ResponseBuilders;
+using WireMock.Types;
 using WireMock.Util;
 using WireMock.Validation;
 #if !USE_ASPNETCORE
@@ -79,7 +80,17 @@ namespace WireMock.Owin.Mappers
                    break;
            }

-            response.StatusCode = responseMessage.StatusCode;
+            switch (responseMessage.StatusCode)
+            {
+                case int statusCodeAsInteger:
+                    response.StatusCode = statusCodeAsInteger;
+                    break;
+
+                case string statusCodeAsString:
+                    response.StatusCode = int.Parse(statusCodeAsString);
+                    break;
+            }
+
            SetResponseHeaders(responseMessage, response);

            if (bytes != null)
--- a/src/WireMock.Net/Owin/WireMockMiddleware.cs
+++ b/src/WireMock.Net/Owin/WireMockMiddleware.cs
@@ -3,11 +3,11 @@ using System.Threading.Tasks;
 using WireMock.Logging;
 using System.Linq;
 using WireMock.Matchers;
-using WireMock.Util;
 using Newtonsoft.Json;
 using WireMock.Http;
 using WireMock.Owin.Mappers;
 using WireMock.Serialization;
+using WireMock.Types;
 using WireMock.Validation;
 #if !USE_ASPNETCORE
 using Microsoft.Owin;
--- a/src/WireMock.Net/RequestBuilders/IParamsRequestBuilder.cs
+++ b/src/WireMock.Net/RequestBuilders/IParamsRequestBuilder.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 using WireMock.Matchers;
-using WireMock.Util;
+using WireMock.Types;

 namespace WireMock.RequestBuilders
 {
--- a/src/WireMock.Net/RequestBuilders/Request.WithParam.cs
+++ b/src/WireMock.Net/RequestBuilders/Request.WithParam.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
-using WireMock.Util;
+using WireMock.Types;
 using WireMock.Validation;

 namespace WireMock.RequestBuilders
--- a/src/WireMock.Net/RequestMessage.cs
+++ b/src/WireMock.Net/RequestMessage.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using WireMock.Models;
+using WireMock.Types;
 using WireMock.Util;
 using WireMock.Validation;

--- a/src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs
+++ b/src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs
@@ -1,6 +1,6 @@
-using System;
+using JetBrains.Annotations;
+using System;
 using System.Text;
-using JetBrains.Annotations;

 namespace WireMock.ResponseBuilders
 {
@@ -53,15 +53,6 @@ namespace WireMock.ResponseBuilders
        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
        IResponseBuilder WithBodyAsJson([NotNull] object body, bool indented);

-        /// <summary>
-        /// WithBody : Create a string response based on a Base64 string (which will be decoded to a normal string).
-        /// </summary>
-        /// <param name="bodyAsBase64">The body.</param>
-        /// <param name="encoding">The Encoding.</param>
-        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-        [Obsolete("Should not be used, will be removed in future.")]
-        IResponseBuilder WithBodyFromBase64([NotNull] string bodyAsBase64, [CanBeNull] Encoding encoding = null);
-
        /// <summary>
        /// WithBodyFromFile : Create a ... response based on a File.
        /// </summary>
--- a/src/WireMock.Net/ResponseBuilders/IHeadersResponseBuilder.cs
+++ b/src/WireMock.Net/ResponseBuilders/IHeadersResponseBuilder.cs
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
-using WireMock.Util;
+using JetBrains.Annotations;
+using System.Collections.Generic;
+using WireMock.Types;

 namespace WireMock.ResponseBuilders
 {
--- a/src/WireMock.Net/ResponseBuilders/IStatusCodeResponseBuilder.cs
+++ b/src/WireMock.Net/ResponseBuilders/IStatusCodeResponseBuilder.cs
@@ -14,6 +14,13 @@ namespace WireMock.ResponseBuilders
        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
        IResponseBuilder WithStatusCode(int code);

+        /// <summary>
+        /// The with status code.
+        /// </summary>
+        /// <param name="code">The code.</param>
+        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+        IResponseBuilder WithStatusCode(string code);
+
        /// <summary>
        /// The with status code.
        /// </summary>
--- a/src/WireMock.Net/ResponseBuilders/Response.cs
+++ b/src/WireMock.Net/ResponseBuilders/Response.cs
@@ -11,6 +11,7 @@ using WireMock.Http;
 using WireMock.ResponseProviders;
 using WireMock.Settings;
 using WireMock.Transformers;
+using WireMock.Types;
 using WireMock.Util;
 using WireMock.Validation;

@@ -87,11 +88,7 @@ namespace WireMock.ResponseBuilders
            ResponseMessage = responseMessage;
        }

-        /// <summary>
-        /// The with status code.
-        /// </summary>
-        /// <param name="code">The code.</param>
-        /// <returns>A <see cref="IResponseBuilder"/>.</returns>\
+        /// <inheritdoc cref="IStatusCodeResponseBuilder.WithStatusCode(int)"/>
        [PublicAPI]
        public IResponseBuilder WithStatusCode(int code)
        {
@@ -99,11 +96,15 @@ namespace WireMock.ResponseBuilders
            return this;
        }

-        /// <summary>
-        /// The with status code.
-        /// </summary>
-        /// <param name="code">The code.</param>
-        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+        /// <inheritdoc cref="IStatusCodeResponseBuilder.WithStatusCode(string)"/>
+        [PublicAPI]
+        public IResponseBuilder WithStatusCode(string code)
+        {
+            ResponseMessage.StatusCode = code;
+            return this;
+        }
+
+        /// <inheritdoc cref="IStatusCodeResponseBuilder.WithStatusCode(HttpStatusCode)"/>
        [PublicAPI]
        public IResponseBuilder WithStatusCode(HttpStatusCode code)
        {
@@ -252,7 +253,7 @@ namespace WireMock.ResponseBuilders

                case BodyDestinationFormat.Json:
                    ResponseMessage.BodyData.DetectedBodyType = BodyType.Json;
-                    ResponseMessage.BodyData.BodyAsJson = JsonConvert.DeserializeObject(body);
+                    ResponseMessage.BodyData.BodyAsJson = JsonUtils.DeserializeObject(body);
                    break;

                default:
@@ -287,23 +288,6 @@ namespace WireMock.ResponseBuilders
            return WithBodyAsJson(body, null, indented);
        }

-        /// <inheritdoc cref="IBodyResponseBuilder.WithBodyFromBase64"/>
-        public IResponseBuilder WithBodyFromBase64(string bodyAsBase64, Encoding encoding = null)
-        {
-            Check.NotNull(bodyAsBase64, nameof(bodyAsBase64));
-
-            encoding = encoding ?? Encoding.UTF8;
-
-            ResponseMessage.BodyData = new BodyData
-            {
-                Encoding = encoding,
-                DetectedBodyType = BodyType.String,
-                BodyAsString = encoding.GetString(Convert.FromBase64String(bodyAsBase64))
-            };
-
-            return this;
-        }
-
        /// <inheritdoc cref="ITransformResponseBuilder.WithTransformer(bool)"/>
        public IResponseBuilder WithTransformer(bool transformContentFromBodyAsFile = false)
        {
@@ -346,8 +330,8 @@ namespace WireMock.ResponseBuilders
            return this;
        }

-        /// <inheritdoc cref="IResponseProvider.ProvideResponseAsync(RequestMessage, IFluentMockServerSettings)"/>
-        public async Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage, IFluentMockServerSettings settings)
+        /// <inheritdoc cref="IResponseProvider.ProvideResponseAsync(RequestMessage, IWireMockServerSettings)"/>
+        public async Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
        {
            Check.NotNull(requestMessage, nameof(requestMessage));
            Check.NotNull(settings, nameof(settings));
--- a/src/WireMock.Net/ResponseMessage.cs
+++ b/src/WireMock.Net/ResponseMessage.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using WireMock.ResponseBuilders;
+using WireMock.Types;
 using WireMock.Util;
 using WireMock.Validation;

@@ -19,7 +20,7 @@ namespace WireMock
        /// <summary>
        /// Gets or sets the status code.
        /// </summary>
-        public int StatusCode { get; set; } = 200;
+        public object StatusCode { get; set; } = 200;

        /// <summary>
        /// Gets or sets the body.
--- a/src/WireMock.Net/ResponseMessageBuilder.cs
+++ b/src/WireMock.Net/ResponseMessageBuilder.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using WireMock.Admin.Mappings;
 using WireMock.Http;
+using WireMock.Types;
 using WireMock.Util;

 namespace WireMock
--- a/src/WireMock.Net/ResponseProviders/DynamicAsyncResponseProvider.cs
+++ b/src/WireMock.Net/ResponseProviders/DynamicAsyncResponseProvider.cs
@@ -13,7 +13,7 @@ namespace WireMock.ResponseProviders
            _responseMessageFunc = responseMessageFunc;
        }

-        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage, IFluentMockServerSettings settings)
+        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
        {
            return _responseMessageFunc(requestMessage);
        }
--- a/src/WireMock.Net/ResponseProviders/DynamicResponseProvider.cs
+++ b/src/WireMock.Net/ResponseProviders/DynamicResponseProvider.cs
@@ -13,7 +13,7 @@ namespace WireMock.ResponseProviders
            _responseMessageFunc = responseMessageFunc;
        }

-        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage, IFluentMockServerSettings settings)
+        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
        {
            return Task.FromResult(_responseMessageFunc(requestMessage));
        }
--- a/src/WireMock.Net/ResponseProviders/IResponseProvider.cs
+++ b/src/WireMock.Net/ResponseProviders/IResponseProvider.cs
@@ -13,8 +13,8 @@ namespace WireMock.ResponseProviders
        /// The provide response.
        /// </summary>
        /// <param name="requestMessage">The request.</param>
-        /// <param name="settings">The FluentMockServerSettings.</param>
+        /// <param name="settings">The WireMockServerSettings.</param>
        /// <returns>The <see cref="ResponseMessage"/>.</returns>
-        Task<ResponseMessage> ProvideResponseAsync([NotNull] RequestMessage requestMessage, [NotNull] IFluentMockServerSettings settings);
+        Task<ResponseMessage> ProvideResponseAsync([NotNull] RequestMessage requestMessage, [NotNull] IWireMockServerSettings settings);
    }
 }
--- a/src/WireMock.Net/ResponseProviders/ProxyAsyncResponseProvider.cs
+++ b/src/WireMock.Net/ResponseProviders/ProxyAsyncResponseProvider.cs
@@ -6,16 +6,16 @@ namespace WireMock.ResponseProviders
 {
    internal class ProxyAsyncResponseProvider : IResponseProvider
    {
-        private readonly Func<RequestMessage, IFluentMockServerSettings, Task<ResponseMessage>> _responseMessageFunc;
-        private readonly IFluentMockServerSettings _settings;
+        private readonly Func<RequestMessage, IWireMockServerSettings, Task<ResponseMessage>> _responseMessageFunc;
+        private readonly IWireMockServerSettings _settings;

-        public ProxyAsyncResponseProvider(Func<RequestMessage, IFluentMockServerSettings, Task<ResponseMessage>> responseMessageFunc, IFluentMockServerSettings settings)
+        public ProxyAsyncResponseProvider(Func<RequestMessage, IWireMockServerSettings, Task<ResponseMessage>> responseMessageFunc, IWireMockServerSettings settings)
        {
            _responseMessageFunc = responseMessageFunc;
            _settings = settings;
        }

-        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage, IFluentMockServerSettings settings)
+        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
        {
            return _responseMessageFunc(requestMessage, _settings);
        }
--- a/src/WireMock.Net/Serialization/LogEntryMapper.cs
+++ b/src/WireMock.Net/Serialization/LogEntryMapper.cs
@@ -2,6 +2,7 @@
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Requests;
 using WireMock.Logging;
+using WireMock.Types;
 using WireMock.ResponseBuilders;
 using WireMock.Util;

--- a/src/WireMock.Net/Serialization/MappingConverter.cs
+++ b/src/WireMock.Net/Serialization/MappingConverter.cs
@@ -5,7 +5,7 @@ using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Settings;
-using WireMock.Util;
+using WireMock.Types;
 using WireMock.Validation;

 namespace WireMock.Serialization
--- a/src/WireMock.Net/Serialization/MatcherMapper.cs
+++ b/src/WireMock.Net/Serialization/MatcherMapper.cs
@@ -12,9 +12,9 @@ namespace WireMock.Serialization
 {
    internal class MatcherMapper
    {
-        private readonly IFluentMockServerSettings _settings;
+        private readonly IWireMockServerSettings _settings;

-        public MatcherMapper(IFluentMockServerSettings settings)
+        public MatcherMapper(IWireMockServerSettings settings)
        {
            Check.NotNull(settings, nameof(settings));
            _settings = settings;
@@ -47,7 +47,7 @@ namespace WireMock.Serialization
                        return new CSharpCodeMatcher(matchBehaviour, stringPatterns);
                    }

-                    throw new NotSupportedException("It's not allowed to use the 'CSharpCodeMatcher' because FluentMockServerSettings.AllowCSharpCodeMatcher is not set to 'true'.");
+                    throw new NotSupportedException("It's not allowed to use the 'CSharpCodeMatcher' because IWireMockServerSettings.AllowCSharpCodeMatcher is not set to 'true'.");

                case "LinqMatcher":
                    return new LinqMatcher(matchBehaviour, stringPatterns);
--- a/src/WireMock.Net/Server/FluentMockServer.cs
+++ b/src/WireMock.Net/Server/FluentMockServer.cs
@@ -1,478 +1,11 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using JetBrains.Annotations;
-using Newtonsoft.Json;
-using WireMock.Admin.Mappings;
-using WireMock.Exceptions;
-using WireMock.Handlers;
-using WireMock.Logging;
-using WireMock.Matchers;
-using WireMock.Matchers.Request;
-using WireMock.Owin;
-using WireMock.RequestBuilders;
-using WireMock.ResponseProviders;
-using WireMock.Serialization;
-using WireMock.Settings;
-using WireMock.Util;
-using WireMock.Validation;
-
-namespace WireMock.Server
-{
-    /// <summary>
-    /// The fluent mock server.
-    /// </summary>
-    public partial class FluentMockServer : IDisposable
-    {
-        private const int ServerStartDelayInMs = 100;
-
-        private readonly IFluentMockServerSettings _settings;
-        private readonly IOwinSelfHost _httpServer;
-        private readonly IWireMockMiddlewareOptions _options = new WireMockMiddlewareOptions();
-        private readonly MappingConverter _mappingConverter;
-        private readonly MatcherMapper _matcherMapper;
-
-        /// <summary>
-        /// Gets a value indicating whether this server is started.
-        /// </summary>
-        [PublicAPI]
-        public bool IsStarted => _httpServer != null && _httpServer.IsStarted;
-
-        /// <summary>
-        /// Gets the ports.
-        /// </summary>
-        [PublicAPI]
-        public List<int> Ports { get; }
-
-        /// <summary>
-        /// Gets the urls.
-        /// </summary>
-        [PublicAPI]
-        public string[] Urls { get; }
-
-        /// <summary>
-        /// Gets the mappings.
-        /// </summary>
-        [PublicAPI]
-        public IEnumerable<IMapping> Mappings => _options.Mappings.Values.ToArray();
-
-        /// <summary>
-        /// Gets the mappings as MappingModels.
-        /// </summary>
-        [PublicAPI]
-        public IEnumerable<MappingModel> MappingModels => ToMappingModels();
-
-        /// <summary>
-        /// Gets the scenarios.
-        /// </summary>
-        [PublicAPI]
-        public ConcurrentDictionary<string, ScenarioState> Scenarios => new ConcurrentDictionary<string, ScenarioState>(_options.Scenarios);
-
-        #region IDisposable Members
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Releases unmanaged and - optionally - managed resources.
-        /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (_httpServer != null)
-            {
-                _httpServer.StopAsync();
-            }
-        }
-        #endregion
-
-        #region Start/Stop
-        /// <summary>
-        /// Starts the specified settings.
-        /// </summary>
-        /// <param name="settings">The FluentMockServerSettings.</param>
-        /// <returns>The <see cref="FluentMockServer"/>.</returns>
-        [PublicAPI]
-        public static FluentMockServer Start([NotNull] IFluentMockServerSettings settings)
-        {
-            Check.NotNull(settings, nameof(settings));
-
-            return new FluentMockServer(settings);
-        }
-
-        /// <summary>
-        /// Start this FluentMockServer.
-        /// </summary>
-        /// <param name="port">The port.</param>
-        /// <param name="ssl">The SSL support.</param>
-        /// <returns>The <see cref="FluentMockServer"/>.</returns>
-        [PublicAPI]
-        public static FluentMockServer Start([CanBeNull] int? port = 0, bool ssl = false)
-        {
-            return new FluentMockServer(new FluentMockServerSettings
-            {
-                Port = port,
-                UseSSL = ssl
-            });
-        }
-
-        /// <summary>
-        /// Start this FluentMockServer.
-        /// </summary>
-        /// <param name="urls">The urls to listen on.</param>
-        /// <returns>The <see cref="FluentMockServer"/>.</returns>
-        [PublicAPI]
-        public static FluentMockServer Start(params string[] urls)
-        {
-            Check.NotNullOrEmpty(urls, nameof(urls));
-
-            return new FluentMockServer(new FluentMockServerSettings
-            {
-                Urls = urls
-            });
-        }
-
-        /// <summary>
-        /// Start this FluentMockServer with the admin interface.
-        /// </summary>
-        /// <param name="port">The port.</param>
-        /// <param name="ssl">The SSL support.</param>
-        /// <returns>The <see cref="FluentMockServer"/>.</returns>
-        [PublicAPI]
-        public static FluentMockServer StartWithAdminInterface(int? port = 0, bool ssl = false)
-        {
-            return new FluentMockServer(new FluentMockServerSettings
-            {
-                Port = port,
-                UseSSL = ssl,
-                StartAdminInterface = true
-            });
-        }
-
-        /// <summary>
-        /// Start this FluentMockServer with the admin interface.
-        /// </summary>
-        /// <param name="urls">The urls.</param>
-        /// <returns>The <see cref="FluentMockServer"/>.</returns>
-        [PublicAPI]
-        public static FluentMockServer StartWithAdminInterface(params string[] urls)
-        {
-            Check.NotNullOrEmpty(urls, nameof(urls));
-
-            return new FluentMockServer(new FluentMockServerSettings
-            {
-                Urls = urls,
-                StartAdminInterface = true
-            });
-        }
-
-        /// <summary>
-        /// Start this FluentMockServer with the admin interface and read static mappings.
-        /// </summary>
-        /// <param name="urls">The urls.</param>
-        /// <returns>The <see cref="FluentMockServer"/>.</returns>
-        [PublicAPI]
-        public static FluentMockServer StartWithAdminInterfaceAndReadStaticMappings(params string[] urls)
-        {
-            Check.NotNullOrEmpty(urls, nameof(urls));
-
-            return new FluentMockServer(new FluentMockServerSettings
-            {
-                Urls = urls,
-                StartAdminInterface = true,
-                ReadStaticMappings = true
-            });
-        }
-
-        private FluentMockServer(IFluentMockServerSettings settings)
-        {
-            _settings = settings;
-
-            // Set default values if not provided
-            _settings.Logger = settings.Logger ?? new WireMockNullLogger();
-            _settings.FileSystemHandler = settings.FileSystemHandler ?? new LocalFileSystemHandler();
-
-            _settings.Logger.Info("WireMock.Net by Stef Heyenrath (https://github.com/WireMock-Net/WireMock.Net)");
-            _settings.Logger.Debug("WireMock.Net server settings {0}", JsonConvert.SerializeObject(settings, Formatting.Indented));
-
-            if (settings.Urls != null)
-            {
-                Urls = settings.Urls.ToArray();
-            }
-            else
-            {
-                int port = settings.Port > 0 ? settings.Port.Value : PortUtils.FindFreeTcpPort();
-                Urls = new[] { $"{(settings.UseSSL == true ? "https" : "http")}://localhost:{port}" };
-            }
-
-            _options.FileSystemHandler = _settings.FileSystemHandler;
-            _options.PreWireMockMiddlewareInit = settings.PreWireMockMiddlewareInit;
-            _options.PostWireMockMiddlewareInit = settings.PostWireMockMiddlewareInit;
-            _options.Logger = _settings.Logger;
-
-            _matcherMapper = new MatcherMapper(_settings);
-            _mappingConverter = new MappingConverter(_matcherMapper);
-
-#if USE_ASPNETCORE
-            _httpServer = new AspNetCoreSelfHost(_options, Urls);
-#else
-            _httpServer = new OwinSelfHost(_options, Urls);
-#endif
-            Ports = _httpServer.Ports;
-
-            var startTask = _httpServer.StartAsync();
-
-            using (var ctsStartTimeout = new CancellationTokenSource(settings.StartTimeout))
-            {
-                while (!_httpServer.IsStarted)
-                {
-                    // Throw exception if service start fails
-                    if (_httpServer.RunningException != null)
-                    {
-                        throw new WireMockException($"Service start failed with error: {_httpServer.RunningException.Message}", _httpServer.RunningException);
-                    }
-
-                    if (ctsStartTimeout.IsCancellationRequested)
-                    {
-                        // In case of an aggregate exception, throw the exception.
-                        if (startTask.Exception != null)
-                        {
-                            throw new WireMockException($"Service start failed with error: {startTask.Exception.Message}", startTask.Exception);
-                        }
-
-                        // Else throw TimeoutException
-                        throw new TimeoutException($"Service start timed out after {TimeSpan.FromMilliseconds(settings.StartTimeout)}");
-                    }
-
-                    ctsStartTimeout.Token.WaitHandle.WaitOne(ServerStartDelayInMs);
-                }
-            }
-
-            if (settings.AllowBodyForAllHttpMethods == true)
-            {
-                _options.AllowBodyForAllHttpMethods = _settings.AllowBodyForAllHttpMethods;
-                _settings.Logger.Info("AllowBodyForAllHttpMethods is set to {0}", _settings.AllowBodyForAllHttpMethods == true);
-            }
-
-            if (settings.AllowPartialMapping == true)
-            {
-                AllowPartialMapping();
-            }
-
-            if (settings.StartAdminInterface == true)
-            {
-                if (!string.IsNullOrEmpty(settings.AdminUsername) && !string.IsNullOrEmpty(settings.AdminPassword))
-                {
-                    SetBasicAuthentication(settings.AdminUsername, settings.AdminPassword);
-                }
-
-                InitAdmin();
-            }
-
-            if (settings.ReadStaticMappings == true)
-            {
-                ReadStaticMappings();
-            }
-
-            if (settings.WatchStaticMappings == true)
-            {
-                WatchStaticMappings();
-            }
-
-            if (settings.ProxyAndRecordSettings != null)
-            {
-                InitProxyAndRecord(settings);
-            }
-
-            if (settings.RequestLogExpirationDuration != null)
-            {
-                SetRequestLogExpirationDuration(settings.RequestLogExpirationDuration);
-            }
-
-            if (settings.MaxRequestLogCount != null)
-            {
-                SetMaxRequestLogCount(settings.MaxRequestLogCount);
-            }
-        }
-
-        /// <summary>
-        /// Stop this server.
-        /// </summary>
-        [PublicAPI]
-        public void Stop()
-        {
-            var result = _httpServer?.StopAsync();
-            result?.Wait(); // wait for stop to actually happen
-        }
-        #endregion
-
-        /// <summary>
-        /// Adds the catch all mapping.
-        /// </summary>
-        [PublicAPI]
-        public void AddCatchAllMapping()
-        {
-            Given(Request.Create().WithPath("/*").UsingAnyMethod())
-                .WithGuid(Guid.Parse("90008000-0000-4444-a17e-669cd84f1f05"))
-                .AtPriority(1000)
-                .RespondWith(new DynamicResponseProvider(request => ResponseMessageBuilder.Create("No matching mapping found", 404)));
-        }
-
-        /// <summary>
-        /// Resets LogEntries and Mappings.
-        /// </summary>
-        [PublicAPI]
-        public void Reset()
-        {
-            ResetLogEntries();
-
-            ResetMappings();
-        }
-
-        /// <summary>
-        /// Resets the Mappings.
-        /// </summary>
-        [PublicAPI]
-        public void ResetMappings()
-        {
-            foreach (var nonAdmin in _options.Mappings.ToArray().Where(m => !m.Value.IsAdminInterface))
-            {
-                _options.Mappings.TryRemove(nonAdmin.Key, out _);
-            }
-        }
-
-        /// <summary>
-        /// Deletes the mapping.
-        /// </summary>
-        /// <param name="guid">The unique identifier.</param>
-        [PublicAPI]
-        public bool DeleteMapping(Guid guid)
-        {
-            // Check a mapping exists with the same GUID, if so, remove it.
-            if (_options.Mappings.ContainsKey(guid))
-            {
-                return _options.Mappings.TryRemove(guid, out _);
-            }
-
-            return false;
-        }
-
-        private bool DeleteMapping(string path)
-        {
-            // Check a mapping exists with the same path, if so, remove it.
-            var mapping = _options.Mappings.ToArray().FirstOrDefault(entry => string.Equals(entry.Value.Path, path, StringComparison.OrdinalIgnoreCase));
-            return DeleteMapping(mapping.Key);
-        }
-
-        /// <summary>
-        /// The add request processing delay.
-        /// </summary>
-        /// <param name="delay">The delay.</param>
-        [PublicAPI]
-        public void AddGlobalProcessingDelay(TimeSpan delay)
-        {
-            _options.RequestProcessingDelay = delay;
-        }
-
-        /// <summary>
-        /// Allows the partial mapping.
-        /// </summary>
-        [PublicAPI]
-        public void AllowPartialMapping(bool allow = true)
-        {
-            _settings.Logger.Info("AllowPartialMapping is set to {0}", allow);
-            _options.AllowPartialMapping = allow;
-        }
-
-        /// <summary>
-        /// Sets the basic authentication.
-        /// </summary>
-        /// <param name="username">The username.</param>
-        /// <param name="password">The password.</param>
-        [PublicAPI]
-        public void SetBasicAuthentication([NotNull] string username, [NotNull] string password)
-        {
-            Check.NotNull(username, nameof(username));
-            Check.NotNull(password, nameof(password));
-
-            string authorization = Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes(username + ":" + password));
-            _options.AuthorizationMatcher = new RegexMatcher(MatchBehaviour.AcceptOnMatch, "^(?i)BASIC " + authorization + "$");
-        }
-
-        /// <summary>
-        /// Removes the basic authentication.
-        /// </summary>
-        [PublicAPI]
-        public void RemoveBasicAuthentication()
-        {
-            _options.AuthorizationMatcher = null;
-        }
-
-        /// <summary>
-        /// Sets the maximum RequestLog count.
-        /// </summary>
-        /// <param name="maxRequestLogCount">The maximum RequestLog count.</param>
-        [PublicAPI]
-        public void SetMaxRequestLogCount([CanBeNull] int? maxRequestLogCount)
-        {
-            _options.MaxRequestLogCount = maxRequestLogCount;
-        }
-
-        /// <summary>
-        /// Sets RequestLog expiration in hours.
-        /// </summary>
-        /// <param name="requestLogExpirationDuration">The RequestLog expiration in hours.</param>
-        [PublicAPI]
-        public void SetRequestLogExpirationDuration([CanBeNull] int? requestLogExpirationDuration)
-        {
-            _options.RequestLogExpirationDuration = requestLogExpirationDuration;
-        }
-
-        /// <summary>
-        /// Resets the Scenarios.
-        /// </summary>
-        [PublicAPI]
-        public void ResetScenarios()
-        {
-            _options.Scenarios.Clear();
-        }
-
-        /// <summary>
-        /// The given.
-        /// </summary>
-        /// <param name="requestMatcher">The request matcher.</param>
-        /// <param name="saveToFile">Optional boolean to indicate if this mapping should be saved as static mapping file.</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        [PublicAPI]
-        public IRespondWithAProvider Given(IRequestMatcher requestMatcher, bool saveToFile = false)
-        {
-            return new RespondWithAProvider(RegisterMapping, requestMatcher, _settings, saveToFile);
-        }
-
-        private void RegisterMapping(IMapping mapping, bool saveToFile)
-        {
-            // Check a mapping exists with the same Guid, if so, replace it.
-            if (_options.Mappings.ContainsKey(mapping.Guid))
-            {
-                _options.Mappings[mapping.Guid] = mapping;
-            }
-            else
-            {
-                _options.Mappings.TryAdd(mapping.Guid, mapping);
-            }
-
-            if (saveToFile)
-            {
-                SaveMappingToFile(mapping);
-            }
-        }
-    }
+using WireMock.Settings;
+
+namespace WireMock.Server
+{
+    public class FluentMockServer : WireMockServer
+    {
+        public FluentMockServer(IFluentMockServerSettings settings) : base((IWireMockServerSettings) settings)
+        {
+        }
+    }
 }
--- a/src/WireMock.Net/Server/RespondWithAProvider.cs
+++ b/src/WireMock.Net/Server/RespondWithAProvider.cs
@@ -18,7 +18,7 @@ namespace WireMock.Server
        private string _scenario;
        private readonly RegistrationCallback _registrationCallback;
        private readonly IRequestMatcher _requestMatcher;
-        private readonly IFluentMockServerSettings _settings;
+        private readonly IWireMockServerSettings _settings;
        private readonly bool _saveToFile;

        public Guid Guid { get; private set; } = Guid.NewGuid();
@@ -28,9 +28,9 @@ namespace WireMock.Server
        /// </summary>
        /// <param name="registrationCallback">The registration callback.</param>
        /// <param name="requestMatcher">The request matcher.</param>
-        /// <param name="settings">The FluentMockServerSettings.</param>
+        /// <param name="settings">The WireMockServerSettings.</param>
        /// <param name="saveToFile">Optional boolean to indicate if this mapping should be saved as static mapping file.</param>
-        public RespondWithAProvider(RegistrationCallback registrationCallback, IRequestMatcher requestMatcher, IFluentMockServerSettings settings, bool saveToFile = false)
+        public RespondWithAProvider(RegistrationCallback registrationCallback, IRequestMatcher requestMatcher, IWireMockServerSettings settings, bool saveToFile = false)
        {
            _registrationCallback = registrationCallback;
            _requestMatcher = requestMatcher;
--- a/src/WireMock.Net/Server/FluentMockServer.Admin.cs
+++ b/src/WireMock.Net/Server/FluentMockServer.Admin.cs
@@ -1,13 +1,14 @@
+using JetBrains.Annotations;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Scenarios;
 using WireMock.Admin.Settings;
@@ -20,6 +21,7 @@ using WireMock.ResponseBuilders;
 using WireMock.ResponseProviders;
 using WireMock.Serialization;
 using WireMock.Settings;
+using WireMock.Types;
 using WireMock.Util;
 using WireMock.Validation;

@@ -28,7 +30,7 @@ namespace WireMock.Server
    /// <summary>
    /// The fluent mock server.
    /// </summary>
-    public partial class FluentMockServer
+    public partial class WireMockServer
    {
        private const int EnhancedFileSystemWatcherTimeoutMs = 1000;
        private const int AdminPriority = int.MinValue;
@@ -179,8 +181,10 @@ namespace WireMock.Server

            _settings.Logger.Info($"Watching folder '{folder}'{includeSubdirectoriesText} for new, updated and deleted MappingFiles.");

-            var watcher = new EnhancedFileSystemWatcher(folder, "*.json", EnhancedFileSystemWatcherTimeoutMs);
-            watcher.IncludeSubdirectories = includeSubdirectories;
+            var watcher = new EnhancedFileSystemWatcher(folder, "*.json", EnhancedFileSystemWatcherTimeoutMs)
+            {
+                IncludeSubdirectories = includeSubdirectories
+            };

            watcher.Created += (sender, args) =>
            {
@@ -229,7 +233,7 @@ namespace WireMock.Server

            if (FileHelper.TryReadMappingFileWithRetryAndDelay(_settings.FileSystemHandler, path, out string value))
            {
-                var mappingModels = DeserializeObjectToArray<MappingModel>(JsonConvert.DeserializeObject(value));
+                var mappingModels = DeserializeObjectToArray<MappingModel>(JsonUtils.DeserializeObject(value));
                foreach (var mappingModel in mappingModels)
                {
                    if (mappingModels.Length == 1 && Guid.TryParse(filenameWithoutExtension, out Guid guidFromFilename))
@@ -252,7 +256,7 @@ namespace WireMock.Server
        #region Proxy and Record
        private HttpClient _httpClientForProxy;

-        private void InitProxyAndRecord(IFluentMockServerSettings settings)
+        private void InitProxyAndRecord(IWireMockServerSettings settings)
        {
            _httpClientForProxy = HttpClientHelper.CreateHttpClient(settings.ProxyAndRecordSettings);

@@ -265,7 +269,7 @@ namespace WireMock.Server
            respondProvider.RespondWith(new ProxyAsyncResponseProvider(ProxyAndRecordAsync, settings));
        }

-        private async Task<ResponseMessage> ProxyAndRecordAsync(RequestMessage requestMessage, IFluentMockServerSettings settings)
+        private async Task<ResponseMessage> ProxyAndRecordAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
        {
            var requestUri = new Uri(requestMessage.Url);
            var proxyUri = new Uri(settings.ProxyAndRecordSettings.Url);
@@ -487,12 +491,12 @@ namespace WireMock.Server
            }
            catch (ArgumentException a)
            {
-                _settings.Logger.Error("HttpStatusCode set to 400 {0}", a);
+                _settings.Logger.Error("HttpStatusCode set to 400", a);
                return ResponseMessageBuilder.Create(a.Message, 400);
            }
            catch (Exception e)
            {
-                _settings.Logger.Error("HttpStatusCode set to 500 {0}", e);
+                _settings.Logger.Error("HttpStatusCode set to 500", e);
                return ResponseMessageBuilder.Create(e.ToString(), 500);
            }
        }
@@ -805,9 +809,17 @@ namespace WireMock.Server
                return responseBuilder.WithProxy(proxyAndRecordSettings);
            }

-            if (responseModel.StatusCode.HasValue)
+            if (responseModel.StatusCode is string statusCodeAsString)
            {
-                responseBuilder = responseBuilder.WithStatusCode(responseModel.StatusCode.Value);
+                responseBuilder = responseBuilder.WithStatusCode(statusCodeAsString);
+            }
+            else if (responseModel.StatusCode is int statusCodeAsInt && statusCodeAsInt > 0)
+            {
+                responseBuilder = responseBuilder.WithStatusCode(statusCodeAsInt);
+            }
+            else
+            {
+                responseBuilder = responseBuilder.WithStatusCode(HttpStatusCode.OK);
            }

            if (responseModel.Headers != null)
@@ -842,10 +854,6 @@ namespace WireMock.Server
            {
                responseBuilder = responseBuilder.WithBodyAsJson(responseModel.BodyAsJson, ToEncoding(responseModel.BodyEncoding), responseModel.BodyAsJsonIndented == true);
            }
-            else if (responseModel.BodyFromBase64 != null)
-            {
-                responseBuilder = responseBuilder.WithBodyFromBase64(responseModel.BodyFromBase64, ToEncoding(responseModel.BodyEncoding));
-            }
            else if (responseModel.BodyAsFile != null)
            {
                responseBuilder = responseBuilder.WithBodyFromFile(responseModel.BodyAsFile);
@@ -882,7 +890,7 @@ namespace WireMock.Server
        {
            if (requestMessage?.BodyData?.DetectedBodyType == BodyType.String)
            {
-                return JsonConvert.DeserializeObject<T>(requestMessage.BodyData.BodyAsString);
+                return JsonUtils.DeserializeObject<T>(requestMessage.BodyData.BodyAsString);
            }

            if (requestMessage?.BodyData?.DetectedBodyType == BodyType.Json)
--- a/src/WireMock.Net/Server/FluentMockServer.AdminFiles.cs
+++ b/src/WireMock.Net/Server/FluentMockServer.AdminFiles.cs
@@ -2,11 +2,12 @@
 using System.Linq;
 using System.Text;
 using WireMock.Matchers;
+using WireMock.Types;
 using WireMock.Util;

 namespace WireMock.Server
 {
-    public partial class FluentMockServer
+    public partial class WireMockServer
    {
        private readonly RegexMatcher _adminFilesFilenamePathMatcher = new RegexMatcher(MatchBehaviour.AcceptOnMatch, @"^\/__admin\/files\/.*$");
        private static readonly Encoding[] FileBodyIsString = { Encoding.UTF8, Encoding.ASCII };
--- a/src/WireMock.Net/Server/FluentMockServer.LogEntries.cs
+++ b/src/WireMock.Net/Server/FluentMockServer.LogEntries.cs
@@ -1,100 +1,100 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Linq;
-using JetBrains.Annotations;
-using WireMock.Logging;
-using WireMock.Matchers;
-using WireMock.Matchers.Request;
-
-namespace WireMock.Server
-{
-    public partial class FluentMockServer
-    {
-        /// <summary>
-        /// Occurs when [log entries changed].
-        /// </summary>
-        [PublicAPI]
-        public event NotifyCollectionChangedEventHandler LogEntriesChanged
-        {
-            add
-            {
-                _options.LogEntries.CollectionChanged += (sender, eventRecordArgs) =>
-                {
-                    try
-                    {
-                        value(sender, eventRecordArgs);
-                    }
-                    catch (Exception exception)
-                    {
-                        _options.Logger.Error("Error calling the LogEntriesChanged event handler: {0}", exception.Message);
-                    }
-                };
-            }
-
-            remove => _options.LogEntries.CollectionChanged -= value;
-        }
-
-        /// <summary>
-        /// Gets the request logs.
-        /// </summary>
-        [PublicAPI]
-        public IEnumerable<LogEntry> LogEntries => new ReadOnlyCollection<LogEntry>(_options.LogEntries.ToList());
-
-        /// <summary>
-        /// The search log-entries based on matchers.
-        /// </summary>
-        /// <param name="matchers">The matchers.</param>
-        /// <returns>The <see cref="IEnumerable"/>.</returns>
-        [PublicAPI]
-        public IEnumerable<LogEntry> FindLogEntries([NotNull] params IRequestMatcher[] matchers)
-        {
-            var results = new Dictionary<LogEntry, RequestMatchResult>();
-
-            foreach (var log in _options.LogEntries.ToList())
-            {
-                var requestMatchResult = new RequestMatchResult();
-                foreach (var matcher in matchers)
-                {
-                    matcher.GetMatchingScore(log.RequestMessage, requestMatchResult);
-                }
-
-                if (requestMatchResult.AverageTotalScore > MatchScores.AlmostPerfect)
-                {
-                    results.Add(log, requestMatchResult);
-                }
-            }
-
-            return new ReadOnlyCollection<LogEntry>(results.OrderBy(x => x.Value).Select(x => x.Key).ToList());
-        }
-
-        /// <summary>
-        /// Resets the LogEntries.
-        /// </summary>
-        [PublicAPI]
-        public void ResetLogEntries()
-        {
-            _options.LogEntries.Clear();
-        }
-
-        /// <summary>
-        /// Deletes a LogEntry.
-        /// </summary>
-        /// <param name="guid">The unique identifier.</param>
-        [PublicAPI]
-        public bool DeleteLogEntry(Guid guid)
-        {
-            // Check a logentry exists with the same GUID, if so, remove it.
-            var existing = _options.LogEntries.ToList().FirstOrDefault(m => m.Guid == guid);
-            if (existing != null)
-            {
-                _options.LogEntries.Remove(existing);
-                return true;
-            }
-
-            return false;
-        }
-    }
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Linq;
+using JetBrains.Annotations;
+using WireMock.Logging;
+using WireMock.Matchers;
+using WireMock.Matchers.Request;
+
+namespace WireMock.Server
+{
+    public partial class WireMockServer
+    {
+        /// <summary>
+        /// Occurs when [log entries changed].
+        /// </summary>
+        [PublicAPI]
+        public event NotifyCollectionChangedEventHandler LogEntriesChanged
+        {
+            add
+            {
+                _options.LogEntries.CollectionChanged += (sender, eventRecordArgs) =>
+                {
+                    try
+                    {
+                        value(sender, eventRecordArgs);
+                    }
+                    catch (Exception exception)
+                    {
+                        _options.Logger.Error("Error calling the LogEntriesChanged event handler: {0}", exception.Message);
+                    }
+                };
+            }
+
+            remove => _options.LogEntries.CollectionChanged -= value;
+        }
+
+        /// <summary>
+        /// Gets the request logs.
+        /// </summary>
+        [PublicAPI]
+        public IEnumerable<LogEntry> LogEntries => new ReadOnlyCollection<LogEntry>(_options.LogEntries.ToList());
+
+        /// <summary>
+        /// The search log-entries based on matchers.
+        /// </summary>
+        /// <param name="matchers">The matchers.</param>
+        /// <returns>The <see cref="IEnumerable"/>.</returns>
+        [PublicAPI]
+        public IEnumerable<LogEntry> FindLogEntries([NotNull] params IRequestMatcher[] matchers)
+        {
+            var results = new Dictionary<LogEntry, RequestMatchResult>();
+
+            foreach (var log in _options.LogEntries.ToList())
+            {
+                var requestMatchResult = new RequestMatchResult();
+                foreach (var matcher in matchers)
+                {
+                    matcher.GetMatchingScore(log.RequestMessage, requestMatchResult);
+                }
+
+                if (requestMatchResult.AverageTotalScore > MatchScores.AlmostPerfect)
+                {
+                    results.Add(log, requestMatchResult);
+                }
+            }
+
+            return new ReadOnlyCollection<LogEntry>(results.OrderBy(x => x.Value).Select(x => x.Key).ToList());
+        }
+
+        /// <summary>
+        /// Resets the LogEntries.
+        /// </summary>
+        [PublicAPI]
+        public void ResetLogEntries()
+        {
+            _options.LogEntries.Clear();
+        }
+
+        /// <summary>
+        /// Deletes a LogEntry.
+        /// </summary>
+        /// <param name="guid">The unique identifier.</param>
+        [PublicAPI]
+        public bool DeleteLogEntry(Guid guid)
+        {
+            // Check a logentry exists with the same GUID, if so, remove it.
+            var existing = _options.LogEntries.ToList().FirstOrDefault(m => m.Guid == guid);
+            if (existing != null)
+            {
+                _options.LogEntries.Remove(existing);
+                return true;
+            }
+
+            return false;
+        }
+    }
 }
--- a/src/WireMock.Net/Server/WireMockServer.cs
+++ b/src/WireMock.Net/Server/WireMockServer.cs
@@ -0,0 +1,477 @@
+using JetBrains.Annotations;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using WireMock.Admin.Mappings;
+using WireMock.Exceptions;
+using WireMock.Handlers;
+using WireMock.Logging;
+using WireMock.Matchers;
+using WireMock.Matchers.Request;
+using WireMock.Owin;
+using WireMock.RequestBuilders;
+using WireMock.ResponseProviders;
+using WireMock.Serialization;
+using WireMock.Settings;
+using WireMock.Util;
+using WireMock.Validation;
+
+namespace WireMock.Server
+{
+    /// <summary>
+    /// The fluent mock server.
+    /// </summary>
+    public partial class WireMockServer : IDisposable
+    {
+        private const int ServerStartDelayInMs = 100;
+
+        private readonly IWireMockServerSettings _settings;
+        private readonly IOwinSelfHost _httpServer;
+        private readonly IWireMockMiddlewareOptions _options = new WireMockMiddlewareOptions();
+        private readonly MappingConverter _mappingConverter;
+        private readonly MatcherMapper _matcherMapper;
+
+        /// <summary>
+        /// Gets a value indicating whether this server is started.
+        /// </summary>
+        [PublicAPI]
+        public bool IsStarted => _httpServer != null && _httpServer.IsStarted;
+
+        /// <summary>
+        /// Gets the ports.
+        /// </summary>
+        [PublicAPI]
+        public List<int> Ports { get; }
+
+        /// <summary>
+        /// Gets the urls.
+        /// </summary>
+        [PublicAPI]
+        public string[] Urls { get; }
+
+        /// <summary>
+        /// Gets the mappings.
+        /// </summary>
+        [PublicAPI]
+        public IEnumerable<IMapping> Mappings => _options.Mappings.Values.ToArray();
+
+        /// <summary>
+        /// Gets the mappings as MappingModels.
+        /// </summary>
+        [PublicAPI]
+        public IEnumerable<MappingModel> MappingModels => ToMappingModels();
+
+        /// <summary>
+        /// Gets the scenarios.
+        /// </summary>
+        [PublicAPI]
+        public ConcurrentDictionary<string, ScenarioState> Scenarios => new ConcurrentDictionary<string, ScenarioState>(_options.Scenarios);
+
+        #region IDisposable Members
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Releases unmanaged and - optionally - managed resources.
+        /// </summary>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_httpServer != null)
+            {
+                _httpServer.StopAsync();
+            }
+        }
+        #endregion
+
+        #region Start/Stop
+        /// <summary>
+        /// Starts the specified settings.
+        /// </summary>
+        /// <param name="settings">The WireMockServerSettings.</param>
+        /// <returns>The <see cref="WireMockServer"/>.</returns>
+        [PublicAPI]
+        public static WireMockServer Start([NotNull] IWireMockServerSettings settings)
+        {
+            Check.NotNull(settings, nameof(settings));
+
+            return new WireMockServer(settings);
+        }
+
+        /// <summary>
+        /// Start this WireMockServer.
+        /// </summary>
+        /// <param name="port">The port.</param>
+        /// <param name="ssl">The SSL support.</param>
+        /// <returns>The <see cref="WireMockServer"/>.</returns>
+        [PublicAPI]
+        public static WireMockServer Start([CanBeNull] int? port = 0, bool ssl = false)
+        {
+            return new WireMockServer(new WireMockServerSettings
+            {
+                Port = port,
+                UseSSL = ssl
+            });
+        }
+
+        /// <summary>
+        /// Start this WireMockServer.
+        /// </summary>
+        /// <param name="urls">The urls to listen on.</param>
+        /// <returns>The <see cref="WireMockServer"/>.</returns>
+        [PublicAPI]
+        public static WireMockServer Start(params string[] urls)
+        {
+            Check.NotNullOrEmpty(urls, nameof(urls));
+
+            return new WireMockServer(new WireMockServerSettings
+            {
+                Urls = urls
+            });
+        }
+
+        /// <summary>
+        /// Start this WireMockServer with the admin interface.
+        /// </summary>
+        /// <param name="port">The port.</param>
+        /// <param name="ssl">The SSL support.</param>
+        /// <returns>The <see cref="WireMockServer"/>.</returns>
+        [PublicAPI]
+        public static WireMockServer StartWithAdminInterface(int? port = 0, bool ssl = false)
+        {
+            return new WireMockServer(new WireMockServerSettings
+            {
+                Port = port,
+                UseSSL = ssl,
+                StartAdminInterface = true
+            });
+        }
+
+        /// <summary>
+        /// Start this WireMockServer with the admin interface.
+        /// </summary>
+        /// <param name="urls">The urls.</param>
+        /// <returns>The <see cref="WireMockServer"/>.</returns>
+        [PublicAPI]
+        public static WireMockServer StartWithAdminInterface(params string[] urls)
+        {
+            Check.NotNullOrEmpty(urls, nameof(urls));
+
+            return new WireMockServer(new WireMockServerSettings
+            {
+                Urls = urls,
+                StartAdminInterface = true
+            });
+        }
+
+        /// <summary>
+        /// Start this WireMockServer with the admin interface and read static mappings.
+        /// </summary>
+        /// <param name="urls">The urls.</param>
+        /// <returns>The <see cref="WireMockServer"/>.</returns>
+        [PublicAPI]
+        public static WireMockServer StartWithAdminInterfaceAndReadStaticMappings(params string[] urls)
+        {
+            Check.NotNullOrEmpty(urls, nameof(urls));
+
+            return new WireMockServer(new WireMockServerSettings
+            {
+                Urls = urls,
+                StartAdminInterface = true,
+                ReadStaticMappings = true
+            });
+        }
+        protected WireMockServer(IWireMockServerSettings settings)
+        {
+            _settings = settings;
+
+            // Set default values if not provided
+            _settings.Logger = settings.Logger ?? new WireMockNullLogger();
+            _settings.FileSystemHandler = settings.FileSystemHandler ?? new LocalFileSystemHandler();
+
+            _settings.Logger.Info("WireMock.Net by Stef Heyenrath (https://github.com/WireMock-Net/WireMock.Net)");
+            _settings.Logger.Debug("WireMock.Net server settings {0}", JsonConvert.SerializeObject(settings, Formatting.Indented));
+
+            if (settings.Urls != null)
+            {
+                Urls = settings.Urls.ToArray();
+            }
+            else
+            {
+                int port = settings.Port > 0 ? settings.Port.Value : PortUtils.FindFreeTcpPort();
+                Urls = new[] { $"{(settings.UseSSL == true ? "https" : "http")}://localhost:{port}" };
+            }
+
+            _options.FileSystemHandler = _settings.FileSystemHandler;
+            _options.PreWireMockMiddlewareInit = settings.PreWireMockMiddlewareInit;
+            _options.PostWireMockMiddlewareInit = settings.PostWireMockMiddlewareInit;
+            _options.Logger = _settings.Logger;
+
+            _matcherMapper = new MatcherMapper(_settings);
+            _mappingConverter = new MappingConverter(_matcherMapper);
+
+#if USE_ASPNETCORE
+            _httpServer = new AspNetCoreSelfHost(_options, Urls);
+#else
+            _httpServer = new OwinSelfHost(_options, Urls);
+#endif
+            Ports = _httpServer.Ports;
+
+            var startTask = _httpServer.StartAsync();
+
+            using (var ctsStartTimeout = new CancellationTokenSource(settings.StartTimeout))
+            {
+                while (!_httpServer.IsStarted)
+                {
+                    // Throw exception if service start fails
+                    if (_httpServer.RunningException != null)
+                    {
+                        throw new WireMockException($"Service start failed with error: {_httpServer.RunningException.Message}", _httpServer.RunningException);
+                    }
+
+                    if (ctsStartTimeout.IsCancellationRequested)
+                    {
+                        // In case of an aggregate exception, throw the exception.
+                        if (startTask.Exception != null)
+                        {
+                            throw new WireMockException($"Service start failed with error: {startTask.Exception.Message}", startTask.Exception);
+                        }
+
+                        // Else throw TimeoutException
+                        throw new TimeoutException($"Service start timed out after {TimeSpan.FromMilliseconds(settings.StartTimeout)}");
+                    }
+
+                    ctsStartTimeout.Token.WaitHandle.WaitOne(ServerStartDelayInMs);
+                }
+            }
+
+            if (settings.AllowBodyForAllHttpMethods == true)
+            {
+                _options.AllowBodyForAllHttpMethods = _settings.AllowBodyForAllHttpMethods;
+                _settings.Logger.Info("AllowBodyForAllHttpMethods is set to {0}", _settings.AllowBodyForAllHttpMethods == true);
+            }
+
+            if (settings.AllowPartialMapping == true)
+            {
+                AllowPartialMapping();
+            }
+
+            if (settings.StartAdminInterface == true)
+            {
+                if (!string.IsNullOrEmpty(settings.AdminUsername) && !string.IsNullOrEmpty(settings.AdminPassword))
+                {
+                    SetBasicAuthentication(settings.AdminUsername, settings.AdminPassword);
+                }
+
+                InitAdmin();
+            }
+
+            if (settings.ReadStaticMappings == true)
+            {
+                ReadStaticMappings();
+            }
+
+            if (settings.WatchStaticMappings == true)
+            {
+                WatchStaticMappings();
+            }
+
+            if (settings.ProxyAndRecordSettings != null)
+            {
+                InitProxyAndRecord(settings);
+            }
+
+            if (settings.RequestLogExpirationDuration != null)
+            {
+                SetRequestLogExpirationDuration(settings.RequestLogExpirationDuration);
+            }
+
+            if (settings.MaxRequestLogCount != null)
+            {
+                SetMaxRequestLogCount(settings.MaxRequestLogCount);
+            }
+        }
+
+        /// <summary>
+        /// Stop this server.
+        /// </summary>
+        [PublicAPI]
+        public void Stop()
+        {
+            var result = _httpServer?.StopAsync();
+            result?.Wait(); // wait for stop to actually happen
+        }
+        #endregion
+
+        /// <summary>
+        /// Adds the catch all mapping.
+        /// </summary>
+        [PublicAPI]
+        public void AddCatchAllMapping()
+        {
+            Given(Request.Create().WithPath("/*").UsingAnyMethod())
+                .WithGuid(Guid.Parse("90008000-0000-4444-a17e-669cd84f1f05"))
+                .AtPriority(1000)
+                .RespondWith(new DynamicResponseProvider(request => ResponseMessageBuilder.Create("No matching mapping found", 404)));
+        }
+
+        /// <summary>
+        /// Resets LogEntries and Mappings.
+        /// </summary>
+        [PublicAPI]
+        public void Reset()
+        {
+            ResetLogEntries();
+
+            ResetMappings();
+        }
+
+        /// <summary>
+        /// Resets the Mappings.
+        /// </summary>
+        [PublicAPI]
+        public void ResetMappings()
+        {
+            foreach (var nonAdmin in _options.Mappings.ToArray().Where(m => !m.Value.IsAdminInterface))
+            {
+                _options.Mappings.TryRemove(nonAdmin.Key, out _);
+            }
+        }
+
+        /// <summary>
+        /// Deletes the mapping.
+        /// </summary>
+        /// <param name="guid">The unique identifier.</param>
+        [PublicAPI]
+        public bool DeleteMapping(Guid guid)
+        {
+            // Check a mapping exists with the same GUID, if so, remove it.
+            if (_options.Mappings.ContainsKey(guid))
+            {
+                return _options.Mappings.TryRemove(guid, out _);
+            }
+
+            return false;
+        }
+
+        private bool DeleteMapping(string path)
+        {
+            // Check a mapping exists with the same path, if so, remove it.
+            var mapping = _options.Mappings.ToArray().FirstOrDefault(entry => string.Equals(entry.Value.Path, path, StringComparison.OrdinalIgnoreCase));
+            return DeleteMapping(mapping.Key);
+        }
+
+        /// <summary>
+        /// The add request processing delay.
+        /// </summary>
+        /// <param name="delay">The delay.</param>
+        [PublicAPI]
+        public void AddGlobalProcessingDelay(TimeSpan delay)
+        {
+            _options.RequestProcessingDelay = delay;
+        }
+
+        /// <summary>
+        /// Allows the partial mapping.
+        /// </summary>
+        [PublicAPI]
+        public void AllowPartialMapping(bool allow = true)
+        {
+            _settings.Logger.Info("AllowPartialMapping is set to {0}", allow);
+            _options.AllowPartialMapping = allow;
+        }
+
+        /// <summary>
+        /// Sets the basic authentication.
+        /// </summary>
+        /// <param name="username">The username.</param>
+        /// <param name="password">The password.</param>
+        [PublicAPI]
+        public void SetBasicAuthentication([NotNull] string username, [NotNull] string password)
+        {
+            Check.NotNull(username, nameof(username));
+            Check.NotNull(password, nameof(password));
+
+            string authorization = Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes(username + ":" + password));
+            _options.AuthorizationMatcher = new RegexMatcher(MatchBehaviour.AcceptOnMatch, "^(?i)BASIC " + authorization + "$");
+        }
+
+        /// <summary>
+        /// Removes the basic authentication.
+        /// </summary>
+        [PublicAPI]
+        public void RemoveBasicAuthentication()
+        {
+            _options.AuthorizationMatcher = null;
+        }
+
+        /// <summary>
+        /// Sets the maximum RequestLog count.
+        /// </summary>
+        /// <param name="maxRequestLogCount">The maximum RequestLog count.</param>
+        [PublicAPI]
+        public void SetMaxRequestLogCount([CanBeNull] int? maxRequestLogCount)
+        {
+            _options.MaxRequestLogCount = maxRequestLogCount;
+        }
+
+        /// <summary>
+        /// Sets RequestLog expiration in hours.
+        /// </summary>
+        /// <param name="requestLogExpirationDuration">The RequestLog expiration in hours.</param>
+        [PublicAPI]
+        public void SetRequestLogExpirationDuration([CanBeNull] int? requestLogExpirationDuration)
+        {
+            _options.RequestLogExpirationDuration = requestLogExpirationDuration;
+        }
+
+        /// <summary>
+        /// Resets the Scenarios.
+        /// </summary>
+        [PublicAPI]
+        public void ResetScenarios()
+        {
+            _options.Scenarios.Clear();
+        }
+
+        /// <summary>
+        /// The given.
+        /// </summary>
+        /// <param name="requestMatcher">The request matcher.</param>
+        /// <param name="saveToFile">Optional boolean to indicate if this mapping should be saved as static mapping file.</param>
+        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+        [PublicAPI]
+        public IRespondWithAProvider Given(IRequestMatcher requestMatcher, bool saveToFile = false)
+        {
+            return new RespondWithAProvider(RegisterMapping, requestMatcher, _settings, saveToFile);
+        }
+
+        private void RegisterMapping(IMapping mapping, bool saveToFile)
+        {
+            // Check a mapping exists with the same Guid, if so, replace it.
+            if (_options.Mappings.ContainsKey(mapping.Guid))
+            {
+                _options.Mappings[mapping.Guid] = mapping;
+            }
+            else
+            {
+                _options.Mappings.TryAdd(mapping.Guid, mapping);
+            }
+
+            if (saveToFile)
+            {
+                SaveMappingToFile(mapping);
+            }
+        }
+    }
+}
--- a/src/WireMock.Net/Settings/FluentMockServerSettings.cs
+++ b/src/WireMock.Net/Settings/FluentMockServerSettings.cs
@@ -1,105 +1,9 @@
-using HandlebarsDotNet;
-using JetBrains.Annotations;
-using Newtonsoft.Json;
-using System;
-using WireMock.Handlers;
-using WireMock.Logging;
-
-namespace WireMock.Settings
+namespace WireMock.Settings
 {
    /// <summary>
    /// FluentMockServerSettings
    /// </summary>
-    public class FluentMockServerSettings : IFluentMockServerSettings
+    public class FluentMockServerSettings : WireMockServerSettings
    {
-        /// <inheritdoc cref="IFluentMockServerSettings.Port"/>
-        [PublicAPI]
-        public int? Port { get; set; }
-
-        /// <inheritdoc cref="IFluentMockServerSettings.UseSSL"/>
-        [PublicAPI]
-        // ReSharper disable once InconsistentNaming
-        public bool? UseSSL { get; set; }
-
-        /// <inheritdoc cref="IFluentMockServerSettings.StartAdminInterface"/>
-        [PublicAPI]
-        public bool? StartAdminInterface { get; set; }
-
-        /// <inheritdoc cref="IFluentMockServerSettings.ReadStaticMappings"/>
-        [PublicAPI]
-        public bool? ReadStaticMappings { get; set; }
-
-        /// <inheritdoc cref="IFluentMockServerSettings.WatchStaticMappings"/>
-        [PublicAPI]
-        public bool? WatchStaticMappings { get; set; }
-
-        /// <inheritdoc cref="IFluentMockServerSettings.WatchStaticMappingsInSubdirectories"/>
-        [PublicAPI]
-        public bool? WatchStaticMappingsInSubdirectories { get; set; }
-
-        /// <inheritdoc cref="IFluentMockServerSettings.ProxyAndRecordSettings"/>
-        [PublicAPI]
-        public IProxyAndRecordSettings ProxyAndRecordSettings { get; set; }
-
-        /// <inheritdoc cref="IFluentMockServerSettings.Urls"/>
-        [PublicAPI]
-        public string[] Urls { get; set; }
-
-        /// <inheritdoc cref="IFluentMockServerSettings.StartTimeout"/>
-        [PublicAPI]
-        public int StartTimeout { get; set; } = 10000;
-
-        /// <inheritdoc cref="IFluentMockServerSettings.AllowPartialMapping"/>
-        [PublicAPI]
-        public bool? AllowPartialMapping { get; set; }
-
-        /// <inheritdoc cref="IFluentMockServerSettings.AdminUsername"/>
-        [PublicAPI]
-        public string AdminUsername { get; set; }
-
-        /// <inheritdoc cref="IFluentMockServerSettings.AdminPassword"/>
-        [PublicAPI]
-        public string AdminPassword { get; set; }
-
-        /// <inheritdoc cref="IFluentMockServerSettings.RequestLogExpirationDuration"/>
-        [PublicAPI]
-        public int? RequestLogExpirationDuration { get; set; }
-
-        /// <inheritdoc cref="IFluentMockServerSettings.MaxRequestLogCount"/>
-        [PublicAPI]
-        public int? MaxRequestLogCount { get; set; }
-
-        /// <inheritdoc cref="IFluentMockServerSettings.PreWireMockMiddlewareInit"/>
-        [PublicAPI]
-        [JsonIgnore]
-        public Action<object> PreWireMockMiddlewareInit { get; set; }
-
-        /// <inheritdoc cref="IFluentMockServerSettings.PostWireMockMiddlewareInit"/>
-        [PublicAPI]
-        [JsonIgnore]
-        public Action<object> PostWireMockMiddlewareInit { get; set; }
-
-        /// <inheritdoc cref="IFluentMockServerSettings.Logger"/>
-        [PublicAPI]
-        [JsonIgnore]
-        public IWireMockLogger Logger { get; set; } = new WireMockNullLogger();
-
-        /// <inheritdoc cref="IFluentMockServerSettings.FileSystemHandler"/>
-        [PublicAPI]
-        [JsonIgnore]
-        public IFileSystemHandler FileSystemHandler { get; set; }
-
-        /// <inheritdoc cref="IFluentMockServerSettings.HandlebarsRegistrationCallback"/>
-        [PublicAPI]
-        [JsonIgnore]
-        public Action<IHandlebars, IFileSystemHandler> HandlebarsRegistrationCallback { get; set; }
-
-        /// <inheritdoc cref="IFluentMockServerSettings.AllowCSharpCodeMatcher"/>
-        [PublicAPI]
-        public bool? AllowCSharpCodeMatcher { get; set; }
-
-        /// <inheritdoc cref="IFluentMockServerSettings.AllowBodyForAllHttpMethods"/>
-        [PublicAPI]
-        public bool? AllowBodyForAllHttpMethods { get; set; }
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stef Heyenrath	29e86abe12	1.1.5.0	2020-01-25 17:58:44 +01:00
Stef Heyenrath	710fc8dcf6	Fixed StatusCode = null or < 0 (#406 ) * . * fix tests * responseModel.StatusCode is int statusCodeAsInt && statusCodeAsInt > 0 * < 0	2020-01-25 17:51:38 +01:00
Stef Heyenrath	dfbfa5fd35	1.1.4.0	2020-01-25 15:28:43 +01:00
Stef Heyenrath	69bbd76ca4	Log Exception (#405 )	2020-01-25 15:25:47 +01:00
Stef Heyenrath	bd0c5a83c9	WireMock.Net.Service	2020-01-25 13:54:09 +01:00
Stef Heyenrath	a08efe2f78	steps:	2020-01-25 12:39:36 +01:00
Stef Heyenrath	6e151098e5	azure-pipelines	2020-01-25 12:29:13 +01:00
Stef Heyenrath	43d481435c	1.1.3	2020-01-22 16:40:10 +01:00
Kashif Jamal Soofi	ea1be6641a	Fix for invalid cast exception (#403 )	2020-01-22 14:27:44 +01:00
Stef Heyenrath	93613885c1	1.1.2.0	2020-01-09 20:18:07 +01:00
Vitaliy Davydiak	caee5895eb	ResponseModel.StatusCode is deserialized as either string or long. (#399 )	2020-01-09 20:15:15 +01:00
Stef Heyenrath	101d755a00	1.1.1.0	2020-01-09 18:04:41 +01:00
Kashif Jamal Soofi	368fdd4c7d	Feature/xpath transformer (#398 ) * XPath transformer, added handlerbars helper to select nodes using xpath and setting the outerxml value in response * Added test to select attribute value and node text * Removed extra empty lines	2020-01-09 17:51:44 +01:00
Stef Heyenrath	3f802c3948	1.1.0.0	2019-12-27 16:13:36 +01:00
Stef Heyenrath	d971144426	WireMock.Net version 1.1.x (#363 ) * refactor * rename api * -preview-01 * logger * move * RandomDataGenerator.Net * . * ISettings * renames... * refactor CommandlineParser logic * remove standalone * Remove Interfaces * Update tests * WireMock.Net.StandAlone * . * fix * . * _settings * Admin * WireMock.Net.Abstractions * fix build * rename WireMockServer * fix compile errors	2019-12-27 16:01:13 +01:00
Stef Heyenrath	368f0e13ac	1.0.43.0	2019-12-26 14:02:19 +01:00
Stef Heyenrath	120a808104	StatusCode as string (#385 ) * StatusCode as string * fix tests * fix test * ReplaceSingleNode * <!--<DelaySign>true</DelaySign>--> * Array * add test * Response_ProvideResponse_Handlebars_WithBodyAsJson_ResultAsHandlebarsString * net461 * . * fix * target frame * BodyAsJson * Response_ProvideResponse_WithStatusCode * fix build * fix test	2019-12-26 13:57:35 +01:00
Stef Heyenrath	b5795713b1	1.0.42.0	2019-12-15 12:19:41 +01:00
Stef Heyenrath	a8c17ce311	#383 (#391 )	2019-12-14 21:37:04 +01:00
Stef Heyenrath	7678e8fb70	1.0.41.0	2019-12-14 12:19:55 +01:00
Stef Heyenrath	8ae0abb023	. (#392 )	2019-12-13 13:21:50 +01:00