diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs
index 988b3531..c09be481 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs
@@ -174,7 +174,10 @@ public record ItemChanges
 
 public record DeletedItem
 {
-    [JsonPropertyName("_id")]
+     [JsonExtensionData]
+    public Dictionary<string, object>? ExtensionData { get; set; }
+
+   [JsonPropertyName("_id")]
     public string Id { get; set; }
 }
 
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupJoinRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupJoinRequest.cs
index 48088de9..a93ca2d2 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupJoinRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupJoinRequest.cs
@@ -26,7 +26,10 @@ public record MatchGroupJoinRequest : IRequestData
 
 public record JoinServer
 {
-    [JsonPropertyName("ping")]
+     [JsonExtensionData]
+    public Dictionary<string, object>? ExtensionData { get; set; }
+
+   [JsonPropertyName("ping")]
     public int? Ping { get; set; }
 
     [JsonPropertyName("ip")]
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs
index 232ac256..19b2e4e6 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs
@@ -149,7 +149,10 @@ public record BotConfig : BaseConfig
 
 public record WeeklyBossSettings
 {
-    /// <summary>
+     [JsonExtensionData]
+    public Dictionary<string, object>? ExtensionData { get; set; }
+
+   /// <summary>
     /// Should a weekly boss be picked to 100% spawn
     /// </summary>
     [JsonPropertyName("enabled")]
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/FindSlotResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/FindSlotResult.cs
index 8aa02646..59709529 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/FindSlotResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/FindSlotResult.cs
@@ -1,10 +1,13 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace SPTarkov.Server.Core.Models.Spt.Inventory;
 
 public class FindSlotResult
 {
-    public FindSlotResult(bool success)
+     [JsonExtensionData]
+    public Dictionary<string, object>? ExtensionData { get; set; }
+
+   public FindSlotResult(bool success)
     {
         Success = success;
     }
diff --git a/Tools/JsonExtensionDataGenerator/JsonExtensionDataGeneratorLauncher.cs b/Tools/JsonExtensionDataGenerator/JsonExtensionDataGeneratorLauncher.cs
index 0f61db55..ebea9c9b 100644
--- a/Tools/JsonExtensionDataGenerator/JsonExtensionDataGeneratorLauncher.cs
+++ b/Tools/JsonExtensionDataGenerator/JsonExtensionDataGeneratorLauncher.cs
@@ -145,8 +145,8 @@ public class JsonExtensionDataGeneratorLauncher
 
     private static int FindEndClassIndex(string content, int currentIndex)
     {
-        // we do +3 cause thats the length of what we are searching for
-        return _endRecordClassRegex.Match(content, currentIndex).Index + 3;
+        // we do +3 cause that's the length of what we are searching for
+        return _endRecordClassRegex.Match(content, currentIndex).Index;
     }
 
     private static int FindNextClassStartIndex(string content, int currentIndex)