diff --git a/examples/WireMock.Net.WebApplication/WireMock.Net.WebApplication.NETCore2.csproj b/examples/WireMock.Net.WebApplication/WireMock.Net.WebApplication.NETCore2.csproj
index ee3458bc..6ffcd759 100644
--- a/examples/WireMock.Net.WebApplication/WireMock.Net.WebApplication.NETCore2.csproj
+++ b/examples/WireMock.Net.WebApplication/WireMock.Net.WebApplication.NETCore2.csproj
@@ -17,7 +17,7 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1'">
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.5" />
+    <PackageReference Include="Microsoft.AspNetCore.All" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
 
diff --git a/src/WireMock.Net.StandAlone/StandAloneApp.cs b/src/WireMock.Net.StandAlone/StandAloneApp.cs
index 1846b153..a2f79c44 100644
--- a/src/WireMock.Net.StandAlone/StandAloneApp.cs
+++ b/src/WireMock.Net.StandAlone/StandAloneApp.cs
@@ -1,15 +1,17 @@
-using System.Linq;
+using System;
+using System.Linq;
+using JetBrains.Annotations;
+using WireMock.Logging;
 using WireMock.Server;
 using WireMock.Settings;
 using WireMock.Validation;
-using JetBrains.Annotations;
-using WireMock.Logging;
 
 namespace WireMock.Net.StandAlone
 {
     /// <summary>
     /// The StandAloneApp
     /// </summary>
+    [Obsolete("This class will be removed in version 1.1.0")]
     public static class StandAloneApp
     {
         /// <summary>
@@ -17,6 +19,7 @@ namespace WireMock.Net.StandAlone
         /// </summary>
         /// <param name="settings">The FluentMockServerSettings</param>
         [PublicAPI]
+        [Obsolete("Will be replaced by WireMockServer.Start(settings) in version 1.1.0")]
         public static FluentMockServer Start([NotNull] IFluentMockServerSettings settings)
         {
             Check.NotNull(settings, nameof(settings));
@@ -34,6 +37,7 @@ namespace WireMock.Net.StandAlone
         /// <param name="args">The commandline arguments</param>
         /// <param name="logger">The logger</param>
         [PublicAPI]
+        [Obsolete("Will be replaced by `var settings = WireMockServerSettingsParser.ParseArguments(args, logger); WireMockServer.Start(settings);` in version 1.1.0")]
         public static FluentMockServer Start([NotNull] string[] args, [CanBeNull] IWireMockLogger logger = null)
         {
             Check.NotNull(args, nameof(args));
diff --git a/src/WireMock.Net/Server/FluentMockServer.cs b/src/WireMock.Net/Server/FluentMockServer.cs
index 5cff8671..63e36bc3 100644
--- a/src/WireMock.Net/Server/FluentMockServer.cs
+++ b/src/WireMock.Net/Server/FluentMockServer.cs
@@ -25,6 +25,7 @@ namespace WireMock.Server
     /// <summary>
     /// The fluent mock server.
     /// </summary>
+    [Obsolete("Will be replaced by WireMockServer in version 1.1.0")]
     public partial class FluentMockServer : IDisposable
     {
         private const int ServerStartDelayInMs = 100;
diff --git a/src/WireMock.Net/Settings/FluentMockServerSettings.cs b/src/WireMock.Net/Settings/FluentMockServerSettings.cs
index d4b71be0..7758109b 100644
--- a/src/WireMock.Net/Settings/FluentMockServerSettings.cs
+++ b/src/WireMock.Net/Settings/FluentMockServerSettings.cs
@@ -10,6 +10,7 @@ namespace WireMock.Settings
     /// <summary>
     /// FluentMockServerSettings
     /// </summary>
+    [Obsolete("Will be replaced by WireMockServerSettings in version 1.1.0")]
     public class FluentMockServerSettings : IFluentMockServerSettings
     {
         /// <inheritdoc cref="IFluentMockServerSettings.Port"/>
diff --git a/src/WireMock.Net/Settings/IFluentMockServerSettings.cs b/src/WireMock.Net/Settings/IFluentMockServerSettings.cs
index 240a4e4b..b6ae621e 100644
--- a/src/WireMock.Net/Settings/IFluentMockServerSettings.cs
+++ b/src/WireMock.Net/Settings/IFluentMockServerSettings.cs
@@ -9,6 +9,7 @@ namespace WireMock.Settings
     /// <summary>
     /// IFluentMockServerSettings
     /// </summary>
+    [Obsolete("This interface will be removed and replaced by the class WireMockServerSettings in version 1.1.0")]
     public interface IFluentMockServerSettings
     {
         /// <summary>
diff --git a/src/WireMock.Net/Settings/IProxyAndRecordSettings.cs b/src/WireMock.Net/Settings/IProxyAndRecordSettings.cs
index 2e173553..6f291074 100644
--- a/src/WireMock.Net/Settings/IProxyAndRecordSettings.cs
+++ b/src/WireMock.Net/Settings/IProxyAndRecordSettings.cs
@@ -1,10 +1,13 @@
-using JetBrains.Annotations;
+using System;
+
+using JetBrains.Annotations;
 
 namespace WireMock.Settings
 {
     /// <summary>
     /// IProxyAndRecordSettings
     /// </summary>
+    [Obsolete("This interface will be removed and replaced by the class ProxyAndRecordSettings in version 1.1.0")]
     public interface IProxyAndRecordSettings
     {
         /// <summary>