diff --git a/Build/DeloitteDigital.Atlas.nuspec b/Build/DeloitteDigital.Atlas.nuspec
index 717a6c0..acf658c 100644
--- a/Build/DeloitteDigital.Atlas.nuspec
+++ b/Build/DeloitteDigital.Atlas.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>DeloitteDigital.Atlas</id>
-    <version>1.1.0</version>
+    <version>2.0.2</version>
     <authors>Deloitte Digital</authors>
     <owners>Deloitte Digital</owners>
     <licenseUrl>https://github.com/DeloitteDigitalAPAC/Atlas/blob/master/LICENSE</licenseUrl>
diff --git a/DeloitteDigital.Atlas.sln b/DeloitteDigital.Atlas.sln
index ace31fb..268ff30 100644
--- a/DeloitteDigital.Atlas.sln
+++ b/DeloitteDigital.Atlas.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.539
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeloitteDigital.Atlas", "src\DeloitteDigital.Atlas\DeloitteDigital.Atlas.csproj", "{601B96BD-D95F-4281-9A1B-7D99374DD869}"
 EndProject
@@ -31,4 +31,8 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		EnterpriseLibraryConfigurationToolBinariesPathV6 = packages\EnterpriseLibrary.Common.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.TransientFaultHandling.6.0.1304.0\lib\portable-net45+win+wp8;packages\EnterpriseLibrary.TransientFaultHandling.Caching.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.TransientFaultHandling.Data.6.0.1304.1\lib\NET45;packages\EnterpriseLibrary.TransientFaultHandling.ServiceBus.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.TransientFaultHandling.WindowsAzure.Storage.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.TransientFaultHandling.Configuration.6.0.1304.0\lib\NET45
+		SolutionGuid = {C4120DCF-283D-4C71-A165-A67041EBB723}
+	EndGlobalSection
 EndGlobal
diff --git a/src/DeloitteDigital.Atlas.Tests/DeloitteDigital.Atlas.Tests.csproj b/src/DeloitteDigital.Atlas.Tests/DeloitteDigital.Atlas.Tests.csproj
index 617a180..76676bb 100644
--- a/src/DeloitteDigital.Atlas.Tests/DeloitteDigital.Atlas.Tests.csproj
+++ b/src/DeloitteDigital.Atlas.Tests/DeloitteDigital.Atlas.Tests.csproj
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DeloitteDigital.Atlas.Tests</RootNamespace>
     <AssemblyName>DeloitteDigital.Atlas.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -36,131 +36,100 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HtmlAgilityPack, Version=1.4.6.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Lucene.Net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.1.0.0\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
-      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Practices.EnterpriseLibrary.Common, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EnterpriseLibrary.Common.6.0.1304.0\lib\NET45\Microsoft.Practices.EnterpriseLibrary.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EnterpriseLibrary.TransientFaultHandling.6.0.1304.0\lib\portable-net45+win+wp8\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Abstractions, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Abstractions.8.2.160729\lib\NET452\Sitecore.Abstractions.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Caching, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EnterpriseLibrary.TransientFaultHandling.Caching.6.0.1304.0\lib\NET45\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Caching.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Analytics.8.2.160729\lib\NET452\Sitecore.Analytics.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Configuration, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EnterpriseLibrary.TransientFaultHandling.Configuration.6.0.1304.0\lib\NET45\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Configuration.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics.Core, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Analytics.Core.8.2.160729\lib\NET452\Sitecore.Analytics.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Data, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EnterpriseLibrary.TransientFaultHandling.Data.6.0.1304.1\lib\NET45\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Data.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics.DataAccess, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Analytics.DataAccess.8.2.160729\lib\NET452\Sitecore.Analytics.DataAccess.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.ServiceBus, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EnterpriseLibrary.TransientFaultHandling.ServiceBus.6.0.1304.0\lib\NET45\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.ServiceBus.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics.Model, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Analytics.Model.8.2.160729\lib\NET452\Sitecore.Analytics.Model.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.WindowsAzure.Storage, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EnterpriseLibrary.TransientFaultHandling.WindowsAzure.Storage.6.0.1304.0\lib\NET45\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.WindowsAzure.Storage.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics.Processing, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Analytics.Processing.8.2.160729\lib\NET452\Sitecore.Analytics.Processing.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.FakeDb.1.3.1\lib\net45\Sitecore.FakeDb.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Mvp.Xml, Version=2.3.0.0, Culture=neutral, PublicKeyToken=6ead800d778c9b9f, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Mvp.Xml.2.3.0\lib\net20\Mvp.Xml.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb.Serialization, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.FakeDb.Serialization.1.3.1\lib\net45\Sitecore.FakeDb.Serialization.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Kernel.8.2.160729\lib\NET452\Sitecore.Kernel.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Sitecore.FakeDb.1.7.4\lib\net45\Sitecore.FakeDb.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Logging.8.2.160729\lib\NET452\Sitecore.Logging.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Sitecore.FakeDb.Serialization, Version=1.7.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Sitecore.FakeDb.Serialization.1.7.4\lib\net45\Sitecore.FakeDb.Serialization.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Logging.Client, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Logging.Client.8.2.160729\lib\NET452\Sitecore.Logging.Client.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Sitecore.Kernel.9.0.180604\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Marketing, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Marketing.8.2.160729\lib\NET452\Sitecore.Marketing.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Sitecore.Logging, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Sitecore.Logging.9.0.180604\lib\NET462\Sitecore.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Marketing.Core, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Marketing.Core.8.2.160729\lib\NET452\Sitecore.Marketing.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Sitecore.Logging.Client, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Sitecore.Logging.Client.9.0.180604\lib\NET462\Sitecore.Logging.Client.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Marketing.Taxonomy, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Marketing.Taxonomy.8.2.160729\lib\NET452\Sitecore.Marketing.Taxonomy.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Sitecore.Nexus, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Sitecore.Nexus.9.0.180604\lib\NET462\Sitecore.Nexus.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Nexus, Version=1.0.4415.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Nexus.8.2.160729\lib\NET452\Sitecore.Nexus.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Sitecore.NVelocity, Version=8.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Sitecore.NVelocity.9.0.180604\lib\NET462\Sitecore.NVelocity.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.NVelocity, Version=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.NVelocity.8.2.160729\lib\NET452\Sitecore.NVelocity.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Sitecore.Zip, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Sitecore.Zip.9.0.180604\lib\NET462\Sitecore.Zip.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Xdb.Configuration, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Xdb.Configuration.8.2.160729\lib\NET452\Sitecore.Xdb.Configuration.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System" />
+    <Reference Include="System.Reflection, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Reflection.4.1.0\lib\net462\System.Reflection.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Zip, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Zip.8.2.160729\lib\NET452\Sitecore.Zip.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Runtime.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Runtime.Extensions.4.1.0\lib\net462\System.Runtime.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="System" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <Choose>
diff --git a/src/DeloitteDigital.Atlas.Tests/Properties/AssemblyInfo.cs b/src/DeloitteDigital.Atlas.Tests/Properties/AssemblyInfo.cs
index e7c8fcf..15a98de 100644
--- a/src/DeloitteDigital.Atlas.Tests/Properties/AssemblyInfo.cs
+++ b/src/DeloitteDigital.Atlas.Tests/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("DeloitteDigital.Atlas.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.2.0")]
+[assembly: AssemblyFileVersion("2.0.2.0")]
diff --git a/src/DeloitteDigital.Atlas.Tests/app.config b/src/DeloitteDigital.Atlas.Tests/app.config
index e47eedb..ff6b0f7 100644
--- a/src/DeloitteDigital.Atlas.Tests/app.config
+++ b/src/DeloitteDigital.Atlas.Tests/app.config
@@ -15,11 +15,14 @@
          For Sitecore versions prior to 8.2 should be 'Sitecore.Data.Database, Sitecore.Kernel'.
          For Sitecore 8.2 and later should be 'Sitecore.Data.DefaultDatabase, Sitecore.Kernel'. -->
     <sc.variable name="databaseType" value="Sitecore.Data.DefaultDatabase, Sitecore.Kernel" />
-  <!-- SERIALIZATION FOLDERS --><szfolders>
+    <!-- SERIALIZATION FOLDERS -->
+    <szfolders>
       <folder name="core" value="..\..\Data\CoreSerialization\core\" />
       <folder name="master" value="..\..\Data\Serialization\master\" />
       <folder name="custom" value="..\..\Data\CustomSerialization\master\" />
-    </szfolders><pipelines>
+      <folder name="incorrect" value="..\..\Data\IncorrectSerialization\master\" />
+    </szfolders>
+    <pipelines>
       <loadDsDbItem>
         <processor type="Sitecore.FakeDb.Serialization.Pipelines.DeserializeLinkedTemplate, Sitecore.FakeDb.Serialization" />
         <processor type="Sitecore.FakeDb.Serialization.Pipelines.CopySharedFields, Sitecore.FakeDb.Serialization" />
@@ -30,7 +33,8 @@
       <loadDsDbTemplate>
         <processor type="Sitecore.FakeDb.Serialization.Pipelines.LoadTemplateFields, Sitecore.FakeDb.Serialization" />
       </loadDsDbTemplate>
-    </pipelines></sitecore>
+    </pipelines>
+  </sitecore>
   <log4net />
   <system.web>
     <membership defaultProvider="fake">
@@ -56,20 +60,20 @@
       </properties>
     </profile>
   </system.web>
-  
   <runtime>
-  
-       <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-  
-            <dependentAssembly>
-  
-                 <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
-  
-                 <bindingRedirect oldVersion="0.0.0.0-1.4.9.5" newVersion="1.4.9.5" />
-  
-            </dependentAssembly>
-  
-       </assemblyBinding>
-  
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.9.5" newVersion="1.4.9.5" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/src/DeloitteDigital.Atlas.Tests/packages.config b/src/DeloitteDigital.Atlas.Tests/packages.config
index 29df5eb..d5eff9e 100644
--- a/src/DeloitteDigital.Atlas.Tests/packages.config
+++ b/src/DeloitteDigital.Atlas.Tests/packages.config
@@ -1,43 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net452" />
-  <package id="Lucene.Net" version="3.0.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="1.0.0" targetFramework="net452" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net452" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
-  <package id="Sitecore.Abstractions" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
-  <package id="Sitecore.Analytics" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
-  <package id="Sitecore.Analytics.Core" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
-  <package id="Sitecore.Analytics.DataAccess" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
-  <package id="Sitecore.Analytics.Model" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
-  <package id="Sitecore.Analytics.Processing" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
-  <package id="Sitecore.FakeDb" version="1.3.1" targetFramework="net452" />
-  <package id="Sitecore.FakeDb.Serialization" version="1.3.1" targetFramework="net452" />
-  <package id="Sitecore.Kernel" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
-  <package id="Sitecore.Logging" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
-  <package id="Sitecore.Logging.Client" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
-  <package id="Sitecore.Marketing" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
-  <package id="Sitecore.Marketing.Core" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
-  <package id="Sitecore.Marketing.Taxonomy" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
-  <package id="Sitecore.Nexus" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
-  <package id="Sitecore.NVelocity" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
-  <package id="Sitecore.Xdb.Configuration" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
-  <package id="Sitecore.Zip" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
-  <package id="System.Collections" version="4.0.11" targetFramework="net452" />
-  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net452" />
-  <package id="System.ComponentModel" version="4.0.1" targetFramework="net452" />
-  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net452" />
-  <package id="System.Globalization" version="4.0.11" targetFramework="net452" />
-  <package id="System.Linq" version="4.1.0" targetFramework="net452" />
-  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net452" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net452" />
-  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net452" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net452" />
-  <package id="System.Threading" version="4.0.11" targetFramework="net452" />
-  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net452" />
+  <package id="EnterpriseLibrary.Common" version="6.0.1304.0" targetFramework="net462" />
+  <package id="EnterpriseLibrary.TransientFaultHandling" version="6.0.1304.0" targetFramework="net462" />
+  <package id="EnterpriseLibrary.TransientFaultHandling.Caching" version="6.0.1304.0" targetFramework="net462" />
+  <package id="EnterpriseLibrary.TransientFaultHandling.Configuration" version="6.0.1304.0" targetFramework="net462" />
+  <package id="EnterpriseLibrary.TransientFaultHandling.Data" version="6.0.1304.1" targetFramework="net462" />
+  <package id="EnterpriseLibrary.TransientFaultHandling.ServiceBus" version="6.0.1304.0" targetFramework="net462" />
+  <package id="EnterpriseLibrary.TransientFaultHandling.WindowsAzure.Storage" version="6.0.1304.0" targetFramework="net462" />
+  <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net462" />
+  <package id="Lucene.Net" version="3.0.3" targetFramework="net462" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net462" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net462" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="1.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net462" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net462" />
+  <package id="Mvp.Xml" version="2.3.0" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net462" />
+  <package id="Sitecore.FakeDb" version="1.7.4" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.Serialization" version="1.7.4" targetFramework="net462" />
+  <package id="Sitecore.Kernel" version="9.0.180604" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.Logging" version="9.0.180604" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.Logging.Client" version="9.0.180604" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.Nexus" version="9.0.180604" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.NVelocity" version="9.0.180604" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.Zip" version="9.0.180604" targetFramework="net462" developmentDependency="true" />
+  <package id="System.Collections" version="4.0.11" targetFramework="net462" />
+  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net462" />
+  <package id="System.ComponentModel" version="4.0.1" targetFramework="net462" />
+  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net462" />
+  <package id="System.Globalization" version="4.0.11" targetFramework="net462" />
+  <package id="System.Linq" version="4.1.0" targetFramework="net462" />
+  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net462" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net462" />
+  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net462" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net462" />
+  <package id="System.Threading" version="4.0.11" targetFramework="net462" />
+  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net462" />
 </packages>
\ No newline at end of file
diff --git a/src/DeloitteDigital.Atlas/DeloitteDigital.Atlas.csproj b/src/DeloitteDigital.Atlas/DeloitteDigital.Atlas.csproj
index 182ec8c..f2e2cb4 100644
--- a/src/DeloitteDigital.Atlas/DeloitteDigital.Atlas.csproj
+++ b/src/DeloitteDigital.Atlas/DeloitteDigital.Atlas.csproj
@@ -11,7 +11,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DeloitteDigital.Atlas</RootNamespace>
     <AssemblyName>DeloitteDigital.Atlas</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -47,13 +47,11 @@
       <Private>True</Private>
       <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Kernel.NoReferences.8.2.160729\lib\NET452\Sitecore.Kernel.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Sitecore.Kernel.NoReferences.9.0.180604\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Mvc, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Mvc.NoReferences.8.2.160729\lib\NET452\Sitecore.Mvc.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Sitecore.Mvc, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Sitecore.Mvc.NoReferences.9.0.180604\lib\NET462\Sitecore.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/src/DeloitteDigital.Atlas/Properties/AssemblyInfo.cs b/src/DeloitteDigital.Atlas/Properties/AssemblyInfo.cs
index 6251488..2243d5b 100644
--- a/src/DeloitteDigital.Atlas/Properties/AssemblyInfo.cs
+++ b/src/DeloitteDigital.Atlas/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Deloitte Digital")]
 [assembly: AssemblyProduct("DeloitteDigital.Atlas")]
-[assembly: AssemblyCopyright("Copyright © Deloitte Digital 2016")]
+[assembly: AssemblyCopyright("Copyright © Deloitte Digital 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("2.0.2.0")]
+[assembly: AssemblyFileVersion("2.0.2.0")]
+[assembly: AssemblyInformationalVersion("2.0.2")]
\ No newline at end of file
diff --git a/src/DeloitteDigital.Atlas/app.config b/src/DeloitteDigital.Atlas/app.config
index 1cd6675..e3fe633 100644
--- a/src/DeloitteDigital.Atlas/app.config
+++ b/src/DeloitteDigital.Atlas/app.config
@@ -6,6 +6,22 @@
         <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.4.9.5" newVersion="1.4.9.5" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>
diff --git a/src/DeloitteDigital.Atlas/packages.config b/src/DeloitteDigital.Atlas/packages.config
index 79299ad..f468a20 100644
--- a/src/DeloitteDigital.Atlas/packages.config
+++ b/src/DeloitteDigital.Atlas/packages.config
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net452" />
-  <package id="log4net" version="2.0.5" targetFramework="net452" />
-  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
-  <package id="Sitecore.Mvc.NoReferences" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
+  <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net462" />
+  <package id="log4net" version="2.0.5" targetFramework="net462" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net462" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net462" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net462" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net462" />
+  <package id="Sitecore.Kernel.NoReferences" version="9.0.180604" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.Mvc.NoReferences" version="9.0.180604" targetFramework="net462" developmentDependency="true" />
 </packages>
\ No newline at end of file