diff --git a/Source/DivaModLoader/PvLoader.cpp b/Source/DivaModLoader/PvLoader.cpp
index a91c64b..c6b2688 100644
--- a/Source/DivaModLoader/PvLoader.cpp
+++ b/Source/DivaModLoader/PvLoader.cpp
@@ -1,6 +1,15 @@
 #include "PvLoader.h"
+#include "SigScan.h"
 
-HOOK(void, __fastcall, PvLoaderParseStart, 0x1404BB3C1);
+SIG_SCAN
+(
+    sigPvLoaderParseStart,
+    0x1404BB3C1,
+    "\x49\xBD\xEB\x68\xF3\x3E\xC5\x25\x43\x00\x0F\x1F\x44\x00\x00", 
+    "xxxxxxxxxxxxxxx"
+);
+
+HOOK(void, __fastcall, PvLoaderParseStart, sigPvLoaderParseStart());
 
 static std::vector<uint32_t> pvIdStack;
 
@@ -48,7 +57,15 @@ uint32_t pvLoaderParseStartImp(const char* data, size_t length)
     return 0xFFFFFFFF;
 }
 
-HOOK(void, __fastcall, PvLoaderParseLoop, 0x1404BB5D6);
+SIG_SCAN
+(
+    sigPvLoaderParseLoop,
+    0x1404BB5D6,
+    "\x49\xFF\xC6\x49\x81\xFE\xE8\x03\x00\x00", 
+    "xxxxxxxxxx"
+);
+
+HOOK(void, __fastcall, PvLoaderParseLoop, sigPvLoaderParseLoop());
 
 uint32_t pvLoaderParseLoopImp()
 {
@@ -62,23 +79,79 @@ uint32_t pvLoaderParseLoopImp()
     return 0xFFFFFFFF;
 }
 
+SIG_SCAN
+(
+    sigPvLoaderIfCheck1,
+    0x1405807C2,
+    "\x80\xBC\x02\x40\x03\x00\x00\x00", 
+    "xxxxxxxx"
+);
+
+SIG_SCAN
+(
+    sigPvLoaderIfCheck2,
+    0x1405807F0,
+    "\x44\x38\x08\x75\x11", 
+    "xxxxx"
+);
+
+SIG_SCAN
+(
+    sigPvLoaderIfCheck3,
+    0x1405811E0,
+    "\x80\x38\x00\x75\x4C", 
+    "xxxxx"
+);
+
+SIG_SCAN
+(
+    sigPvLoaderU16Trunc1,
+    0x1406DE563,
+    "\x66\x44\x89\xB1\x88\x0A\x00\x00",
+    "xxxxxxxx"
+);
+
+SIG_SCAN
+(
+    sigPvLoaderU16Trunc2,
+    0x1406DEA21,
+    "\x66\x89\x91\x88\x0A\x00\x00", 
+    "xxxxxxx"
+);
+
+SIG_SCAN
+(
+    sigPvLoaderU16Trunc3,
+    0x1406DF6F4,
+    "\x0F\xBF\x91\x88\x0A\x00\x00", 
+    "xxxxxxx"
+);
+
+SIG_SCAN
+(
+    sigPvLoaderU16Trunc4,
+    0x1406DF748,
+    "\x66\x83\xB9\x88\x0A\x00\x00\xFF", 
+    "xxxxxxxx"
+);
+
 void PvLoader::init()
 {
     // Skip if checks that always return true but would access out of bounds data due to large IDs regardless
-    WRITE_NOP(0x1405807C2, 0xE);
-    WRITE_MEMORY(0x1405811E0, uint8_t, 0x90, 0x90, 0x90, 0xEB);
-    WRITE_MEMORY(0x1405807F0, uint8_t, 0x90, 0x90, 0x90, 0xEB);
-    WRITE_MEMORY(0x140580813, uint8_t, 0x90, 0x90, 0x90, 0xEB);
-    WRITE_MEMORY(0x140580836, uint8_t, 0x90, 0x90, 0x90, 0xEB);
-    WRITE_MEMORY(0x140580860, uint8_t, 0x90, 0x90, 0x90, 0xEB);
-    WRITE_MEMORY(0x140580883, uint8_t, 0x90, 0x90, 0x90, 0xEB);
+    WRITE_NOP(sigPvLoaderIfCheck1(), 0xE);
+    WRITE_MEMORY(sigPvLoaderIfCheck2(), uint8_t, 0x90, 0x90, 0x90, 0xEB);
+    WRITE_MEMORY((uint8_t*)sigPvLoaderIfCheck2() + 0x23, uint8_t, 0x90, 0x90, 0x90, 0xEB); // 0x140580813
+    WRITE_MEMORY((uint8_t*)sigPvLoaderIfCheck2() + 0x46, uint8_t, 0x90, 0x90, 0x90, 0xEB); // 0x140580836
+    WRITE_MEMORY((uint8_t*)sigPvLoaderIfCheck2() + 0x70, uint8_t, 0x90, 0x90, 0x90, 0xEB); // 0x140580860
+    WRITE_MEMORY((uint8_t*)sigPvLoaderIfCheck2() + 0x93, uint8_t, 0x90, 0x90, 0x90, 0xEB); // 0x140580883
+    WRITE_MEMORY(sigPvLoaderIfCheck3(), uint8_t, 0x90, 0x90, 0x90, 0xEB);
 
     // Prevent truncation to u16 when using MM+ UI, there's enough space for an u32 since the next element is 4 byte aligned
-    WRITE_NOP(0x1406DE563, 1);
-    WRITE_NOP(0x1406DEA21, 1);
-    WRITE_NOP(0x1406DEA28, 3);
-    WRITE_MEMORY(0x1406DF6F4, uint8_t, 0x90, 0x8B);
-    WRITE_NOP(0x1406DF748, 1);
+    WRITE_NOP(sigPvLoaderU16Trunc1(), 1);
+    WRITE_NOP(sigPvLoaderU16Trunc2(), 1);
+    WRITE_NOP((uint8_t*)sigPvLoaderU16Trunc2() + 7, 3);
+    WRITE_MEMORY(sigPvLoaderU16Trunc3(), uint8_t, 0x90, 0x8B);
+    WRITE_NOP(sigPvLoaderU16Trunc4(), 1);
 
     // Scan the pv_db file before reading it to not waste time looking for entries that don't exist in the file
     WRITE_CALL(originalPvLoaderParseStart, implOfPvLoaderParseStart);