diff --git a/project/Aki.Custom/BTR/BTRManager.cs b/project/Aki.Custom/BTR/BTRManager.cs
index a19168b..e4408dd 100644
--- a/project/Aki.Custom/BTR/BTRManager.cs
+++ b/project/Aki.Custom/BTR/BTRManager.cs
@@ -13,7 +13,7 @@ using System.Linq;
 using System.Reflection;
 using UnityEngine;
 using Random = UnityEngine.Random;
-using BotEventHandler = GClass595;
+using BotEventHandler = GClass598;
 
 namespace Aki.Custom.BTR
 {
diff --git a/project/Aki.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs b/project/Aki.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs
index d0c44a1..78c7ebd 100644
--- a/project/Aki.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs
+++ b/project/Aki.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs
@@ -6,7 +6,7 @@ using EFT.Vehicle;
 using HarmonyLib;
 using System;
 using System.Reflection;
-using BTRDialog = EFT.UI.TraderDialogScreen.GClass3132;
+using BTRDialog = EFT.UI.TraderDialogScreen.GClass3137;
 
 namespace Aki.Custom.BTR.Patches
 {
diff --git a/project/Aki.Custom/BTR/Patches/BTRBotAttachPatch.cs b/project/Aki.Custom/BTR/Patches/BTRBotAttachPatch.cs
index 467fab9..30f65dc 100644
--- a/project/Aki.Custom/BTR/Patches/BTRBotAttachPatch.cs
+++ b/project/Aki.Custom/BTR/Patches/BTRBotAttachPatch.cs
@@ -35,7 +35,7 @@ namespace Aki.Custom.BTR.Patches
             var btrTurretViewTupleField = (ValueTuple<ObservedPlayerView, bool>)AccessTools.Field(__instance.GetType(), "valueTuple_0").GetValue(__instance);
             if (!btrTurretViewTupleField.Item2)
             {
-                __instance.method_1(btrBotId);
+                __instance.method_3(btrBotId);
                 return false;
             }
 
diff --git a/project/Aki.Custom/BTR/Patches/BTRInteractionPatch.cs b/project/Aki.Custom/BTR/Patches/BTRInteractionPatch.cs
index d1fbca6..2ec49d7 100644
--- a/project/Aki.Custom/BTR/Patches/BTRInteractionPatch.cs
+++ b/project/Aki.Custom/BTR/Patches/BTRInteractionPatch.cs
@@ -5,7 +5,7 @@ using EFT.GlobalEvents;
 using EFT.Vehicle;
 using HarmonyLib;
 using System.Reflection;
-using GlobalEventHandler = GClass2911;
+using GlobalEventHandler = GClass2915;
 
 namespace Aki.Custom.BTR.Patches
 {
diff --git a/project/Aki.Custom/BTR/Patches/BTRReceiveDamageInfoPatch.cs b/project/Aki.Custom/BTR/Patches/BTRReceiveDamageInfoPatch.cs
index d73d027..9be74ff 100644
--- a/project/Aki.Custom/BTR/Patches/BTRReceiveDamageInfoPatch.cs
+++ b/project/Aki.Custom/BTR/Patches/BTRReceiveDamageInfoPatch.cs
@@ -4,7 +4,7 @@ using EFT;
 using EFT.Vehicle;
 using HarmonyLib;
 using System.Reflection;
-using BotEventHandler = GClass595;
+using BotEventHandler = GClass598;
 
 namespace Aki.Custom.BTR.Patches
 {
diff --git a/project/Aki.Custom/Patches/ExitWhileLootingPatch.cs b/project/Aki.Custom/Patches/ExitWhileLootingPatch.cs
index c4ecb70..09d4c49 100644
--- a/project/Aki.Custom/Patches/ExitWhileLootingPatch.cs
+++ b/project/Aki.Custom/Patches/ExitWhileLootingPatch.cs
@@ -31,7 +31,7 @@ namespace Aki.Custom.Patches
             var player = Singleton<GameWorld>.Instance.MainPlayer;
             if (profileId == player?.Profile.Id)
             {
-                GClass3107.Instance.CloseAllScreensForced();
+                GClass3112.Instance.CloseAllScreensForced();
             }
 
             return true;
diff --git a/project/Aki.Custom/Patches/RagfairFeePatch.cs b/project/Aki.Custom/Patches/RagfairFeePatch.cs
index de4c3b0..6633c54 100644
--- a/project/Aki.Custom/Patches/RagfairFeePatch.cs
+++ b/project/Aki.Custom/Patches/RagfairFeePatch.cs
@@ -17,8 +17,8 @@ namespace Aki.Custom.Patches
         public RagfairFeePatch()
         {
             // Remember to update prefix parameter if below lines are broken
-            _ = nameof(GClass3069.IsAllSelectedItemSame);
-            _ = nameof(GClass3069.AutoSelectSimilar);
+            _ = nameof(GClass3074.IsAllSelectedItemSame);
+            _ = nameof(GClass3074.AutoSelectSimilar);
         }
 
         protected override MethodBase GetTargetMethod()
@@ -34,14 +34,14 @@ namespace Aki.Custom.Patches
         /// <param name="___double_0">RequirementsPrice</param>
         /// <param name="___bool_0">SellInOnePiece</param>
         [PatchPrefix]
-        private static void PatchPrefix(ref Item ___item_0, ref GClass3069 ___gclass3069_0, ref double ___double_0, ref bool ___bool_0)
+        private static void PatchPrefix(ref Item ___item_0, ref GClass3074 ___gclass3074_0, ref double ___double_0, ref bool ___bool_0)
         {
             RequestHandler.PutJson("/client/ragfair/offerfees", new
             {
                 id = ___item_0.Id,
                 tpl = ___item_0.TemplateId,
-                count = ___gclass3069_0.OfferItemCount,
-                fee = Mathf.CeilToInt((float)GClass2086.CalculateTaxPrice(___item_0, ___gclass3069_0.OfferItemCount, ___double_0, ___bool_0))
+                count = ___gclass3074_0.OfferItemCount,
+                fee = Mathf.CeilToInt((float)GClass2089.CalculateTaxPrice(___item_0, ___gclass3074_0.OfferItemCount, ___double_0, ___bool_0))
             }.ToJson());
         }
     }
diff --git a/project/Aki.Debugging/Patches/BTRDebugCommandPatch.cs b/project/Aki.Debugging/Patches/BTRDebugCommandPatch.cs
index 42e2f5a..a9b7a37 100644
--- a/project/Aki.Debugging/Patches/BTRDebugCommandPatch.cs
+++ b/project/Aki.Debugging/Patches/BTRDebugCommandPatch.cs
@@ -5,7 +5,7 @@ using EFT;
 using EFT.UI;
 using HarmonyLib;
 using System.Reflection;
-using DialogControlClass = GClass1954;
+using DialogControlClass = GClass1957;
 
 namespace Aki.Debugging.Patches
 {
diff --git a/project/Aki.Debugging/Patches/PMCBotSpawnLocationPatch.cs b/project/Aki.Debugging/Patches/PMCBotSpawnLocationPatch.cs
index 3596d99..68edd96 100644
--- a/project/Aki.Debugging/Patches/PMCBotSpawnLocationPatch.cs
+++ b/project/Aki.Debugging/Patches/PMCBotSpawnLocationPatch.cs
@@ -17,11 +17,11 @@ namespace Aki.Debugging.Patches
     {
         private readonly List<ISpawnPoint> playerSpawnPoints;
         private readonly Random _rnd = new Random();
-        private readonly GStruct379 _spawnSettings = new GStruct379();
+        private readonly GStruct380 _spawnSettings = new GStruct380();
 
         public SptSpawnHelper()
         {
-            IEnumerable<ISpawnPoint> locationSpawnPoints = GClass2924.CreateFromScene();
+            IEnumerable<ISpawnPoint> locationSpawnPoints = GClass2928.CreateFromScene();
 
             var playerSpawns = locationSpawnPoints.Where(x => x.Categories.HasFlag(ESpawnCategoryMask.Player)).ToList();
             this.playerSpawnPoints = locationSpawnPoints.Where(x => x.Categories.HasFlag(ESpawnCategoryMask.Player)).ToList();
@@ -62,7 +62,7 @@ namespace Aki.Debugging.Patches
         }
 
         [PatchPrefix]
-        public static bool PatchPrefix(GClass1470 __instance, GClass588 data)
+        public static bool PatchPrefix(GClass1472 __instance, GClass591 data)
         {
 
             var firstBotRole = data.Profiles[0].Info.Settings.Role;
diff --git a/project/Aki.SinglePlayer/Patches/RaidFix/GetNewBotTemplatesPatch.cs b/project/Aki.SinglePlayer/Patches/RaidFix/GetNewBotTemplatesPatch.cs
index 293f69e..c330e25 100644
--- a/project/Aki.SinglePlayer/Patches/RaidFix/GetNewBotTemplatesPatch.cs
+++ b/project/Aki.SinglePlayer/Patches/RaidFix/GetNewBotTemplatesPatch.cs
@@ -44,7 +44,7 @@ namespace Aki.SinglePlayer.Patches.RaidFix
         /// BotsPresets.GetNewProfile()
         /// </summary>
         [PatchPrefix]
-        private static bool PatchPrefix(ref Task<Profile> __result, BotsPresets __instance, List<Profile> ___list_0, GClass588 data, ref bool withDelete)
+        private static bool PatchPrefix(ref Task<Profile> __result, BotsPresets __instance, List<Profile> ___list_0, GClass591 data, ref bool withDelete)
         {
             /*
                 When client wants new bot and GetNewProfile() return null (if not more available templates or they don't satisfy by Role and Difficulty condition)
diff --git a/project/Aki.SinglePlayer/Patches/RaidFix/LabsKeycardRemovalPatch.cs b/project/Aki.SinglePlayer/Patches/RaidFix/LabsKeycardRemovalPatch.cs
index 056a299..98440dc 100644
--- a/project/Aki.SinglePlayer/Patches/RaidFix/LabsKeycardRemovalPatch.cs
+++ b/project/Aki.SinglePlayer/Patches/RaidFix/LabsKeycardRemovalPatch.cs
@@ -43,7 +43,7 @@ namespace Aki.SinglePlayer.Patches.RaidFix
             }
 
             var inventoryController = Traverse.Create(player).Field<InventoryControllerClass>("_inventoryController").Value;
-            GClass2770.Remove(accessCardItem, inventoryController, false, true);
+            GClass2774.Remove(accessCardItem, inventoryController, false, true);
         }
     }
 }
\ No newline at end of file
diff --git a/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs b/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs
index b4462c0..4a21862 100644
--- a/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs
+++ b/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs
@@ -29,7 +29,7 @@ namespace Aki.SinglePlayer.Patches.ScavMode
             _ = nameof(TimeAndWeatherSettings.IsRandomWeather);
             _ = nameof(BotControllerSettings.IsScavWars);
             _ = nameof(WavesSettings.IsBosses);
-            _ = GClass3166.MAX_SCAV_COUNT; // UPDATE REFS TO THIS CLASS BELOW !!!
+            _ = GClass3172.MAX_SCAV_COUNT; // UPDATE REFS TO THIS CLASS BELOW !!!
 
             // `MatchmakerInsuranceScreen` OnShowNextScreen
             _onReadyScreenMethod = AccessTools.Method(typeof(MainMenuController), nameof(MainMenuController.method_42));
@@ -116,9 +116,9 @@ namespace Aki.SinglePlayer.Patches.ScavMode
 
             // Get fields from MainMenuController.cs
             var raidSettings = Traverse.Create(menuController).Field("raidSettings_0").GetValue<RaidSettings>();
-            var matchmakerPlayersController = Traverse.Create(menuController).Field($"{nameof(GClass3166).ToLowerInvariant()}_0").GetValue<GClass3166>();
+            var matchmakerPlayersController = Traverse.Create(menuController).Field($"{nameof(GClass3172).ToLowerInvariant()}_0").GetValue<GClass3172>();
 
-            var gclass = new MatchmakerOfflineRaidScreen.GClass3155(profile?.Info, ref raidSettings, matchmakerPlayersController);
+            var gclass = new MatchmakerOfflineRaidScreen.GClass3160(profile?.Info, ref raidSettings, matchmakerPlayersController);
 
             gclass.OnShowNextScreen += LoadOfflineRaidNextScreen;
 
diff --git a/project/Aki.SinglePlayer/Utils/TraderServices/TraderServicesManager.cs b/project/Aki.SinglePlayer/Utils/TraderServices/TraderServicesManager.cs
index 81048e1..28c3b56 100644
--- a/project/Aki.SinglePlayer/Utils/TraderServices/TraderServicesManager.cs
+++ b/project/Aki.SinglePlayer/Utils/TraderServices/TraderServicesManager.cs
@@ -6,7 +6,7 @@ using System;
 using System.Collections.Generic;
 using UnityEngine;
 using static BackendConfigSettingsClass;
-using TraderServiceClass = GClass1791;
+using TraderServiceClass = GClass1794;
 
 namespace Aki.SinglePlayer.Utils.TraderServices
 {