diff --git a/sys/Ds4Pdo.hpp b/sys/Ds4Pdo.hpp
index 984061a..5322c09 100644
--- a/sys/Ds4Pdo.hpp
+++ b/sys/Ds4Pdo.hpp
@@ -2,18 +2,21 @@
 
 #include "EmulationTargetPDO.hpp"
 #include <ViGEm/km/BusShared.h>
+
 #include "Util.h"
 
+
 namespace ViGEm::Bus::Targets
-{	
+{
 	class EmulationTargetDS4 : public Core::EmulationTargetPDO
 	{
 	public:
 		EmulationTargetDS4();
 		~EmulationTargetDS4() = default;
-
-		NTSTATUS PrepareDevice(PWDFDEVICE_INIT DeviceInit, 
-		                       PUNICODE_STRING DeviceId, PUNICODE_STRING DeviceDescription) override;
+		
+		NTSTATUS PrepareDevice(PWDFDEVICE_INIT DeviceInit,
+		                       PUNICODE_STRING DeviceId,
+		                       PUNICODE_STRING DeviceDescription) override;
 
 		NTSTATUS PrepareHardware(WDFDEVICE Device) override;
 
@@ -27,7 +30,7 @@ namespace ViGEm::Bus::Targets
 
 	private:
 		static PCWSTR _deviceDescription;
-		
+
 #if defined(_X86_)
 		static const int XUSB_CONFIGURATION_SIZE = 0x00E4;
 #else
@@ -69,7 +72,7 @@ namespace ViGEm::Bus::Targets
 
 		static const int DS4_REPORT_SIZE = 0x40;
 		static const int DS4_QUEUE_FLUSH_PERIOD = 0x05;
-		
+
 		//
 		// HID Input Report buffer
 		//
@@ -79,7 +82,7 @@ namespace ViGEm::Bus::Targets
 		// Output report cache
 		//
 		DS4_OUTPUT_REPORT OutputReport;
-		
+
 		//
 		// Timer for dispatching interrupt transfer
 		//
@@ -104,8 +107,7 @@ namespace ViGEm::Bus::Targets
 	typedef struct _DS4_PDO_CONTEXT
 	{
 		EmulationTargetDS4* Context;
-
-	} DS4_PDO_CONTEXT, * PDS4_PDO_CONTEXT;
+	} DS4_PDO_CONTEXT, *PDS4_PDO_CONTEXT;
 
 	WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(DS4_PDO_CONTEXT, Ds4PdoGetContext)
 }
diff --git a/sys/EmulationTargetPDO.hpp b/sys/EmulationTargetPDO.hpp
index a5ccea7..5413835 100644
--- a/sys/EmulationTargetPDO.hpp
+++ b/sys/EmulationTargetPDO.hpp
@@ -95,4 +95,9 @@ namespace ViGEm::Bus::Core
         //
         WDFQUEUE PendingNotificationRequests{};
 	};
+
+	typedef struct _PDO_IDENTIFICATION_DESCRIPTION
+	{
+		EmulationTargetPDO* Context;
+	} PDO_IDENTIFICATION_DESCRIPTION, *PPDO_IDENTIFICATION_DESCRIPTION;
 }
diff --git a/sys/ViGEmBus.vcxproj b/sys/ViGEmBus.vcxproj
index dcafc77..9ccba7b 100644
--- a/sys/ViGEmBus.vcxproj
+++ b/sys/ViGEmBus.vcxproj
@@ -188,6 +188,7 @@
     <ClInclude Include="$(SolutionDir)\Include\ViGEmBusDriver.h" />
     <ClInclude Include="..\client\include\ViGEm\km\BusShared.h" />
     <ClInclude Include="busenum.h" />
+    <ClInclude Include="BusFdoPdoCommon.hpp" />
     <ClInclude Include="ByteArray.h" />
     <ClInclude Include="Context.h" />
     <ClInclude Include="CRTCPP.hpp" />
diff --git a/sys/ViGEmBus.vcxproj.filters b/sys/ViGEmBus.vcxproj.filters
index 10e2f03..035b890 100644
--- a/sys/ViGEmBus.vcxproj.filters
+++ b/sys/ViGEmBus.vcxproj.filters
@@ -84,6 +84,9 @@
     <ClInclude Include="Ds4Pdo.hpp">
       <Filter>Header Files\Targets</Filter>
     </ClInclude>
+    <ClInclude Include="BusFdoPdoCommon.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="busenum.c">