diff --git a/project/assets/database/locations/factory4_day/base.json b/project/assets/database/locations/factory4_day/base.json
index 7dd3d16c..fa9deb07 100644
--- a/project/assets/database/locations/factory4_day/base.json
+++ b/project/assets/database/locations/factory4_day/base.json
@@ -95,12 +95,16 @@
   "BotLocationModifier": {
     "AccuracySpeed": 1,
     "DistToActivate": 140,
+    "DistToActivatePvE": 140,
     "DistToPersueAxemanCoef": 0.9,
     "DistToSleep": 150,
+    "DistToSleepPvE": 150,
     "GainSight": 1,
     "KhorovodChance": 0,
     "MagnetPower": 15,
     "MarksmanAccuratyCoef": 1,
+    "MaxExfiltrationTime": 900,
+    "MinExfiltrationTime": 600,
     "Scattering": 1,
     "VisibleDistance": 1
   },
@@ -124,9 +128,10 @@
   "DisabledScavExits": "Cellars,Gate 0",
   "EnableCoop": true,
   "Enabled": true,
-  "EscapeTimeLimit": 19,
+  "EscapeTimeLimit": 20,
   "EscapeTimeLimitCoop": 15,
-  "EscapeTimeLimitPVE": 19,
+  "EscapeTimeLimitPVE": 20,
+  "ForceOnlineRaidInPVE": false,
   "GenerateLocalLootCache": true,
   "GlobalContainerChanceModifier": 1,
   "GlobalLootChanceModifier": 0.3,
@@ -3955,6 +3960,10 @@
     {
       "BotPreset": "normal",
       "BotSide": "Savage",
+      "SpawnMode": [
+        "regular",
+        "pve"
+      ],
       "SpawnPoints": "BotZone",
       "WildSpawnType": "assault",
       "isPlayers": false,
@@ -3967,21 +3976,29 @@
     {
       "BotPreset": "normal",
       "BotSide": "Savage",
+      "SpawnMode": [
+        "regular",
+        "pve"
+      ],
       "SpawnPoints": "BotZone",
       "WildSpawnType": "assault",
       "isPlayers": false,
       "number": 1,
       "slots_max": 4,
-      "slots_min": 1,
+      "slots_min": 2,
       "time_max": -1,
       "time_min": -1
     },
     {
       "BotPreset": "hard",
       "BotSide": "Savage",
+      "SpawnMode": [
+        "regular",
+        "pve"
+      ],
       "SpawnPoints": "BotZone",
       "WildSpawnType": "assault",
-      "isPlayers": true,
+      "isPlayers": false,
       "number": 2,
       "slots_max": 4,
       "slots_min": 2,
@@ -3991,9 +4008,13 @@
     {
       "BotPreset": "normal",
       "BotSide": "Savage",
+      "SpawnMode": [
+        "regular",
+        "pve"
+      ],
       "SpawnPoints": "BotZone",
       "WildSpawnType": "assault",
-      "isPlayers": true,
+      "isPlayers": false,
       "number": 3,
       "slots_max": 4,
       "slots_min": 2,
@@ -4003,9 +4024,13 @@
     {
       "BotPreset": "normal",
       "BotSide": "Savage",
+      "SpawnMode": [
+        "regular",
+        "pve"
+      ],
       "SpawnPoints": "BotZone",
       "WildSpawnType": "assault",
-      "isPlayers": true,
+      "isPlayers": false,
       "number": 4,
       "slots_max": 4,
       "slots_min": 2,
@@ -4015,9 +4040,13 @@
     {
       "BotPreset": "hard",
       "BotSide": "Savage",
+      "SpawnMode": [
+        "regular",
+        "pve"
+      ],
       "SpawnPoints": "BotZone",
       "WildSpawnType": "assault",
-      "isPlayers": true,
+      "isPlayers": false,
       "number": 5,
       "slots_max": 4,
       "slots_min": 3,
@@ -4027,6 +4056,10 @@
     {
       "BotPreset": "hard",
       "BotSide": "Savage",
+      "SpawnMode": [
+        "regular",
+        "pve"
+      ],
       "SpawnPoints": "BotZone",
       "WildSpawnType": "assault",
       "isPlayers": false,
@@ -4039,6 +4072,10 @@
     {
       "BotPreset": "hard",
       "BotSide": "Savage",
+      "SpawnMode": [
+        "regular",
+        "pve"
+      ],
       "SpawnPoints": "BotZone",
       "WildSpawnType": "assault",
       "isPlayers": false,
diff --git a/project/assets/database/locations/woods/base.json b/project/assets/database/locations/woods/base.json
index 45cceeb7..fbf4d575 100644
--- a/project/assets/database/locations/woods/base.json
+++ b/project/assets/database/locations/woods/base.json
@@ -102,7 +102,6 @@
         "regular",
         "pve"
       ],
-      "Supports": null,
       "Time": -1,
       "TriggerId": "",
       "TriggerName": ""
@@ -179,9 +178,10 @@
   "DisabledScavExits": "",
   "EnableCoop": true,
   "Enabled": true,
-  "EscapeTimeLimit": 29,
+  "EscapeTimeLimit": 40,
   "EscapeTimeLimitCoop": 30,
-  "EscapeTimeLimitPVE": 29,
+  "EscapeTimeLimitPVE": 40,
+  "ForceOnlineRaidInPVE": false,
   "GenerateLocalLootCache": true,
   "GlobalContainerChanceModifier": 1,
   "GlobalLootChanceModifier": 0.95,
@@ -242,8 +242,8 @@
   },
   "OcculsionCullingEnabled": false,
   "OfflineNewSpawn": true,
-  "OfflineOldSpawn": false,
-  "OldSpawn": false,
+  "OfflineOldSpawn": true,
+  "OldSpawn": true,
   "OpenZones": "ZoneClearVill,ZoneHouse,ZoneScavBase2,ZoneHouse,ZoneWoodCutter,ZoneBigRocks,ZoneRoad,ZoneHighRocks,ZoneMiniHouse,ZoneBigRocks",
   "PlayersRequestCount": -1,
   "PmcMaxPlayersInGroup": 5,
@@ -8917,274 +8917,337 @@
       "BotPreset": "normal",
       "BotSide": "Savage",
       "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
       "SpawnPoints": "ZoneClearVill",
       "WildSpawnType": "assault",
       "isPlayers": false,
       "number": 0,
       "slots_max": 2,
-      "slots_min": 1,
-      "time_max": 100,
-      "time_min": 55
+      "slots_min": 0,
+      "time_max": -1,
+      "time_min": -1
     },
     {
       "BotPreset": "hard",
       "BotSide": "Savage",
       "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
       "SpawnPoints": "ZoneHouse",
       "WildSpawnType": "assault",
       "isPlayers": false,
       "number": 1,
-      "slots_max": 2,
+      "slots_max": 3,
       "slots_min": 0,
-      "time_max": 125,
-      "time_min": 120
+      "time_max": -1,
+      "time_min": -1
     },
     {
       "BotPreset": "normal",
       "BotSide": "Savage",
       "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
       "SpawnPoints": "ZoneScavBase2",
       "WildSpawnType": "assault",
       "isPlayers": false,
       "number": 2,
-      "slots_max": 2,
+      "slots_max": 3,
       "slots_min": 0,
-      "time_max": 499,
-      "time_min": 288
+      "time_max": -1,
+      "time_min": -1
     },
     {
       "BotPreset": "hard",
       "BotSide": "Savage",
       "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
       "SpawnPoints": "ZoneHouse",
       "WildSpawnType": "assault",
       "isPlayers": false,
       "number": 3,
-      "slots_max": 2,
-      "slots_min": 1,
-      "time_max": 700,
-      "time_min": 400
+      "slots_max": 0,
+      "slots_min": 0,
+      "time_max": -1,
+      "time_min": -1
     },
     {
       "BotPreset": "hard",
       "BotSide": "Savage",
       "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
       "SpawnPoints": "ZoneWoodCutter",
       "WildSpawnType": "assault",
       "isPlayers": false,
       "number": 4,
-      "slots_max": 1,
-      "slots_min": 0,
-      "time_max": 800,
-      "time_min": 700
+      "slots_max": 3,
+      "slots_min": 1,
+      "time_max": -1,
+      "time_min": -1
     },
     {
       "BotPreset": "hard",
       "BotSide": "Savage",
       "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
       "SpawnPoints": "ZoneHouse",
       "WildSpawnType": "assault",
       "isPlayers": false,
       "number": 5,
-      "slots_max": 1,
+      "slots_max": 0,
       "slots_min": 0,
-      "time_max": 1000,
-      "time_min": 800
+      "time_max": -1,
+      "time_min": -1
     },
     {
       "BotPreset": "hard",
       "BotSide": "Savage",
       "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
       "SpawnPoints": "ZoneWoodCutter",
       "WildSpawnType": "assault",
       "isPlayers": false,
       "number": 6,
       "slots_max": 0,
       "slots_min": 0,
-      "time_max": 1300,
-      "time_min": 1000
+      "time_max": -1,
+      "time_min": -1
     },
     {
       "BotPreset": "normal",
       "BotSide": "Savage",
       "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
       "SpawnPoints": "ZoneBigRocks",
       "WildSpawnType": "assault",
       "isPlayers": false,
       "number": 7,
       "slots_max": 0,
       "slots_min": 0,
-      "time_max": 60,
-      "time_min": 30
+      "time_max": -1,
+      "time_min": -1
     },
     {
       "BotPreset": "easy",
       "BotSide": "Savage",
       "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
       "SpawnPoints": "ZoneRoad",
       "WildSpawnType": "assault",
       "isPlayers": false,
       "number": 8,
-      "slots_max": 0,
+      "slots_max": 2,
       "slots_min": 0,
-      "time_max": 9,
-      "time_min": 0
+      "time_max": -1,
+      "time_min": -1
     },
     {
       "BotPreset": "normal",
       "BotSide": "Savage",
       "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
       "SpawnPoints": "ZoneHighRocks",
       "WildSpawnType": "marksman",
       "isPlayers": false,
       "number": 9,
       "slots_max": 1,
-      "slots_min": 1,
-      "time_max": 31,
-      "time_min": 20
+      "slots_min": 0,
+      "time_max": -1,
+      "time_min": -1
     },
     {
       "BotPreset": "hard",
       "BotSide": "Savage",
       "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
       "SpawnPoints": "ZoneMiniHouse",
       "WildSpawnType": "assault",
       "isPlayers": false,
       "number": 0,
       "slots_max": 2,
       "slots_min": 0,
-      "time_max": 160,
-      "time_min": 140
+      "time_max": -1,
+      "time_min": -1
     },
     {
       "BotPreset": "hard",
       "BotSide": "Savage",
       "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
       "SpawnPoints": "ZoneBigRocks",
       "WildSpawnType": "assault",
-      "isPlayers": true,
-      "number": 0,
-      "slots_max": 1,
-      "slots_min": 0,
-      "time_max": 400,
-      "time_min": 350
-    },
-    {
-      "BotPreset": "hard",
-      "BotSide": "Savage",
-      "OpenZones": "",
-      "SpawnPoints": "ZoneRoad",
-      "WildSpawnType": "assault",
-      "isPlayers": true,
-      "number": 0,
-      "slots_max": 3,
-      "slots_min": 0,
-      "time_max": 250,
-      "time_min": 180
-    },
-    {
-      "BotPreset": "easy",
-      "BotSide": "Savage",
-      "OpenZones": "",
-      "SpawnPoints": "",
-      "WildSpawnType": "assault",
-      "isPlayers": false,
-      "number": 0,
-      "slots_max": 3,
-      "slots_min": 2,
-      "time_max": 120,
-      "time_min": 0
-    },
-    {
-      "BotPreset": "normal",
-      "BotSide": "Savage",
-      "OpenZones": "",
-      "SpawnPoints": "",
-      "WildSpawnType": "assault",
-      "isPlayers": false,
-      "number": 0,
-      "slots_max": 5,
-      "slots_min": 2,
-      "time_max": 180,
-      "time_min": 150
-    },
-    {
-      "BotPreset": "hard",
-      "BotSide": "Savage",
-      "OpenZones": "",
-      "SpawnPoints": "",
-      "WildSpawnType": "assault",
-      "isPlayers": true,
-      "number": 0,
-      "slots_max": 6,
-      "slots_min": 2,
-      "time_max": 210,
-      "time_min": 180
-    },
-    {
-      "BotPreset": "easy",
-      "BotSide": "Savage",
-      "OpenZones": "",
-      "SpawnPoints": "",
-      "WildSpawnType": "assault",
-      "isPlayers": true,
-      "number": 0,
-      "slots_max": 6,
-      "slots_min": 2,
-      "time_max": 600,
-      "time_min": 400
-    },
-    {
-      "BotPreset": "normal",
-      "BotSide": "Savage",
-      "OpenZones": "",
-      "SpawnPoints": "",
-      "WildSpawnType": "assault",
-      "isPlayers": true,
-      "number": 0,
-      "slots_max": 6,
-      "slots_min": 2,
-      "time_max": 800,
-      "time_min": 600
-    },
-    {
-      "BotPreset": "hard",
-      "BotSide": "Savage",
-      "OpenZones": "",
-      "SpawnPoints": "",
-      "WildSpawnType": "assault",
-      "isPlayers": false,
-      "number": 0,
-      "slots_max": 5,
-      "slots_min": 0,
-      "time_max": 1100,
-      "time_min": 900
-    },
-    {
-      "BotPreset": "normal",
-      "BotSide": "Savage",
-      "OpenZones": "",
-      "SpawnPoints": "",
-      "WildSpawnType": "assault",
-      "isPlayers": true,
-      "number": 0,
-      "slots_max": 5,
-      "slots_min": 1,
-      "time_max": 420,
-      "time_min": 400
-    },
-    {
-      "BotPreset": "normal",
-      "BotSide": "Savage",
-      "OpenZones": "",
-      "SpawnPoints": "",
-      "WildSpawnType": "assault",
       "isPlayers": false,
       "number": 0,
       "slots_max": 1,
       "slots_min": 0,
       "time_max": -1,
       "time_min": -1
+    },
+    {
+      "BotPreset": "hard",
+      "BotSide": "Savage",
+      "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
+      "SpawnPoints": "ZoneRoad",
+      "WildSpawnType": "assault",
+      "isPlayers": false,
+      "number": 0,
+      "slots_max": 3,
+      "slots_min": 0,
+      "time_max": -1,
+      "time_min": -1
+    },
+    {
+      "BotPreset": "easy",
+      "BotSide": "Savage",
+      "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
+      "SpawnPoints": "",
+      "WildSpawnType": "assault",
+      "isPlayers": false,
+      "number": 0,
+      "slots_max": 3,
+      "slots_min": 0,
+      "time_max": -1,
+      "time_min": -1
+    },
+    {
+      "BotPreset": "normal",
+      "BotSide": "Savage",
+      "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
+      "SpawnPoints": "",
+      "WildSpawnType": "assault",
+      "isPlayers": false,
+      "number": 0,
+      "slots_max": 3,
+      "slots_min": 0,
+      "time_max": -1,
+      "time_min": -1
+    },
+    {
+      "BotPreset": "hard",
+      "BotSide": "Savage",
+      "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
+      "SpawnPoints": "",
+      "WildSpawnType": "assault",
+      "isPlayers": false,
+      "number": 0,
+      "slots_max": 3,
+      "slots_min": 0,
+      "time_max": -1,
+      "time_min": -1
+    },
+    {
+      "BotPreset": "easy",
+      "BotSide": "Savage",
+      "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
+      "SpawnPoints": "",
+      "WildSpawnType": "assault",
+      "isPlayers": false,
+      "number": 0,
+      "slots_max": 3,
+      "slots_min": 0,
+      "time_max": -1,
+      "time_min": -1
+    },
+    {
+      "BotPreset": "normal",
+      "BotSide": "Savage",
+      "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
+      "SpawnPoints": "",
+      "WildSpawnType": "assault",
+      "isPlayers": false,
+      "number": 0,
+      "slots_max": 3,
+      "slots_min": 0,
+      "time_max": -1,
+      "time_min": -1
+    },
+    {
+      "BotPreset": "hard",
+      "BotSide": "Savage",
+      "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
+      "SpawnPoints": "",
+      "WildSpawnType": "assault",
+      "isPlayers": false,
+      "number": 0,
+      "slots_max": 3,
+      "slots_min": 0,
+      "time_max": -1,
+      "time_min": -1
+    },
+    {
+      "BotPreset": "normal",
+      "BotSide": "Savage",
+      "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
+      "SpawnPoints": "",
+      "WildSpawnType": "assault",
+      "isPlayers": false,
+      "number": 0,
+      "slots_max": 3,
+      "slots_min": 0,
+      "time_max": -1,
+      "time_min": -1
+    },
+    {
+      "BotPreset": "normal",
+      "BotSide": "Savage",
+      "OpenZones": "",
+      "SpawnMode": [
+        "pve"
+      ],
+      "SpawnPoints": "",
+      "WildSpawnType": "assault",
+      "isPlayers": false,
+      "number": 0,
+      "slots_max": 3,
+      "slots_min": 0,
+      "time_max": -1,
+      "time_min": -1
     }
   ]
 }
diff --git a/project/src/models/eft/common/ILocationBase.ts b/project/src/models/eft/common/ILocationBase.ts
index bdc60388..2a04d303 100644
--- a/project/src/models/eft/common/ILocationBase.ts
+++ b/project/src/models/eft/common/ILocationBase.ts
@@ -79,6 +79,7 @@ export interface ILocationBase
     EscapeTimeLimitCoop: number
     EscapeTimeLimitPVE: number
     exit_access_time: number
+    ForceOnlineRaidInPVE: boolean
     exit_count: number
     exit_time: number
     exits: Exit[]
@@ -168,14 +169,18 @@ export interface BotLocationModifier
 {
     AccuracySpeed: number
     DistToActivate: number
+    DistToActivatePvE: number
     DistToPersueAxemanCoef: number
     DistToSleep: number
+    DistToSleepPvE: number
     GainSight: number
     KhorovodChance: number
     MagnetPower: number
     MarksmanAccuratyCoef: number
     Scattering: number
     VisibleDistance: number
+    MaxExfiltrationTime: number
+    MinExfiltrationTime: number
 }
 
 export interface MinMaxBot extends MinMax
@@ -273,6 +278,7 @@ export interface Wave
     time_min: number
     sptId?: string
     ChanceGroup?: number
+    SpawnMode: string[]
 }
 
 export enum WildSpawnType