diff --git a/Shuttle.Esb/.build/package.nuspec b/Shuttle.Esb/.build/package.nuspec
index 738c6da..6166a29 100644
--- a/Shuttle.Esb/.build/package.nuspec
+++ b/Shuttle.Esb/.build/package.nuspec
@@ -26,6 +26,7 @@
         <dependency id="Shuttle.Core.Serialization" version="{Shuttle.Core.Serialization-version}" />
         <dependency id="Shuttle.Core.Specification" version="{Shuttle.Core.Specification-version}" />
         <dependency id="Shuttle.Core.Streams" version="{Shuttle.Core.Streams-version}" />
+        <dependency id="Shuttle.Core.System" version="{Shuttle.Core.System-version}" />
         <dependency id="Shuttle.Core.Threading" version="{Shuttle.Core.Threading-version}" />
         <dependency id="Shuttle.Core.TimeSpanTypeConverters" version="{Shuttle.Core.TimeSpanTypeConverters-version}" />
       </group>
@@ -40,6 +41,7 @@
         <dependency id="Shuttle.Core.Serialization" version="{Shuttle.Core.Serialization-version}" />
         <dependency id="Shuttle.Core.Specification" version="{Shuttle.Core.Specification-version}" />
         <dependency id="Shuttle.Core.Streams" version="{Shuttle.Core.Streams-version}" />
+        <dependency id="Shuttle.Core.System" version="{Shuttle.Core.System-version}" />
         <dependency id="Shuttle.Core.Threading" version="{Shuttle.Core.Threading-version}" />
         <dependency id="Shuttle.Core.TimeSpanTypeConverters" version="{Shuttle.Core.TimeSpanTypeConverters-version}" />
         <dependency id="System.Configuration.ConfigurationManager"
@@ -56,22 +58,7 @@
         <dependency id="Shuttle.Core.Serialization" version="{Shuttle.Core.Serialization-version}" />
         <dependency id="Shuttle.Core.Specification" version="{Shuttle.Core.Specification-version}" />
         <dependency id="Shuttle.Core.Streams" version="{Shuttle.Core.Streams-version}" />
-        <dependency id="Shuttle.Core.Threading" version="{Shuttle.Core.Threading-version}" />
-        <dependency id="Shuttle.Core.TimeSpanTypeConverters" version="{Shuttle.Core.TimeSpanTypeConverters-version}" />
-        <dependency id="System.Configuration.ConfigurationManager"
-                    version="{System.Configuration.ConfigurationManager-version}" />
-      </group>
-
-      <group targetFramework="netcoreapp2.1">
-        <dependency id="Shuttle.Core.Compression" version="{Shuttle.Core.Compression-version}" />
-        <dependency id="Shuttle.Core.Container" version="{Shuttle.Core.Container-version}" />
-        <dependency id="Shuttle.Core.Encryption" version="{Shuttle.Core.Encryption-version}" />
-        <dependency id="Shuttle.Core.Pipelines" version="{Shuttle.Core.Pipelines-version}" />
-        <dependency id="Shuttle.Core.PipelineTransaction" version="{Shuttle.Core.PipelineTransaction-version}" />
-        <dependency id="Shuttle.Core.Reflection" version="{Shuttle.Core.Reflection-version}" />
-        <dependency id="Shuttle.Core.Serialization" version="{Shuttle.Core.Serialization-version}" />
-        <dependency id="Shuttle.Core.Specification" version="{Shuttle.Core.Specification-version}" />
-        <dependency id="Shuttle.Core.Streams" version="{Shuttle.Core.Streams-version}" />
+        <dependency id="Shuttle.Core.System" version="{Shuttle.Core.System-version}" />
         <dependency id="Shuttle.Core.Threading" version="{Shuttle.Core.Threading-version}" />
         <dependency id="Shuttle.Core.TimeSpanTypeConverters" version="{Shuttle.Core.TimeSpanTypeConverters-version}" />
         <dependency id="System.Configuration.ConfigurationManager"
diff --git a/Shuttle.Esb/Properties/AssemblyInfo.cs b/Shuttle.Esb/Properties/AssemblyInfo.cs
index 08b8ed4..7c7dc92 100644
--- a/Shuttle.Esb/Properties/AssemblyInfo.cs
+++ b/Shuttle.Esb/Properties/AssemblyInfo.cs
@@ -13,10 +13,10 @@
 [assembly: AssemblyTitle(".NET Standard 2.0")]
 #endif
 
-[assembly: AssemblyVersion("10.1.7.0")]
+[assembly: AssemblyVersion("10.1.8.0")]
 [assembly: AssemblyCopyright("Copyright © Eben Roux 2018")]
 [assembly: AssemblyProduct("Shuttle.Esb")]
 [assembly: AssemblyCompany("Shuttle")]
 [assembly: AssemblyConfiguration("Release")]
-[assembly: AssemblyInformationalVersion("10.1.7")]
+[assembly: AssemblyInformationalVersion("10.1.8")]
 [assembly: ComVisible(false)]
diff --git a/Shuttle.Esb/Shuttle.Esb.csproj b/Shuttle.Esb/Shuttle.Esb.csproj
index 48374d0..36ac905 100644
--- a/Shuttle.Esb/Shuttle.Esb.csproj
+++ b/Shuttle.Esb/Shuttle.Esb.csproj
@@ -24,12 +24,11 @@
         <PackageReference Include="Shuttle.Core.System" Version="1.0.1" />
         <PackageReference Include="Shuttle.Core.Threading" Version="10.0.2" />
         <PackageReference Include="Shuttle.Core.TimeSpanTypeConverters" Version="10.0.1" />
-        <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.0' or '$(TargetFramework)' == 'netcoreapp2.1'" />
-        <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
+        <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.1'" />
     </ItemGroup>
 
     <ItemGroup>
-        <Reference Include="System.Configuration" Condition="'$(TargetFramework)' != 'netstandard2.0' and '$(TargetFramework)' != 'netcoreapp2.0' and '$(TargetFramework)' != 'netcoreapp2.1'" />
+        <Reference Include="System.Configuration" Condition="'$(TargetFramework)' != 'netstandard2.0' and '$(TargetFramework)' != 'netcoreapp2.1'" />
         <Reference Include="System.Transactions" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
     </ItemGroup>