diff --git a/PolygonClientUtilities/Classes.h b/PolygonClientUtilities/Classes.h
index 2264537..c9fddb4 100644
--- a/PolygonClientUtilities/Classes.h
+++ b/PolygonClientUtilities/Classes.h
@@ -3,7 +3,6 @@
 #include "Config.h"
 #include <oaidl.h>
 
-#ifdef ARBITERBUILD
 struct DataModel
 {
 	void* padding1[CLASSPADDING_DATAMODEL__JOBID];
@@ -27,9 +26,7 @@ struct ServerReplicator
 	bool padding2;        // offset of 7476 -> 7477
 	bool isAuthenticated; // offset of 7477 -> 7478
 };
-#endif
 
-#if defined(MFC2010) || defined(MFC2011)
 // 2010 struct definitions:
 // 0x47E010: CWorkspace->DoExecScript()
 // 0x47EC10: CWorkspace->ExecUrlScript()
@@ -66,5 +63,4 @@ struct CCommandLineInfo
 
 class CRobloxCommandLineInfo : public CCommandLineInfo {};
 
-const auto CCommandLineInfo__ParseLast = (void(__thiscall*)(CCommandLineInfo * _this, BOOL bLast))ADDRESS_CCOMMANDLINEINFO__PARSELAST;
-#endif
\ No newline at end of file
+const auto CCommandLineInfo__ParseLast = (void(__thiscall*)(CCommandLineInfo * _this, BOOL bLast))ADDRESS_CCOMMANDLINEINFO__PARSELAST;
\ No newline at end of file
diff --git a/PolygonClientUtilities/Config.h b/PolygonClientUtilities/Config.h
index b7e2ca7..e915790 100644
--- a/PolygonClientUtilities/Config.h
+++ b/PolygonClientUtilities/Config.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#define MFC2010
+#define PLAYER2012
 #define PLAYERBUILD
-#define ARBITERBUILD
+// #define ARBITERBUILD
 
 // #define DEBUG_SERVERREPLICATOR__PROCESSPACKET
 
@@ -82,6 +82,9 @@
 #define ADDRESS_CROBLOXCOMMANDLINEINFO__PARSEPARAM 0x0045EE50
 #define ADDRESS_CCOMMANDLINEINFO__PARSELAST        0x0081354A
 
+// Player specific definitions
+#define ADDRESS_APPLICATION__PARSEARGUMENTS        0x0
+
 // RakNet definitions
 #define ID_SET_GLOBALS                             127
 #define ID_DATA                                    129
@@ -115,6 +118,20 @@
 // with that offset, the address you'd have to put for your trust check hook will be 0x00DF20A0 - 0x00BF0000 = 0x002020A0
 // and you just put that address into the function
 
+// MFC specific definitions
+#define CLASSLOCATION_CROBLOXAPP                   0x0
+#define CLASSLOCATION_CAPP                         0x0
+
+#define CLASSPADDING_CROBLOXDOC__WORKSPACE         40
+
+#define ADDRESS_CAPP__CREATEGAME                   0x0
+#define ADDRESS_CAPP__ROBLOXAUTHENTICATE           0x0
+#define ADDRESS_CROBLOXAPP__INITINSTANCE           0x0
+#define ADDRESS_CROBLOXAPP__CREATEDOCUMENT         0x0
+#define ADDRESS_CWORKSPACE__EXECURLSCRIPT          0x0
+#define ADDRESS_CROBLOXCOMMANDLINEINFO__PARSEPARAM 0x0
+#define ADDRESS_CCOMMANDLINEINFO__PARSELAST        0x0
+
 #define CLASSPADDING_DATAMODEL__JOBID              763 // when compiled as debug, this must be 762
 
 #define ADDRESS_DATAMODEL__GETJOBID                Patches::GetAddressByOffset(0x002079A0)
@@ -122,6 +139,8 @@
 #define ADDRESS_NETWORK__RAKNETADDRESSTOSTRING     0x0
 #define ADDRESS_HTTP__TRUSTCHECK                   Patches::GetAddressByOffset(0x002020A0)
 #define ADDRESS_CRYPT__VERIFYSIGNATUREBASE64       Patches::GetAddressByOffset(0x00526330)
+#define ADDRESS_SERVERREPLICATOR__SENDTOP          0x0
+#define ADDRESS_SERVERREPLICATOR__PROCESSTICKET    0x0
 
 // Player specific definitions
 #define ADDRESS_APPLICATION__PARSEARGUMENTS        Patches::GetAddressByOffset(0x00004E60)
diff --git a/PolygonClientUtilities/PlayerCommandLine.cpp b/PolygonClientUtilities/PlayerCommandLine.cpp
index 0f8e641..c971276 100644
--- a/PolygonClientUtilities/PlayerCommandLine.cpp
+++ b/PolygonClientUtilities/PlayerCommandLine.cpp
@@ -1,5 +1,6 @@
 #include "pch.h"
 #include "PlayerCommandLine.h"
+#include "Patches.h"
 #include "Util.h"
 
 Application__ParseArguments_t Application__ParseArguments = (Application__ParseArguments_t)ADDRESS_APPLICATION__PARSEARGUMENTS;
diff --git a/PolygonClientUtilities/RCCOutput.cpp b/PolygonClientUtilities/RCCOutput.cpp
index 3f22a8a..33eb673 100644
--- a/PolygonClientUtilities/RCCOutput.cpp
+++ b/PolygonClientUtilities/RCCOutput.cpp
@@ -1,5 +1,6 @@
 #include "pch.h"
 #include "RCCOutput.h"
+#include "Patches.h"
 
 HANDLE outputHandle;
 
diff --git a/PolygonClientUtilities/TrustCheck.cpp b/PolygonClientUtilities/TrustCheck.cpp
index 91dfb15..03969d3 100644
--- a/PolygonClientUtilities/TrustCheck.cpp
+++ b/PolygonClientUtilities/TrustCheck.cpp
@@ -1,5 +1,6 @@
 #include "pch.h"
 #include "TrustCheck.h"
+#include "Patches.h"
 #include "Util.h"
 #include "LUrlParser.h"
 
diff --git a/PolygonClientUtilities/VerifySignatureBase64.cpp b/PolygonClientUtilities/VerifySignatureBase64.cpp
index 8c262ed..285c821 100644
--- a/PolygonClientUtilities/VerifySignatureBase64.cpp
+++ b/PolygonClientUtilities/VerifySignatureBase64.cpp
@@ -1,5 +1,6 @@
 #include "pch.h"
 #include "VerifySignatureBase64.h"
+#include "Patches.h"
 
 Crypt__verifySignatureBase64_t Crypt__verifySignatureBase64 = (Crypt__verifySignatureBase64_t)ADDRESS_CRYPT__VERIFYSIGNATUREBASE64;