diff --git a/src/Alturos.Yolo.TestConsole/Alturos.Yolo.TestConsole.csproj b/src/Alturos.Yolo.TestConsole/Alturos.Yolo.TestConsole.csproj
index 5cfbbee..e83d674 100644
--- a/src/Alturos.Yolo.TestConsole/Alturos.Yolo.TestConsole.csproj
+++ b/src/Alturos.Yolo.TestConsole/Alturos.Yolo.TestConsole.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
     <ProjectGuid>{C6A638E4-40ED-4F73-8F78-B9465FBE475D}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>Alturos.Yolo.TestConsole</RootNamespace>
@@ -14,24 +14,25 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>bin\x64\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/src/Alturos.Yolo.TestUI/Alturos.Yolo.TestUI.csproj b/src/Alturos.Yolo.TestUI/Alturos.Yolo.TestUI.csproj
index 15d569f..96d1e99 100644
--- a/src/Alturos.Yolo.TestUI/Alturos.Yolo.TestUI.csproj
+++ b/src/Alturos.Yolo.TestUI/Alturos.Yolo.TestUI.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
     <ProjectGuid>{2923401A-6C84-455A-A6CC-A13A70E13D63}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Alturos.Yolo.TestUI</RootNamespace>
@@ -14,25 +14,25 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>bin\x64\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/src/Alturos.Yolo.UnitTest/Alturos.Yolo.UnitTest.csproj b/src/Alturos.Yolo.UnitTest/Alturos.Yolo.UnitTest.csproj
index 13e5629..538f329 100644
--- a/src/Alturos.Yolo.UnitTest/Alturos.Yolo.UnitTest.csproj
+++ b/src/Alturos.Yolo.UnitTest/Alturos.Yolo.UnitTest.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
     <ProjectGuid>{850159D7-0908-41D8-A8BA-E0E44FC4DD36}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -20,25 +20,25 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>bin\x64\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
diff --git a/src/Alturos.Yolo.WebService/Alturos.Yolo.WebService.csproj b/src/Alturos.Yolo.WebService/Alturos.Yolo.WebService.csproj
index 23c901b..9cabfa6 100644
--- a/src/Alturos.Yolo.WebService/Alturos.Yolo.WebService.csproj
+++ b/src/Alturos.Yolo.WebService/Alturos.Yolo.WebService.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
     <ProjectGuid>{AC917731-93FA-414F-88F4-0D3298F1FDE3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>Alturos.Yolo.WebService</RootNamespace>
@@ -15,24 +15,25 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>bin\x64\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
diff --git a/src/Alturos.Yolo.sln b/src/Alturos.Yolo.sln
index 8dcf4fb..ff4369b 100644
--- a/src/Alturos.Yolo.sln
+++ b/src/Alturos.Yolo.sln
@@ -11,78 +11,34 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Alturos.Yolo.UnitTest", "Al
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Alturos.Yolo.WebService", "Alturos.Yolo.WebService\Alturos.Yolo.WebService.csproj", "{AC917731-93FA-414F-88F4-0D3298F1FDE3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Alturos.Yolo", "Alturos.Yolo\Alturos.Yolo.csproj", "{2C530266-A3DA-4175-8311-06E5A2378F22}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Alturos.Yolo", "Alturos.Yolo\Alturos.Yolo.csproj", "{2C530266-A3DA-4175-8311-06E5A2378F22}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2923401A-6C84-455A-A6CC-A13A70E13D63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2923401A-6C84-455A-A6CC-A13A70E13D63}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2923401A-6C84-455A-A6CC-A13A70E13D63}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2923401A-6C84-455A-A6CC-A13A70E13D63}.Debug|x64.Build.0 = Debug|Any CPU
-		{2923401A-6C84-455A-A6CC-A13A70E13D63}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2923401A-6C84-455A-A6CC-A13A70E13D63}.Debug|x86.Build.0 = Debug|Any CPU
-		{2923401A-6C84-455A-A6CC-A13A70E13D63}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2923401A-6C84-455A-A6CC-A13A70E13D63}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2923401A-6C84-455A-A6CC-A13A70E13D63}.Release|x64.ActiveCfg = Release|Any CPU
-		{2923401A-6C84-455A-A6CC-A13A70E13D63}.Release|x64.Build.0 = Release|Any CPU
-		{2923401A-6C84-455A-A6CC-A13A70E13D63}.Release|x86.ActiveCfg = Release|Any CPU
-		{2923401A-6C84-455A-A6CC-A13A70E13D63}.Release|x86.Build.0 = Release|Any CPU
-		{C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Debug|x64.Build.0 = Debug|Any CPU
-		{C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Debug|x86.Build.0 = Debug|Any CPU
-		{C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Release|x64.ActiveCfg = Release|Any CPU
-		{C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Release|x64.Build.0 = Release|Any CPU
-		{C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Release|x86.ActiveCfg = Release|Any CPU
-		{C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Release|x86.Build.0 = Release|Any CPU
-		{850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Debug|x64.Build.0 = Debug|Any CPU
-		{850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Debug|x86.Build.0 = Debug|Any CPU
-		{850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Release|Any CPU.Build.0 = Release|Any CPU
-		{850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Release|x64.ActiveCfg = Release|Any CPU
-		{850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Release|x64.Build.0 = Release|Any CPU
-		{850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Release|x86.ActiveCfg = Release|Any CPU
-		{850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Release|x86.Build.0 = Release|Any CPU
-		{AC917731-93FA-414F-88F4-0D3298F1FDE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC917731-93FA-414F-88F4-0D3298F1FDE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC917731-93FA-414F-88F4-0D3298F1FDE3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AC917731-93FA-414F-88F4-0D3298F1FDE3}.Debug|x64.Build.0 = Debug|Any CPU
-		{AC917731-93FA-414F-88F4-0D3298F1FDE3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AC917731-93FA-414F-88F4-0D3298F1FDE3}.Debug|x86.Build.0 = Debug|Any CPU
-		{AC917731-93FA-414F-88F4-0D3298F1FDE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC917731-93FA-414F-88F4-0D3298F1FDE3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC917731-93FA-414F-88F4-0D3298F1FDE3}.Release|x64.ActiveCfg = Release|Any CPU
-		{AC917731-93FA-414F-88F4-0D3298F1FDE3}.Release|x64.Build.0 = Release|Any CPU
-		{AC917731-93FA-414F-88F4-0D3298F1FDE3}.Release|x86.ActiveCfg = Release|Any CPU
-		{AC917731-93FA-414F-88F4-0D3298F1FDE3}.Release|x86.Build.0 = Release|Any CPU
-		{2C530266-A3DA-4175-8311-06E5A2378F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C530266-A3DA-4175-8311-06E5A2378F22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C530266-A3DA-4175-8311-06E5A2378F22}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2C530266-A3DA-4175-8311-06E5A2378F22}.Debug|x64.Build.0 = Debug|Any CPU
-		{2C530266-A3DA-4175-8311-06E5A2378F22}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2C530266-A3DA-4175-8311-06E5A2378F22}.Debug|x86.Build.0 = Debug|Any CPU
-		{2C530266-A3DA-4175-8311-06E5A2378F22}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2C530266-A3DA-4175-8311-06E5A2378F22}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2C530266-A3DA-4175-8311-06E5A2378F22}.Release|x64.ActiveCfg = Release|Any CPU
-		{2C530266-A3DA-4175-8311-06E5A2378F22}.Release|x64.Build.0 = Release|Any CPU
-		{2C530266-A3DA-4175-8311-06E5A2378F22}.Release|x86.ActiveCfg = Release|Any CPU
-		{2C530266-A3DA-4175-8311-06E5A2378F22}.Release|x86.Build.0 = Release|Any CPU
+		{2923401A-6C84-455A-A6CC-A13A70E13D63}.Debug|x64.ActiveCfg = Debug|x64
+		{2923401A-6C84-455A-A6CC-A13A70E13D63}.Debug|x64.Build.0 = Debug|x64
+		{2923401A-6C84-455A-A6CC-A13A70E13D63}.Release|x64.ActiveCfg = Release|x64
+		{2923401A-6C84-455A-A6CC-A13A70E13D63}.Release|x64.Build.0 = Release|x64
+		{C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Debug|x64.ActiveCfg = Debug|x64
+		{C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Debug|x64.Build.0 = Debug|x64
+		{C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Release|x64.ActiveCfg = Release|x64
+		{C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Release|x64.Build.0 = Release|x64
+		{850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Debug|x64.ActiveCfg = Debug|x64
+		{850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Debug|x64.Build.0 = Debug|x64
+		{850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Release|x64.ActiveCfg = Release|x64
+		{850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Release|x64.Build.0 = Release|x64
+		{AC917731-93FA-414F-88F4-0D3298F1FDE3}.Debug|x64.ActiveCfg = Debug|x64
+		{AC917731-93FA-414F-88F4-0D3298F1FDE3}.Debug|x64.Build.0 = Debug|x64
+		{AC917731-93FA-414F-88F4-0D3298F1FDE3}.Release|x64.ActiveCfg = Release|x64
+		{AC917731-93FA-414F-88F4-0D3298F1FDE3}.Release|x64.Build.0 = Release|x64
+		{2C530266-A3DA-4175-8311-06E5A2378F22}.Debug|x64.ActiveCfg = Debug|x64
+		{2C530266-A3DA-4175-8311-06E5A2378F22}.Debug|x64.Build.0 = Debug|x64
+		{2C530266-A3DA-4175-8311-06E5A2378F22}.Release|x64.ActiveCfg = Release|x64
+		{2C530266-A3DA-4175-8311-06E5A2378F22}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/Alturos.Yolo/Alturos.Yolo.csproj b/src/Alturos.Yolo/Alturos.Yolo.csproj
index 118256f..82498ed 100644
--- a/src/Alturos.Yolo/Alturos.Yolo.csproj
+++ b/src/Alturos.Yolo/Alturos.Yolo.csproj
@@ -16,6 +16,16 @@
     <Version>3.0.6-alpha</Version>
     <AssemblyVersion>3.0.6</AssemblyVersion>
     <FileVersion>3.0.6</FileVersion>
+    <Platforms>x64</Platforms>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|x64'">
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
 
   <!-- Only for .netstandard 2.0 -->
diff --git a/src/Alturos.Yolo/DefaultYoloSystemValidator.cs b/src/Alturos.Yolo/DefaultYoloSystemValidator.cs
index ef9198b..0477faa 100644
--- a/src/Alturos.Yolo/DefaultYoloSystemValidator.cs
+++ b/src/Alturos.Yolo/DefaultYoloSystemValidator.cs
@@ -62,7 +62,10 @@ private bool IsMicrosoftVisualCPlusPlus2017Available()
                 { @"Installer\Dependencies\VC,redist.x64,amd64,14.23,bundle", "Microsoft Visual C++ 2015-2019 Redistributable (x64)" },
                 { @"Installer\Dependencies\VC,redist.x64,amd64,14.24,bundle", "Microsoft Visual C++ 2015-2019 Redistributable (x64)" },
                 { @"Installer\Dependencies\VC,redist.x64,amd64,14.25,bundle", "Microsoft Visual C++ 2015-2019 Redistributable (x64)" },
-                { @"Installer\Dependencies\VC,redist.x64,amd64,14.26,bundle", "Microsoft Visual C++ 2015-2019 Redistributable (x64)" }
+                { @"Installer\Dependencies\VC,redist.x64,amd64,14.26,bundle", "Microsoft Visual C++ 2015-2019 Redistributable (x64)" },
+                { @"Installer\Dependencies\VC,redist.x64,amd64,14.27,bundle", "Microsoft Visual C++ 2015-2019 Redistributable (x64)" },
+                { @"Installer\Dependencies\VC,redist.x64,amd64,14.28,bundle", "Microsoft Visual C++ 2015-2019 Redistributable (x64)" },
+                { @"Installer\Dependencies\VC,redist.x64,amd64,14.29,bundle", "Microsoft Visual C++ 2015-2019 Redistributable (x64)" }
             };
 
             foreach (var checkKey in checkKeys)
diff --git a/src/Alturos.Yolo/YoloWrapper.cs b/src/Alturos.Yolo/YoloWrapper.cs
index 7dc344f..c5d9f49 100644
--- a/src/Alturos.Yolo/YoloWrapper.cs
+++ b/src/Alturos.Yolo/YoloWrapper.cs
@@ -74,6 +74,10 @@ public YoloWrapper(YoloConfiguration yoloConfiguration, GpuConfig gpuConfig = nu
             {
                 this._yoloSystemValidator = new DefaultYoloSystemValidator();
             }
+            else
+            {
+                this._yoloSystemValidator = yoloSystemValidator;
+            }
 
             this.Initialize(yoloConfiguration.ConfigFile, yoloConfiguration.WeightsFile, yoloConfiguration.NamesFile, gpuConfig);
         }
@@ -94,6 +98,10 @@ public YoloWrapper(string configurationFilename, string weightsFilename, string
             {
                 this._yoloSystemValidator = new DefaultYoloSystemValidator();
             }
+            else
+            {
+                this._yoloSystemValidator = yoloSystemValidator;
+            }
 
             this.Initialize(configurationFilename, weightsFilename, namesFilename, gpuConfig);
         }