diff --git a/.github/workflows/deploy-build.yml b/.github/workflows/deploy-build.yml
index e91358e5..07f4d251 100644
--- a/.github/workflows/deploy-build.yml
+++ b/.github/workflows/deploy-build.yml
@@ -56,18 +56,27 @@ jobs:
           sed -i "s/{VERSION_NUMBER}/${{ steps.semantic-release.outputs.new_release_version }}/" ./S1API/S1API.cs
           sed -i "s/{VERSION_NUMBER}/${{ steps.semantic-release.outputs.new_release_version }}/" ./S1APILoader/S1APILoader.cs
 
-      - name: Run .NET build for Mono
-        run: dotnet build ./S1API.sln -c Mono -f netstandard2.1
+      - name: Run .NET build for MonoBepInEx
+        run: dotnet build ./S1API.sln -c MonoBepInEx -f netstandard2.1
 
-      - name: Run .NET build for Il2Cpp
-        run: dotnet build ./S1API.sln -c Il2Cpp -f netstandard2.1
+      - name: Run .NET build for Il2CppBepInEx
+        run: dotnet build ./S1API.sln -c Il2CppBepInEx -f net6.0
+
+      - name: Run .NET build for MonoMelon
+        run: dotnet build ./S1API.sln -c MonoMelon -f netstandard2.1
+
+      - name: Run .NET build for Il2CppMelon
+        run: dotnet build ./S1API.sln -c Il2CppMelon -f net6.0
 
       - name: Build artifact zip for Thunderstore
         run: |
           mkdir -p ./artifacts/thunderstore/Plugins/S1API
-          cp ./S1APILoader/bin/Mono/netstandard2.1/S1APILoader.dll ./artifacts/thunderstore/Plugins/S1APILoader.dll
-          cp ./S1API/bin/Il2Cpp/netstandard2.1/S1API.dll ./artifacts/thunderstore/Plugins/S1API/S1API.Il2Cpp.dll
-          cp ./S1API/bin/Mono/netstandard2.1/S1API.dll ./artifacts/thunderstore/Plugins/S1API/S1API.Mono.dll
+          cp ./S1APILoader/bin/MonoMelon/netstandard2.1/S1APILoader.dll ./artifacts/thunderstore/Plugins/S1APILoader.MelonLoader.dll
+          cp ./S1APILoader/bin/MonoBepInEx/netstandard2.1/S1APILoader.dll ./artifacts/thunderstore/Plugins/S1APILoader.BepInEx.dll
+          cp ./S1API/bin/Il2CppMelon/net6.0/S1API.dll ./artifacts/thunderstore/Plugins/S1API/S1API.Il2Cpp.MelonLoader.dll
+          cp ./S1API/bin/MonoMelon/netstandard2.1/S1API.dll ./artifacts/thunderstore/Plugins/S1API/S1API.Mono.MelonLoader.dll
+          cp ./S1API/bin/Il2CppMelon/net6.0/S1API.dll ./artifacts/thunderstore/Plugins/S1API/S1API.Il2Cpp.BepInEx.dll
+          cp ./S1API/bin/MonoMelon/netstandard2.1/S1API.dll ./artifacts/thunderstore/Plugins/S1API/S1API.Mono.BepInEx.dll
           
       - name: Publish artifact to Thunderstore
         uses: GreenTF/upload-thunderstore-package@v4.3
diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml
index 99706f0f..04ae7715 100644
--- a/.github/workflows/verify-build.yml
+++ b/.github/workflows/verify-build.yml
@@ -27,9 +27,15 @@ jobs:
           
       - name: Restore .NET Dependencies
         run: dotnet restore
-          
-      - name: Run .NET Build for Mono
-        run: dotnet build ./S1API.sln -c Mono -f netstandard2.1
-        
-      - name: Run .NET Build for Il2Cpp
-        run: dotnet build ./S1API.sln -c Il2Cpp -f netstandard2.1
\ No newline at end of file
+
+      - name: Run .NET build for MonoBepInEx
+        run: dotnet build ./S1API.sln -c MonoBepInEx -f netstandard2.1
+
+      - name: Run .NET build for Il2CppBepInEx
+        run: dotnet build ./S1API.sln -c Il2CppBepInEx -f net6.0
+
+      - name: Run .NET build for MonoMelon
+        run: dotnet build ./S1API.sln -c MonoMelon -f netstandard2.1
+
+      - name: Run .NET build for Il2CppMelon
+        run: dotnet build ./S1API.sln -c Il2CppMelon -f net6.0
\ No newline at end of file
diff --git a/S1API/Console/ConsoleHelper.cs b/S1API/Console/ConsoleHelper.cs
index a7bded34..f1239090 100644
--- a/S1API/Console/ConsoleHelper.cs
+++ b/S1API/Console/ConsoleHelper.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppSystem.Collections.Generic;
 using static Il2CppScheduleOne.Console;
 #else
@@ -20,7 +20,7 @@ public static class ConsoleHelper
         /// <param name="amount">The cash amount to add or remove.</param>
         public static void RunCashCommand(int amount)
         {
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
             var command = new ChangeCashCommand();
             var args = new Il2CppSystem.Collections.Generic.List<string>();
 #else
diff --git a/S1API/Entities/NPC.cs b/S1API/Entities/NPC.cs
index 9d5b92e2..6cfea9e9 100644
--- a/S1API/Entities/NPC.cs
+++ b/S1API/Entities/NPC.cs
@@ -1,4 +1,4 @@
-#if (IL2CPP)
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using S1DevUtilities = Il2CppScheduleOne.DevUtilities;
 using S1Interaction = Il2CppScheduleOne.Interaction;
 using S1Messaging = Il2CppScheduleOne.Messaging;
@@ -14,7 +14,7 @@
 using S1Vision = Il2CppScheduleOne.Vision;
 using S1NPCs = Il2CppScheduleOne.NPCs;
 using Il2CppSystem.Collections.Generic;
-#elif (MONO)
+#elif (MONOMELON || MONOBEPINEX)
 using S1DevUtilities = ScheduleOne.DevUtilities;
 using S1Interaction = ScheduleOne.Interaction;
 using S1Messaging = ScheduleOne.Messaging;
@@ -95,9 +95,9 @@ protected NPC(
             S1NPC.ConversationCategories.Add(S1Messaging.EConversationCategory.Customer);
             
             // Create our MessageConversation
-#if (IL2CPP)
+#if (IL2CPPMELON || IL2CPPBEPINEX)
             S1NPC.CreateMessageConversation();
-#elif (MONO)
+#elif (MONOMELON || MONOBEPINEX)
             MethodInfo createConvoMethod = AccessTools.Method(typeof(S1NPCs.NPC), "CreateMessageConversation");
             createConvoMethod.Invoke(S1NPC, null);
 #endif 
@@ -162,9 +162,9 @@ protected NPC(
             S1NPC.awareness.VisionCone.QuestionMarkPopup = gameObject.AddComponent<S1WorkspacePopup.WorldspacePopup>();
             
             // Interaction behaviour
-#if (IL2CPP)
+#if (IL2CPPMELON || IL2CPPBEPINEX)
             S1NPC.intObj = gameObject.AddComponent<S1Interaction.InteractableObject>();
-#elif (MONO)
+#elif (MONOMELON || MONOBEPINEX)
             FieldInfo intObjField = AccessTools.Field(typeof(S1NPCs.NPC), "intObj");
             intObjField.SetValue(S1NPC, gameObject.AddComponent<S1Interaction.InteractableObject>());
 #endif
diff --git a/S1API/Entities/NPCs/DanSamwell.cs b/S1API/Entities/NPCs/DanSamwell.cs
index e3f3b0aa..45170f06 100644
--- a/S1API/Entities/NPCs/DanSamwell.cs
+++ b/S1API/Entities/NPCs/DanSamwell.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Docks/AnnaChesterfield.cs b/S1API/Entities/NPCs/Docks/AnnaChesterfield.cs
index 716271c2..8941322d 100644
--- a/S1API/Entities/NPCs/Docks/AnnaChesterfield.cs
+++ b/S1API/Entities/NPCs/Docks/AnnaChesterfield.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Docks/BillyKramer.cs b/S1API/Entities/NPCs/Docks/BillyKramer.cs
index 1195c3ba..4c103ba5 100644
--- a/S1API/Entities/NPCs/Docks/BillyKramer.cs
+++ b/S1API/Entities/NPCs/Docks/BillyKramer.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Docks/CrankyFrank.cs b/S1API/Entities/NPCs/Docks/CrankyFrank.cs
index b5b91835..d8bbd5db 100644
--- a/S1API/Entities/NPCs/Docks/CrankyFrank.cs
+++ b/S1API/Entities/NPCs/Docks/CrankyFrank.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Docks/GenghisBarn.cs b/S1API/Entities/NPCs/Docks/GenghisBarn.cs
index 3f0053a9..0a015cf0 100644
--- a/S1API/Entities/NPCs/Docks/GenghisBarn.cs
+++ b/S1API/Entities/NPCs/Docks/GenghisBarn.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Docks/JaneLucero.cs b/S1API/Entities/NPCs/Docks/JaneLucero.cs
index 92dfb778..3d041ac9 100644
--- a/S1API/Entities/NPCs/Docks/JaneLucero.cs
+++ b/S1API/Entities/NPCs/Docks/JaneLucero.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Docks/JavierPerez.cs b/S1API/Entities/NPCs/Docks/JavierPerez.cs
index d60491cd..a5bd941e 100644
--- a/S1API/Entities/NPCs/Docks/JavierPerez.cs
+++ b/S1API/Entities/NPCs/Docks/JavierPerez.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Docks/LisaGardener.cs b/S1API/Entities/NPCs/Docks/LisaGardener.cs
index 25ff3c57..0e87ae8e 100644
--- a/S1API/Entities/NPCs/Docks/LisaGardener.cs
+++ b/S1API/Entities/NPCs/Docks/LisaGardener.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Docks/MacCooper.cs b/S1API/Entities/NPCs/Docks/MacCooper.cs
index 417812a9..ec01cc86 100644
--- a/S1API/Entities/NPCs/Docks/MacCooper.cs
+++ b/S1API/Entities/NPCs/Docks/MacCooper.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Docks/MarcoBaron.cs b/S1API/Entities/NPCs/Docks/MarcoBaron.cs
index acc1e4b9..5c76f853 100644
--- a/S1API/Entities/NPCs/Docks/MarcoBaron.cs
+++ b/S1API/Entities/NPCs/Docks/MarcoBaron.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Docks/MelissaWood.cs b/S1API/Entities/NPCs/Docks/MelissaWood.cs
index f951d422..f60c8e1f 100644
--- a/S1API/Entities/NPCs/Docks/MelissaWood.cs
+++ b/S1API/Entities/NPCs/Docks/MelissaWood.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Docks/SalvadorMoreno.cs b/S1API/Entities/NPCs/Docks/SalvadorMoreno.cs
index 5874de36..52b28808 100644
--- a/S1API/Entities/NPCs/Docks/SalvadorMoreno.cs
+++ b/S1API/Entities/NPCs/Docks/SalvadorMoreno.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Downtown/BradCrosby.cs b/S1API/Entities/NPCs/Downtown/BradCrosby.cs
index 193ff48c..3e80ad39 100644
--- a/S1API/Entities/NPCs/Downtown/BradCrosby.cs
+++ b/S1API/Entities/NPCs/Downtown/BradCrosby.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Downtown/ElizabethHomley.cs b/S1API/Entities/NPCs/Downtown/ElizabethHomley.cs
index cc5dc2e9..1f709e6a 100644
--- a/S1API/Entities/NPCs/Downtown/ElizabethHomley.cs
+++ b/S1API/Entities/NPCs/Downtown/ElizabethHomley.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Downtown/EugeneBuckley.cs b/S1API/Entities/NPCs/Downtown/EugeneBuckley.cs
index e497a5cc..6cc2b80b 100644
--- a/S1API/Entities/NPCs/Downtown/EugeneBuckley.cs
+++ b/S1API/Entities/NPCs/Downtown/EugeneBuckley.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Downtown/GregFliggle.cs b/S1API/Entities/NPCs/Downtown/GregFliggle.cs
index 6645f34a..f37072ee 100644
--- a/S1API/Entities/NPCs/Downtown/GregFliggle.cs
+++ b/S1API/Entities/NPCs/Downtown/GregFliggle.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Downtown/JeffGilmore.cs b/S1API/Entities/NPCs/Downtown/JeffGilmore.cs
index 8b7ca3d8..38774f22 100644
--- a/S1API/Entities/NPCs/Downtown/JeffGilmore.cs
+++ b/S1API/Entities/NPCs/Downtown/JeffGilmore.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Downtown/JenniferRivera.cs b/S1API/Entities/NPCs/Downtown/JenniferRivera.cs
index 7df65be4..153638a4 100644
--- a/S1API/Entities/NPCs/Downtown/JenniferRivera.cs
+++ b/S1API/Entities/NPCs/Downtown/JenniferRivera.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Downtown/KevinOakley.cs b/S1API/Entities/NPCs/Downtown/KevinOakley.cs
index 6d841940..55d6f886 100644
--- a/S1API/Entities/NPCs/Downtown/KevinOakley.cs
+++ b/S1API/Entities/NPCs/Downtown/KevinOakley.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Downtown/LouisFourier.cs b/S1API/Entities/NPCs/Downtown/LouisFourier.cs
index 6012bb2c..be7a9816 100644
--- a/S1API/Entities/NPCs/Downtown/LouisFourier.cs
+++ b/S1API/Entities/NPCs/Downtown/LouisFourier.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Downtown/LucyPennington.cs b/S1API/Entities/NPCs/Downtown/LucyPennington.cs
index 97fde0e6..91cdb9f7 100644
--- a/S1API/Entities/NPCs/Downtown/LucyPennington.cs
+++ b/S1API/Entities/NPCs/Downtown/LucyPennington.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Downtown/PhilipWentworth.cs b/S1API/Entities/NPCs/Downtown/PhilipWentworth.cs
index 42d715a3..2c136602 100644
--- a/S1API/Entities/NPCs/Downtown/PhilipWentworth.cs
+++ b/S1API/Entities/NPCs/Downtown/PhilipWentworth.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Downtown/RandyCaulfield.cs b/S1API/Entities/NPCs/Downtown/RandyCaulfield.cs
index 3a8fecca..db3c1c19 100644
--- a/S1API/Entities/NPCs/Downtown/RandyCaulfield.cs
+++ b/S1API/Entities/NPCs/Downtown/RandyCaulfield.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/IgorRomanovich.cs b/S1API/Entities/NPCs/IgorRomanovich.cs
index 4723d905..8ee77af1 100644
--- a/S1API/Entities/NPCs/IgorRomanovich.cs
+++ b/S1API/Entities/NPCs/IgorRomanovich.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/MannyOakfield.cs b/S1API/Entities/NPCs/MannyOakfield.cs
index 403897a4..928e373b 100644
--- a/S1API/Entities/NPCs/MannyOakfield.cs
+++ b/S1API/Entities/NPCs/MannyOakfield.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Northtown/AlbertHoover.cs b/S1API/Entities/NPCs/Northtown/AlbertHoover.cs
index 162bcfb8..23a30f0b 100644
--- a/S1API/Entities/NPCs/Northtown/AlbertHoover.cs
+++ b/S1API/Entities/NPCs/Northtown/AlbertHoover.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Northtown/AustinSteiner.cs b/S1API/Entities/NPCs/Northtown/AustinSteiner.cs
index 393ebf90..2daa4e34 100644
--- a/S1API/Entities/NPCs/Northtown/AustinSteiner.cs
+++ b/S1API/Entities/NPCs/Northtown/AustinSteiner.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Northtown/BenjiColeman.cs b/S1API/Entities/NPCs/Northtown/BenjiColeman.cs
index b0c6528b..35b1deb6 100644
--- a/S1API/Entities/NPCs/Northtown/BenjiColeman.cs
+++ b/S1API/Entities/NPCs/Northtown/BenjiColeman.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Northtown/BethPenn.cs b/S1API/Entities/NPCs/Northtown/BethPenn.cs
index e5538920..31914721 100644
--- a/S1API/Entities/NPCs/Northtown/BethPenn.cs
+++ b/S1API/Entities/NPCs/Northtown/BethPenn.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Northtown/ChloeBowers.cs b/S1API/Entities/NPCs/Northtown/ChloeBowers.cs
index 03ab02b8..a4989c5a 100644
--- a/S1API/Entities/NPCs/Northtown/ChloeBowers.cs
+++ b/S1API/Entities/NPCs/Northtown/ChloeBowers.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Northtown/DonnaMartin.cs b/S1API/Entities/NPCs/Northtown/DonnaMartin.cs
index ef38ed01..b745d44f 100644
--- a/S1API/Entities/NPCs/Northtown/DonnaMartin.cs
+++ b/S1API/Entities/NPCs/Northtown/DonnaMartin.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Northtown/GeraldinePoon.cs b/S1API/Entities/NPCs/Northtown/GeraldinePoon.cs
index 3b04d209..9c24b6b4 100644
--- a/S1API/Entities/NPCs/Northtown/GeraldinePoon.cs
+++ b/S1API/Entities/NPCs/Northtown/GeraldinePoon.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Northtown/JessiWaters.cs b/S1API/Entities/NPCs/Northtown/JessiWaters.cs
index 7ed78aaa..8b227ff1 100644
--- a/S1API/Entities/NPCs/Northtown/JessiWaters.cs
+++ b/S1API/Entities/NPCs/Northtown/JessiWaters.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Northtown/KathyHenderson.cs b/S1API/Entities/NPCs/Northtown/KathyHenderson.cs
index 58a9135b..4ac0dcfe 100644
--- a/S1API/Entities/NPCs/Northtown/KathyHenderson.cs
+++ b/S1API/Entities/NPCs/Northtown/KathyHenderson.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Northtown/KyleCooley.cs b/S1API/Entities/NPCs/Northtown/KyleCooley.cs
index b4104f2c..523dcab7 100644
--- a/S1API/Entities/NPCs/Northtown/KyleCooley.cs
+++ b/S1API/Entities/NPCs/Northtown/KyleCooley.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Northtown/LudwigMeyer.cs b/S1API/Entities/NPCs/Northtown/LudwigMeyer.cs
index e3b77d8c..21653c19 100644
--- a/S1API/Entities/NPCs/Northtown/LudwigMeyer.cs
+++ b/S1API/Entities/NPCs/Northtown/LudwigMeyer.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Northtown/MickLubbin.cs b/S1API/Entities/NPCs/Northtown/MickLubbin.cs
index 293e7a80..8ab5f9b6 100644
--- a/S1API/Entities/NPCs/Northtown/MickLubbin.cs
+++ b/S1API/Entities/NPCs/Northtown/MickLubbin.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Northtown/Ming.cs b/S1API/Entities/NPCs/Northtown/Ming.cs
index 5c5b3e11..ea1e1721 100644
--- a/S1API/Entities/NPCs/Northtown/Ming.cs
+++ b/S1API/Entities/NPCs/Northtown/Ming.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Northtown/PeggyMyers.cs b/S1API/Entities/NPCs/Northtown/PeggyMyers.cs
index 875983ab..ae7660a3 100644
--- a/S1API/Entities/NPCs/Northtown/PeggyMyers.cs
+++ b/S1API/Entities/NPCs/Northtown/PeggyMyers.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Northtown/PeterFile.cs b/S1API/Entities/NPCs/Northtown/PeterFile.cs
index e2af8748..6ae508d7 100644
--- a/S1API/Entities/NPCs/Northtown/PeterFile.cs
+++ b/S1API/Entities/NPCs/Northtown/PeterFile.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Northtown/SamThompson.cs b/S1API/Entities/NPCs/Northtown/SamThompson.cs
index d9a49e98..4f349c23 100644
--- a/S1API/Entities/NPCs/Northtown/SamThompson.cs
+++ b/S1API/Entities/NPCs/Northtown/SamThompson.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/OscarHolland.cs b/S1API/Entities/NPCs/OscarHolland.cs
index 5a557110..3349bf8b 100644
--- a/S1API/Entities/NPCs/OscarHolland.cs
+++ b/S1API/Entities/NPCs/OscarHolland.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/PoliceOfficers/OfficerBailey.cs b/S1API/Entities/NPCs/PoliceOfficers/OfficerBailey.cs
index a5203922..46fb882f 100644
--- a/S1API/Entities/NPCs/PoliceOfficers/OfficerBailey.cs
+++ b/S1API/Entities/NPCs/PoliceOfficers/OfficerBailey.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/PoliceOfficers/OfficerCooper.cs b/S1API/Entities/NPCs/PoliceOfficers/OfficerCooper.cs
index c2c40ba9..64555f6a 100644
--- a/S1API/Entities/NPCs/PoliceOfficers/OfficerCooper.cs
+++ b/S1API/Entities/NPCs/PoliceOfficers/OfficerCooper.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/PoliceOfficers/OfficerGreen.cs b/S1API/Entities/NPCs/PoliceOfficers/OfficerGreen.cs
index a5950489..1757e3c2 100644
--- a/S1API/Entities/NPCs/PoliceOfficers/OfficerGreen.cs
+++ b/S1API/Entities/NPCs/PoliceOfficers/OfficerGreen.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/PoliceOfficers/OfficerHoward.cs b/S1API/Entities/NPCs/PoliceOfficers/OfficerHoward.cs
index b077a19b..a2866ec7 100644
--- a/S1API/Entities/NPCs/PoliceOfficers/OfficerHoward.cs
+++ b/S1API/Entities/NPCs/PoliceOfficers/OfficerHoward.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/PoliceOfficers/OfficerJackson.cs b/S1API/Entities/NPCs/PoliceOfficers/OfficerJackson.cs
index 3c3c4a4e..f07628da 100644
--- a/S1API/Entities/NPCs/PoliceOfficers/OfficerJackson.cs
+++ b/S1API/Entities/NPCs/PoliceOfficers/OfficerJackson.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/PoliceOfficers/OfficerLee.cs b/S1API/Entities/NPCs/PoliceOfficers/OfficerLee.cs
index ce448bdf..4048acab 100644
--- a/S1API/Entities/NPCs/PoliceOfficers/OfficerLee.cs
+++ b/S1API/Entities/NPCs/PoliceOfficers/OfficerLee.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/PoliceOfficers/OfficerLopez.cs b/S1API/Entities/NPCs/PoliceOfficers/OfficerLopez.cs
index 6d2235b0..f98ec696 100644
--- a/S1API/Entities/NPCs/PoliceOfficers/OfficerLopez.cs
+++ b/S1API/Entities/NPCs/PoliceOfficers/OfficerLopez.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/PoliceOfficers/OfficerMurphy.cs b/S1API/Entities/NPCs/PoliceOfficers/OfficerMurphy.cs
index 206b2eea..69cf7610 100644
--- a/S1API/Entities/NPCs/PoliceOfficers/OfficerMurphy.cs
+++ b/S1API/Entities/NPCs/PoliceOfficers/OfficerMurphy.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/PoliceOfficers/OfficerOakley.cs b/S1API/Entities/NPCs/PoliceOfficers/OfficerOakley.cs
index 11724460..61a2159a 100644
--- a/S1API/Entities/NPCs/PoliceOfficers/OfficerOakley.cs
+++ b/S1API/Entities/NPCs/PoliceOfficers/OfficerOakley.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/StanCarney.cs b/S1API/Entities/NPCs/StanCarney.cs
index 017983c5..196975e1 100644
--- a/S1API/Entities/NPCs/StanCarney.cs
+++ b/S1API/Entities/NPCs/StanCarney.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Suburbia/AlisonKnight.cs b/S1API/Entities/NPCs/Suburbia/AlisonKnight.cs
index a534cddc..b8023319 100644
--- a/S1API/Entities/NPCs/Suburbia/AlisonKnight.cs
+++ b/S1API/Entities/NPCs/Suburbia/AlisonKnight.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Suburbia/CarlBundy.cs b/S1API/Entities/NPCs/Suburbia/CarlBundy.cs
index e9fcbbb6..663e1a59 100644
--- a/S1API/Entities/NPCs/Suburbia/CarlBundy.cs
+++ b/S1API/Entities/NPCs/Suburbia/CarlBundy.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Suburbia/ChrisSullivan.cs b/S1API/Entities/NPCs/Suburbia/ChrisSullivan.cs
index 5c24211c..0360fc4f 100644
--- a/S1API/Entities/NPCs/Suburbia/ChrisSullivan.cs
+++ b/S1API/Entities/NPCs/Suburbia/ChrisSullivan.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Suburbia/DennisKennedy.cs b/S1API/Entities/NPCs/Suburbia/DennisKennedy.cs
index d733d06a..df287efb 100644
--- a/S1API/Entities/NPCs/Suburbia/DennisKennedy.cs
+++ b/S1API/Entities/NPCs/Suburbia/DennisKennedy.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Suburbia/HankStevenson.cs b/S1API/Entities/NPCs/Suburbia/HankStevenson.cs
index 9440e3ec..ea0bf972 100644
--- a/S1API/Entities/NPCs/Suburbia/HankStevenson.cs
+++ b/S1API/Entities/NPCs/Suburbia/HankStevenson.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Suburbia/HaroldColt.cs b/S1API/Entities/NPCs/Suburbia/HaroldColt.cs
index e313c440..e7442eb4 100644
--- a/S1API/Entities/NPCs/Suburbia/HaroldColt.cs
+++ b/S1API/Entities/NPCs/Suburbia/HaroldColt.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Suburbia/JackKnight.cs b/S1API/Entities/NPCs/Suburbia/JackKnight.cs
index 921ef9d2..36dbac8a 100644
--- a/S1API/Entities/NPCs/Suburbia/JackKnight.cs
+++ b/S1API/Entities/NPCs/Suburbia/JackKnight.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Suburbia/JackieStevenson.cs b/S1API/Entities/NPCs/Suburbia/JackieStevenson.cs
index ca504988..76cee8c9 100644
--- a/S1API/Entities/NPCs/Suburbia/JackieStevenson.cs
+++ b/S1API/Entities/NPCs/Suburbia/JackieStevenson.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Suburbia/JeremyWilkinson.cs b/S1API/Entities/NPCs/Suburbia/JeremyWilkinson.cs
index 4a7ebe04..3ff5a30f 100644
--- a/S1API/Entities/NPCs/Suburbia/JeremyWilkinson.cs
+++ b/S1API/Entities/NPCs/Suburbia/JeremyWilkinson.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Suburbia/KarenKennedy.cs b/S1API/Entities/NPCs/Suburbia/KarenKennedy.cs
index 0df4bccd..c6a0d6d9 100644
--- a/S1API/Entities/NPCs/Suburbia/KarenKennedy.cs
+++ b/S1API/Entities/NPCs/Suburbia/KarenKennedy.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Suburbia/WeiLong.cs b/S1API/Entities/NPCs/Suburbia/WeiLong.cs
index bec8f78f..2e82f1e9 100644
--- a/S1API/Entities/NPCs/Suburbia/WeiLong.cs
+++ b/S1API/Entities/NPCs/Suburbia/WeiLong.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/UncleNelson.cs b/S1API/Entities/NPCs/UncleNelson.cs
index 15e6b06b..99cd30e5 100644
--- a/S1API/Entities/NPCs/UncleNelson.cs
+++ b/S1API/Entities/NPCs/UncleNelson.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Uptown/FionaHancock.cs b/S1API/Entities/NPCs/Uptown/FionaHancock.cs
index 59a3b968..0829fdb9 100644
--- a/S1API/Entities/NPCs/Uptown/FionaHancock.cs
+++ b/S1API/Entities/NPCs/Uptown/FionaHancock.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Uptown/HerbertBleuball.cs b/S1API/Entities/NPCs/Uptown/HerbertBleuball.cs
index 0361d983..9c34e326 100644
--- a/S1API/Entities/NPCs/Uptown/HerbertBleuball.cs
+++ b/S1API/Entities/NPCs/Uptown/HerbertBleuball.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Uptown/JenHeard.cs b/S1API/Entities/NPCs/Uptown/JenHeard.cs
index d2ffe6b5..9cf9ea11 100644
--- a/S1API/Entities/NPCs/Uptown/JenHeard.cs
+++ b/S1API/Entities/NPCs/Uptown/JenHeard.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Uptown/LeoRivers.cs b/S1API/Entities/NPCs/Uptown/LeoRivers.cs
index 6f22c063..d5fd88ea 100644
--- a/S1API/Entities/NPCs/Uptown/LeoRivers.cs
+++ b/S1API/Entities/NPCs/Uptown/LeoRivers.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Uptown/LilyTurner.cs b/S1API/Entities/NPCs/Uptown/LilyTurner.cs
index a2d6b77f..3a26941e 100644
--- a/S1API/Entities/NPCs/Uptown/LilyTurner.cs
+++ b/S1API/Entities/NPCs/Uptown/LilyTurner.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Uptown/MichaelBoog.cs b/S1API/Entities/NPCs/Uptown/MichaelBoog.cs
index d8d160c2..20798227 100644
--- a/S1API/Entities/NPCs/Uptown/MichaelBoog.cs
+++ b/S1API/Entities/NPCs/Uptown/MichaelBoog.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Uptown/PearlMoore.cs b/S1API/Entities/NPCs/Uptown/PearlMoore.cs
index 902efae0..85075c02 100644
--- a/S1API/Entities/NPCs/Uptown/PearlMoore.cs
+++ b/S1API/Entities/NPCs/Uptown/PearlMoore.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Uptown/RayHoffman.cs b/S1API/Entities/NPCs/Uptown/RayHoffman.cs
index 0716d33e..3c5c6fc0 100644
--- a/S1API/Entities/NPCs/Uptown/RayHoffman.cs
+++ b/S1API/Entities/NPCs/Uptown/RayHoffman.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Uptown/TobiasWentworth.cs b/S1API/Entities/NPCs/Uptown/TobiasWentworth.cs
index b4950553..91064578 100644
--- a/S1API/Entities/NPCs/Uptown/TobiasWentworth.cs
+++ b/S1API/Entities/NPCs/Uptown/TobiasWentworth.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Uptown/WalterCussler.cs b/S1API/Entities/NPCs/Uptown/WalterCussler.cs
index ee6b726e..b870e8b7 100644
--- a/S1API/Entities/NPCs/Uptown/WalterCussler.cs
+++ b/S1API/Entities/NPCs/Uptown/WalterCussler.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Westville/CharlesRowland.cs b/S1API/Entities/NPCs/Westville/CharlesRowland.cs
index a82f5374..4c78605c 100644
--- a/S1API/Entities/NPCs/Westville/CharlesRowland.cs
+++ b/S1API/Entities/NPCs/Westville/CharlesRowland.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Westville/DeanWebster.cs b/S1API/Entities/NPCs/Westville/DeanWebster.cs
index 00d9da03..381083bf 100644
--- a/S1API/Entities/NPCs/Westville/DeanWebster.cs
+++ b/S1API/Entities/NPCs/Westville/DeanWebster.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Westville/DorisLubbin.cs b/S1API/Entities/NPCs/Westville/DorisLubbin.cs
index a30fd86a..03ea2f64 100644
--- a/S1API/Entities/NPCs/Westville/DorisLubbin.cs
+++ b/S1API/Entities/NPCs/Westville/DorisLubbin.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Westville/GeorgeGreene.cs b/S1API/Entities/NPCs/Westville/GeorgeGreene.cs
index 0aa2e27a..31cebf2f 100644
--- a/S1API/Entities/NPCs/Westville/GeorgeGreene.cs
+++ b/S1API/Entities/NPCs/Westville/GeorgeGreene.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Westville/JerryMontero.cs b/S1API/Entities/NPCs/Westville/JerryMontero.cs
index 8100e54c..dd1ec080 100644
--- a/S1API/Entities/NPCs/Westville/JerryMontero.cs
+++ b/S1API/Entities/NPCs/Westville/JerryMontero.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Westville/JoyceBall.cs b/S1API/Entities/NPCs/Westville/JoyceBall.cs
index 83452668..c8b67a71 100644
--- a/S1API/Entities/NPCs/Westville/JoyceBall.cs
+++ b/S1API/Entities/NPCs/Westville/JoyceBall.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Westville/KeithWagner.cs b/S1API/Entities/NPCs/Westville/KeithWagner.cs
index 98b0b302..31c2a76e 100644
--- a/S1API/Entities/NPCs/Westville/KeithWagner.cs
+++ b/S1API/Entities/NPCs/Westville/KeithWagner.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Westville/KimDelaney.cs b/S1API/Entities/NPCs/Westville/KimDelaney.cs
index abbc07a4..91d54980 100644
--- a/S1API/Entities/NPCs/Westville/KimDelaney.cs
+++ b/S1API/Entities/NPCs/Westville/KimDelaney.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Westville/MegCooley.cs b/S1API/Entities/NPCs/Westville/MegCooley.cs
index b60df006..d3123ec1 100644
--- a/S1API/Entities/NPCs/Westville/MegCooley.cs
+++ b/S1API/Entities/NPCs/Westville/MegCooley.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Westville/MollyPresley.cs b/S1API/Entities/NPCs/Westville/MollyPresley.cs
index 7f55b99f..82c26c84 100644
--- a/S1API/Entities/NPCs/Westville/MollyPresley.cs
+++ b/S1API/Entities/NPCs/Westville/MollyPresley.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Westville/ShirleyWatts.cs b/S1API/Entities/NPCs/Westville/ShirleyWatts.cs
index 705bb0a2..16f044da 100644
--- a/S1API/Entities/NPCs/Westville/ShirleyWatts.cs
+++ b/S1API/Entities/NPCs/Westville/ShirleyWatts.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/NPCs/Westville/TrentSherman.cs b/S1API/Entities/NPCs/Westville/TrentSherman.cs
index e46f1c2b..5536466e 100644
--- a/S1API/Entities/NPCs/Westville/TrentSherman.cs
+++ b/S1API/Entities/NPCs/Westville/TrentSherman.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.NPCs;
 #else
 using ScheduleOne.NPCs;
diff --git a/S1API/Entities/Player.cs b/S1API/Entities/Player.cs
index a8abc0e6..835bcf82 100644
--- a/S1API/Entities/Player.cs
+++ b/S1API/Entities/Player.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using S1PlayerScripts = Il2CppScheduleOne.PlayerScripts;
 using S1Health = Il2CppScheduleOne.PlayerScripts.Health;
 #else
@@ -11,7 +11,6 @@
 using System.Linq;
 using System.Reflection;
 using HarmonyLib;
-using MelonLoader;
 using S1API.Entities.Interfaces;
 using S1API.Internal.Abstraction;
 using UnityEngine;
diff --git a/S1API/GameTime/TimeManager.cs b/S1API/GameTime/TimeManager.cs
index c6d5cdc9..e3670802 100644
--- a/S1API/GameTime/TimeManager.cs
+++ b/S1API/GameTime/TimeManager.cs
@@ -36,83 +36,83 @@ public static class TimeManager
 
         static TimeManager()
         {
-            if (S1GameTime.Instance != null)
+            if (S1GameTime.TimeManager.Instance != null)
             {
-                S1GameTime.Instance.onDayPass += (Action)(() => OnDayPass());
-                S1GameTime.Instance.onWeekPass += (Action)(() => OnWeekPass());
+                S1GameTime.TimeManager.Instance.onDayPass += (Action)(() => OnDayPass());
+                S1GameTime.TimeManager.Instance.onWeekPass += (Action)(() => OnWeekPass());
             }
 
-            S1GameTime.onSleepStart += (Action)(() => OnSleepStart());
-            S1GameTime.onSleepEnd += (Action<int>)(minutes => OnSleepEnd(minutes));
+            S1GameTime.TimeManager.onSleepStart += (Action)(() => OnSleepStart());
+            S1GameTime.TimeManager.onSleepEnd += (Action<int>)(minutes => OnSleepEnd(minutes));
         }
 
 
         /// <summary>
         /// The current in-game day (Monday, Tuesday, etc.).
         /// </summary>
-        public static Day CurrentDay => (Day)S1GameTime.Instance.CurrentDay;
+        public static Day CurrentDay => (Day)S1GameTime.TimeManager.Instance.CurrentDay;
 
         /// <summary>
         /// The number of in-game days elapsed.
         /// </summary>
-        public static int ElapsedDays => S1GameTime.Instance.ElapsedDays;
+        public static int ElapsedDays => S1GameTime.TimeManager.Instance.ElapsedDays;
 
         /// <summary>
         /// The current 24-hour time (e.g., 1330 for 1:30 PM).
         /// </summary>
-        public static int CurrentTime => S1GameTime.Instance.CurrentTime;
+        public static int CurrentTime => S1GameTime.TimeManager.Instance.CurrentTime;
 
         /// <summary>
         /// Whether it is currently nighttime in-game.
         /// </summary>
-        public static bool IsNight => S1GameTime.Instance.IsNight;
+        public static bool IsNight => S1GameTime.TimeManager.Instance.IsNight;
 
         /// <summary>
         /// Whether the game is currently at the end of the day (4:00 AM).
         /// </summary>
-        public static bool IsEndOfDay => S1GameTime.Instance.IsEndOfDay;
+        public static bool IsEndOfDay => S1GameTime.TimeManager.Instance.IsEndOfDay;
 
         /// <summary>
         /// Whether the player is currently sleeping.
         /// </summary>
-        public static bool SleepInProgress => S1GameTime.Instance.SleepInProgress;
+        public static bool SleepInProgress => S1GameTime.TimeManager.Instance.SleepInProgress;
 
         /// <summary>
         /// Whether the time is currently overridden (frozen or custom).
         /// </summary>
-        public static bool TimeOverridden => S1GameTime.Instance.TimeOverridden;
+        public static bool TimeOverridden => S1GameTime.TimeManager.Instance.TimeOverridden;
 
         /// <summary>
         /// The current normalized time of day (0.0 = start, 1.0 = end).
         /// </summary>
-        public static float NormalizedTime => S1GameTime.Instance.NormalizedTime;
+        public static float NormalizedTime => S1GameTime.TimeManager.Instance.NormalizedTime;
 
         /// <summary>
         /// Total playtime (in seconds).
         /// </summary>
-        public static float Playtime => S1GameTime.Instance.Playtime;
+        public static float Playtime => S1GameTime.TimeManager.Instance.Playtime;
 
         /// <summary>
         /// Fast-forwards time to morning wake time (7:00 AM).
         /// </summary>
-        public static void FastForwardToWakeTime() => S1GameTime.Instance.FastForwardToWakeTime();
+        public static void FastForwardToWakeTime() => S1GameTime.TimeManager.Instance.FastForwardToWakeTime();
 
         /// <summary>
         /// Sets the current time manually.
         /// </summary>
-        public static void SetTime(int time24h, bool local = false) => S1GameTime.Instance.SetTime(time24h, local);
+        public static void SetTime(int time24h, bool local = false) => S1GameTime.TimeManager.Instance.SetTime(time24h, local);
 
         /// <summary>
         /// Sets the number of elapsed in-game days.
         /// </summary>
-        public static void SetElapsedDays(int days) => S1GameTime.Instance.SetElapsedDays(days);
+        public static void SetElapsedDays(int days) => S1GameTime.TimeManager.Instance.SetElapsedDays(days);
 
         /// <summary>
         /// Gets the current time formatted in 12-hour AM/PM format.
         /// </summary>
         public static string GetFormatted12HourTime()
         {
-            return S1GameTime.Get12HourTime(CurrentTime, true);
+            return S1GameTime.TimeManager.Get12HourTime(CurrentTime, true);
         }
 
         /// <summary>
@@ -120,7 +120,7 @@ public static string GetFormatted12HourTime()
         /// </summary>
         public static bool IsCurrentTimeWithinRange(int startTime24h, int endTime24h)
         {
-            return S1GameTime.Instance.IsCurrentTimeWithinRange(startTime24h, endTime24h);
+            return S1GameTime.TimeManager.Instance.IsCurrentTimeWithinRange(startTime24h, endTime24h);
         }
 
         /// <summary>
@@ -128,7 +128,7 @@ public static bool IsCurrentTimeWithinRange(int startTime24h, int endTime24h)
         /// </summary>
         public static int GetMinutesFrom24HourTime(int time24h)
         {
-            return S1GameTime.GetMinSumFrom24HourTime(time24h);
+            return S1GameTime.TimeManager.GetMinSumFrom24HourTime(time24h);
         }
 
         /// <summary>
@@ -136,7 +136,7 @@ public static int GetMinutesFrom24HourTime(int time24h)
         /// </summary>
         public static int Get24HourTimeFromMinutes(int minutes)
         {
-            return S1GameTime.Get24HourTimeFromMinSum(minutes);
+            return S1GameTime.TimeManager.Get24HourTimeFromMinSum(minutes);
         }
     }
 }
diff --git a/S1API/Internal/Abstraction/ISaveable.cs b/S1API/Internal/Abstraction/ISaveable.cs
index 94a5431e..9d7a1db5 100644
--- a/S1API/Internal/Abstraction/ISaveable.cs
+++ b/S1API/Internal/Abstraction/ISaveable.cs
@@ -1,6 +1,6 @@
 #if (MONOMELON || MONOBEPINEX)
 using System.Collections.Generic;
-#elif (IL2CPP)
+#elif (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppSystem.Collections.Generic;
 #endif
 
diff --git a/S1API/Internal/Abstraction/Saveable.cs b/S1API/Internal/Abstraction/Saveable.cs
index 7afa79aa..e40d390a 100644
--- a/S1API/Internal/Abstraction/Saveable.cs
+++ b/S1API/Internal/Abstraction/Saveable.cs
@@ -1,6 +1,6 @@
 #if (MONOMELON || MONOBEPINEX)
 using System.Collections.Generic;
-#elif (IL2CPP)
+#elif (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppSystem.Collections.Generic;
 #endif
 
diff --git a/S1API/Internal/Patches/PhoneAppPatches.cs b/S1API/Internal/Patches/PhoneAppPatches.cs
index 9c9bf913..0229638b 100644
--- a/S1API/Internal/Patches/PhoneAppPatches.cs
+++ b/S1API/Internal/Patches/PhoneAppPatches.cs
@@ -7,7 +7,7 @@
 
 namespace S1API.Internal.Patches
 {   
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
     [HarmonyPatch(typeof(SceneManager), nameof(SceneManager.Internal_SceneLoaded))]
 #else
     [HarmonyPatch(typeof(SceneManager), "Internal_SceneLoaded", new Type[] { typeof(Scene), typeof(LoadSceneMode) })]
diff --git a/S1API/Internal/Patches/PlayerPatches.cs b/S1API/Internal/Patches/PlayerPatches.cs
index d3f24c65..79395e16 100644
--- a/S1API/Internal/Patches/PlayerPatches.cs
+++ b/S1API/Internal/Patches/PlayerPatches.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using S1PlayerScripts = Il2CppScheduleOne.PlayerScripts;
 #else
 using S1PlayerScripts = ScheduleOne.PlayerScripts;
diff --git a/S1API/Logging/Log.cs b/S1API/Logging/Log.cs
index 03986b93..031fe680 100644
--- a/S1API/Logging/Log.cs
+++ b/S1API/Logging/Log.cs
@@ -1,5 +1,5 @@
-#if MONOMELON || IL2CPPMELON
-using MelonLoader
+#if (MONOMELON || IL2CPPMELON)
+using MelonLoader;
 #else
 using BepInEx.Logging;
 #endif
@@ -11,7 +11,7 @@ namespace S1API.Logging
     /// </summary>
     public class Log
     {
-#if MONOMELON || IL2CPPMELON
+#if (MONOMELON || IL2CPPMELON)
         private readonly MelonLogger.Instance _loggerInstance;
 #else
         private readonly ManualLogSource _loggerInstance;
@@ -23,14 +23,14 @@ public class Log
         /// <param name="sourceName">The source name to use for logging</param>
         public Log(string sourceName)
         {
-#if MONOMELON || IL2CPPMELON
-            _loggerInstance = new MelonLogger.Instancer(sourceName);
+#if (MONOMELON || IL2CPPMELON)
+            _loggerInstance = new MelonLogger.Instance(sourceName);
 #else
             _loggerInstance = Logger.CreateLogSource(sourceName);
 #endif
         }
 
-#if MONOBEPINEX || IL2CPPBEPINEX
+#if (MONOBEPINEX || IL2CPPBEPINEX)
         /// <summary>
         /// Default constructor for <see cref="Log"/> instance when BepInEx is enabled
         /// </summary>
@@ -47,7 +47,7 @@ public Log(ManualLogSource loggerInstance)
         /// <param name="message">Message to log</param>
         public void Msg(string message)
         {
-#if MONOMELON || IL2CPPMELON
+#if (MONOMELON || IL2CPPMELON)
             _loggerInstance.Msg(message);
 #else
             _loggerInstance.LogInfo(message);
@@ -60,7 +60,7 @@ public void Msg(string message)
         /// <param name="message">Message to log</param>
         public void Warning(string message)
         {
-#if MONOMELON || IL2CPPMELON
+#if (MONOMELON || IL2CPPMELON)
             _loggerInstance.Warning(message);
 #else
             _loggerInstance.LogWarning(message);
@@ -73,7 +73,7 @@ public void Warning(string message)
         /// <param name="message">Message to log</param>
         public void Error(string message)
         {
-#if MONOMELON || IL2CPPMELON
+#if (MONOMELON || IL2CPPMELON)
             _loggerInstance.Error(message);
 #else
             _loggerInstance.LogError(message);
@@ -86,7 +86,7 @@ public void Error(string message)
         /// <param name="message">Message to log</param>
         public void BigError(string message)
         {
-#if MONOMELON || IL2CPPMELON
+#if (MONOMELON || IL2CPPMELON)
             _loggerInstance.BigError(message);
 #else
             _loggerInstance.LogFatal(message);
diff --git a/S1API/Messaging/Response.cs b/S1API/Messaging/Response.cs
index 1e9028c6..d0a2d021 100644
--- a/S1API/Messaging/Response.cs
+++ b/S1API/Messaging/Response.cs
@@ -1,6 +1,6 @@
-#if (IL2CPP)
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using S1Messaging = Il2CppScheduleOne.Messaging;
-#elif (MONO)
+#elif (MONOMELON || MONOBEPINEX)
 using S1Messaging = ScheduleOne.Messaging;
 #endif
 using System;
diff --git a/S1API/Money/Money.cs b/S1API/Money/Money.cs
index 77ab3f3f..d886dc5b 100644
--- a/S1API/Money/Money.cs
+++ b/S1API/Money/Money.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne;
 using S1ItemFramework = Il2CppScheduleOne.ItemFramework;
 using S1MoneyFramework = Il2CppScheduleOne.Money;
@@ -113,7 +113,7 @@ public static void RemoveNetworthCalculation(System.Action<object> callback)
         /// <returns>A newly created instance of cash with the specified balance.</returns>
         public static CashInstance CreateCashInstance(float amount)
         {
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
             var cashItem = Registry.GetItem<Il2CppScheduleOne.ItemFramework.CashDefinition>("cash");
             var instance = CrossType.As<Il2CppScheduleOne.ItemFramework.ItemInstance>(cashItem.GetDefaultInstance(1));
             var cashInstance = new CashInstance(instance);
diff --git a/S1API/Player/Player.cs b/S1API/Player/Player.cs
deleted file mode 100644
index 34f0a683..00000000
--- a/S1API/Player/Player.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// using UnityEngine;
-//
-// namespace S1API.Player
-// {
-//     public class Player
-//     {
-//         public static Player Local => new Player();
-//         public Vector3 Position = Vector3.zero; 
-//     }
-// }
\ No newline at end of file
diff --git a/S1API/Products/CocaineDefinition.cs b/S1API/Products/CocaineDefinition.cs
index 18b0e5ab..5507e6f8 100644
--- a/S1API/Products/CocaineDefinition.cs
+++ b/S1API/Products/CocaineDefinition.cs
@@ -1,7 +1,7 @@
-#if IL2CPPMELON || IL2CPPBEPINEX
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.Product;
 using S1CocaineDefinition = Il2CppScheduleOne.Product.CocaineDefinition;
-#elif MONOMELON || MONOBEPINEX
+#elif (MONOMELON || MONOBEPINEX)
 using ScheduleOne.Product;
 using S1CocaineDefinition = ScheduleOne.Product.CocaineDefinition;
 #endif
diff --git a/S1API/Products/MethDefinition.cs b/S1API/Products/MethDefinition.cs
index 46cb4926..8904a616 100644
--- a/S1API/Products/MethDefinition.cs
+++ b/S1API/Products/MethDefinition.cs
@@ -1,7 +1,7 @@
-#if IL2CPPMELON || IL2CPPBEPINEX
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.Product;
 using S1MethDefinition = Il2CppScheduleOne.Product.MethDefinition;
-#elif MONOMELON || MONOBEPINEX
+#elif (MONOMELON || MONOBEPINEX)
 using ScheduleOne.Product;
 using S1MethDefinition = ScheduleOne.Product.MethDefinition;
 #endif
diff --git a/S1API/Products/ProductDefinition.cs b/S1API/Products/ProductDefinition.cs
index 38dbadb2..3c4b7fb2 100644
--- a/S1API/Products/ProductDefinition.cs
+++ b/S1API/Products/ProductDefinition.cs
@@ -1,4 +1,4 @@
-#if IL2CPPMELON || IL2CPPBEPINEX
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppInterop.Runtime.InteropTypes;
 
 using S1Product = Il2CppScheduleOne.Product;
diff --git a/S1API/Products/ProductDefinitionWrapper.cs b/S1API/Products/ProductDefinitionWrapper.cs
index a6fb9eb5..2670adca 100644
--- a/S1API/Products/ProductDefinitionWrapper.cs
+++ b/S1API/Products/ProductDefinitionWrapper.cs
@@ -1,5 +1,5 @@
 using S1API.Internal.Utils;
-#if IL2CPPMELON || IL2CPPBEPINEX
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using S1Product = Il2CppScheduleOne.Product;
 #else
 using S1Product = ScheduleOne.Product;
diff --git a/S1API/Products/WeedDefinition.cs b/S1API/Products/WeedDefinition.cs
index bbff0a17..f467819e 100644
--- a/S1API/Products/WeedDefinition.cs
+++ b/S1API/Products/WeedDefinition.cs
@@ -1,7 +1,7 @@
-#if IL2CPPMELON || IL2CPPBEPINEX
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppScheduleOne.Product;
 using S1WeedDefinition = Il2CppScheduleOne.Product.WeedDefinition;
-#elif MONOMELON || MONOBEPINEX
+#elif (MONOMELON || MONOBEPINEX)
 using ScheduleOne.Product;
 using S1WeedDefinition = ScheduleOne.Product.WeedDefinition;
 #endif
diff --git a/S1API/Quests/Quest.cs b/S1API/Quests/Quest.cs
index eb094abe..f281bccb 100644
--- a/S1API/Quests/Quest.cs
+++ b/S1API/Quests/Quest.cs
@@ -90,7 +90,7 @@ public Quest()
 #if (MONOMELON || MONOBEPINEX)
             FieldInfo autoInitField = AccessTools.Field(typeof(S1Quests.Quest), "autoInitialize");
             autoInitField.SetValue(S1Quest, false);
-#elif (IL2CPP)
+#elif (IL2CPPMELON || IL2CPPBEPINEX)
             S1Quest.autoInitialize = false;
 #endif
             
@@ -141,7 +141,7 @@ public Quest()
 #if (MONOMELON || MONOBEPINEX)
             FieldInfo uiPrefabField = AccessTools.Field(typeof(S1Map.POI), "UIPrefab");
             uiPrefabField.SetValue(poi, uiPrefabObject);
-#elif (IL2CPP)
+#elif (IL2CPPMELON || IL2CPPBEPINEX)
             poi.UIPrefab = uiPrefabObject;
 #endif
             S1Quest.PoIPrefab = poiPrefabObject;
diff --git a/S1API/S1API.cs b/S1API/S1API.cs
index 847adb45..ba4eaa7b 100644
--- a/S1API/S1API.cs
+++ b/S1API/S1API.cs
@@ -1,4 +1,4 @@
-#if MONOMELON || IL2CPPMELON
+#if (MONOMELON || IL2CPPMELON)
 using MelonLoader;
 
 [assembly: MelonInfo(typeof(S1API.S1API), "S1API", "{VERSION_NUMBER}", "KaBooMa")]
@@ -12,7 +12,7 @@ public class S1API : MelonMod
     {
     }
 }
-#elif MONOBEPINEX || IL2CPPBEPINEX
+#elif (MONOBEPINEX || IL2CPPBEPINEX)
 using BepInEx;
 using BepInEx.Unity.Mono;
 
@@ -29,5 +29,4 @@ private void Awake()
         }
     }
 }
-
 #endif
diff --git a/S1API/S1API.csproj b/S1API/S1API.csproj
index 223cc89b..a28f1c2d 100644
--- a/S1API/S1API.csproj
+++ b/S1API/S1API.csproj
@@ -19,11 +19,11 @@
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
     
-    <PropertyGroup Condition="'$(Configuration)' == 'Mono'">
+    <PropertyGroup Condition="'$(Configuration)' == 'MonoMelon' or '$(Configuration)' == 'MonoBepInEx'">
         <TargetFramework>netstandard2.1</TargetFramework>
     </PropertyGroup>
     
-    <PropertyGroup Condition="'$(Configuration)' == 'Il2Cpp'">
+    <PropertyGroup Condition="'$(Configuration)' == 'Il2CppMelon' or '$(Configuration)' == 'Il2CppBepInEx'">
         <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
 
diff --git a/S1API/UI/UIFactory.cs b/S1API/UI/UIFactory.cs
index 4ae6d900..57c5b0b3 100644
--- a/S1API/UI/UIFactory.cs
+++ b/S1API/UI/UIFactory.cs
@@ -1,4 +1,4 @@
-#if IL2CPP
+#if (IL2CPPMELON || IL2CPPBEPINEX)
 using Il2CppInterop.Runtime.InteropTypes.Arrays;
 #endif
 
diff --git a/github.build.props b/github.build.props
index 1648fc4d..2c4c39ec 100644
--- a/github.build.props
+++ b/github.build.props
@@ -11,6 +11,7 @@
 
         <!-- Used when building both Il2Cpp and Mono. Typically located at `steamapps/Schedule I/MelonLoader/net6` -->
         <MelonLoaderAssembliesPath>..\ScheduleOneAssemblies\MelonLoader</MelonLoaderAssembliesPath>
+        <BepInExAssembliesPath>..\ScheduleOneAssemblies\BepInEx</BepInExAssembliesPath>
         
 <!-- Mono Configuration -->