diff --git a/app/Tester/Tester.cpp b/app/Tester/Tester.cpp
index dc8f4a9..0dc3074 100644
--- a/app/Tester/Tester.cpp
+++ b/app/Tester/Tester.cpp
@@ -38,12 +38,19 @@ int main()
 
     auto ret = vigem_connect(client);
 
+#if X360
     const auto x360 = vigem_target_x360_alloc();
 
-    ret = vigem_target_add(client, x360);
+	ret = vigem_target_add(client, x360);
 
-    ret = vigem_target_x360_register_notification(client, x360, &notification);
+	ret = vigem_target_x360_register_notification(client, x360, &notification);
+#endif
+	
+	const auto ds4 = vigem_target_ds4_alloc();
+	
+	ret = vigem_target_add(client, ds4);
 
+#if X360
     XUSB_REPORT report;
     XUSB_REPORT_INIT(&report);
 
@@ -54,8 +61,27 @@ int main()
         Sleep(10);
     }
 
+#endif
+
+	DS4_REPORT report;
+	DS4_REPORT_INIT(&report);
+
+	while (!(GetAsyncKeyState(VK_ESCAPE) & 0x8000))
+	{
+		ret = vigem_target_ds4_update(client, ds4, report);
+		report.bThumbLX++;
+		report.wButtons |= DS4_BUTTON_CIRCLE;
+		Sleep(10);
+	}
+
+#if X360
     vigem_target_x360_unregister_notification(x360);
     vigem_target_remove(client, x360);
     vigem_target_free(x360);
+#endif
+
+	vigem_target_remove(client, ds4);
+	vigem_target_free(ds4);
+	
     vigem_free(client);
 }
diff --git a/app/Tester/Tester.vcxproj b/app/Tester/Tester.vcxproj
index 045ec6d..2dcc7f4 100644
--- a/app/Tester/Tester.vcxproj
+++ b/app/Tester/Tester.vcxproj
@@ -23,32 +23,32 @@
     <ProjectGuid>{2F4ED0AB-0B51-4506-91AA-1984C5D44B85}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>Tester</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/appveyor.yml b/appveyor.yml
index 710f231..cb72e00 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
 version: 1.16.{build}.0
-image: Visual Studio 2017
+image: Visual Studio 2019
 build_script:
 - ps: .\build.ps1
 artifacts:
diff --git a/src/ViGEmClient.cpp b/src/ViGEmClient.cpp
index cc23494..8055d82 100644
--- a/src/ViGEmClient.cpp
+++ b/src/ViGEmClient.cpp
@@ -23,11 +23,17 @@ SOFTWARE.
 */
 
 
+//
+// WinAPI
+// 
 #include <Windows.h>
 #include <SetupAPI.h>
 #include <initguid.h>
 #include <Dbghelp.h>
 
+//
+// Driver shared
+// 
 #include "ViGEm/km/BusShared.h"
 #include "ViGEm/Client.h"
 #include <winioctl.h>
@@ -39,11 +45,15 @@ SOFTWARE.
 #include <climits>
 #include <vector>
 #include <algorithm>
-
 #include <thread>
+#include <functional>
 
+//
+// Internal
+// 
 #include "Internal.h"
 
+
 typedef BOOL(WINAPI *MINIDUMPWRITEDUMP)(
     HANDLE hProcess,
     DWORD dwPid,
diff --git a/src/ViGEmClient.vcxproj b/src/ViGEmClient.vcxproj
index dddf1ba..3e6c8c9 100644
--- a/src/ViGEmClient.vcxproj
+++ b/src/ViGEmClient.vcxproj
@@ -42,59 +42,59 @@
   <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'==''">
     <!-- Latest Target Version property -->
     <LatestTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">10.0</WindowsTargetPlatformVersion>
     <TargetPlatformVersion>$(WindowsTargetPlatformVersion)</TargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_LIB|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_DLL|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_LIB|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_DLL|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_LIB|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_DLL|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_LIB|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_DLL|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>