diff --git a/51D.md b/51D.md
deleted file mode 100644
index 19ee8b40..00000000
--- a/51D.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Internal Use
-
-## Enable debugging of NuGet packages
-
-In order to debug into NuGet packages, you must be using packages that reference debug symbols. By default, this includes all pre-release packages but not final versions.
-If you have a debuggable package then you will need to configure Visual Studio to allow you to step into it:
-
-- In tools -> options -> debugging -> symbols, add the Azure DevOps symbol server: 
-![Visual Studio 2017 screenshot with symbol server added][ImageAddSymbolServer]
-- Select the ‘Load only specified modules’ option at the bottom and configure it to only load Symbols for 51Degrees modules as shown below:
-![Visual Studio 2017 configured to only load external symbols for 51Degrees libraries][ImageLoadOnlyFiftyone]
-- In tools -> options -> debugging -> general, ensure that:
-  - Enable Just My Code is off. Having this on will prevent VS stepping into any NuGet packages.
-  - Enable source server support is on.
-  - Example Source Link support is on.
-![Visual Studio 2017 configured for debugging external packages][ImageConfigureDebugger]
-
-When stepping into a method from a relevant NuGet package, you should now see the following warning message:
-![Visual Studio 2017 Source Link download warning][ImageSourceLinkDownload]
-
-[ImageAddSymbolServer]: file://Images/vs2017-add-symbol-server.png
-[ImageConfigureDebugger]: file://Images/vs2017-configure-debugger.png
-[ImageLoadOnlyFiftyone]: file://Images/vs2017-load-only-fiftyone.png
-[ImageSourceLinkDownload]: file://Images/vs2017-source-link-download.png
\ No newline at end of file
diff --git a/Examples/Cloud/Configurator-Console/Configurator-Console.csproj b/Examples/Cloud/Configurator-Console/Configurator-Console.csproj
index e42c1dbe..d7367625 100644
--- a/Examples/Cloud/Configurator-Console/Configurator-Console.csproj
+++ b/Examples/Cloud/Configurator-Console/Configurator-Console.csproj
@@ -13,7 +13,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
     <ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
   </ItemGroup>
 
diff --git a/Examples/Cloud/Framework-Web/Framework-Web.csproj b/Examples/Cloud/Framework-Web/Framework-Web.csproj
index 2a1fe0cd..805f7678 100644
--- a/Examples/Cloud/Framework-Web/Framework-Web.csproj
+++ b/Examples/Cloud/Framework-Web/Framework-Web.csproj
@@ -44,6 +44,18 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="FiftyOne.DeviceDetection, Version=4.4.12.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\FiftyOne.DeviceDetection.4.4.12\lib\netstandard2.0\FiftyOne.DeviceDetection.dll</HintPath>
+    </Reference>
+    <Reference Include="FiftyOne.DeviceDetection.Cloud, Version=4.4.12.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\FiftyOne.DeviceDetection.Cloud.4.4.12\lib\netstandard2.0\FiftyOne.DeviceDetection.Cloud.dll</HintPath>
+    </Reference>
+    <Reference Include="FiftyOne.DeviceDetection.Hash.Engine.OnPremise, Version=4.4.12.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.12\lib\netstandard2.0\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.dll</HintPath>
+    </Reference>
+    <Reference Include="FiftyOne.DeviceDetection.Shared, Version=4.4.12.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\FiftyOne.DeviceDetection.Shared.4.4.12\lib\netstandard2.0\FiftyOne.DeviceDetection.Shared.dll</HintPath>
+    </Reference>
     <Reference Include="FiftyOne.Pipeline.CloudRequestEngine, Version=4.4.7.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\FiftyOne.Pipeline.CloudRequestEngine.4.4.7\lib\netstandard2.0\FiftyOne.Pipeline.CloudRequestEngine.dll</HintPath>
     </Reference>
@@ -289,12 +301,6 @@
       <DependentUpon>Site.Master</DependentUpon>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Cloud\FiftyOne.DeviceDetection.Cloud.csproj">
-      <Project>{b085f69e-d9d9-43cd-83bf-dc881a9ed501}</Project>
-      <Name>FiftyOne.DeviceDetection.Cloud</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
     <Content Include="Scripts\jquery-3.4.1.slim.min.map" />
@@ -374,7 +380,9 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.12\build\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.12\build\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.targets'))" />
   </Target>
+  <Import Project="..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.12\build\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.targets" Condition="Exists('..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.12\build\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Examples/Cloud/Framework-Web/packages.config b/Examples/Cloud/Framework-Web/packages.config
index 889da87e..e7ce9627 100644
--- a/Examples/Cloud/Framework-Web/packages.config
+++ b/Examples/Cloud/Framework-Web/packages.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Antlr" version="3.5.0.2" targetFramework="net472" />
   <package id="AspNet.ScriptManager.bootstrap" version="3.4.1" targetFramework="net472" />
@@ -6,6 +6,10 @@
   <package id="bootstrap" version="3.4.1" targetFramework="net472" />
   <package id="FiftyOne.Caching" version="4.4.1" targetFramework="net472" />
   <package id="FiftyOne.Common" version="4.4.1" targetFramework="net472" />
+  <package id="FiftyOne.DeviceDetection" version="4.4.12" targetFramework="net472" />
+  <package id="FiftyOne.DeviceDetection.Cloud" version="4.4.12" targetFramework="net472" />
+  <package id="FiftyOne.DeviceDetection.Hash.Engine.OnPremise" version="4.4.12" targetFramework="net472" />
+  <package id="FiftyOne.DeviceDetection.Shared" version="4.4.12" targetFramework="net472" />
   <package id="FiftyOne.Pipeline.CloudRequestEngine" version="4.4.7" targetFramework="net472" />
   <package id="FiftyOne.Pipeline.Core" version="4.4.7" targetFramework="net472" />
   <package id="FiftyOne.Pipeline.Engines" version="4.4.7" targetFramework="net472" />
@@ -22,6 +26,7 @@
   <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net472" />
   <package id="Microsoft.AspNet.Web.Optimization.WebForms" version="1.1.3" targetFramework="net472" />
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net472" />
+  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net472" />
   <package id="Microsoft.Extensions.Configuration" version="2.1.1" targetFramework="net472" />
   <package id="Microsoft.Extensions.Configuration.Abstractions" version="2.1.1" targetFramework="net472" />
   <package id="Microsoft.Extensions.Configuration.Binder" version="2.1.10" targetFramework="net472" />
diff --git a/Examples/Cloud/GetAllProperties-Console/GetAllProperties.csproj b/Examples/Cloud/GetAllProperties-Console/GetAllProperties.csproj
index 7efd7504..81618451 100644
--- a/Examples/Cloud/GetAllProperties-Console/GetAllProperties.csproj
+++ b/Examples/Cloud/GetAllProperties-Console/GetAllProperties.csproj
@@ -58,8 +58,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Cloud\FiftyOne.DeviceDetection.Cloud.csproj" />
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
     <ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
   </ItemGroup>
 
diff --git a/Examples/Cloud/GettingStarted-Console/GettingStarted-Console.csproj b/Examples/Cloud/GettingStarted-Console/GettingStarted-Console.csproj
index b0115a32..c34956d1 100644
--- a/Examples/Cloud/GettingStarted-Console/GettingStarted-Console.csproj
+++ b/Examples/Cloud/GettingStarted-Console/GettingStarted-Console.csproj
@@ -74,8 +74,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Cloud\FiftyOne.DeviceDetection.Cloud.csproj" />
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
     <ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
   </ItemGroup>
 
diff --git a/Examples/Cloud/GettingStarted-Web/GettingStarted-Web.csproj b/Examples/Cloud/GettingStarted-Web/GettingStarted-Web.csproj
index b2fa6c79..de5a9681 100644
--- a/Examples/Cloud/GettingStarted-Web/GettingStarted-Web.csproj
+++ b/Examples/Cloud/GettingStarted-Web/GettingStarted-Web.csproj
@@ -24,7 +24,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Cloud\FiftyOne.DeviceDetection.Cloud.csproj" />
     <ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
   </ItemGroup>
 
diff --git a/Examples/Cloud/Metadata-Console/Metadata-Console.csproj b/Examples/Cloud/Metadata-Console/Metadata-Console.csproj
index b3af6359..6ded1ec8 100644
--- a/Examples/Cloud/Metadata-Console/Metadata-Console.csproj
+++ b/Examples/Cloud/Metadata-Console/Metadata-Console.csproj
@@ -12,7 +12,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
     <ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
   </ItemGroup>
 
diff --git a/Examples/Cloud/NativeModel-Console/NativeModelLookup-Console.csproj b/Examples/Cloud/NativeModel-Console/NativeModelLookup-Console.csproj
index 2236a397..2c1c77d7 100644
--- a/Examples/Cloud/NativeModel-Console/NativeModelLookup-Console.csproj
+++ b/Examples/Cloud/NativeModel-Console/NativeModelLookup-Console.csproj
@@ -62,7 +62,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Cloud\FiftyOne.DeviceDetection.Cloud.csproj" />
     <ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
   </ItemGroup>
 
diff --git a/Examples/Cloud/TAC-Console/TacLookup-Console.csproj b/Examples/Cloud/TAC-Console/TacLookup-Console.csproj
index eec807b1..b94478cd 100644
--- a/Examples/Cloud/TAC-Console/TacLookup-Console.csproj
+++ b/Examples/Cloud/TAC-Console/TacLookup-Console.csproj
@@ -74,8 +74,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Cloud\FiftyOne.DeviceDetection.Cloud.csproj" />
     <ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
   </ItemGroup>
-
 </Project>
diff --git a/Examples/ExampleBase/FiftyOne.DeviceDetection.Examples.csproj b/Examples/ExampleBase/FiftyOne.DeviceDetection.Examples.csproj
index 279eafa5..62589bdc 100644
--- a/Examples/ExampleBase/FiftyOne.DeviceDetection.Examples.csproj
+++ b/Examples/ExampleBase/FiftyOne.DeviceDetection.Examples.csproj
@@ -83,10 +83,16 @@
     <PackageReference Include="YamlDotNet" Version="11.2.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Cloud\FiftyOne.DeviceDetection.Cloud.csproj" />
-    <ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Hash.Engine.OnPremise\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.csproj" />
-    <ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
-  </ItemGroup>
-
+  <Choose>
+    <When Condition="$(TestExamples51D)=='True'">
+      <ItemGroup>
+        <ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.12" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
 </Project>
diff --git a/Examples/OnPremise/AppleServerSide-Console/AppleServerSide-Console.csproj b/Examples/OnPremise/AppleServerSide-Console/AppleServerSide-Console.csproj
index e39a3bae..2aea3275 100644
--- a/Examples/OnPremise/AppleServerSide-Console/AppleServerSide-Console.csproj
+++ b/Examples/OnPremise/AppleServerSide-Console/AppleServerSide-Console.csproj
@@ -12,7 +12,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
     <ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
   </ItemGroup>
 
diff --git a/Examples/OnPremise/AppleServerSideConfig-Console/AppleServerSideConfig-Console.csproj b/Examples/OnPremise/AppleServerSideConfig-Console/AppleServerSideConfig-Console.csproj
index 752e214f..3276cab8 100644
--- a/Examples/OnPremise/AppleServerSideConfig-Console/AppleServerSideConfig-Console.csproj
+++ b/Examples/OnPremise/AppleServerSideConfig-Console/AppleServerSideConfig-Console.csproj
@@ -23,7 +23,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
     <ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
   </ItemGroup>
 
diff --git a/Examples/OnPremise/GettingStarted-Console/GettingStarted-Console.csproj b/Examples/OnPremise/GettingStarted-Console/GettingStarted-Console.csproj
index 02d2d780..cf2bdb18 100644
--- a/Examples/OnPremise/GettingStarted-Console/GettingStarted-Console.csproj
+++ b/Examples/OnPremise/GettingStarted-Console/GettingStarted-Console.csproj
@@ -19,8 +19,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Hash.Engine.OnPremise\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.csproj" />
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
     <ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
   </ItemGroup>
 
diff --git a/Examples/OnPremise/GettingStarted-Web/GettingStarted-Web.csproj b/Examples/OnPremise/GettingStarted-Web/GettingStarted-Web.csproj
index d09b029b..3716682d 100644
--- a/Examples/OnPremise/GettingStarted-Web/GettingStarted-Web.csproj
+++ b/Examples/OnPremise/GettingStarted-Web/GettingStarted-Web.csproj
@@ -24,7 +24,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Hash.Engine.OnPremise\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.csproj" />
     <ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
   </ItemGroup>
 
diff --git a/Examples/OnPremise/MatchMetrics-Console/MatchMetrics-Console.csproj b/Examples/OnPremise/MatchMetrics-Console/MatchMetrics-Console.csproj
index 44a29c30..72cb0534 100644
--- a/Examples/OnPremise/MatchMetrics-Console/MatchMetrics-Console.csproj
+++ b/Examples/OnPremise/MatchMetrics-Console/MatchMetrics-Console.csproj
@@ -15,7 +15,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
     <ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
   </ItemGroup>
 
diff --git a/Examples/OnPremise/Metadata-Console/Metadata-Console.csproj b/Examples/OnPremise/Metadata-Console/Metadata-Console.csproj
index 6a03923a..2c138b86 100644
--- a/Examples/OnPremise/Metadata-Console/Metadata-Console.csproj
+++ b/Examples/OnPremise/Metadata-Console/Metadata-Console.csproj
@@ -11,7 +11,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
     <ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
   </ItemGroup>
 
diff --git a/Examples/OnPremise/OfflineProcessing-Console/OfflineProcessing-Console.csproj b/Examples/OnPremise/OfflineProcessing-Console/OfflineProcessing-Console.csproj
index 2702b3fc..9064acff 100644
--- a/Examples/OnPremise/OfflineProcessing-Console/OfflineProcessing-Console.csproj
+++ b/Examples/OnPremise/OfflineProcessing-Console/OfflineProcessing-Console.csproj
@@ -14,7 +14,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
     <ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
   </ItemGroup>
 
diff --git a/Examples/OnPremise/Performance-Console/Performance-Console.csproj b/Examples/OnPremise/Performance-Console/Performance-Console.csproj
index f66b3a67..e5225deb 100644
--- a/Examples/OnPremise/Performance-Console/Performance-Console.csproj
+++ b/Examples/OnPremise/Performance-Console/Performance-Console.csproj
@@ -13,7 +13,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
     <ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
   </ItemGroup>
 
diff --git a/Examples/OnPremise/UpdateDataFile-Console/UpdateDataFile-Console.csproj b/Examples/OnPremise/UpdateDataFile-Console/UpdateDataFile-Console.csproj
index ffea5440..65759bf3 100644
--- a/Examples/OnPremise/UpdateDataFile-Console/UpdateDataFile-Console.csproj
+++ b/Examples/OnPremise/UpdateDataFile-Console/UpdateDataFile-Console.csproj
@@ -15,8 +15,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Hash.Engine.OnPremise\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.csproj" />
-    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
     <ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj" />
   </ItemGroup>
 
diff --git a/FiftyOne.DeviceDetection/Examples/AspNetCore3.1-UACH-manual/Client-Hints Not Integrated NetCore 3.1.csproj b/FiftyOne.DeviceDetection/Examples/AspNetCore3.1-UACH-manual/Client-Hints Not Integrated NetCore 3.1.csproj
index 8612468c..340fc54c 100644
--- a/FiftyOne.DeviceDetection/Examples/AspNetCore3.1-UACH-manual/Client-Hints Not Integrated NetCore 3.1.csproj	
+++ b/FiftyOne.DeviceDetection/Examples/AspNetCore3.1-UACH-manual/Client-Hints Not Integrated NetCore 3.1.csproj	
@@ -59,9 +59,17 @@
   <ItemGroup>
     <PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.7" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
-  </ItemGroup>
 
+  <Choose>
+    <When Condition="$(TestExamples51D)=='True'">
+      <ItemGroup>
+        <ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.12" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
 </Project>
diff --git a/FiftyOne.DeviceDetection/Examples/AspNetCore3.1-UACH/Client-Hints NetCore 3.1.csproj b/FiftyOne.DeviceDetection/Examples/AspNetCore3.1-UACH/Client-Hints NetCore 3.1.csproj
index caf4ab47..17f3cd6f 100644
--- a/FiftyOne.DeviceDetection/Examples/AspNetCore3.1-UACH/Client-Hints NetCore 3.1.csproj	
+++ b/FiftyOne.DeviceDetection/Examples/AspNetCore3.1-UACH/Client-Hints NetCore 3.1.csproj	
@@ -59,9 +59,17 @@
   <ItemGroup>
     <PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.7" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
-  </ItemGroup>
 
+  <Choose>
+    <When Condition="$(TestExamples51D)=='True'">
+      <ItemGroup>
+        <ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.12" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
 </Project>
diff --git a/FiftyOne.DeviceDetection/Examples/Cloud-AspNetCore3.1-UACH-manual/Cloud - Client-Hints Not Integrated NetCore 3.1.csproj b/FiftyOne.DeviceDetection/Examples/Cloud-AspNetCore3.1-UACH-manual/Cloud - Client-Hints Not Integrated NetCore 3.1.csproj
index 2d224894..5e808f66 100644
--- a/FiftyOne.DeviceDetection/Examples/Cloud-AspNetCore3.1-UACH-manual/Cloud - Client-Hints Not Integrated NetCore 3.1.csproj	
+++ b/FiftyOne.DeviceDetection/Examples/Cloud-AspNetCore3.1-UACH-manual/Cloud - Client-Hints Not Integrated NetCore 3.1.csproj	
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -59,9 +59,17 @@
   <ItemGroup>
     <PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.7" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
-  </ItemGroup>
 
+  <Choose>
+    <When Condition="$(TestExamples51D)=='True'">
+      <ItemGroup>
+        <ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.12" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
 </Project>
diff --git a/FiftyOne.DeviceDetection/Examples/Cloud-AspNetCore3.1-UACH/Cloud - Client-Hints NetCore 3.1.csproj b/FiftyOne.DeviceDetection/Examples/Cloud-AspNetCore3.1-UACH/Cloud - Client-Hints NetCore 3.1.csproj
index b4dddc86..d9bfc9e9 100644
--- a/FiftyOne.DeviceDetection/Examples/Cloud-AspNetCore3.1-UACH/Cloud - Client-Hints NetCore 3.1.csproj	
+++ b/FiftyOne.DeviceDetection/Examples/Cloud-AspNetCore3.1-UACH/Cloud - Client-Hints NetCore 3.1.csproj	
@@ -59,9 +59,17 @@
   <ItemGroup>
     <PackageReference Include="FiftyOne.Pipeline.Web" Version="4.4.7" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
-  </ItemGroup>
 
+  <Choose>
+    <When Condition="$(TestExamples51D)=='True'">
+      <ItemGroup>
+        <ProjectReference Include="..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.csproj" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.12" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
 </Project>
diff --git a/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Cloud/FiftyOne.DeviceDetection.Cloud.csproj b/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Cloud/FiftyOne.DeviceDetection.Cloud.csproj
index 13f5bbf9..94a8f79a 100644
--- a/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Cloud/FiftyOne.DeviceDetection.Cloud.csproj
+++ b/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Cloud/FiftyOne.DeviceDetection.Cloud.csproj
@@ -42,10 +42,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Data/FiftyOne.DeviceDetection.Shared.csproj b/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Data/FiftyOne.DeviceDetection.Shared.csproj
index 8610b6f3..ead2f735 100644
--- a/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Data/FiftyOne.DeviceDetection.Shared.csproj
+++ b/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Data/FiftyOne.DeviceDetection.Shared.csproj
@@ -42,10 +42,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
   
   <ItemGroup>
diff --git a/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Hash.Engine.OnPremise/FiftyOne.DeviceDetection.Hash.Engine.OnPremise.csproj b/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Hash.Engine.OnPremise/FiftyOne.DeviceDetection.Hash.Engine.OnPremise.csproj
index 8a57f410..fe2d6bdb 100644
--- a/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Hash.Engine.OnPremise/FiftyOne.DeviceDetection.Hash.Engine.OnPremise.csproj
+++ b/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Hash.Engine.OnPremise/FiftyOne.DeviceDetection.Hash.Engine.OnPremise.csproj
@@ -72,10 +72,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 
   <PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
diff --git a/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.csproj b/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.csproj
index 25613db8..468896a5 100644
--- a/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.csproj
+++ b/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.csproj
@@ -42,10 +42,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/FiftyOne.DeviceDetection/device-detection-cxx b/FiftyOne.DeviceDetection/device-detection-cxx
index 66e57f3e..105f3220 160000
--- a/FiftyOne.DeviceDetection/device-detection-cxx
+++ b/FiftyOne.DeviceDetection/device-detection-cxx
@@ -1 +1 @@
-Subproject commit 66e57f3eb1e39125cae881237528b9db2b3bc13c
+Subproject commit 105f3220707a689e258d6c04a5704f91293fd988
diff --git a/ci/common-ci b/ci/common-ci
index 70fb4815..bfffd7bd 160000
--- a/ci/common-ci
+++ b/ci/common-ci
@@ -1 +1 @@
-Subproject commit 70fb4815a324f84a6cf651ac9815e15984644bb2
+Subproject commit bfffd7bde49abc58ef661e99d72d1c01ecdf9697
diff --git a/ci/shared-build-and-test-stage-linux.yml b/ci/shared-build-and-test-stage-linux.yml
index 4335b0c3..6f259dc5 100644
--- a/ci/shared-build-and-test-stage-linux.yml
+++ b/ci/shared-build-and-test-stage-linux.yml
@@ -131,4 +131,5 @@ stages:
         ACCEPTCH_HARDWARE_KEY: $(AcceptChHardwareKey)
         ACCEPTCH_PLATFORM_KEY: $(AcceptChPlatformKey)
         ACCEPTCH_NONE_KEY: $(AcceptChNoneKey)
-        51D_CLOUD_ENDPOINT: 'https://cloud.51degrees.com/api/v4'
+        51D_CLOUD_ENDPOINT: 'https://cloud.51degrees.com/api/v4'        
+        TestExamples51D: 'True'
\ No newline at end of file
diff --git a/ci/shared-build-and-test-stage.yml b/ci/shared-build-and-test-stage.yml
index ad96f349..2edd70c7 100644
--- a/ci/shared-build-and-test-stage.yml
+++ b/ci/shared-build-and-test-stage.yml
@@ -91,7 +91,9 @@ stages:
       inputs:
         version: 3.1.x
         performMultiLevelLookup: true
-        packageType: sdk   
+        packageType: sdk  
+      env:
+        PROCESSOR_ARCHITECTURE: '$(BuildPlatform)'
        
     # Download the latest V4 TAC hash file from the distributor
     - task: PowerShell@2
@@ -181,6 +183,7 @@ stages:
         ACCEPTCH_PLATFORM_KEY: $(AcceptChPlatformKey)
         ACCEPTCH_NONE_KEY: $(AcceptChNoneKey)  
         51D_CLOUD_ENDPOINT: 'https://cloud.51degrees.com/api/v4'
+        TestExamples51D: 'True'
       condition: succeededOrFailed()
     
       # Build the performance test project. This will only target the x64 platform.