diff --git a/Examples/AnomalyDetection/Modules/AnomalyDetection/AnomalyDetection.csproj b/Examples/AnomalyDetection/Modules/AnomalyDetection/AnomalyDetection.csproj
index b1fd19c..1d211c2 100644
--- a/Examples/AnomalyDetection/Modules/AnomalyDetection/AnomalyDetection.csproj
+++ b/Examples/AnomalyDetection/Modules/AnomalyDetection/AnomalyDetection.csproj
@@ -4,7 +4,7 @@
     <ApplicationIcon />
     <LangVersion>latest</LangVersion>
     <OutputType>Exe</OutputType>
-    <Configurations>Debug;Release;TemplateDevelopment</Configurations>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
 
@@ -29,11 +29,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4" Condition="'$(Configuration)|$(Platform)'!='TemplateDevelopment|AnyCPU'" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.14" Condition="'$(Configuration)|$(Platform)'!='Debug|AnyCPU'" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Microsoft.Azure.TypeEdge\Microsoft.Azure.TypeEdge.csproj" Condition="'$(Configuration)|$(Platform)'=='TemplateDevelopment|AnyCPU'" />
+    <ProjectReference Include="..\..\..\..\Microsoft.Azure.TypeEdge\Microsoft.Azure.TypeEdge.csproj" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
     <ProjectReference Include="..\..\Thermostat.Shared\Thermostat.Shared.csproj" />
   </ItemGroup>
 
diff --git a/Examples/AnomalyDetection/Modules/ModelTraining/ModelTraining.csproj b/Examples/AnomalyDetection/Modules/ModelTraining/ModelTraining.csproj
index 7cccc88..ed1eccf 100644
--- a/Examples/AnomalyDetection/Modules/ModelTraining/ModelTraining.csproj
+++ b/Examples/AnomalyDetection/Modules/ModelTraining/ModelTraining.csproj
@@ -5,7 +5,7 @@
     <ApplicationIcon />
     <LangVersion>latest</LangVersion>
     <OutputType>Exe</OutputType>
-    <Configurations>Debug;Release;TemplateDevelopment</Configurations>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
 
@@ -14,11 +14,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4" Condition="'$(Configuration)|$(Platform)'!='TemplateDevelopment|AnyCPU'" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.14" Condition="'$(Configuration)|$(Platform)'!='Debug|AnyCPU'" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Microsoft.Azure.TypeEdge\Microsoft.Azure.TypeEdge.csproj" Condition="'$(Configuration)|$(Platform)'=='TemplateDevelopment|AnyCPU'" />
+    <ProjectReference Include="..\..\..\..\Microsoft.Azure.TypeEdge\Microsoft.Azure.TypeEdge.csproj" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
     <ProjectReference Include="..\..\Thermostat.Shared\Thermostat.Shared.csproj" />
   </ItemGroup>
 
diff --git a/Examples/AnomalyDetection/Modules/Orchestrator/Orchestrator.csproj b/Examples/AnomalyDetection/Modules/Orchestrator/Orchestrator.csproj
index 2cdc099..1cff1b6 100644
--- a/Examples/AnomalyDetection/Modules/Orchestrator/Orchestrator.csproj
+++ b/Examples/AnomalyDetection/Modules/Orchestrator/Orchestrator.csproj
@@ -5,7 +5,7 @@
     <ApplicationIcon />
     <OutputType>Exe</OutputType>
     <LangVersion>latest</LangVersion>
-    <Configurations>Debug;Release;TemplateDevelopment</Configurations>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -13,11 +13,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4" Condition="'$(Configuration)|$(Platform)'!='TemplateDevelopment|AnyCPU'" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.14" Condition="'$(Configuration)|$(Platform)'!='Debug|AnyCPU'" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Microsoft.Azure.TypeEdge\Microsoft.Azure.TypeEdge.csproj" Condition="'$(Configuration)|$(Platform)'=='TemplateDevelopment|AnyCPU'" />
+    <ProjectReference Include="..\..\..\..\Microsoft.Azure.TypeEdge\Microsoft.Azure.TypeEdge.csproj" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
     <ProjectReference Include="..\..\Thermostat.Shared\Thermostat.Shared.csproj" />
   </ItemGroup>
 
diff --git a/Examples/AnomalyDetection/Modules/TemperatureSensor/TemperatureSensor.csproj b/Examples/AnomalyDetection/Modules/TemperatureSensor/TemperatureSensor.csproj
index 9a91bc0..aa8f110 100644
--- a/Examples/AnomalyDetection/Modules/TemperatureSensor/TemperatureSensor.csproj
+++ b/Examples/AnomalyDetection/Modules/TemperatureSensor/TemperatureSensor.csproj
@@ -5,7 +5,7 @@
     <ApplicationIcon />
     <OutputType>Exe</OutputType>
     <LangVersion>latest</LangVersion>
-    <Configurations>Debug;Release;TemplateDevelopment</Configurations>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -13,12 +13,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4" Condition="'$(Configuration)|$(Platform)'!='TemplateDevelopment|AnyCPU'" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.14" Condition="'$(Configuration)|$(Platform)'!='Debug|AnyCPU'" />
     <PackageReference Include="WaveGenerator" Version="1.2.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Microsoft.Azure.TypeEdge\Microsoft.Azure.TypeEdge.csproj" Condition="'$(Configuration)|$(Platform)'=='TemplateDevelopment|AnyCPU'" />
+    <ProjectReference Include="..\..\..\..\Microsoft.Azure.TypeEdge\Microsoft.Azure.TypeEdge.csproj" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
     <ProjectReference Include="..\..\Thermostat.Shared\Thermostat.Shared.csproj" />
   </ItemGroup>
 
diff --git a/Examples/AnomalyDetection/Modules/Visualization/Visualization.csproj b/Examples/AnomalyDetection/Modules/Visualization/Visualization.csproj
index 9e6583a..1dc0f41 100644
--- a/Examples/AnomalyDetection/Modules/Visualization/Visualization.csproj
+++ b/Examples/AnomalyDetection/Modules/Visualization/Visualization.csproj
@@ -5,7 +5,7 @@
     <ApplicationIcon />
     <OutputType>Exe</OutputType>
     <LangVersion>latest</LangVersion>
-    <Configurations>Debug;Release;TemplateDevelopment</Configurations>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -15,11 +15,11 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="1.0.2" />
-    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4" Condition="'$(Configuration)|$(Platform)'!='TemplateDevelopment|AnyCPU'" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.14" Condition="'$(Configuration)|$(Platform)'!='Debug|AnyCPU'" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Microsoft.Azure.TypeEdge\Microsoft.Azure.TypeEdge.csproj" Condition="'$(Configuration)|$(Platform)'=='TemplateDevelopment|AnyCPU'" />
+    <ProjectReference Include="..\..\..\..\Microsoft.Azure.TypeEdge\Microsoft.Azure.TypeEdge.csproj" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
     <ProjectReference Include="..\..\Thermostat.Shared\Thermostat.Shared.csproj" />
     <ProjectReference Include="..\VisualizationWeb\VisualizationWeb.csproj" />
   </ItemGroup>
diff --git a/Examples/AnomalyDetection/Modules/VisualizationWeb/Startup.cs b/Examples/AnomalyDetection/Modules/VisualizationWeb/Startup.cs
index 11d8345..e4a2f17 100644
--- a/Examples/AnomalyDetection/Modules/VisualizationWeb/Startup.cs
+++ b/Examples/AnomalyDetection/Modules/VisualizationWeb/Startup.cs
@@ -37,7 +37,6 @@ namespace VisualizationWeb
         {
             if (env.IsDevelopment())
             {
-                app.UseBrowserLink();
                 app.UseDeveloperExceptionPage();
             }
             else
diff --git a/Examples/AnomalyDetection/Modules/VisualizationWeb/VisualizationWeb.csproj b/Examples/AnomalyDetection/Modules/VisualizationWeb/VisualizationWeb.csproj
index 8fb209a..165ec19 100644
--- a/Examples/AnomalyDetection/Modules/VisualizationWeb/VisualizationWeb.csproj
+++ b/Examples/AnomalyDetection/Modules/VisualizationWeb/VisualizationWeb.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.all" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.1.4" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
diff --git a/Examples/AnomalyDetection/Thermostat.Emulator/Thermostat.Emulator.csproj b/Examples/AnomalyDetection/Thermostat.Emulator/Thermostat.Emulator.csproj
index 2b07be3..0cf4947 100644
--- a/Examples/AnomalyDetection/Thermostat.Emulator/Thermostat.Emulator.csproj
+++ b/Examples/AnomalyDetection/Thermostat.Emulator/Thermostat.Emulator.csproj
@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <LangVersion>latest</LangVersion>
-    <Configurations>Debug;Release;TemplateDevelopment</Configurations>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -20,11 +20,11 @@
   <ItemGroup>
     <PackageReference Include="rocksdb-native-arm" Version="5.4.6" />
     <PackageReference Include="RocksDbNative" Version="5.4.6.10" />
-    <PackageReference Include="Microsoft.Azure.TypeEdge.Host" Version="0.4.4" Condition="'$(Configuration)|$(Platform)'!='TemplateDevelopment|AnyCPU'" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge.Host" Version="0.4.4.14" Condition="'$(Configuration)|$(Platform)'!='Debug|AnyCPU'" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Microsoft.Azure.TypeEdge.Host\Microsoft.Azure.TypeEdge.Host.csproj" Condition="'$(Configuration)|$(Platform)'=='TemplateDevelopment|AnyCPU'" />
+    <ProjectReference Include="..\..\..\Microsoft.Azure.TypeEdge.Host\Microsoft.Azure.TypeEdge.Host.csproj" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
     <ProjectReference Include="..\Modules\AnomalyDetection\AnomalyDetection.csproj" />
     <ProjectReference Include="..\Modules\ModelTraining\ModelTraining.csproj" />
     <ProjectReference Include="..\Modules\Orchestrator\Orchestrator.csproj" />
@@ -35,13 +35,13 @@
 
 
   <ItemGroup>
-    <None Include="..\..\..\Microsoft.Azure.TypeEdge.Host\Certificates\**\*.*" CopyToOutputDirectory="PreserveNewest" Condition="'$(Configuration)|$(Platform)'=='TemplateDevelopment|AnyCPU'">
+    <None Include="..\..\..\Microsoft.Azure.TypeEdge.Host\Certificates\**\*.*" CopyToOutputDirectory="PreserveNewest" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
       <Link>Certificates\%(RecursiveDir)%(FileName)%(Extension)</Link>
     </None>
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\..\Microsoft.Azure.TypeEdge.Host\appsettings_hub.json" CopyToOutputDirectory="PreserveNewest" Condition="'$(Configuration)|$(Platform)'=='TemplateDevelopment|AnyCPU'">
+    <None Include="..\..\..\Microsoft.Azure.TypeEdge.Host\appsettings_hub.json" CopyToOutputDirectory="PreserveNewest" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
       <Link>appsettings_hub.json</Link>
     </None>
   </ItemGroup>
diff --git a/Examples/AnomalyDetection/Thermostat.ServiceApp/Thermostat.ServiceApp.csproj b/Examples/AnomalyDetection/Thermostat.ServiceApp/Thermostat.ServiceApp.csproj
index c03981c..f23cb33 100644
--- a/Examples/AnomalyDetection/Thermostat.ServiceApp/Thermostat.ServiceApp.csproj
+++ b/Examples/AnomalyDetection/Thermostat.ServiceApp/Thermostat.ServiceApp.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <LangVersion>latest</LangVersion>
     <OutputType>Exe</OutputType>
-    <Configurations>Debug;Release;TemplateDevelopment</Configurations>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -12,12 +12,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge.Proxy" Version="0.4.4" Condition="'$(Configuration)|$(Platform)'!='TemplateDevelopment|AnyCPU'" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge.Proxy" Version="0.4.4.5" Condition="'$(Configuration)|$(Platform)'!='Debug|AnyCPU'" />
   </ItemGroup>
 
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Microsoft.Azure.TypeEdge.Proxy\Microsoft.Azure.TypeEdge.Proxy.csproj" Condition="'$(Configuration)|$(Platform)'=='TemplateDevelopment|AnyCPU'" />
+    <ProjectReference Include="..\..\..\Microsoft.Azure.TypeEdge.Proxy\Microsoft.Azure.TypeEdge.Proxy.csproj" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
     <ProjectReference Include="..\Thermostat.Shared\Thermostat.Shared.csproj" />
   </ItemGroup>
 
diff --git a/Examples/AnomalyDetection/Thermostat.Shared/Thermostat.Shared.csproj b/Examples/AnomalyDetection/Thermostat.Shared/Thermostat.Shared.csproj
index 9bd6fa5..610fef7 100644
--- a/Examples/AnomalyDetection/Thermostat.Shared/Thermostat.Shared.csproj
+++ b/Examples/AnomalyDetection/Thermostat.Shared/Thermostat.Shared.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Configurations>Debug;Release;TemplateDevelopment</Configurations>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -10,11 +10,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4" Condition="'$(Configuration)|$(Platform)'!='TemplateDevelopment|AnyCPU'" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.14" Condition="'$(Configuration)|$(Platform)'!='Debug|AnyCPU'" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Microsoft.Azure.TypeEdge\Microsoft.Azure.TypeEdge.csproj" Condition="'$(Configuration)|$(Platform)'=='TemplateDevelopment|AnyCPU'" />
+    <ProjectReference Include="..\..\..\Microsoft.Azure.TypeEdge\Microsoft.Azure.TypeEdge.csproj" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
   </ItemGroup>
 
 </Project>
diff --git a/Examples/QuickStart/Modules/TemperatureSensor/TemperatureSensor.csproj b/Examples/QuickStart/Modules/TemperatureSensor/TemperatureSensor.csproj
index 9a91bc0..aa8f110 100644
--- a/Examples/QuickStart/Modules/TemperatureSensor/TemperatureSensor.csproj
+++ b/Examples/QuickStart/Modules/TemperatureSensor/TemperatureSensor.csproj
@@ -5,7 +5,7 @@
     <ApplicationIcon />
     <OutputType>Exe</OutputType>
     <LangVersion>latest</LangVersion>
-    <Configurations>Debug;Release;TemplateDevelopment</Configurations>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -13,12 +13,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4" Condition="'$(Configuration)|$(Platform)'!='TemplateDevelopment|AnyCPU'" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.14" Condition="'$(Configuration)|$(Platform)'!='Debug|AnyCPU'" />
     <PackageReference Include="WaveGenerator" Version="1.2.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Microsoft.Azure.TypeEdge\Microsoft.Azure.TypeEdge.csproj" Condition="'$(Configuration)|$(Platform)'=='TemplateDevelopment|AnyCPU'" />
+    <ProjectReference Include="..\..\..\..\Microsoft.Azure.TypeEdge\Microsoft.Azure.TypeEdge.csproj" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
     <ProjectReference Include="..\..\Thermostat.Shared\Thermostat.Shared.csproj" />
   </ItemGroup>
 
diff --git a/Examples/QuickStart/Thermostat.Emulator/Thermostat.Emulator.csproj b/Examples/QuickStart/Thermostat.Emulator/Thermostat.Emulator.csproj
index 7d3ce75..98089c3 100644
--- a/Examples/QuickStart/Thermostat.Emulator/Thermostat.Emulator.csproj
+++ b/Examples/QuickStart/Thermostat.Emulator/Thermostat.Emulator.csproj
@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <LangVersion>latest</LangVersion>
-    <Configurations>Debug;Release;TemplateDevelopment</Configurations>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -20,24 +20,24 @@
   <ItemGroup>
     <PackageReference Include="rocksdb-native-arm" Version="5.4.6" />
     <PackageReference Include="RocksDbNative" Version="5.4.6.10" />
-    <PackageReference Include="Microsoft.Azure.TypeEdge.Host" Version="0.4.4" Condition="'$(Configuration)|$(Platform)'!='TemplateDevelopment|AnyCPU'" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge.Host" Version="0.4.4.14" Condition="'$(Configuration)|$(Platform)'!='Debug|AnyCPU'" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Microsoft.Azure.TypeEdge.Host\Microsoft.Azure.TypeEdge.Host.csproj" Condition="'$(Configuration)|$(Platform)'=='TemplateDevelopment|AnyCPU'" />
+    <ProjectReference Include="..\..\..\Microsoft.Azure.TypeEdge.Host\Microsoft.Azure.TypeEdge.Host.csproj" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
     <ProjectReference Include="..\Modules\TemperatureSensor\TemperatureSensor.csproj" />
     <ProjectReference Include="..\Thermostat.Shared\Thermostat.Shared.csproj" />
   </ItemGroup>
 
 
   <ItemGroup>
-    <None Include="..\..\..\Microsoft.Azure.TypeEdge.Host\Certificates\**\*.*" CopyToOutputDirectory="PreserveNewest" Condition="'$(Configuration)|$(Platform)'=='TemplateDevelopment|AnyCPU'">
+    <None Include="..\..\..\Microsoft.Azure.TypeEdge.Host\Certificates\**\*.*" CopyToOutputDirectory="PreserveNewest" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
       <Link>Certificates\%(RecursiveDir)%(FileName)%(Extension)</Link>
     </None>
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\..\Microsoft.Azure.TypeEdge.Host\appsettings_hub.json" CopyToOutputDirectory="PreserveNewest" Condition="'$(Configuration)|$(Platform)'=='TemplateDevelopment|AnyCPU'">
+    <None Include="..\..\..\Microsoft.Azure.TypeEdge.Host\appsettings_hub.json" CopyToOutputDirectory="PreserveNewest" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
       <Link>appsettings_hub.json</Link>
     </None>
   </ItemGroup>
diff --git a/Examples/QuickStart/Thermostat.ServiceApp/Thermostat.ServiceApp.csproj b/Examples/QuickStart/Thermostat.ServiceApp/Thermostat.ServiceApp.csproj
index c03981c..f23cb33 100644
--- a/Examples/QuickStart/Thermostat.ServiceApp/Thermostat.ServiceApp.csproj
+++ b/Examples/QuickStart/Thermostat.ServiceApp/Thermostat.ServiceApp.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <LangVersion>latest</LangVersion>
     <OutputType>Exe</OutputType>
-    <Configurations>Debug;Release;TemplateDevelopment</Configurations>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -12,12 +12,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge.Proxy" Version="0.4.4" Condition="'$(Configuration)|$(Platform)'!='TemplateDevelopment|AnyCPU'" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge.Proxy" Version="0.4.4.5" Condition="'$(Configuration)|$(Platform)'!='Debug|AnyCPU'" />
   </ItemGroup>
 
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Microsoft.Azure.TypeEdge.Proxy\Microsoft.Azure.TypeEdge.Proxy.csproj" Condition="'$(Configuration)|$(Platform)'=='TemplateDevelopment|AnyCPU'" />
+    <ProjectReference Include="..\..\..\Microsoft.Azure.TypeEdge.Proxy\Microsoft.Azure.TypeEdge.Proxy.csproj" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
     <ProjectReference Include="..\Thermostat.Shared\Thermostat.Shared.csproj" />
   </ItemGroup>
 
diff --git a/Examples/QuickStart/Thermostat.Shared/Thermostat.Shared.csproj b/Examples/QuickStart/Thermostat.Shared/Thermostat.Shared.csproj
index 9bd6fa5..610fef7 100644
--- a/Examples/QuickStart/Thermostat.Shared/Thermostat.Shared.csproj
+++ b/Examples/QuickStart/Thermostat.Shared/Thermostat.Shared.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Configurations>Debug;Release;TemplateDevelopment</Configurations>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -10,11 +10,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4" Condition="'$(Configuration)|$(Platform)'!='TemplateDevelopment|AnyCPU'" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.14" Condition="'$(Configuration)|$(Platform)'!='Debug|AnyCPU'" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Microsoft.Azure.TypeEdge\Microsoft.Azure.TypeEdge.csproj" Condition="'$(Configuration)|$(Platform)'=='TemplateDevelopment|AnyCPU'" />
+    <ProjectReference Include="..\..\..\Microsoft.Azure.TypeEdge\Microsoft.Azure.TypeEdge.csproj" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
   </ItemGroup>
 
 </Project>
diff --git a/Microsoft.Azure.TypeEdge - Examples.sln b/Microsoft.Azure.TypeEdge - Examples.sln
index e901385..03224c6 100644
--- a/Microsoft.Azure.TypeEdge - Examples.sln	
+++ b/Microsoft.Azure.TypeEdge - Examples.sln	
@@ -38,271 +38,187 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Thermostat.Shared", "Examples\AnomalyDetection\Thermostat.Shared\Thermostat.Shared.csproj", "{50EC54E1-C73A-47C7-83EE-47946416EADF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Thermostat.Emulator", "Examples\AnomalyDetection\Thermostat.Emulator\Thermostat.Emulator.csproj", "{7CEA7478-911A-4291-B457-D81BD031ACE2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{6F13F88C-B271-4DA6-9A35-5FD7FEADD3A3} = {6F13F88C-B271-4DA6-9A35-5FD7FEADD3A3}
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Thermostat.ServiceApp", "Examples\AnomalyDetection\Thermostat.ServiceApp\Thermostat.ServiceApp.csproj", "{CF2288E8-E2F0-4989-B460-F19F1C4615DE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5FC1E03A-7CD6-40AC-A893-2691DA8C9B5C} = {5FC1E03A-7CD6-40AC-A893-2691DA8C9B5C}
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{55D73BA2-72B9-46B5-96C8-C32C9398340B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TemperatureSensor", "Examples\AnomalyDetection\Modules\TemperatureSensor\TemperatureSensor.csproj", "{1F1D6340-302C-4422-9101-49A7F5C3F3F0}"
+	ProjectSection(ProjectDependencies) = postProject
+		{54587D56-7C22-4084-9321-84D57C2F6ECB} = {54587D56-7C22-4084-9321-84D57C2F6ECB}
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnomalyDetection", "Examples\AnomalyDetection\Modules\AnomalyDetection\AnomalyDetection.csproj", "{454D7BD7-6490-4124-9F7F-B486F98EC454}"
+	ProjectSection(ProjectDependencies) = postProject
+		{54587D56-7C22-4084-9321-84D57C2F6ECB} = {54587D56-7C22-4084-9321-84D57C2F6ECB}
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Visualization", "Examples\AnomalyDetection\Modules\Visualization\Visualization.csproj", "{8B048F42-4132-4374-8204-69EBFD2984C7}"
+	ProjectSection(ProjectDependencies) = postProject
+		{54587D56-7C22-4084-9321-84D57C2F6ECB} = {54587D56-7C22-4084-9321-84D57C2F6ECB}
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VisualizationWeb", "Examples\AnomalyDetection\Modules\VisualizationWeb\VisualizationWeb.csproj", "{D14AF601-C10D-4D4E-BC59-FF8496027815}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orchestrator", "Examples\AnomalyDetection\Modules\Orchestrator\Orchestrator.csproj", "{FB7F2691-C83C-4E2B-8FCD-A3DB1650609F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{54587D56-7C22-4084-9321-84D57C2F6ECB} = {54587D56-7C22-4084-9321-84D57C2F6ECB}
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AnomalyDetection", "AnomalyDetection", "{26E2528E-52E6-4F2E-A1CC-7CACE91D1D1E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModelTraining", "Examples\AnomalyDetection\Modules\ModelTraining\ModelTraining.csproj", "{AD8E4B48-D0AD-42AA-A189-B7502C2767E5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{54587D56-7C22-4084-9321-84D57C2F6ECB} = {54587D56-7C22-4084-9321-84D57C2F6ECB}
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "QuickStart", "QuickStart", "{F5BC3660-E589-4E0E-A9E5-C5C26EA6A611}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Thermostat.Shared", "Examples\QuickStart\Thermostat.Shared\Thermostat.Shared.csproj", "{CA829039-2301-4EF4-B08B-EBFDA5FDB1F4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Thermostat.ServiceApp", "Examples\QuickStart\Thermostat.ServiceApp\Thermostat.ServiceApp.csproj", "{D70E7FC3-89BD-4A95-953A-7FF5EE3BB041}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5FC1E03A-7CD6-40AC-A893-2691DA8C9B5C} = {5FC1E03A-7CD6-40AC-A893-2691DA8C9B5C}
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Thermostat.Emulator", "Examples\QuickStart\Thermostat.Emulator\Thermostat.Emulator.csproj", "{CDFE2B1F-8EAC-4707-AB78-3306B762E34D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{6F13F88C-B271-4DA6-9A35-5FD7FEADD3A3} = {6F13F88C-B271-4DA6-9A35-5FD7FEADD3A3}
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{B21CA3C7-A2FE-4180-9524-D91028A5389F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TemperatureSensor", "Examples\QuickStart\Modules\TemperatureSensor\TemperatureSensor.csproj", "{6EECA6D0-A4D6-4F56-8E1A-D2F08DB9ACA1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{54587D56-7C22-4084-9321-84D57C2F6ECB} = {54587D56-7C22-4084-9321-84D57C2F6ECB}
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Devices.Edge.Agent.Docker", "IoT.Edge\edge-agent\src\Microsoft.Azure.Devices.Edge.Agent.Docker\Microsoft.Azure.Devices.Edge.Agent.Docker.csproj", "{4B895993-4D8B-47A0-8949-45E96F2621E8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		CodeCoverage|Any CPU = CodeCoverage|Any CPU
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
-		TemplateDevelopment|Any CPU = TemplateDevelopment|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{54587D56-7C22-4084-9321-84D57C2F6ECB}.CodeCoverage|Any CPU.ActiveCfg = Debug|Any CPU
-		{54587D56-7C22-4084-9321-84D57C2F6ECB}.CodeCoverage|Any CPU.Build.0 = Debug|Any CPU
 		{54587D56-7C22-4084-9321-84D57C2F6ECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{54587D56-7C22-4084-9321-84D57C2F6ECB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{54587D56-7C22-4084-9321-84D57C2F6ECB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{54587D56-7C22-4084-9321-84D57C2F6ECB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{54587D56-7C22-4084-9321-84D57C2F6ECB}.TemplateDevelopment|Any CPU.ActiveCfg = Debug|Any CPU
-		{54587D56-7C22-4084-9321-84D57C2F6ECB}.TemplateDevelopment|Any CPU.Build.0 = Debug|Any CPU
-		{6F13F88C-B271-4DA6-9A35-5FD7FEADD3A3}.CodeCoverage|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F13F88C-B271-4DA6-9A35-5FD7FEADD3A3}.CodeCoverage|Any CPU.Build.0 = Debug|Any CPU
 		{6F13F88C-B271-4DA6-9A35-5FD7FEADD3A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6F13F88C-B271-4DA6-9A35-5FD7FEADD3A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6F13F88C-B271-4DA6-9A35-5FD7FEADD3A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6F13F88C-B271-4DA6-9A35-5FD7FEADD3A3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6F13F88C-B271-4DA6-9A35-5FD7FEADD3A3}.TemplateDevelopment|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F13F88C-B271-4DA6-9A35-5FD7FEADD3A3}.TemplateDevelopment|Any CPU.Build.0 = Debug|Any CPU
-		{5FC1E03A-7CD6-40AC-A893-2691DA8C9B5C}.CodeCoverage|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{5FC1E03A-7CD6-40AC-A893-2691DA8C9B5C}.CodeCoverage|Any CPU.Build.0 = TemplateDevelopment|Any CPU
 		{5FC1E03A-7CD6-40AC-A893-2691DA8C9B5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5FC1E03A-7CD6-40AC-A893-2691DA8C9B5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5FC1E03A-7CD6-40AC-A893-2691DA8C9B5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5FC1E03A-7CD6-40AC-A893-2691DA8C9B5C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5FC1E03A-7CD6-40AC-A893-2691DA8C9B5C}.TemplateDevelopment|Any CPU.ActiveCfg = Debug|Any CPU
-		{5FC1E03A-7CD6-40AC-A893-2691DA8C9B5C}.TemplateDevelopment|Any CPU.Build.0 = Debug|Any CPU
-		{D4C50202-5092-4ACD-B90B-C1F4AD4234F3}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{D4C50202-5092-4ACD-B90B-C1F4AD4234F3}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{D4C50202-5092-4ACD-B90B-C1F4AD4234F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D4C50202-5092-4ACD-B90B-C1F4AD4234F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D4C50202-5092-4ACD-B90B-C1F4AD4234F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4C50202-5092-4ACD-B90B-C1F4AD4234F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D4C50202-5092-4ACD-B90B-C1F4AD4234F3}.TemplateDevelopment|Any CPU.ActiveCfg = Debug|Any CPU
-		{D4C50202-5092-4ACD-B90B-C1F4AD4234F3}.TemplateDevelopment|Any CPU.Build.0 = Debug|Any CPU
-		{4819548E-5F81-4EBC-893B-EB0C024EF61B}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{4819548E-5F81-4EBC-893B-EB0C024EF61B}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{4819548E-5F81-4EBC-893B-EB0C024EF61B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4819548E-5F81-4EBC-893B-EB0C024EF61B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4819548E-5F81-4EBC-893B-EB0C024EF61B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4819548E-5F81-4EBC-893B-EB0C024EF61B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4819548E-5F81-4EBC-893B-EB0C024EF61B}.TemplateDevelopment|Any CPU.ActiveCfg = Debug|Any CPU
-		{4819548E-5F81-4EBC-893B-EB0C024EF61B}.TemplateDevelopment|Any CPU.Build.0 = Debug|Any CPU
-		{BE40B8F4-B740-4FC9-A24D-2869514885D6}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{BE40B8F4-B740-4FC9-A24D-2869514885D6}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{BE40B8F4-B740-4FC9-A24D-2869514885D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BE40B8F4-B740-4FC9-A24D-2869514885D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BE40B8F4-B740-4FC9-A24D-2869514885D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BE40B8F4-B740-4FC9-A24D-2869514885D6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BE40B8F4-B740-4FC9-A24D-2869514885D6}.TemplateDevelopment|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE40B8F4-B740-4FC9-A24D-2869514885D6}.TemplateDevelopment|Any CPU.Build.0 = Debug|Any CPU
-		{C1780512-EAA3-4BE5-AC30-61DA95303599}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{C1780512-EAA3-4BE5-AC30-61DA95303599}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{C1780512-EAA3-4BE5-AC30-61DA95303599}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C1780512-EAA3-4BE5-AC30-61DA95303599}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C1780512-EAA3-4BE5-AC30-61DA95303599}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C1780512-EAA3-4BE5-AC30-61DA95303599}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C1780512-EAA3-4BE5-AC30-61DA95303599}.TemplateDevelopment|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1780512-EAA3-4BE5-AC30-61DA95303599}.TemplateDevelopment|Any CPU.Build.0 = Debug|Any CPU
-		{DF4ABEC8-D7EC-4647-9AC7-E62079A930D3}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{DF4ABEC8-D7EC-4647-9AC7-E62079A930D3}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{DF4ABEC8-D7EC-4647-9AC7-E62079A930D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DF4ABEC8-D7EC-4647-9AC7-E62079A930D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DF4ABEC8-D7EC-4647-9AC7-E62079A930D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DF4ABEC8-D7EC-4647-9AC7-E62079A930D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DF4ABEC8-D7EC-4647-9AC7-E62079A930D3}.TemplateDevelopment|Any CPU.ActiveCfg = Debug|Any CPU
-		{DF4ABEC8-D7EC-4647-9AC7-E62079A930D3}.TemplateDevelopment|Any CPU.Build.0 = Debug|Any CPU
-		{17D57DFA-F735-49CB-8E27-1F960F46C472}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{17D57DFA-F735-49CB-8E27-1F960F46C472}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{17D57DFA-F735-49CB-8E27-1F960F46C472}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{17D57DFA-F735-49CB-8E27-1F960F46C472}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{17D57DFA-F735-49CB-8E27-1F960F46C472}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{17D57DFA-F735-49CB-8E27-1F960F46C472}.Release|Any CPU.Build.0 = Release|Any CPU
-		{17D57DFA-F735-49CB-8E27-1F960F46C472}.TemplateDevelopment|Any CPU.ActiveCfg = Debug|Any CPU
-		{17D57DFA-F735-49CB-8E27-1F960F46C472}.TemplateDevelopment|Any CPU.Build.0 = Debug|Any CPU
-		{3A09A9DB-AA0C-492B-BD8E-9D515485A193}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{3A09A9DB-AA0C-492B-BD8E-9D515485A193}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{3A09A9DB-AA0C-492B-BD8E-9D515485A193}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3A09A9DB-AA0C-492B-BD8E-9D515485A193}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3A09A9DB-AA0C-492B-BD8E-9D515485A193}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3A09A9DB-AA0C-492B-BD8E-9D515485A193}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A09A9DB-AA0C-492B-BD8E-9D515485A193}.TemplateDevelopment|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A09A9DB-AA0C-492B-BD8E-9D515485A193}.TemplateDevelopment|Any CPU.Build.0 = Debug|Any CPU
-		{F5830821-3E1E-423C-975E-4A6DC0612735}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{F5830821-3E1E-423C-975E-4A6DC0612735}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{F5830821-3E1E-423C-975E-4A6DC0612735}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F5830821-3E1E-423C-975E-4A6DC0612735}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F5830821-3E1E-423C-975E-4A6DC0612735}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F5830821-3E1E-423C-975E-4A6DC0612735}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5830821-3E1E-423C-975E-4A6DC0612735}.TemplateDevelopment|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5830821-3E1E-423C-975E-4A6DC0612735}.TemplateDevelopment|Any CPU.Build.0 = Debug|Any CPU
-		{A7DEAB53-6DCB-4287-8DED-C0358BCB4EBB}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{A7DEAB53-6DCB-4287-8DED-C0358BCB4EBB}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{A7DEAB53-6DCB-4287-8DED-C0358BCB4EBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A7DEAB53-6DCB-4287-8DED-C0358BCB4EBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A7DEAB53-6DCB-4287-8DED-C0358BCB4EBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A7DEAB53-6DCB-4287-8DED-C0358BCB4EBB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A7DEAB53-6DCB-4287-8DED-C0358BCB4EBB}.TemplateDevelopment|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7DEAB53-6DCB-4287-8DED-C0358BCB4EBB}.TemplateDevelopment|Any CPU.Build.0 = Debug|Any CPU
-		{ED0444A3-03A3-4B84-854F-CC6BC53DEBB8}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{ED0444A3-03A3-4B84-854F-CC6BC53DEBB8}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{ED0444A3-03A3-4B84-854F-CC6BC53DEBB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ED0444A3-03A3-4B84-854F-CC6BC53DEBB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ED0444A3-03A3-4B84-854F-CC6BC53DEBB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ED0444A3-03A3-4B84-854F-CC6BC53DEBB8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ED0444A3-03A3-4B84-854F-CC6BC53DEBB8}.TemplateDevelopment|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED0444A3-03A3-4B84-854F-CC6BC53DEBB8}.TemplateDevelopment|Any CPU.Build.0 = Debug|Any CPU
-		{101A6115-688F-474A-AC5F-051FA6232349}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{101A6115-688F-474A-AC5F-051FA6232349}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{101A6115-688F-474A-AC5F-051FA6232349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{101A6115-688F-474A-AC5F-051FA6232349}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{101A6115-688F-474A-AC5F-051FA6232349}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{101A6115-688F-474A-AC5F-051FA6232349}.Release|Any CPU.Build.0 = Release|Any CPU
-		{101A6115-688F-474A-AC5F-051FA6232349}.TemplateDevelopment|Any CPU.ActiveCfg = Debug|Any CPU
-		{101A6115-688F-474A-AC5F-051FA6232349}.TemplateDevelopment|Any CPU.Build.0 = Debug|Any CPU
-		{50EC54E1-C73A-47C7-83EE-47946416EADF}.CodeCoverage|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{50EC54E1-C73A-47C7-83EE-47946416EADF}.CodeCoverage|Any CPU.Build.0 = TemplateDevelopment|Any CPU
 		{50EC54E1-C73A-47C7-83EE-47946416EADF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{50EC54E1-C73A-47C7-83EE-47946416EADF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{50EC54E1-C73A-47C7-83EE-47946416EADF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50EC54E1-C73A-47C7-83EE-47946416EADF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50EC54E1-C73A-47C7-83EE-47946416EADF}.TemplateDevelopment|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{50EC54E1-C73A-47C7-83EE-47946416EADF}.TemplateDevelopment|Any CPU.Build.0 = TemplateDevelopment|Any CPU
-		{7CEA7478-911A-4291-B457-D81BD031ACE2}.CodeCoverage|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{7CEA7478-911A-4291-B457-D81BD031ACE2}.CodeCoverage|Any CPU.Build.0 = TemplateDevelopment|Any CPU
 		{7CEA7478-911A-4291-B457-D81BD031ACE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7CEA7478-911A-4291-B457-D81BD031ACE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7CEA7478-911A-4291-B457-D81BD031ACE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7CEA7478-911A-4291-B457-D81BD031ACE2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7CEA7478-911A-4291-B457-D81BD031ACE2}.TemplateDevelopment|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{7CEA7478-911A-4291-B457-D81BD031ACE2}.TemplateDevelopment|Any CPU.Build.0 = TemplateDevelopment|Any CPU
-		{CF2288E8-E2F0-4989-B460-F19F1C4615DE}.CodeCoverage|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{CF2288E8-E2F0-4989-B460-F19F1C4615DE}.CodeCoverage|Any CPU.Build.0 = TemplateDevelopment|Any CPU
 		{CF2288E8-E2F0-4989-B460-F19F1C4615DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CF2288E8-E2F0-4989-B460-F19F1C4615DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CF2288E8-E2F0-4989-B460-F19F1C4615DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CF2288E8-E2F0-4989-B460-F19F1C4615DE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CF2288E8-E2F0-4989-B460-F19F1C4615DE}.TemplateDevelopment|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{CF2288E8-E2F0-4989-B460-F19F1C4615DE}.TemplateDevelopment|Any CPU.Build.0 = TemplateDevelopment|Any CPU
-		{1F1D6340-302C-4422-9101-49A7F5C3F3F0}.CodeCoverage|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{1F1D6340-302C-4422-9101-49A7F5C3F3F0}.CodeCoverage|Any CPU.Build.0 = TemplateDevelopment|Any CPU
 		{1F1D6340-302C-4422-9101-49A7F5C3F3F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F1D6340-302C-4422-9101-49A7F5C3F3F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F1D6340-302C-4422-9101-49A7F5C3F3F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1F1D6340-302C-4422-9101-49A7F5C3F3F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1D6340-302C-4422-9101-49A7F5C3F3F0}.TemplateDevelopment|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{1F1D6340-302C-4422-9101-49A7F5C3F3F0}.TemplateDevelopment|Any CPU.Build.0 = TemplateDevelopment|Any CPU
-		{454D7BD7-6490-4124-9F7F-B486F98EC454}.CodeCoverage|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{454D7BD7-6490-4124-9F7F-B486F98EC454}.CodeCoverage|Any CPU.Build.0 = TemplateDevelopment|Any CPU
 		{454D7BD7-6490-4124-9F7F-B486F98EC454}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{454D7BD7-6490-4124-9F7F-B486F98EC454}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{454D7BD7-6490-4124-9F7F-B486F98EC454}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{454D7BD7-6490-4124-9F7F-B486F98EC454}.Release|Any CPU.Build.0 = Release|Any CPU
-		{454D7BD7-6490-4124-9F7F-B486F98EC454}.TemplateDevelopment|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{454D7BD7-6490-4124-9F7F-B486F98EC454}.TemplateDevelopment|Any CPU.Build.0 = TemplateDevelopment|Any CPU
-		{8B048F42-4132-4374-8204-69EBFD2984C7}.CodeCoverage|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{8B048F42-4132-4374-8204-69EBFD2984C7}.CodeCoverage|Any CPU.Build.0 = TemplateDevelopment|Any CPU
 		{8B048F42-4132-4374-8204-69EBFD2984C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8B048F42-4132-4374-8204-69EBFD2984C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8B048F42-4132-4374-8204-69EBFD2984C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8B048F42-4132-4374-8204-69EBFD2984C7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8B048F42-4132-4374-8204-69EBFD2984C7}.TemplateDevelopment|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{8B048F42-4132-4374-8204-69EBFD2984C7}.TemplateDevelopment|Any CPU.Build.0 = TemplateDevelopment|Any CPU
-		{D14AF601-C10D-4D4E-BC59-FF8496027815}.CodeCoverage|Any CPU.ActiveCfg = Debug|Any CPU
-		{D14AF601-C10D-4D4E-BC59-FF8496027815}.CodeCoverage|Any CPU.Build.0 = Debug|Any CPU
 		{D14AF601-C10D-4D4E-BC59-FF8496027815}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D14AF601-C10D-4D4E-BC59-FF8496027815}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D14AF601-C10D-4D4E-BC59-FF8496027815}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D14AF601-C10D-4D4E-BC59-FF8496027815}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D14AF601-C10D-4D4E-BC59-FF8496027815}.TemplateDevelopment|Any CPU.ActiveCfg = Debug|Any CPU
-		{D14AF601-C10D-4D4E-BC59-FF8496027815}.TemplateDevelopment|Any CPU.Build.0 = Debug|Any CPU
-		{FB7F2691-C83C-4E2B-8FCD-A3DB1650609F}.CodeCoverage|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{FB7F2691-C83C-4E2B-8FCD-A3DB1650609F}.CodeCoverage|Any CPU.Build.0 = TemplateDevelopment|Any CPU
 		{FB7F2691-C83C-4E2B-8FCD-A3DB1650609F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FB7F2691-C83C-4E2B-8FCD-A3DB1650609F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FB7F2691-C83C-4E2B-8FCD-A3DB1650609F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FB7F2691-C83C-4E2B-8FCD-A3DB1650609F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FB7F2691-C83C-4E2B-8FCD-A3DB1650609F}.TemplateDevelopment|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{FB7F2691-C83C-4E2B-8FCD-A3DB1650609F}.TemplateDevelopment|Any CPU.Build.0 = TemplateDevelopment|Any CPU
-		{AD8E4B48-D0AD-42AA-A189-B7502C2767E5}.CodeCoverage|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{AD8E4B48-D0AD-42AA-A189-B7502C2767E5}.CodeCoverage|Any CPU.Build.0 = TemplateDevelopment|Any CPU
 		{AD8E4B48-D0AD-42AA-A189-B7502C2767E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AD8E4B48-D0AD-42AA-A189-B7502C2767E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AD8E4B48-D0AD-42AA-A189-B7502C2767E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AD8E4B48-D0AD-42AA-A189-B7502C2767E5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AD8E4B48-D0AD-42AA-A189-B7502C2767E5}.TemplateDevelopment|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{AD8E4B48-D0AD-42AA-A189-B7502C2767E5}.TemplateDevelopment|Any CPU.Build.0 = TemplateDevelopment|Any CPU
-		{CA829039-2301-4EF4-B08B-EBFDA5FDB1F4}.CodeCoverage|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{CA829039-2301-4EF4-B08B-EBFDA5FDB1F4}.CodeCoverage|Any CPU.Build.0 = TemplateDevelopment|Any CPU
 		{CA829039-2301-4EF4-B08B-EBFDA5FDB1F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CA829039-2301-4EF4-B08B-EBFDA5FDB1F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CA829039-2301-4EF4-B08B-EBFDA5FDB1F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CA829039-2301-4EF4-B08B-EBFDA5FDB1F4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CA829039-2301-4EF4-B08B-EBFDA5FDB1F4}.TemplateDevelopment|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{CA829039-2301-4EF4-B08B-EBFDA5FDB1F4}.TemplateDevelopment|Any CPU.Build.0 = TemplateDevelopment|Any CPU
-		{D70E7FC3-89BD-4A95-953A-7FF5EE3BB041}.CodeCoverage|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{D70E7FC3-89BD-4A95-953A-7FF5EE3BB041}.CodeCoverage|Any CPU.Build.0 = TemplateDevelopment|Any CPU
 		{D70E7FC3-89BD-4A95-953A-7FF5EE3BB041}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D70E7FC3-89BD-4A95-953A-7FF5EE3BB041}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D70E7FC3-89BD-4A95-953A-7FF5EE3BB041}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D70E7FC3-89BD-4A95-953A-7FF5EE3BB041}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D70E7FC3-89BD-4A95-953A-7FF5EE3BB041}.TemplateDevelopment|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{D70E7FC3-89BD-4A95-953A-7FF5EE3BB041}.TemplateDevelopment|Any CPU.Build.0 = TemplateDevelopment|Any CPU
-		{CDFE2B1F-8EAC-4707-AB78-3306B762E34D}.CodeCoverage|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{CDFE2B1F-8EAC-4707-AB78-3306B762E34D}.CodeCoverage|Any CPU.Build.0 = TemplateDevelopment|Any CPU
 		{CDFE2B1F-8EAC-4707-AB78-3306B762E34D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CDFE2B1F-8EAC-4707-AB78-3306B762E34D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CDFE2B1F-8EAC-4707-AB78-3306B762E34D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CDFE2B1F-8EAC-4707-AB78-3306B762E34D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CDFE2B1F-8EAC-4707-AB78-3306B762E34D}.TemplateDevelopment|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{CDFE2B1F-8EAC-4707-AB78-3306B762E34D}.TemplateDevelopment|Any CPU.Build.0 = TemplateDevelopment|Any CPU
-		{6EECA6D0-A4D6-4F56-8E1A-D2F08DB9ACA1}.CodeCoverage|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{6EECA6D0-A4D6-4F56-8E1A-D2F08DB9ACA1}.CodeCoverage|Any CPU.Build.0 = TemplateDevelopment|Any CPU
 		{6EECA6D0-A4D6-4F56-8E1A-D2F08DB9ACA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6EECA6D0-A4D6-4F56-8E1A-D2F08DB9ACA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6EECA6D0-A4D6-4F56-8E1A-D2F08DB9ACA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6EECA6D0-A4D6-4F56-8E1A-D2F08DB9ACA1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6EECA6D0-A4D6-4F56-8E1A-D2F08DB9ACA1}.TemplateDevelopment|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{6EECA6D0-A4D6-4F56-8E1A-D2F08DB9ACA1}.TemplateDevelopment|Any CPU.Build.0 = TemplateDevelopment|Any CPU
-		{4B895993-4D8B-47A0-8949-45E96F2621E8}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{4B895993-4D8B-47A0-8949-45E96F2621E8}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{4B895993-4D8B-47A0-8949-45E96F2621E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4B895993-4D8B-47A0-8949-45E96F2621E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4B895993-4D8B-47A0-8949-45E96F2621E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4B895993-4D8B-47A0-8949-45E96F2621E8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4B895993-4D8B-47A0-8949-45E96F2621E8}.TemplateDevelopment|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{4B895993-4D8B-47A0-8949-45E96F2621E8}.TemplateDevelopment|Any CPU.Build.0 = CodeCoverage|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Microsoft.Azure.TypeEdge.Host/.nuspec b/Microsoft.Azure.TypeEdge.Host/.nuspec
index 4fd2a3e..9f54bb0 100644
--- a/Microsoft.Azure.TypeEdge.Host/.nuspec
+++ b/Microsoft.Azure.TypeEdge.Host/.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>Microsoft.Azure.TypeEdge.Host</id>
-    <version>0.4.4</version>
+    <version>$version$</version>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
diff --git a/Microsoft.Azure.TypeEdge.Host/Microsoft.Azure.TypeEdge.Host.csproj b/Microsoft.Azure.TypeEdge.Host/Microsoft.Azure.TypeEdge.Host.csproj
index 182f5f9..8d4a943 100644
--- a/Microsoft.Azure.TypeEdge.Host/Microsoft.Azure.TypeEdge.Host.csproj
+++ b/Microsoft.Azure.TypeEdge.Host/Microsoft.Azure.TypeEdge.Host.csproj
@@ -1,11 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageOutputPath>../../TypeEdgeNuGets</PackageOutputPath>
     <Authors>Microsoft</Authors>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Configurations>Debug;Release;TemplateDevelopment</Configurations>
+    <Configurations>Debug;Release</Configurations>
+
+    <Version>0.4.4.16</Version>
+    <NuspecProperties>version=$(Version)</NuspecProperties>
 
     <NuspecFile>.nuspec</NuspecFile>
 
@@ -18,6 +22,9 @@
     <None Remove="deviceconfig.json" />
   </ItemGroup>
 
+  <PropertyGroup Condition="$(Configuration) == 'Release'">
+    <BumpRevision>True</BumpRevision>
+  </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\IoT.Edge\edge-agent\src\Microsoft.Azure.Devices.Edge.Agent.Core\Microsoft.Azure.Devices.Edge.Agent.Core.csproj" />
@@ -42,6 +49,10 @@
 
   <ItemGroup>
     <PackageReference Include="Docker.DotNet" Version="3.125.2" />
+    <PackageReference Include="MSBump" Version="2.3.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.10" />
     <PackageReference Include="System.CodeDom" Version="4.5.0" />
   </ItemGroup>
@@ -76,4 +87,8 @@
       <LastGenOutput>Service.cs</LastGenOutput>
     </None>
   </ItemGroup>
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="$(Configuration) == 'Release'">
+    <Exec Command="dotnet pack --no-build" />
+  </Target>
 </Project>
diff --git a/Microsoft.Azure.TypeEdge.Proxy/Microsoft.Azure.TypeEdge.Proxy.csproj b/Microsoft.Azure.TypeEdge.Proxy/Microsoft.Azure.TypeEdge.Proxy.csproj
index 1d97861..71131a4 100644
--- a/Microsoft.Azure.TypeEdge.Proxy/Microsoft.Azure.TypeEdge.Proxy.csproj
+++ b/Microsoft.Azure.TypeEdge.Proxy/Microsoft.Azure.TypeEdge.Proxy.csproj
@@ -1,25 +1,38 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <PackageId>Microsoft.Azure.TypeEdge.Proxy</PackageId>
-    <Version>0.4.4</Version>
+    <Version>0.4.4.6</Version>
     <Authors>Microsoft</Authors>
 
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageOutputPath>../../TypeEdgeNuGets</PackageOutputPath>
     
     <TargetFramework>netcoreapp2.1</TargetFramework>
     
-    <Configurations>Debug;Release;TemplateDevelopment</Configurations>
+    <Configurations>Debug;Release</Configurations>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="$(Configuration) == 'Release'">
+    <BumpRevision>True</BumpRevision>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Devices" Version="1.16.0" />
+    <PackageReference Include="MSBump" Version="2.3.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Azure.TypeEdge\Microsoft.Azure.TypeEdge.csproj" />
   </ItemGroup>
 
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="$(Configuration) == 'Release'">
+    <Exec Command="dotnet pack --no-build" />
+  </Target>
+
 </Project>
diff --git a/Microsoft.Azure.TypeEdge.sln b/Microsoft.Azure.TypeEdge.sln
index ee15f08..dc4704b 100644
--- a/Microsoft.Azure.TypeEdge.sln
+++ b/Microsoft.Azure.TypeEdge.sln
@@ -37,132 +37,70 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Devices.Edg
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		CodeCoverage|Any CPU = CodeCoverage|Any CPU
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
-		TemplateDevelopment|Any CPU = TemplateDevelopment|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{54587D56-7C22-4084-9321-84D57C2F6ECB}.CodeCoverage|Any CPU.ActiveCfg = Debug|Any CPU
-		{54587D56-7C22-4084-9321-84D57C2F6ECB}.CodeCoverage|Any CPU.Build.0 = Debug|Any CPU
 		{54587D56-7C22-4084-9321-84D57C2F6ECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{54587D56-7C22-4084-9321-84D57C2F6ECB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{54587D56-7C22-4084-9321-84D57C2F6ECB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{54587D56-7C22-4084-9321-84D57C2F6ECB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{54587D56-7C22-4084-9321-84D57C2F6ECB}.TemplateDevelopment|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{54587D56-7C22-4084-9321-84D57C2F6ECB}.TemplateDevelopment|Any CPU.Build.0 = TemplateDevelopment|Any CPU
-		{6F13F88C-B271-4DA6-9A35-5FD7FEADD3A3}.CodeCoverage|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F13F88C-B271-4DA6-9A35-5FD7FEADD3A3}.CodeCoverage|Any CPU.Build.0 = Debug|Any CPU
 		{6F13F88C-B271-4DA6-9A35-5FD7FEADD3A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6F13F88C-B271-4DA6-9A35-5FD7FEADD3A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6F13F88C-B271-4DA6-9A35-5FD7FEADD3A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6F13F88C-B271-4DA6-9A35-5FD7FEADD3A3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6F13F88C-B271-4DA6-9A35-5FD7FEADD3A3}.TemplateDevelopment|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{6F13F88C-B271-4DA6-9A35-5FD7FEADD3A3}.TemplateDevelopment|Any CPU.Build.0 = TemplateDevelopment|Any CPU
-		{5FC1E03A-7CD6-40AC-A893-2691DA8C9B5C}.CodeCoverage|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{5FC1E03A-7CD6-40AC-A893-2691DA8C9B5C}.CodeCoverage|Any CPU.Build.0 = TemplateDevelopment|Any CPU
 		{5FC1E03A-7CD6-40AC-A893-2691DA8C9B5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5FC1E03A-7CD6-40AC-A893-2691DA8C9B5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5FC1E03A-7CD6-40AC-A893-2691DA8C9B5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5FC1E03A-7CD6-40AC-A893-2691DA8C9B5C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5FC1E03A-7CD6-40AC-A893-2691DA8C9B5C}.TemplateDevelopment|Any CPU.ActiveCfg = TemplateDevelopment|Any CPU
-		{5FC1E03A-7CD6-40AC-A893-2691DA8C9B5C}.TemplateDevelopment|Any CPU.Build.0 = TemplateDevelopment|Any CPU
-		{D4C50202-5092-4ACD-B90B-C1F4AD4234F3}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{D4C50202-5092-4ACD-B90B-C1F4AD4234F3}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{D4C50202-5092-4ACD-B90B-C1F4AD4234F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D4C50202-5092-4ACD-B90B-C1F4AD4234F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D4C50202-5092-4ACD-B90B-C1F4AD4234F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4C50202-5092-4ACD-B90B-C1F4AD4234F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D4C50202-5092-4ACD-B90B-C1F4AD4234F3}.TemplateDevelopment|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{D4C50202-5092-4ACD-B90B-C1F4AD4234F3}.TemplateDevelopment|Any CPU.Build.0 = CodeCoverage|Any CPU
-		{4819548E-5F81-4EBC-893B-EB0C024EF61B}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{4819548E-5F81-4EBC-893B-EB0C024EF61B}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{4819548E-5F81-4EBC-893B-EB0C024EF61B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4819548E-5F81-4EBC-893B-EB0C024EF61B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4819548E-5F81-4EBC-893B-EB0C024EF61B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4819548E-5F81-4EBC-893B-EB0C024EF61B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4819548E-5F81-4EBC-893B-EB0C024EF61B}.TemplateDevelopment|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{4819548E-5F81-4EBC-893B-EB0C024EF61B}.TemplateDevelopment|Any CPU.Build.0 = CodeCoverage|Any CPU
-		{BE40B8F4-B740-4FC9-A24D-2869514885D6}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{BE40B8F4-B740-4FC9-A24D-2869514885D6}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{BE40B8F4-B740-4FC9-A24D-2869514885D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BE40B8F4-B740-4FC9-A24D-2869514885D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BE40B8F4-B740-4FC9-A24D-2869514885D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BE40B8F4-B740-4FC9-A24D-2869514885D6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BE40B8F4-B740-4FC9-A24D-2869514885D6}.TemplateDevelopment|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{BE40B8F4-B740-4FC9-A24D-2869514885D6}.TemplateDevelopment|Any CPU.Build.0 = CodeCoverage|Any CPU
-		{C1780512-EAA3-4BE5-AC30-61DA95303599}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{C1780512-EAA3-4BE5-AC30-61DA95303599}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{C1780512-EAA3-4BE5-AC30-61DA95303599}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C1780512-EAA3-4BE5-AC30-61DA95303599}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C1780512-EAA3-4BE5-AC30-61DA95303599}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C1780512-EAA3-4BE5-AC30-61DA95303599}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C1780512-EAA3-4BE5-AC30-61DA95303599}.TemplateDevelopment|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{C1780512-EAA3-4BE5-AC30-61DA95303599}.TemplateDevelopment|Any CPU.Build.0 = CodeCoverage|Any CPU
-		{DF4ABEC8-D7EC-4647-9AC7-E62079A930D3}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{DF4ABEC8-D7EC-4647-9AC7-E62079A930D3}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{DF4ABEC8-D7EC-4647-9AC7-E62079A930D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DF4ABEC8-D7EC-4647-9AC7-E62079A930D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DF4ABEC8-D7EC-4647-9AC7-E62079A930D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DF4ABEC8-D7EC-4647-9AC7-E62079A930D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DF4ABEC8-D7EC-4647-9AC7-E62079A930D3}.TemplateDevelopment|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{DF4ABEC8-D7EC-4647-9AC7-E62079A930D3}.TemplateDevelopment|Any CPU.Build.0 = CodeCoverage|Any CPU
-		{17D57DFA-F735-49CB-8E27-1F960F46C472}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{17D57DFA-F735-49CB-8E27-1F960F46C472}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{17D57DFA-F735-49CB-8E27-1F960F46C472}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{17D57DFA-F735-49CB-8E27-1F960F46C472}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{17D57DFA-F735-49CB-8E27-1F960F46C472}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{17D57DFA-F735-49CB-8E27-1F960F46C472}.Release|Any CPU.Build.0 = Release|Any CPU
-		{17D57DFA-F735-49CB-8E27-1F960F46C472}.TemplateDevelopment|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{17D57DFA-F735-49CB-8E27-1F960F46C472}.TemplateDevelopment|Any CPU.Build.0 = CodeCoverage|Any CPU
-		{3A09A9DB-AA0C-492B-BD8E-9D515485A193}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{3A09A9DB-AA0C-492B-BD8E-9D515485A193}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{3A09A9DB-AA0C-492B-BD8E-9D515485A193}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3A09A9DB-AA0C-492B-BD8E-9D515485A193}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3A09A9DB-AA0C-492B-BD8E-9D515485A193}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3A09A9DB-AA0C-492B-BD8E-9D515485A193}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A09A9DB-AA0C-492B-BD8E-9D515485A193}.TemplateDevelopment|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{3A09A9DB-AA0C-492B-BD8E-9D515485A193}.TemplateDevelopment|Any CPU.Build.0 = CodeCoverage|Any CPU
-		{F5830821-3E1E-423C-975E-4A6DC0612735}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{F5830821-3E1E-423C-975E-4A6DC0612735}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{F5830821-3E1E-423C-975E-4A6DC0612735}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F5830821-3E1E-423C-975E-4A6DC0612735}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F5830821-3E1E-423C-975E-4A6DC0612735}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F5830821-3E1E-423C-975E-4A6DC0612735}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5830821-3E1E-423C-975E-4A6DC0612735}.TemplateDevelopment|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{F5830821-3E1E-423C-975E-4A6DC0612735}.TemplateDevelopment|Any CPU.Build.0 = CodeCoverage|Any CPU
-		{A7DEAB53-6DCB-4287-8DED-C0358BCB4EBB}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{A7DEAB53-6DCB-4287-8DED-C0358BCB4EBB}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{A7DEAB53-6DCB-4287-8DED-C0358BCB4EBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A7DEAB53-6DCB-4287-8DED-C0358BCB4EBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A7DEAB53-6DCB-4287-8DED-C0358BCB4EBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A7DEAB53-6DCB-4287-8DED-C0358BCB4EBB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A7DEAB53-6DCB-4287-8DED-C0358BCB4EBB}.TemplateDevelopment|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{A7DEAB53-6DCB-4287-8DED-C0358BCB4EBB}.TemplateDevelopment|Any CPU.Build.0 = CodeCoverage|Any CPU
-		{ED0444A3-03A3-4B84-854F-CC6BC53DEBB8}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{ED0444A3-03A3-4B84-854F-CC6BC53DEBB8}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{ED0444A3-03A3-4B84-854F-CC6BC53DEBB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ED0444A3-03A3-4B84-854F-CC6BC53DEBB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ED0444A3-03A3-4B84-854F-CC6BC53DEBB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ED0444A3-03A3-4B84-854F-CC6BC53DEBB8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ED0444A3-03A3-4B84-854F-CC6BC53DEBB8}.TemplateDevelopment|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{ED0444A3-03A3-4B84-854F-CC6BC53DEBB8}.TemplateDevelopment|Any CPU.Build.0 = CodeCoverage|Any CPU
-		{101A6115-688F-474A-AC5F-051FA6232349}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{101A6115-688F-474A-AC5F-051FA6232349}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{101A6115-688F-474A-AC5F-051FA6232349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{101A6115-688F-474A-AC5F-051FA6232349}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{101A6115-688F-474A-AC5F-051FA6232349}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{101A6115-688F-474A-AC5F-051FA6232349}.Release|Any CPU.Build.0 = Release|Any CPU
-		{101A6115-688F-474A-AC5F-051FA6232349}.TemplateDevelopment|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{101A6115-688F-474A-AC5F-051FA6232349}.TemplateDevelopment|Any CPU.Build.0 = CodeCoverage|Any CPU
-		{05407166-867F-4321-A3B2-0E5D56726C2B}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{05407166-867F-4321-A3B2-0E5D56726C2B}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
 		{05407166-867F-4321-A3B2-0E5D56726C2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{05407166-867F-4321-A3B2-0E5D56726C2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{05407166-867F-4321-A3B2-0E5D56726C2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{05407166-867F-4321-A3B2-0E5D56726C2B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{05407166-867F-4321-A3B2-0E5D56726C2B}.TemplateDevelopment|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{05407166-867F-4321-A3B2-0E5D56726C2B}.TemplateDevelopment|Any CPU.Build.0 = CodeCoverage|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Microsoft.Azure.TypeEdge/Extensions.cs b/Microsoft.Azure.TypeEdge/Extensions.cs
index 96aa940..8feaaa7 100644
--- a/Microsoft.Azure.TypeEdge/Extensions.cs
+++ b/Microsoft.Azure.TypeEdge/Extensions.cs
@@ -5,16 +5,16 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Azure.TypeEdge.Attributes;
+using System.Threading.Tasks; 
+using Microsoft.Azure.TypeEdge.Attributes; 
 using Microsoft.Azure.TypeEdge.DovEnv;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.FileProviders; 
 using Microsoft.Extensions.FileProviders.Physical;
-
+ 
 namespace Microsoft.Azure.TypeEdge
 {
-    public static class Extensions
+    public static class Extensions 
     {
         public static IConfigurationBuilder AddDotΕnv(this IConfigurationBuilder builder)
         {
diff --git a/Microsoft.Azure.TypeEdge/Microsoft.Azure.TypeEdge.csproj b/Microsoft.Azure.TypeEdge/Microsoft.Azure.TypeEdge.csproj
index f328cc4..539d705 100644
--- a/Microsoft.Azure.TypeEdge/Microsoft.Azure.TypeEdge.csproj
+++ b/Microsoft.Azure.TypeEdge/Microsoft.Azure.TypeEdge.csproj
@@ -1,18 +1,23 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <PackageId>Microsoft.Azure.TypeEdge</PackageId>
     <Authors>Microsoft</Authors>
     
-    <Version>0.4.4</Version>
+    <Version>0.4.4.14</Version>
     <PackageOutputPath>../../TypeEdgeNuGets</PackageOutputPath>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>Microsoft.Azure.TypeEdge</AssemblyName>
     <RootNamespace>Microsoft.Azure.TypeEdge</RootNamespace>
-    <Configurations>Debug;Release;TemplateDevelopment</Configurations>
+    <Configurations>Debug;Release</Configurations>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="$(Configuration) == 'Release'">
+    <BumpRevision>True</BumpRevision>
   </PropertyGroup>
 
   <ItemGroup>
@@ -33,10 +38,18 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
+    <PackageReference Include="MSBump" Version="2.3.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.10" />
     <PackageReference Include="Serilog" Version="2.7.1" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="1.4.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="2.1.0" />
   </ItemGroup>
 
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="$(Configuration) == 'Release'">
+    <Exec Command="dotnet pack --no-build" />
+  </Target>
+
 </Project>
diff --git a/Templates/TypeEdgeApplication/Modules/TypeEdgeModule1/TypeEdgeModule1.csproj b/Templates/TypeEdgeApplication/Modules/TypeEdgeModule1/TypeEdgeModule1.csproj
index 4047c31..6727051 100644
--- a/Templates/TypeEdgeApplication/Modules/TypeEdgeModule1/TypeEdgeModule1.csproj
+++ b/Templates/TypeEdgeApplication/Modules/TypeEdgeModule1/TypeEdgeModule1.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Templates/TypeEdgeApplication/Modules/TypeEdgeModule2/TypeEdgeModule2.csproj b/Templates/TypeEdgeApplication/Modules/TypeEdgeModule2/TypeEdgeModule2.csproj
index 4047c31..6727051 100644
--- a/Templates/TypeEdgeApplication/Modules/TypeEdgeModule2/TypeEdgeModule2.csproj
+++ b/Templates/TypeEdgeApplication/Modules/TypeEdgeModule2/TypeEdgeModule2.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Templates/TypeEdgeApplication/TypeEdgeApplication.Emulator/TypeEdgeApplication.Emulator.csproj b/Templates/TypeEdgeApplication/TypeEdgeApplication.Emulator/TypeEdgeApplication.Emulator.csproj
index 74e5029..78314d9 100644
--- a/Templates/TypeEdgeApplication/TypeEdgeApplication.Emulator/TypeEdgeApplication.Emulator.csproj
+++ b/Templates/TypeEdgeApplication/TypeEdgeApplication.Emulator/TypeEdgeApplication.Emulator.csproj
@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageReference Include="rocksdb-native-arm" Version="5.4.6" />
     <PackageReference Include="RocksDbNative" Version="5.4.6.10" />
-    <PackageReference Include="Microsoft.Azure.TypeEdge.Host" Version="0.4.4" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge.Host" Version="0.4.4.*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Templates/TypeEdgeApplication/TypeEdgeApplication.Proxy/TypeEdgeApplication.Proxy.csproj b/Templates/TypeEdgeApplication/TypeEdgeApplication.Proxy/TypeEdgeApplication.Proxy.csproj
index be2e3d4..b557ddd 100644
--- a/Templates/TypeEdgeApplication/TypeEdgeApplication.Proxy/TypeEdgeApplication.Proxy.csproj
+++ b/Templates/TypeEdgeApplication/TypeEdgeApplication.Proxy/TypeEdgeApplication.Proxy.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge.Proxy" Version="0.4.4" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge.Proxy" Version="0.4.4.*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Templates/TypeEdgeApplication/TypeEdgeApplication.Shared/TypeEdgeApplication.Shared.csproj b/Templates/TypeEdgeApplication/TypeEdgeApplication.Shared/TypeEdgeApplication.Shared.csproj
index df7c150..f0915da 100644
--- a/Templates/TypeEdgeApplication/TypeEdgeApplication.Shared/TypeEdgeApplication.Shared.csproj
+++ b/Templates/TypeEdgeApplication/TypeEdgeApplication.Shared/TypeEdgeApplication.Shared.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.*" />
   </ItemGroup>
 
 </Project>
diff --git a/Templates/TypeEdgeEmulator/TypeEdgeEmulator.csproj b/Templates/TypeEdgeEmulator/TypeEdgeEmulator.csproj
index 518d12c..506959a 100644
--- a/Templates/TypeEdgeEmulator/TypeEdgeEmulator.csproj
+++ b/Templates/TypeEdgeEmulator/TypeEdgeEmulator.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge.Host" Version="0.4.4" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge.Host" Version="0.4.4.*" />
   </ItemGroup>
 
 </Project>
diff --git a/Templates/TypeEdgeML/Modules/TypeEdgeModule1/TypeEdgeModule1.csproj b/Templates/TypeEdgeML/Modules/TypeEdgeModule1/TypeEdgeModule1.csproj
index 05ac7b4..fb14eee 100644
--- a/Templates/TypeEdgeML/Modules/TypeEdgeModule1/TypeEdgeModule1.csproj
+++ b/Templates/TypeEdgeML/Modules/TypeEdgeModule1/TypeEdgeModule1.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Templates/TypeEdgeML/Modules/TypeEdgeModule2/TypeEdgeModule2.csproj b/Templates/TypeEdgeML/Modules/TypeEdgeModule2/TypeEdgeModule2.csproj
index 05ac7b4..fb14eee 100644
--- a/Templates/TypeEdgeML/Modules/TypeEdgeModule2/TypeEdgeModule2.csproj
+++ b/Templates/TypeEdgeML/Modules/TypeEdgeModule2/TypeEdgeModule2.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Templates/TypeEdgeML/Modules/TypeEdgeModule3/TypeEdgeModule3.csproj b/Templates/TypeEdgeML/Modules/TypeEdgeModule3/TypeEdgeModule3.csproj
index 4053b83..db7f560 100644
--- a/Templates/TypeEdgeML/Modules/TypeEdgeModule3/TypeEdgeModule3.csproj
+++ b/Templates/TypeEdgeML/Modules/TypeEdgeModule3/TypeEdgeModule3.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="paloukari.Python.Runtime" Version="2.4.64" />
-    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.*" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/Templates/TypeEdgeML/TypeEdgeML.Emulator/TypeEdgeML.Emulator.csproj b/Templates/TypeEdgeML/TypeEdgeML.Emulator/TypeEdgeML.Emulator.csproj
index b263b7a..eaa5528 100644
--- a/Templates/TypeEdgeML/TypeEdgeML.Emulator/TypeEdgeML.Emulator.csproj
+++ b/Templates/TypeEdgeML/TypeEdgeML.Emulator/TypeEdgeML.Emulator.csproj
@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageReference Include="rocksdb-native-arm" Version="5.4.6" />
     <PackageReference Include="RocksDbNative" Version="5.4.6.10" />
-    <PackageReference Include="Microsoft.Azure.TypeEdge.Host" Version="0.4.4" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge.Host" Version="0.4.4.*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Templates/TypeEdgeML/TypeEdgeML.Proxy/TypeEdgeML.Proxy.csproj b/Templates/TypeEdgeML/TypeEdgeML.Proxy/TypeEdgeML.Proxy.csproj
index 619e671..c0c2291 100644
--- a/Templates/TypeEdgeML/TypeEdgeML.Proxy/TypeEdgeML.Proxy.csproj
+++ b/Templates/TypeEdgeML/TypeEdgeML.Proxy/TypeEdgeML.Proxy.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge.Proxy" Version="0.4.4" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge.Proxy" Version="0.4.4.*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Templates/TypeEdgeML/TypeEdgeML.Shared/TypeEdgeML.Shared.csproj b/Templates/TypeEdgeML/TypeEdgeML.Shared/TypeEdgeML.Shared.csproj
index df7c150..f0915da 100644
--- a/Templates/TypeEdgeML/TypeEdgeML.Shared/TypeEdgeML.Shared.csproj
+++ b/Templates/TypeEdgeML/TypeEdgeML.Shared/TypeEdgeML.Shared.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.*" />
   </ItemGroup>
 
 </Project>
diff --git a/Templates/TypeEdgeModule/TypeEdgeModule.csproj b/Templates/TypeEdgeModule/TypeEdgeModule.csproj
index c119ff3..e26f14e 100644
--- a/Templates/TypeEdgeModule/TypeEdgeModule.csproj
+++ b/Templates/TypeEdgeModule/TypeEdgeModule.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.*" />
   </ItemGroup>
 
 </Project>
diff --git a/Templates/TypeEdgeModuleVsCode/TypeEdgeModuleVsCode.csproj b/Templates/TypeEdgeModuleVsCode/TypeEdgeModuleVsCode.csproj
index c119ff3..e26f14e 100644
--- a/Templates/TypeEdgeModuleVsCode/TypeEdgeModuleVsCode.csproj
+++ b/Templates/TypeEdgeModuleVsCode/TypeEdgeModuleVsCode.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge" Version="0.4.4.*" />
   </ItemGroup>
 
 </Project>
diff --git a/Templates/TypeEdgeServiceProxy/TypeEdgeServiceProxy.csproj b/Templates/TypeEdgeServiceProxy/TypeEdgeServiceProxy.csproj
index 6e6d162..aafec52 100644
--- a/Templates/TypeEdgeServiceProxy/TypeEdgeServiceProxy.csproj
+++ b/Templates/TypeEdgeServiceProxy/TypeEdgeServiceProxy.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.TypeEdge.Proxy" Version="0.4.4" />
+    <PackageReference Include="Microsoft.Azure.TypeEdge.Proxy" Version="0.4.4.*" />
   </ItemGroup>
 
 </Project>
diff --git a/nuget.exe b/nuget.exe
new file mode 100644
index 0000000..ccb2979
Binary files /dev/null and b/nuget.exe differ