diff --git a/Libraries/SPTarkov.Server.Core/Models/Common/IdWithCount.cs b/Libraries/SPTarkov.Server.Core/Models/Common/IdWithCount.cs
index 88eb91f0..6f068842 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Common/IdWithCount.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Common/IdWithCount.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Common;
 public record IdWithCount
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     ID of stack to take money from
diff --git a/Libraries/SPTarkov.Server.Core/Models/Common/MinMax.cs b/Libraries/SPTarkov.Server.Core/Models/Common/MinMax.cs
index 1bab7ba4..e346cdb0 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Common/MinMax.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Common/MinMax.cs
@@ -7,7 +7,7 @@ public record MinMax<T>
     where T : IMinMaxValue<T>
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public MinMax(T min, T max)
     {
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GenerateBotsRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GenerateBotsRequestData.cs
index 0b443dc2..4bb778cb 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GenerateBotsRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GenerateBotsRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Bot;
 public record GenerateBotsRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("conditions")]
     public List<GenerateCondition>? Conditions { get; set; }
@@ -15,7 +15,7 @@ public record GenerateBotsRequestData : IRequestData
 public record GenerateCondition
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     e.g. assault/pmcBot/bossKilla
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/RandomisedBotLevelResult.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/RandomisedBotLevelResult.cs
index a7fd418b..97e233ac 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/RandomisedBotLevelResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/RandomisedBotLevelResult.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Bot;
 public record RandomisedBotLevelResult
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("level")]
     public int? Level { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs
index a5d0709e..b337bbbb 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Builds;
 public record SetMagazineRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/EmptyRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/EmptyRequestData.cs
index ba9c39f4..077e091a 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/EmptyRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/EmptyRequestData.cs
@@ -6,5 +6,5 @@ namespace SPTarkov.Server.Core.Models.Eft.Common;
 public record EmptyRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Location.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Location.cs
index 97cd9a57..69234e94 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Location.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Location.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common;
 public record Location
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Map meta-data
@@ -51,7 +51,7 @@ public record Location
 public record StaticContainer
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("containersGroups")]
     public Dictionary<string, ContainerMinMax>? ContainersGroups { get; set; }
@@ -63,7 +63,7 @@ public record StaticContainer
 public record ContainerMinMax
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("minContainers")]
     public int? MinContainers { get; set; }
@@ -81,7 +81,7 @@ public record ContainerMinMax
 public record ContainerData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("groupId")]
     public string? GroupId { get; set; }
@@ -90,7 +90,7 @@ public record ContainerData
 public record StaticLootDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("itemcountDistribution")]
     public ItemCountDistribution[] ItemCountDistribution { get; set; }
@@ -102,7 +102,7 @@ public record StaticLootDetails
 public record ItemCountDistribution
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("count")]
     public int? Count { get; set; }
@@ -114,7 +114,7 @@ public record ItemCountDistribution
 public record ItemDistribution
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("tpl")]
     public string? Tpl { get; set; }
@@ -126,7 +126,7 @@ public record ItemDistribution
 public record StaticContainerDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("staticWeapons")]
     public List<SpawnpointTemplate> StaticWeapons { get; set; }
@@ -141,7 +141,7 @@ public record StaticContainerDetails
 public record StaticForced
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("containerId")]
     public string ContainerId { get; set; }
@@ -153,7 +153,7 @@ public record StaticForced
 public record StaticContainerData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("probability")]
     public float? Probability { get; set; }
@@ -165,7 +165,7 @@ public record StaticContainerData
 public record StaticAmmoDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("tpl")]
     public string? Tpl { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs
index 9ca9c4f1..255d559f 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs
@@ -9,7 +9,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common;
 public record LocationBase
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("AccessKeys")]
     public List<string>? AccessKeys { get; set; }
@@ -383,7 +383,7 @@ public record LocationBase
 public record EventTrapsData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public double MaxBarbedWires { get; set; }
 
@@ -397,7 +397,7 @@ public record EventTrapsData
 public record Transit
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("activateAfterSec")]
     public int? ActivateAfterSeconds { get; set; }
@@ -436,7 +436,7 @@ public record Transit
 public record NonWaveGroupScenario
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Chance")]
     public double? Chance { get; set; }
@@ -466,7 +466,7 @@ public record Limit : MinMax<int>
 public record AirdropParameter
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("AirdropPointDeactivateDistance")]
     public int? AirdropPointDeactivateDistance { get; set; }
@@ -502,7 +502,7 @@ public record AirdropParameter
 public record Banner
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -514,7 +514,7 @@ public record Banner
 public record Pic
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("file")]
     public string? File { get; set; }
@@ -532,7 +532,7 @@ public record Pic
 public record BossLocationSpawn
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("BossChance")]
     public double? BossChance { get; set; }
@@ -605,7 +605,7 @@ public record BossLocationSpawn
 public record BossSupport
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("BossEscortAmount")]
     public string? BossEscortAmount { get; set; }
@@ -621,7 +621,7 @@ public record BossSupport
 public record BotLocationModifier
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("AccuracySpeed")]
     public double? AccuracySpeed { get; set; }
@@ -708,7 +708,7 @@ public record BotLocationModifier
 public record AdditionalHostilitySettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("AlwaysEnemies")]
     public List<string>? AlwaysEnemies { get; set; }
@@ -750,7 +750,7 @@ public record AdditionalHostilitySettings
 public record ChancedEnemy
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("EnemyChance")]
     public int? EnemyChance { get; set; }
@@ -768,7 +768,7 @@ public record MinMaxBot : MinMax<int>
 public record MinPlayerWaitTime
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("minPlayers")]
     public int? MinPlayers { get; set; }
@@ -780,7 +780,7 @@ public record MinPlayerWaitTime
 public record Preview
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("path")]
     public string? Path { get; set; }
@@ -792,7 +792,7 @@ public record Preview
 public record Scene
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("path")]
     public string? Path { get; set; }
@@ -804,7 +804,7 @@ public record Scene
 public record SpawnPointParam
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("BotZoneName")]
     public string? BotZoneName { get; set; }
@@ -840,7 +840,7 @@ public record SpawnPointParam
 public record ColliderParams
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     private string? _parent;
 
@@ -858,7 +858,7 @@ public record ColliderParams
 public record ColliderProps
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Center")]
     public XYZ? Center { get; set; }
@@ -873,7 +873,7 @@ public record ColliderProps
 public record Exit
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     % Chance out of 100 exit will appear in raid
@@ -969,7 +969,7 @@ public record Exit
 public record MaxItemCountInLocation
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("TemplateId")]
     public string? TemplateId { get; set; }
@@ -981,7 +981,7 @@ public record MaxItemCountInLocation
 public record Wave
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("BotPreset")]
     public string? BotPreset { get; set; }
@@ -1039,7 +1039,7 @@ public record Wave
 public record LocationEvents
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Halloween2024")]
     public Halloween2024? Halloween2024 { get; set; }
@@ -1050,7 +1050,7 @@ public record LocationEvents
 public record Khorovod
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public double? Chance { get; set; }
 }
@@ -1058,7 +1058,7 @@ public record Khorovod
 public record Halloween2024
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("CrowdAttackBlockRadius")]
     public double? CrowdAttackBlockRadius { get; set; }
@@ -1108,7 +1108,7 @@ public record Halloween2024
 public record CrowdAttackSpawnParam
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Difficulty")]
     public string? Difficulty { get; set; }
@@ -1123,7 +1123,7 @@ public record CrowdAttackSpawnParam
 public record Area
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("center")]
     public XYZ? Center { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs
index 6ec1e1d0..094e2505 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common;
 public record LooseLoot
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("spawnpointCount")]
     public SpawnpointCount? SpawnpointCount { get; set; }
@@ -21,7 +21,7 @@ public record LooseLoot
 public record SpawnpointCount
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("mean")]
     public required double Mean { get; set; }
@@ -33,7 +33,7 @@ public record SpawnpointCount
 public record SpawnpointTemplate
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     private string? _root;
 
@@ -78,7 +78,7 @@ public record SpawnpointTemplate
 public record GroupPosition
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     private string? _name;
 
@@ -102,7 +102,7 @@ public record GroupPosition
 public record Spawnpoint
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("locationId")]
     public string? LocationId { get; set; }
@@ -120,7 +120,7 @@ public record Spawnpoint
 public record LooseLootItemDistribution
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("composedKey")]
     public ComposedKey? ComposedKey { get; set; }
@@ -132,7 +132,7 @@ public record LooseLootItemDistribution
 public record ComposedKey
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     private string? _key;
 
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/MetricsTableData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/MetricsTableData.cs
index 1269f7c8..bb876bd1 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/MetricsTableData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/MetricsTableData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common;
 public record MetricsTableData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Keys")]
     public List<int>? Keys { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs
index d7e59366..97c2c8ef 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs
@@ -23,7 +23,7 @@ public record PostRaidPmcData : PmcData { }
 public record PostRaidStats
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Eft")]
     public EftStats? Eft { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs
index fe427b30..16ae4fd0 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Request;
 public record BaseInteractionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Action")]
     public string? Action { get; set; }
@@ -20,7 +20,7 @@ public record BaseInteractionRequestData
 public record OwnerInfo
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/UIDRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/UIDRequestData.cs
index c3444647..7cef4749 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/UIDRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/UIDRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Request;
 public record UIDRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("uid")]
     public string? Uid { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Achievement.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Achievement.cs
index 1ffe6089..0738f548 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Achievement.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Achievement.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 public record Achievement
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("index")]
     public required int Index { get; set; }
@@ -53,7 +53,7 @@ public record Achievement
 public record AchievementQuestConditionTypes
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("started")]
     public List<QuestCondition>? Started { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs
index c483a81d..8422f7d2 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs
@@ -10,7 +10,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 public record BotBase
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
     public string? Id { get; set; }
@@ -119,7 +119,7 @@ public record BotBase
 public record MoneyTransferLimits
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     // Resets every 24 hours in live
     /// <summary>
@@ -141,7 +141,7 @@ public record MoneyTransferLimits
 public record TaskConditionCounter
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -162,7 +162,7 @@ public record TaskConditionCounter
 public record UnlockedInfo
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("unlockedProductionRecipe")]
     public HashSet<string>? UnlockedProductionRecipe { get; set; }
@@ -171,7 +171,7 @@ public record UnlockedInfo
 public record Info
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     private string? _side;
 
@@ -270,7 +270,7 @@ public record Info
 public record BotInfoSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     private string? _botDifficulty;
     private string? _role;
@@ -300,7 +300,7 @@ public record BotInfoSettings
 public record Ban
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("banType")]
     public BanType? BanType { get; set; }
@@ -324,7 +324,7 @@ public enum BanType
 public record Customization
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     private string? _body;
 
@@ -369,7 +369,7 @@ public record Customization
 public record BotBaseHealth
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public CurrentMinMax? Hydration { get; set; }
 
@@ -391,7 +391,7 @@ public record BotBaseHealth
 public record BodyPartHealth
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public CurrentMinMax? Health { get; set; }
 
@@ -401,7 +401,7 @@ public record BodyPartHealth
 public record BodyPartEffectProperties
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     // TODO: this was any, what actual type is it?
     public object? ExtraData { get; set; }
@@ -412,7 +412,7 @@ public record BodyPartEffectProperties
 public record CurrentMinMax
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public double? Current { get; set; }
 
@@ -428,7 +428,7 @@ public record CurrentMinMax
 public record BotBaseInventory
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("items")]
     public List<Item>? Items { get; set; }
@@ -472,7 +472,7 @@ public record BotBaseInventory
 public record Skills
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public List<CommonSkill>? Common { get; set; }
 
@@ -483,6 +483,9 @@ public record Skills
 
 public record MasterySkill
 {
+    [JsonExtensionData]
+    public Dictionary<string, object>? ExtensionData { get; set; }
+
     public string? Id { get; set; }
 
     public double? Progress { get; set; }
@@ -491,7 +494,7 @@ public record MasterySkill
 public record CommonSkill
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public double? PointsEarnedDuringSession { get; set; }
 
@@ -511,7 +514,7 @@ public record CommonSkill
 public record Stats
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public EftStats? Eft { get; set; }
 }
@@ -519,7 +522,7 @@ public record Stats
 public record EftStats
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public List<string>? CarriedQuestItems { get; set; }
 
@@ -562,7 +565,7 @@ public record EftStats
 public record DroppedItem
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public string? QuestId { get; set; }
 
@@ -574,7 +577,7 @@ public record DroppedItem
 public record FoundInRaidItem
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public string? QuestId { get; set; }
 
@@ -584,7 +587,7 @@ public record FoundInRaidItem
 public record Victim
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public string? AccountId { get; set; }
 
@@ -616,7 +619,7 @@ public record Victim
 public record SessionCounters
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public List<CounterKeyValue>? Items { get; set; }
 }
@@ -624,7 +627,7 @@ public record SessionCounters
 public record OverallCounters
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public List<CounterKeyValue>? Items { get; set; }
 }
@@ -632,7 +635,7 @@ public record OverallCounters
 public record CounterKeyValue
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public List<string>? Key { get; set; }
 
@@ -642,7 +645,7 @@ public record CounterKeyValue
 public record Aggressor
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public double? PrestigeLevel { get; set; }
 
@@ -675,7 +678,7 @@ public record Aggressor
 public record DamageHistory
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public string? LethalDamagePart { get; set; }
 
@@ -690,7 +693,7 @@ public record DamageHistory
 public record BodyPartsDamageHistory
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public List<DamageStats>? Head { get; set; }
 
@@ -712,7 +715,7 @@ public record BodyPartsDamageHistory
 public record DamageStats
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public double? Amount { get; set; }
 
@@ -731,7 +734,7 @@ public record DamageStats
 public record DeathCause
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonConverter(typeof(JsonStringEnumConverter))]
     public DamageType? DamageType { get; set; }
@@ -748,7 +751,7 @@ public record DeathCause
 public record LastPlayerState
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public LastPlayerStateInfo? Info { get; set; }
 
@@ -761,7 +764,7 @@ public record LastPlayerState
 public record LastPlayerStateInfo
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public string? Nickname { get; set; }
 
@@ -775,7 +778,7 @@ public record LastPlayerStateInfo
 public record BackendCounter
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -790,7 +793,7 @@ public record BackendCounter
 public record InsuredItem
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Trader ID item was insured by
@@ -805,7 +808,7 @@ public record InsuredItem
 public record Hideout
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public Dictionary<string, Production?>? Production { get; set; }
 
@@ -832,7 +835,7 @@ public record Hideout
 public record HideoutCounters
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("fuelCounter")]
     public double? FuelCounter { get; set; }
@@ -850,7 +853,7 @@ public record HideoutCounters
 public record HideoutImprovement
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("completed")]
     public bool? Completed { get; set; }
@@ -862,7 +865,7 @@ public record HideoutImprovement
 public record Production // use this instead of productive and scavcase
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public List<Item>? Products { get; set; }
 
@@ -939,7 +942,7 @@ public record Production // use this instead of productive and scavcase
 public record BotHideoutArea
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("type")]
     public HideoutAreas? Type { get; set; }
@@ -972,7 +975,7 @@ public record BotHideoutArea
 public record HideoutSlot
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     SPT specific value to keep track of what index this slot is (0,1,2,3 etc.)
@@ -987,7 +990,7 @@ public record HideoutSlot
 public record LastCompleted
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("$oid")]
     public string? OId { get; set; }
@@ -996,7 +999,7 @@ public record LastCompleted
 public record Notes
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Notes")]
     public List<Note>? DataNotes { get; set; }
@@ -1014,7 +1017,7 @@ public enum SurvivorClass
 public record Quests
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("qid")]
     public string? QId { get; set; }
@@ -1041,7 +1044,7 @@ public record Quests
 public record TraderInfo
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("loyaltyLevel")]
     public int? LoyaltyLevel { get; set; }
@@ -1065,7 +1068,7 @@ public record TraderInfo
 public record RagfairInfo
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("rating")]
     public double? Rating { get; set; }
@@ -1086,7 +1089,7 @@ public record RagfairInfo
 public record Bonus
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotCore.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotCore.cs
index 1f7b9c11..4bbc20ba 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotCore.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotCore.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 public record BotCore
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("SAVAGE_KILL_DIST")]
     public double? SavageKillDistance { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs
index 10ff0633..da7db594 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs
@@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 public record BotType
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("appearance")]
     public Appearance? BotAppearance { get; set; }
@@ -44,7 +44,7 @@ public record BotType
 public record Appearance
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("body")]
     public Dictionary<string, double>? Body { get; set; }
@@ -68,7 +68,7 @@ public record Appearance
 public record Chances
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("equipment")]
     public Dictionary<string, double>? EquipmentChances { get; set; }
@@ -91,7 +91,7 @@ public record Chances
 public record ModsChances
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("mod_charge")]
 public double? ModCharge { get; set; }
@@ -254,7 +254,7 @@ public double? ModPistol_Grip { get; set; }
 public record Difficulties
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("easy")]
     public DifficultyCategories? Easy { get; set; }
@@ -272,7 +272,7 @@ public record Difficulties
 public record DifficultyCategories
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public Dictionary<string, object>? Aiming { get; set; } // TODO: string | number | boolean
 
@@ -306,7 +306,7 @@ public record DifficultyCategories
 public record Experience
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     key = bot difficulty
@@ -336,7 +336,7 @@ public record Experience
 public record Generation
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("items")]
     public GenerationWeightingItems? Items { get; set; }
@@ -345,7 +345,7 @@ public record Generation
 public record GenerationData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     key: number of items, value: weighting
@@ -364,7 +364,7 @@ public record GenerationData
 public record GenerationWeightingItems
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("grenades")]
     public GenerationData Grenades { get; set; }
@@ -409,7 +409,7 @@ public record GenerationWeightingItems
 public record BotTypeHealth
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public List<BodyPart>? BodyParts { get; set; }
 
@@ -423,7 +423,7 @@ public record BotTypeHealth
 public record BodyPart
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public MinMax<double>? Chest { get; set; }
 
@@ -443,7 +443,7 @@ public record BodyPart
 public record BotTypeInventory
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("equipment")]
     public Dictionary<EquipmentSlots, Dictionary<string, double>>? Equipment { get; set; }
@@ -460,7 +460,7 @@ public record BotTypeInventory
 public record Equipment
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public Dictionary<string, double>? ArmBand { get; set; }
 
@@ -494,7 +494,7 @@ public record Equipment
 public record ItemPools
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public Dictionary<string, double>? Backpack { get; set; }
 
@@ -510,7 +510,7 @@ public record ItemPools
 public record BotDbSkills
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public Dictionary<string, MinMax<double>>? Common { get; set; }
 
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomisationStorage.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomisationStorage.cs
index 9ab09095..3d2eb63a 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomisationStorage.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomisationStorage.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 public record CustomisationStorage
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     // Customisation.json/itemId
     [JsonPropertyName("id")]
@@ -21,7 +21,7 @@ public record CustomisationStorage
 public record CustomisationType
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public const string SUITE = "suite";
     public const string DOG_TAG = "dogTag";
@@ -41,7 +41,7 @@ public record CustomisationType
 public record CustomisationTypeId
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public const string CUSTOMIZATION = "5cbdb4a2e2b501000d352ae2";
     public const string BODY_PARTS = "5cd943c31388ce000a659df5";
@@ -70,7 +70,7 @@ public record CustomisationTypeId
 public record CustomisationSource
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public const string QUEST = "quest";
     public const string PRESTIGE = "prestige";
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs
index a7c7c31c..1478b4dc 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 public record CustomizationItem
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
     public string? Id { get; set; }
@@ -29,7 +29,7 @@ public record CustomizationItem
 public class CustomizationProps
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Prefab")]
     public object? Prefab { get; set; } // Prefab object or string
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/HandbookBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/HandbookBase.cs
index d19035b5..e5598f5e 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/HandbookBase.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/HandbookBase.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 public record HandbookBase
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Categories")]
     public List<HandbookCategory>? Categories { get; set; }
@@ -17,7 +17,7 @@ public record HandbookBase
 public record HandbookCategory
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Id")]
     public string? Id { get; set; }
@@ -40,7 +40,7 @@ public record HandbookCategory
 public record HandbookItem
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs
index 9415d079..a57ad2b3 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 public record Item
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     private string? _id;
 
@@ -60,7 +60,7 @@ public record Item
 public record HideoutItem
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Hideout inventory id that was used by improvement action
@@ -106,7 +106,7 @@ public record HideoutItem
 public record ItemLocation
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("x")]
     public int? X { get; set; }
@@ -140,7 +140,7 @@ public enum ItemRotation
 public record Upd
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public UpdBuff? Buff { get; set; }
 
@@ -207,7 +207,7 @@ public record Upd
 public record LockableKeyComponent
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public float? RelativeValue { get; set; }
     public int? NumberOfUsages { get; set; }
@@ -216,7 +216,7 @@ public record LockableKeyComponent
 public record LockableComponent
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public string[]? KeyIds { get; set; }
     public bool? Locked { get; set; }
@@ -234,7 +234,7 @@ public enum PinLockState
 public record UpdBuff
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Rarity")]
     public string? Rarity { get; set; }
@@ -253,7 +253,7 @@ public record UpdBuff
 public record UpdTogglable
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("On")]
     public bool? On { get; set; }
@@ -262,7 +262,7 @@ public record UpdTogglable
 public record UpdMap
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Markers")]
     public List<MapMarker>? Markers { get; set; }
@@ -271,7 +271,7 @@ public record UpdMap
 public record MapMarker
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Type")]
     public string? Type { get; set; }
@@ -289,7 +289,7 @@ public record MapMarker
 public record UpdTag
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Color")]
     public int? Color { get; set; }
@@ -301,7 +301,7 @@ public record UpdTag
 public record UpdFaceShield
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Hits")]
     public int? Hits { get; set; }
@@ -313,7 +313,7 @@ public record UpdFaceShield
 public record UpdRepairable
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Durability")]
     public double? Durability { get; set; }
@@ -325,7 +325,7 @@ public record UpdRepairable
 public record UpdRecodableComponent
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("IsEncoded")]
     public bool? IsEncoded { get; set; }
@@ -334,7 +334,7 @@ public record UpdRecodableComponent
 public record UpdMedKit
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("HpResource")]
     public double? HpResource { get; set; }
@@ -343,7 +343,7 @@ public record UpdMedKit
 public record UpdSight
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("ScopesCurrentCalibPointIndexes")]
     public List<int>? ScopesCurrentCalibPointIndexes { get; set; }
@@ -360,7 +360,7 @@ public record UpdSight
 public record UpdFoldable
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Folded")]
     public bool? Folded { get; set; }
@@ -369,7 +369,7 @@ public record UpdFoldable
 public record UpdFireMode
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("FireMode")]
     public string? FireMode { get; set; }
@@ -378,7 +378,7 @@ public record UpdFireMode
 public record UpdFoodDrink
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("HpPercent")]
     public double? HpPercent { get; set; }
@@ -387,7 +387,7 @@ public record UpdFoodDrink
 public record UpdKey
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     // Checked in client
     [JsonPropertyName("NumberOfUsages")]
@@ -397,7 +397,7 @@ public record UpdKey
 public record UpdResource
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Value")]
     public double? Value { get; set; }
@@ -409,7 +409,7 @@ public record UpdResource
 public record UpdLight
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("IsActive")]
     public bool? IsActive { get; set; }
@@ -421,7 +421,7 @@ public record UpdLight
 public record UpdDogtag
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("AccountId")]
     public string? AccountId { get; set; }
@@ -463,7 +463,7 @@ public record UpdDogtag
 public record UpdSideEffect
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Value")]
     public double? Value { get; set; }
@@ -472,7 +472,7 @@ public record UpdSideEffect
 public record UpdRepairKit
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Resource")]
     public double? Resource { get; set; }
@@ -481,7 +481,7 @@ public record UpdRepairKit
 public record UpdCultistAmulet
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("NumberOfUsages")]
     public double? NumberOfUsages { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs
index 51709cc8..f267fb1c 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 public record LocationServices
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("TraderServerSettings")]
     public TraderServerSettings? TraderServerSettings { get; set; }
@@ -19,7 +19,7 @@ public record LocationServices
 public record TraderServerSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("TraderServices")]
     public TraderServices? TraderServices { get; set; }
@@ -28,7 +28,7 @@ public record TraderServerSettings
 public record TraderServices
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("ExUsecLoyalty")]
     public TraderService? ExUsecLoyalty { get; set; }
@@ -55,7 +55,7 @@ public record TraderServices
 public record TraderService
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("TraderId")]
     public string? TraderId { get; set; }
@@ -78,7 +78,7 @@ public record TraderService
 public record ServiceRequirements
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("CompletedQuests")]
     [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
@@ -93,7 +93,7 @@ public record ServiceRequirements
 public record CompletedQuest
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("QuestId")]
     public string? QuestId { get; set; }
@@ -102,7 +102,7 @@ public record CompletedQuest
 public record StandingRequirement
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Value")]
     public double? Value { get; set; }
@@ -111,7 +111,7 @@ public record StandingRequirement
 public record ServiceItemCostDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Count")]
     public int? Count { get; set; }
@@ -120,7 +120,7 @@ public record ServiceItemCostDetails
 public record BtrServerSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("ChanceSpawn")]
     public double? ChanceSpawn { get; set; }
@@ -171,7 +171,7 @@ public record BtrServerSettings
 public record ServerMapBtrsettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("MapID")]
     public string? MapID { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsBase.cs
index e18a0803..9e37453b 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsBase.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsBase.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 public record LocationsBase
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("locations")]
     public Locations? Locations { get; set; }
@@ -17,7 +17,7 @@ public record LocationsBase
 public record Locations
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     // Add properties as necessary
 }
@@ -25,7 +25,7 @@ public record Locations
 public record Path
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Source")]
     public string? Source { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs
index 401c2405..76d54d06 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 public record LocationsGenerateAllResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("locations")]
     public Dictionary<string, LocationBase> Locations { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Match.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Match.cs
index 58055880..b39c4d60 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Match.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Match.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 public record Match
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("metrics")]
     public Metrics? Metrics { get; set; }
@@ -14,7 +14,7 @@ public record Match
 public record Metrics
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Keys")]
     public List<int>? Keys { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Prestige.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Prestige.cs
index 9dcc2f76..48d83393 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Prestige.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Prestige.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 public record Prestige
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("elements")]
     public List<PrestigeElement>? Elements { get; set; }
@@ -14,7 +14,7 @@ public record Prestige
 public record PrestigeElement
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -38,7 +38,7 @@ public record PrestigeElement
 public record TransferConfigs
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("stashConfig")]
     public StashPrestigeConfig? StashConfig { get; set; }
@@ -53,7 +53,7 @@ public record TransferConfigs
 public record StashPrestigeConfig
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("xCellCount")]
     public int? XCellCount { get; set; }
@@ -68,7 +68,7 @@ public record StashPrestigeConfig
 public record StashPrestigeFilters
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("includedItems")]
     public List<string>? IncludedItems { get; set; }
@@ -80,7 +80,7 @@ public record StashPrestigeFilters
 public record PrestigeSkillConfig
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("transferMultiplier")]
     public double? TransferMultiplier { get; set; }
@@ -89,7 +89,7 @@ public record PrestigeSkillConfig
 public record PrestigeMasteringConfig
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("transferMultiplier")]
     public double? TransferMultiplier { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/ProfileTemplate.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/ProfileTemplate.cs
index facc4516..bd4dbae7 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/ProfileTemplate.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/ProfileTemplate.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 public record ProfileSides
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("descriptionLocaleKey")]
     public string? DescriptionLocaleKey { get; set; }
@@ -21,7 +21,7 @@ public record ProfileSides
 public record TemplateSide
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("character")]
     public PmcData? Character { get; set; }
@@ -48,7 +48,7 @@ public record TemplateSide
 public record ProfileTraderTemplate
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("initialLoyaltyLevel")]
     public Dictionary<string, int?>? InitialLoyaltyLevel { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs
index ba92a047..4ffa24ab 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs
@@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 public record Quest
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     SPT addition - human readable quest name
@@ -141,7 +141,7 @@ public record Quest
 public record QuestStatus
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("qid")]
     public required string QId { get; set; }
@@ -165,7 +165,7 @@ public record QuestStatus
 public record QuestConditionTypes
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Started")]
     public List<QuestCondition>? Started { get; set; }
@@ -186,7 +186,7 @@ public record QuestConditionTypes
 public record QuestCondition
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public required string Id { get; set; }
@@ -327,7 +327,7 @@ public record QuestCondition
 public record QuestConditionCounter
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -339,7 +339,7 @@ public record QuestConditionCounter
 public record QuestConditionCounterCondition
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -433,7 +433,7 @@ public record QuestConditionCounterCondition
 public record EnemyHealthEffect
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("bodyParts")]
     public List<string>? BodyParts { get; set; }
@@ -445,7 +445,7 @@ public record EnemyHealthEffect
 public record ValueCompare
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("compareMethod")]
     public string? CompareMethod { get; set; }
@@ -457,7 +457,7 @@ public record ValueCompare
 public record CounterConditionDistance
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("value")]
     public double? Value { get; set; }
@@ -469,7 +469,7 @@ public record CounterConditionDistance
 public record DaytimeCounter
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("from")]
     public int? From { get; set; }
@@ -481,7 +481,7 @@ public record DaytimeCounter
 public record VisibilityCondition
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -505,7 +505,7 @@ public record VisibilityCondition
 public record QuestRewards
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("AvailableForStart")]
     public List<Reward>? AvailableForStart { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/RepeatableQuests.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/RepeatableQuests.cs
index 9bb8dc8c..57e3e456 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/RepeatableQuests.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/RepeatableQuests.cs
@@ -35,7 +35,7 @@ public record RepeatableQuest : Quest
 public record RepeatableQuestDatabase
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("templates")]
     public RepeatableTemplates? Templates { get; set; }
@@ -53,7 +53,7 @@ public record RepeatableQuestDatabase
 public record RepeatableQuestStatus
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -77,7 +77,7 @@ public record RepeatableQuestStatus
 public record RepeatableTemplates
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Elimination")]
     public RepeatableQuest? Elimination { get; set; }
@@ -95,7 +95,7 @@ public record RepeatableTemplates
 public record PmcDataRepeatableQuest
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -132,7 +132,7 @@ public record PmcDataRepeatableQuest
 public record ChangeRequirement
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("changeCost")]
     public List<ChangeCost?>? ChangeCost { get; set; }
@@ -144,7 +144,7 @@ public record ChangeRequirement
 public record ChangeCost
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     What item it will take to reset daily
@@ -164,7 +164,7 @@ public record ChangeCost
 public record RewardOptions
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("itemsBlacklist")]
     public List<string>? ItemsBlacklist { get; set; }
@@ -173,7 +173,7 @@ public record RewardOptions
 public record Options
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Completion")]
     public CompletionFilter? Completion { get; set; }
@@ -182,7 +182,7 @@ public record Options
 public record CompletionFilter
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("itemsBlacklist")]
     public List<ItemsBlacklist>? ItemsBlacklist { get; set; }
@@ -194,7 +194,7 @@ public record CompletionFilter
 public record ItemsBlacklist
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("minPlayerLevel")]
     public int? MinPlayerLevel { get; set; }
@@ -206,7 +206,7 @@ public record ItemsBlacklist
 public record ItemsWhitelist
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("minPlayerLevel")]
     public int? MinPlayerLevel { get; set; }
@@ -218,7 +218,7 @@ public record ItemsWhitelist
 public record SampleQuests
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs
index acb1e022..d391ef12 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 public record Reward
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("value")]
     [JsonConverter(typeof(StringToNumberFactoryConverter))]
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs
index 31dcacdc..bc878a97 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs
@@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 public record TemplateItem
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     private Dictionary<string, bool>? _blocks;
 
@@ -85,7 +85,7 @@ public record TemplateItem
 public record Props
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     private string _backgroundColor;
 
@@ -1581,7 +1581,7 @@ public record Props
 public record WeaponRecoilSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Enable")]
     public bool? Enable { get; set; }
@@ -1593,7 +1593,7 @@ public record WeaponRecoilSettings
 public record WeaponRecoilSettingValues
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Enable")]
     public bool? Enable { get; set; }
@@ -1608,7 +1608,7 @@ public record WeaponRecoilSettingValues
 public record WeaponRecoilProcess
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("ComponentType")]
     public string? ComponentType { get; set; }
@@ -1629,7 +1629,7 @@ public record WeaponRecoilProcess
 public record WeaponRecoilTransformationCurve
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Keys")]
     public List<WeaponRecoilTransformationCurveKey>? Keys { get; set; }
@@ -1638,7 +1638,7 @@ public record WeaponRecoilTransformationCurve
 public record WeaponRecoilTransformationCurveKey
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("inTangent")]
     public double? InTangent { get; set; }
@@ -1656,7 +1656,7 @@ public record WeaponRecoilTransformationCurveKey
 public record HealthEffect
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("type")]
     public string? Type { get; set; }
@@ -1668,7 +1668,7 @@ public record HealthEffect
 public record Prefab
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("path")]
     public string? Path { get; set; }
@@ -1680,7 +1680,7 @@ public record Prefab
 public record Grid
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_name")]
     public string? Name { get; set; }
@@ -1701,7 +1701,7 @@ public record Grid
 public record GridProps
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("filters")]
     public List<GridFilter>? Filters { get; set; }
@@ -1728,7 +1728,7 @@ public record GridProps
 public record GridFilter
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Filter")]
     public HashSet<string>? Filter { get; set; }
@@ -1743,7 +1743,7 @@ public record GridFilter
 public record Slot
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     private string? _name;
 
@@ -1785,7 +1785,7 @@ public record Slot
 public record SlotProps
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("filters")]
     public List<SlotFilter>? Filters { get; set; }
@@ -1797,7 +1797,7 @@ public record SlotProps
 public record SlotFilter
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Shift")]
     public double? Shift { get; set; }
@@ -1830,7 +1830,7 @@ public record SlotFilter
 public record StackSlot
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_name")]
     public string? Name { get; set; }
@@ -1857,7 +1857,7 @@ public record StackSlot
 public record StackSlotProps
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("filters")]
     public List<SlotFilter>? Filters { get; set; }
@@ -1866,7 +1866,7 @@ public record StackSlotProps
 public record RandomLootSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("allowToSpawnIdenticalItems")]
     public bool? AllowToSpawnIdenticalItems { get; set; }
@@ -1896,7 +1896,7 @@ public record RandomLootSettings
 public record RandomLootExcluded
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("categoryTemplates")]
     public List<object>? CategoryTemplates { get; set; } // TODO: object here
@@ -1911,7 +1911,7 @@ public record RandomLootExcluded
 public record EffectsHealth
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Energy")]
     public EffectsHealthProps? Energy { get; set; }
@@ -1923,7 +1923,7 @@ public record EffectsHealth
 public record EffectsHealthProps
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("value")]
     public double? Value { get; set; }
@@ -1938,7 +1938,7 @@ public record EffectsHealthProps
 public record EffectsDamage
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Pain")]
     public EffectDamageProps? Pain { get; set; }
@@ -1965,7 +1965,7 @@ public record EffectsDamage
 public record EffectDamageProps
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("value")]
     public double? Value { get; set; }
@@ -1992,7 +1992,7 @@ public record EffectDamageProps
 public record Color
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("r")]
     public double? R { get; set; }
@@ -2010,7 +2010,7 @@ public record Color
 public record ShotsGroupSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("EndShotIndex")]
     public double? EndShotIndex { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs
index 9bcdc5c2..565008ee 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs
@@ -146,6 +146,9 @@ public record ItemBuyData
 
 public record ItemSellData
 {
+    [JsonExtensionData]
+    public Dictionary<string, object>? ExtensionData { get; set; }
+
     [JsonPropertyName("category")]
     public required List<string> Category { get; set; }
 
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XY.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XY.cs
index afa00181..67b7d7f0 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XY.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XY.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common;
 public record XY
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("x")]
     public double? X { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XYZ.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XYZ.cs
index a99ac51f..1cf72e9b 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XYZ.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XYZ.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common;
 public record XYZ
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("x")]
     public double? X { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/BuyClothingRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/BuyClothingRequestData.cs
index b6ec6bcf..73a30fd3 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/BuyClothingRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/BuyClothingRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Customization;
 public record BuyClothingRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("offer")]
     public string? Offer { get; set; }
@@ -18,7 +18,7 @@ public record BuyClothingRequestData : InventoryBaseActionRequestData
 public record PaymentItemForClothing
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("del")]
     public bool? Del { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/CustomizationSetRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/CustomizationSetRequest.cs
index 702b9c2d..c52af4f1 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/CustomizationSetRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/CustomizationSetRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Customization;
 public record CustomizationSetRequest : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("customizations")]
     public List<CustomizationSetOption>? Customizations { get; set; }
@@ -15,7 +15,7 @@ public record CustomizationSetRequest : InventoryBaseActionRequestData
 public record CustomizationSetOption
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/WearClothingRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/WearClothingRequestData.cs
index 0b731e25..2f958187 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/WearClothingRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/WearClothingRequestData.cs
@@ -5,5 +5,5 @@ namespace SPTarkov.Server.Core.Models.Eft.Customization;
 public record WearClothingRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AcceptFriendRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AcceptFriendRequestData.cs
index 7e96b0ac..4ed8296c 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AcceptFriendRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AcceptFriendRequestData.cs
@@ -12,7 +12,7 @@ public record DeclineFriendRequestData : BaseFriendRequest { }
 public record BaseFriendRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("profileId")]
     public string? ProfileId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs
index f42900ff..47b65282 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record AddUserGroupMailRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("dialogId")]
     public string? DialogId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs
index 28d57f07..98bab3cb 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record ChangeGroupMailOwnerRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("dialogId")]
     public string? DialogId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChatServer.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChatServer.cs
index 7d1b1df1..87d1b105 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChatServer.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChatServer.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record ChatServer
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
     public string? Id { get; set; }
@@ -41,7 +41,7 @@ public record ChatServer
 public record Chat
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ClearMailMessageRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ClearMailMessageRequest.cs
index bf0c40aa..3c74c85e 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ClearMailMessageRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ClearMailMessageRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record ClearMailMessageRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("dialogId")]
     public string? DialogId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/CreateGroupMailRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/CreateGroupMailRequest.cs
index f3478189..389d8ea9 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/CreateGroupMailRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/CreateGroupMailRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record CreateGroupMailRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Name")]
     public string? Name { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/DeleteFriendRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/DeleteFriendRequest.cs
index b411ddcd..216874a4 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/DeleteFriendRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/DeleteFriendRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record DeleteFriendRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("friend_id")]
     public string? FriendId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestData.cs
index d508a121..4b1b2e56 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record FriendRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("status")]
     public int? Status { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestSendResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestSendResponse.cs
index ba08fff7..24069838 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestSendResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestSendResponse.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record FriendRequestSendResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("status")]
     public BackendErrorCodes? Status { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs
index 5424e33b..195b68c6 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record GetAllAttachmentsRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("dialogId")]
     public string DialogId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs
index 201bdc7e..b34b9728 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record GetAllAttachmentsResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("messages")]
     public List<Message>? Messages { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetChatServerListRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetChatServerListRequestData.cs
index d109f7ed..efc92e5f 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetChatServerListRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetChatServerListRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record GetChatServerListRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("VersionId")]
     public string? VersionId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetFriendListDataResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetFriendListDataResponse.cs
index eea68c7a..1831eb42 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetFriendListDataResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetFriendListDataResponse.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record GetFriendListDataResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Friends")]
     public List<UserDialogInfo>? Friends { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs
index 0327a078..c40acdc7 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record GetMailDialogInfoRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("dialogId")]
     public string? DialogId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs
index d1a587a4..886e8f05 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record GetMailDialogListRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("limit")]
     public int? Limit { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs
index 1d55a72d..75cb196c 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record GetMailDialogViewRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("type")]
     public MessageType? Type { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs
index 5a539891..346e8222 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record GetMailDialogViewResponseData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("messages")]
     public List<Message>? Messages { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/PinDialogRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/PinDialogRequestData.cs
index e2594b07..a9a8907b 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/PinDialogRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/PinDialogRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record PinDialogRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("dialogId")]
     public string? DialogId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveDialogRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveDialogRequestData.cs
index 3db35edb..5159baf1 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveDialogRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveDialogRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record RemoveDialogRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("dialogId")]
     public string? DialogId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs
index 3e84cdea..2dedcf9c 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record RemoveMailMessageRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("dialogId")]
     public string? DialogId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs
index 2a09bf66..b30b8605 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record RemoveUserGroupMailRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("dialogId")]
     public string? DialogId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SendMessageRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SendMessageRequest.cs
index a20fa773..3ddfd946 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SendMessageRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SendMessageRequest.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record SendMessageRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("dialogId")]
     public string? DialogId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SetDialogReadRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SetDialogReadRequestData.cs
index 1de92b34..cc5e64cc 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SetDialogReadRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SetDialogReadRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 public record SetDialogReadRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("dialogs")]
     public List<string>? Dialogs { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CheckVersionResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CheckVersionResponse.cs
index 4f06862b..38b12ef8 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CheckVersionResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CheckVersionResponse.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game;
 public record CheckVersionResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("isvalid")]
     public bool? IsValid { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CurrentGroupResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CurrentGroupResponse.cs
index 5fa63738..e6c5c60b 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CurrentGroupResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CurrentGroupResponse.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game;
 public record CurrentGroupResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("squad")]
     public List<CurrentGroupSquadMember>? Squad { get; set; }
@@ -15,7 +15,7 @@ public record CurrentGroupResponse
 public record CurrentGroupSquadMember
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
     public string? Id { get; set; }
@@ -36,7 +36,7 @@ public record CurrentGroupSquadMember
 public record CurrentGroupMemberInfo
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Nickname")]
     public string? Nickname { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameConfigResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameConfigResponse.cs
index 455be628..218e0c39 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameConfigResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameConfigResponse.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game;
 public record GameConfigResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("aid")]
     public double? Aid { get; set; }
@@ -59,7 +59,7 @@ public record GameConfigResponse
 public record PurchasedGames
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("eft")]
     public bool? IsEftPurchased { get; set; }
@@ -71,7 +71,7 @@ public record PurchasedGames
 public record Backend
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Lobby")]
     public string? Lobby { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameEmptyCrcRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameEmptyCrcRequestData.cs
index ff02a6af..99c0e1e1 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameEmptyCrcRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameEmptyCrcRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game;
 public record GameEmptyCrcRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("crc")]
     public int? Crc { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameKeepAliveResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameKeepAliveResponse.cs
index 40a5ce87..8c398e03 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameKeepAliveResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameKeepAliveResponse.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game;
 public record GameKeepAliveResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("msg")]
     public string? Message { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameLogoutResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameLogoutResponseData.cs
index a104aeee..ed22d22f 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameLogoutResponseData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameLogoutResponseData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game;
 public record GameLogoutResponseData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("status")]
     public string? Status { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeRequestData.cs
index 4ec91f5c..2ffa6f41 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game;
 public record GameModeRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("sessionMode")]
     public string? SessionMode { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs
index a5d38cff..e6bd7581 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs
@@ -11,7 +11,7 @@ public enum SessionMode
 public record GameModeResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("gameMode")]
     public string? GameMode { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameStartResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameStartResponse.cs
index 755103ff..4291c62b 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameStartResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameStartResponse.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game;
 public record GameStartResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("utc_time")]
     public double UtcTime { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetItemPricesResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetItemPricesResponse.cs
index 0e21379c..af324087 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetItemPricesResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetItemPricesResponse.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game;
 public record GetItemPricesResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("supplyNextTime")]
     public double? SupplyNextTime { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeRequest.cs
index 43d7f0ed..b8741ef9 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game;
 public record GetRaidTimeRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Side")]
     public string? Side { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeResponse.cs
index 60d9cd39..481873e1 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeResponse.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game;
 public record GetRaidTimeResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("NewSurviveTimeSeconds")]
     public double? NewSurviveTimeSeconds { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendSurveyOpinionRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendSurveyOpinionRequest.cs
index 1b771e3b..5f96f906 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendSurveyOpinionRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendSurveyOpinionRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game;
 public record SendSurveyOpinionRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("resultJson")]
     public string? ResultJson { get; set; }
@@ -21,7 +21,7 @@ public record SendSurveyOpinionRequest : IRequestData
 public record SurveyOpinionAnswer
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("questionId")]
     public int? QuestionId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/ServerDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/ServerDetails.cs
index 99f38986..b02cbb1d 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/ServerDetails.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/ServerDetails.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game;
 public record ServerDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("ip")]
     public string? Ip { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SurveyResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SurveyResponseData.cs
index 76be7e98..82086186 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SurveyResponseData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SurveyResponseData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game;
 public record SurveyResponseData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("locale")]
     public Dictionary<string, Dictionary<string, string>>? Locale { get; set; }
@@ -17,7 +17,7 @@ public record SurveyResponseData
 public record Survey
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public int? Id { get; set; }
@@ -41,7 +41,7 @@ public record Survey
 public record WelcomePageData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("titleLocaleKey")]
     public string? TitleLocaleKey { get; set; }
@@ -56,7 +56,7 @@ public record WelcomePageData
 public record FarewellPageData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("textLocaleKey")]
     public string? TextLocaleKey { get; set; }
@@ -65,7 +65,7 @@ public record FarewellPageData
 public record SurveyQuestion
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public int? Id { get; set; }
@@ -92,7 +92,7 @@ public record SurveyQuestion
 public record SurveyAnswer
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public int? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/VersionValidateRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/VersionValidateRequestData.cs
index 10da4b32..460c1d65 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/VersionValidateRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/VersionValidateRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game;
 public record VersionValidateRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("version")]
     public Version? Version { get; set; }
@@ -18,7 +18,7 @@ public record VersionValidateRequestData : IRequestData
 public record Version
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("major")]
     public string? Major { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/HealthTreatmentRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/HealthTreatmentRequestData.cs
index c323005f..083910e4 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/HealthTreatmentRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/HealthTreatmentRequestData.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Health;
 public record HealthTreatmentRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("trader")]
     public string? Trader { get; set; }
@@ -29,7 +29,7 @@ public record HealthTreatmentRequestData : InventoryBaseActionRequestData
 public record Difference
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("BodyParts")]
     public BodyParts? BodyParts { get; set; }
@@ -44,7 +44,7 @@ public record Difference
 public record BodyParts
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Head")]
     public BodyPartEffects? Head { get; set; }
@@ -71,7 +71,7 @@ public record BodyParts
 public record BodyPartEffects
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public double Health { get; set; }
 
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidEatRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidEatRequestData.cs
index ae67909a..4a480ecc 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidEatRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidEatRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Health;
 public record OffraidEatRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("item")]
     public string? Item { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidHealRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidHealRequestData.cs
index cd869f21..000de8ca 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidHealRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidHealRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Health;
 public record OffraidHealRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("item")]
     public string? Item { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/SyncHealthRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/SyncHealthRequestData.cs
index 78890545..3522ba59 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/SyncHealthRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/SyncHealthRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Health;
 public record SyncHealthRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Health")]
     public List<BodyPartHealth>? Health { get; set; }
@@ -26,7 +26,7 @@ public record SyncHealthRequestData
 public record BodyPartCollection
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Head")]
     public BodyPartHealth? Head { get; set; }
@@ -53,7 +53,7 @@ public record BodyPartCollection
 public record BodyPartHealth
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Maximum")]
     public int? Maximum { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs
index 890eccc3..952a5319 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs
@@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Health;
 public class WorkoutData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("skills")]
     public WorkoutSkills? Skills { get; set; }
@@ -17,7 +17,7 @@ public class WorkoutData : IRequestData
 public record WorkoutSkills
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Common")]
     public List<CommonSkill> Common { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs
index c3f9d8a6..4c18bf35 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record HandleQTEEventRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     true if QTE was successful, otherwise false
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutArea.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutArea.cs
index b8033f95..160576cc 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutArea.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutArea.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record HideoutArea
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
     public string? Id { get; set; }
@@ -46,7 +46,7 @@ public record HideoutArea
 public record HideoutAreaRequirement
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("areaType")]
     public int? AreaType { get; set; }
@@ -61,7 +61,7 @@ public record HideoutAreaRequirement
 public record Stage
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("autoUpgrade")]
     public bool? AutoUpgrade { get; set; }
@@ -100,7 +100,7 @@ public record Stage
 public record StageImprovement
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -118,7 +118,7 @@ public record StageImprovement
 public record StageImprovementBonus
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -145,7 +145,7 @@ public record StageImprovementBonus
 public record StageImprovementRequirement
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("count")]
     public int? Count { get; set; }
@@ -169,7 +169,7 @@ public record StageImprovementRequirement
 public record StageRequirement
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("areaType")]
     public int? AreaType { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs
index b8bc0396..a9cbbca9 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record HideoutCircleOfCultistProductionStartRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("timestamp")]
     public long? Timestamp { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs
index 193dd9bd..061c77d3 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record HideoutContinuousProductionStartRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("recipeId")]
     public string? RecipeId { get; set; }
@@ -18,7 +18,7 @@ public record HideoutContinuousProductionStartRequestData : InventoryBaseActionR
 public record HideoutProperties
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public int? BtcFarmGcs { get; set; }
 
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomisation.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomisation.cs
index d8db3f63..b3307c29 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomisation.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomisation.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record HideoutCustomisation
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("globals")]
     public List<HideoutCustomisationGlobal>? Globals { get; set; }
@@ -18,7 +18,7 @@ public record HideoutCustomisation
 public record HideoutCustomisationGlobal
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -45,7 +45,7 @@ public record HideoutCustomisationGlobal
 public record HideoutCustomisationSlot
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs
index 26f6f08d..2a0f7d0f 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record HideoutCustomizationApplyRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Id of the newly picked item to apply to hideout
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs
index 391e9233..f309fe52 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record HideoutCustomizationSetMannequinPoseRequest : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("poses")]
     public Dictionary<string, string>? Poses { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs
index 9a385f30..441b3d1d 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record HideoutDeleteProductionRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("recipeId")]
     public string? RecipeId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs
index 0c7ac782..1a25b351 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs
@@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record HideoutImproveAreaRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Hideout area id from areas.json
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutProduction.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutProduction.cs
index 4fe033f5..a820f963 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutProduction.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutProduction.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record HideoutProductionData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("recipes")]
     public List<HideoutProduction>? Recipes { get; set; }
@@ -22,7 +22,7 @@ public record HideoutProductionData
 public record HideoutProduction
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
     public string? Id { get; set; }
@@ -67,7 +67,7 @@ public record HideoutProduction
 public record Requirement
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("templateId")]
     public string? TemplateId { get; set; }
@@ -106,7 +106,7 @@ public record Requirement
 public record ScavRecipe
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
     public string? Id { get; set; }
@@ -124,7 +124,7 @@ public record ScavRecipe
 public record EndProducts
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Common")]
     public MinMax<int>? Common { get; set; }
@@ -139,7 +139,7 @@ public record EndProducts
 public record CultistRecipe
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs
index 11f5f4d1..14cf93c4 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs
@@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record HideoutPutItemInRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("areaType")]
     public HideoutAreas? AreaType { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs
index e1211c52..292c3aa7 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record HideoutScavCaseStartRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("recipeId")]
     public string? RecipeId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSettingsBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSettingsBase.cs
index 91af193c..cda90483 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSettingsBase.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSettingsBase.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record HideoutSettingsBase
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("generatorSpeedWithoutFuel")]
     public double? GeneratorSpeedWithoutFuel { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs
index 8879924a..ba0a9e9e 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record HideoutSingleProductionStartRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("recipeId")]
     public string? RecipeId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs
index 05a2ba6f..6c003f91 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record HideoutTakeItemOutRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("areaType")]
     public HideoutAreas? AreaType { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs
index a48f7a44..636a597e 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record HideoutTakeProductionRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("recipeId")]
     public string? RecipeId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs
index b611a29c..054e8c03 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record HideoutToggleAreaRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("areaType")]
     public HideoutAreas? AreaType { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs
index 1abed3eb..7bcc7d69 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record HideoutUpgradeCompleteRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("areaType")]
     public HideoutAreas? AreaType { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs
index a3220ed4..0ba4d079 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs
@@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record HideoutUpgradeRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("areaType")]
     public HideoutAreas? AreaType { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/QteData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/QteData.cs
index 952f3aaf..d8ea1a9b 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/QteData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/QteData.cs
@@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record QteData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -49,7 +49,7 @@ public record QteData
 public record QuickTimeEvent
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("type")]
     [JsonConverter(typeof(JsonStringEnumConverter))]
@@ -77,7 +77,7 @@ public record QuickTimeEvent
 public record QteRequirement
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("type")]
     public RequirementType? RequirementType { get; set; }
@@ -86,7 +86,7 @@ public record QteRequirement
 public record QteResult
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("energy")]
     public int? Energy { get; set; }
@@ -101,7 +101,7 @@ public record QteResult
 public record QteEffect
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("type")]
     [JsonConverter(typeof(JsonStringEnumConverter))]
@@ -128,7 +128,7 @@ public record QteEffect
 public record SkillLevelMultiplier
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("level")]
     public int? Level { get; set; }
@@ -140,7 +140,7 @@ public record SkillLevelMultiplier
 public record Position
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("x")]
     public float? X { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/RecordShootingRangePoints.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/RecordShootingRangePoints.cs
index f95d7787..1d054406 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/RecordShootingRangePoints.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/RecordShootingRangePoints.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 public record RecordShootingRangePoints : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("points")]
     public int? Points { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/GetBodyResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/GetBodyResponseData.cs
index 2e2044de..2b9dd9c7 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/GetBodyResponseData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/GetBodyResponseData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.HttpResponse;
 public record GetBodyResponseData<T>
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("err")]
     public BackendErrorCodes? Err { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/NullResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/NullResponseData.cs
index 648ca7bc..0e45b3ac 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/NullResponseData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/NullResponseData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.HttpResponse;
 public record NullResponseData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("err")]
     public int? Err { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/InsuredItemsData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/InsuredItemsData.cs
index d63b76a5..eba79359 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/InsuredItemsData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/InsuredItemsData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.InRaid;
 public record InsuredItemsData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs
index 0a2fb595..d0725965 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.InRaid;
 public record ItemDeliveryRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("items")]
     public List<Item>? Items { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs
index 30dbf2d1..0cea1f75 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.InRaid;
 public record RegisterPlayerRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("crc")]
     public int? Crc { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs
index 9384c84a..e26cbd24 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Insurance;
 public record GetInsuranceCostRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("traders")]
     public List<string>? Traders { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/InsureRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/InsureRequestData.cs
index 0e243b06..4c92e21b 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/InsureRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/InsureRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Insurance;
 public record InsureRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("tid")]
     public string? TransactionId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemDirectRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemDirectRequest.cs
index 226c893f..fd1a8ece 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemDirectRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemDirectRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record AddItemDirectRequest
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Item and child mods to add to player inventory
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemRequestData.cs
index 8b63ffa2..dcb2be2e 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record AddItemRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Trader id
@@ -20,7 +20,7 @@ public record AddItemRequestData
 public record ItemToAdd
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("count")]
     public int? Count { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemTempObject.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemTempObject.cs
index be095539..03e42245 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemTempObject.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemTempObject.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record AddItemTempObject
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("itemRef")]
     public Item? ItemReference { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemsDirectRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemsDirectRequest.cs
index 45de4d54..cc2db11c 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemsDirectRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemsDirectRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record AddItemsDirectRequest
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Item and child mods to add to player inventory
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryAddRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryAddRequestData.cs
index 79c2782c..a00657b3 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryAddRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryAddRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record InventoryAddRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("item")]
     public string? Item { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs
index 0578dd11..503d1372 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs
@@ -8,7 +8,7 @@ public abstract record InventoryBaseActionRequestData : BaseInteractionRequestDa
 public record To
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -26,7 +26,7 @@ public record To
 public record Container
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -41,7 +41,7 @@ public record Container
 public record Location
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("x")]
     public double? X { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBindRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBindRequestData.cs
index 35a7bbb0..7c6890ae 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBindRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBindRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record InventoryBindRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("item")]
     public string? Item { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs
index 5d2fcba4..54baa978 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record InventoryCreateMarkerRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("item")]
     public string? Item { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs
index 152edd4b..cf8d9920 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record InventoryDeleteMarkerRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("item")]
     public string? Item { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs
index 6ef627cd..625ea02f 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record InventoryEditMarkerRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("item")]
     public string? Item { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryExamineRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryExamineRequestData.cs
index 6f44dd90..5ce72365 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryExamineRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryExamineRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record InventoryExamineRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("item")]
     public string? Item { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryFoldRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryFoldRequestData.cs
index 2fa3482e..a39bc4c2 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryFoldRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryFoldRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record InventoryFoldRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("item")]
     public string? Item { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMergeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMergeRequestData.cs
index 09898ecd..246db830 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMergeRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMergeRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record InventoryMergeRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("item")]
     public string? Item { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMoveRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMoveRequestData.cs
index 361a40e4..62558f59 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMoveRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMoveRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record InventoryMoveRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("item")]
     public string? Item { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs
index 074c125f..9543e7e7 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record InventoryReadEncyclopediaRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("ids")]
     public List<string> Ids { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs
index 8ceeee08..396998cb 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record InventoryRemoveRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("item")]
     public string? Item { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySortRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySortRequestData.cs
index 54ec6fdd..9b61c864 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySortRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySortRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record InventorySortRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("changedItems")]
     public List<Item>? ChangedItems { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySplitRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySplitRequestData.cs
index 4c3892f4..6649f4f8 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySplitRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySplitRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record InventorySplitRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Id of item to split
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySwapRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySwapRequestData.cs
index 974ce256..e4ce7fdf 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySwapRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySwapRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record InventorySwapRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("item")]
     public string? Item { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTagRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTagRequestData.cs
index 9b93420e..7b207a5f 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTagRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTagRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record InventoryTagRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("item")]
     public string? Item { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryToggleRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryToggleRequestData.cs
index 73b7b9c3..77463eda 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryToggleRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryToggleRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record InventoryToggleRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("item")]
     public string? Item { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTransferRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTransferRequestData.cs
index 44206471..76d047ca 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTransferRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTransferRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record InventoryTransferRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("item")]
     public string? Item { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryUnbindRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryUnbindRequestData.cs
index aae8b130..2b938a46 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryUnbindRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryUnbindRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record InventoryUnbindRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("item")]
     public string? Item { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs
index 35b7d374..f9b3f00b 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record OpenRandomLootContainerRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Container item id being opened
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/PinOrLockItemRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/PinOrLockItemRequest.cs
index 32e507c3..60a0157a 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/PinOrLockItemRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/PinOrLockItemRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record PinOrLockItemRequest : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Id of item being pinned
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/RedeemProfileRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/RedeemProfileRequestData.cs
index c8275beb..03681ae0 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/RedeemProfileRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/RedeemProfileRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record RedeemProfileRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("events")]
     public List<RedeemProfileRequestEvent>? Events { get; set; }
@@ -14,7 +14,7 @@ public record RedeemProfileRequestData : InventoryBaseActionRequestData
 public record RedeemProfileRequestEvent
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("MessageId")]
     public string? MessageId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/SetFavoriteItems.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/SetFavoriteItems.cs
index c1471550..d66ea45e 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/SetFavoriteItems.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/SetFavoriteItems.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 public record SetFavoriteItems : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("items")]
     public List<string>? Items { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs
index 340afa75..454b1b08 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.ItemEvent;
 public record EmptyItemEventRouterResponse : ItemEventRouterBase
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("profileChanges")]
     public string? ProfileChanges { get; set; } = "";
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs
index 3085288b..56042704 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs
@@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.ItemEvent;
 public record ItemEventRouterBase
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
     [JsonPropertyName("warnings")]
@@ -21,7 +21,7 @@ public record ItemEventRouterBase
 public record Warning
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("index")]
     public int? Index { get; set; }
@@ -39,7 +39,7 @@ public record Warning
 public record ProfileChange
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
     public string? Id { get; set; }
@@ -102,7 +102,7 @@ public record ProfileChange
 public record HideoutStashItem
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -114,7 +114,7 @@ public record HideoutStashItem
 public record WeaponBuildChange
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -132,7 +132,7 @@ public record WeaponBuildChange
 public record EquipmentBuildChange
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -159,7 +159,7 @@ public record EquipmentBuildChange
 public record ItemChanges
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("new")]
     public List<Item>? NewItems { get; set; }
@@ -177,7 +177,7 @@ public record ItemChanges
 public record TraderData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("salesSum")]
     public double? SalesSum { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs
index bb6cd0ea..49281c06 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs
@@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.ItemEvent;
 public record ItemEventRouterRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("data")]
     public List<BaseInteractionRequestData>? Data { get; set; }
@@ -23,7 +23,7 @@ public record ItemEventRouterRequest : IRequestData
 public record Daum
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Action")]
     public string? Action { get; set; }
@@ -53,7 +53,7 @@ public record Daum
 public record FromOwner
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -65,7 +65,7 @@ public record FromOwner
 public record To
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -80,7 +80,7 @@ public record To
 public record Location
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("x")]
     public int? X { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs
index a8816ba2..54d36059 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs
@@ -8,5 +8,5 @@ namespace SPTarkov.Server.Core.Models.Eft.ItemEvent;
 public record ItemEventRouterResponse : ItemEventRouterBase
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs
index 0e71777f..0497f12c 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Launcher;
 public record GetMiniProfileRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("username")]
     public string? Username { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs
index 2c44f739..2267a508 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Launcher;
 public record LoginRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("username")]
     public string? Username { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs
index 751f8637..44dda862 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Launcher;
 public record MiniProfile
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("username")]
     public string? Username { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/AirdropLootResult.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/AirdropLootResult.cs
index 2e627934..733e2aa9 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/AirdropLootResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/AirdropLootResult.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Location;
 public record AirdropLootResult
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("dropType")]
     public string? DropType { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootRequest.cs
index fe06544d..24123fbd 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Location;
 public record GetAirdropLootRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("containerId")]
     public string? ContainerId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootResponse.cs
index 2968427e..89607980 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootResponse.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Location;
 public record GetAirdropLootResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     The type of airdrop
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetLocationRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetLocationRequestData.cs
index 3d190f67..d959e924 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetLocationRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetLocationRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Location;
 public record GetLocationRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("crc")]
     public int? Crc { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndLocalRaidRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndLocalRaidRequestData.cs
index f9851411..dee8a723 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndLocalRaidRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndLocalRaidRequestData.cs
@@ -9,7 +9,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match;
 public record EndLocalRaidRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     ID of server player just left
@@ -39,7 +39,7 @@ public record EndLocalRaidRequestData : IRequestData
 public record EndRaidResult
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("profile")]
     public PmcData? Profile { get; set; }
@@ -79,7 +79,7 @@ public record EndRaidResult
 public record LocationTransit
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("hash")]
     public string? Hash { get; set; }
@@ -124,7 +124,7 @@ public record LocationTransit
 public record TransitProfile
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndOfflineRaidRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndOfflineRaidRequestData.cs
index db37906e..9c121893 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndOfflineRaidRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndOfflineRaidRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match;
 public record EndOfflineRaidRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("crc")]
     public int? Crc { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GroupCharacter.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GroupCharacter.cs
index ce497eb1..17a74fd3 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GroupCharacter.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GroupCharacter.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match;
 public record GroupCharacter
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
     public string? Id { get; set; }
@@ -37,7 +37,7 @@ public record GroupCharacter
 public record CharacterInfo
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Nickname")]
     public string? Nickname { get; set; }
@@ -67,7 +67,7 @@ public record CharacterInfo
 public record PlayerVisualRepresentation
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Info")]
     public VisualInfo? Info { get; set; }
@@ -82,7 +82,7 @@ public record PlayerVisualRepresentation
 public record VisualInfo
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Side")]
     public string? Side { get; set; }
@@ -103,7 +103,7 @@ public record VisualInfo
 public record Customization
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Head")]
     public string? Head { get; set; }
@@ -121,7 +121,7 @@ public record Customization
 public record Equipment
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupCurrentResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupCurrentResponse.cs
index cd2a98ac..829752cc 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupCurrentResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupCurrentResponse.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match;
 public record MatchGroupCurrentResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("squad")]
     public List<GroupCharacter>? Squad { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs
index d9c5f16e..8830a561 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match;
 public record MatchGroupInviteSendRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("to")]
     public string? To { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs
index 130ff8f4..fa88dac5 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match;
 public record MatchGroupPlayerRemoveRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("aidToKick")]
     public string? AidToKick { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStartGameRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStartGameRequest.cs
index bbe985c9..a455bb09 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStartGameRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStartGameRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match;
 public record MatchGroupStartGameRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("groupId")]
     public string? GroupId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusRequest.cs
index d4a531c1..da3216aa 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusRequest.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match;
 public record MatchGroupStatusRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("location")]
     public string? Location { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusResponse.cs
index d165ee24..f9602b04 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusResponse.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match;
 public record MatchGroupStatusResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("players")]
     public List<GroupCharacter>? Players { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupTransferRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupTransferRequest.cs
index d3aee82e..6ce97ec5 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupTransferRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupTransferRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match;
 public record MatchGroupTransferRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("aidToChange")]
     public string? AidToChange { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusRequest.cs
index 003c617a..8a26921e 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusRequest.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match;
 public record ProfileStatusRequest
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("groupId")]
     public int? GroupId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusResponse.cs
index ec612f87..74ed6e98 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusResponse.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match;
 public record ProfileStatusResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("maxPveCountExceeded")]
     public bool? MaxPveCountExceeded { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/PutMetricsRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/PutMetricsRequestData.cs
index ddaf9768..a2881641 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/PutMetricsRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/PutMetricsRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match;
 public record PutMetricsRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("sid")]
     public string? SessionId { get; set; }
@@ -39,7 +39,7 @@ public record PutMetricsRequestData : IRequestData
 public record SharedSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("StatedFieldOfView")]
     public double? StatedFieldOfView { get; set; }
@@ -48,7 +48,7 @@ public record SharedSettings
 public record HardwareDescription
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("deviceUniqueIdentifier")]
     public string? DeviceUniqueIdentifier { get; set; }
@@ -105,7 +105,7 @@ public record HardwareDescription
 public record ClientEvents
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("MatchingCompleted")]
     public double? MatchingCompleted { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RaidSettings.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RaidSettings.cs
index 75926273..7c9760ee 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RaidSettings.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RaidSettings.cs
@@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match;
 public record RaidSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("keyId")]
     public string? KeyId { get; set; }
@@ -56,7 +56,7 @@ public record RaidSettings
 public record TimeAndWeatherSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("isRandomTime")]
     public bool? IsRandomTime { get; set; }
@@ -91,7 +91,7 @@ public record TimeAndWeatherSettings
 public record BotSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("isScavWars")]
     public bool? IsScavWars { get; set; }
@@ -104,7 +104,7 @@ public record BotSettings
 public record WavesSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("botAmount")]
     [JsonConverter(typeof(JsonStringEnumConverter))]
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RequestIdRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RequestIdRequest.cs
index 5e06d356..ae1d5b76 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RequestIdRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RequestIdRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match;
 public record RequestIdRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("requestId")]
     public string? RequestId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/Server.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/Server.cs
index bf9000c6..e24b4c33 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/Server.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/Server.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match;
 public record Server
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("ping")]
     public int? Ping { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/SessionStatus.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/SessionStatus.cs
index 30ded9d2..a64f954a 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/SessionStatus.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/SessionStatus.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match;
 public record SessionStatus
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("profileid")]
     public string? ProfileId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidRequestData.cs
index 62261c4d..2b68b02a 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidRequestData.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match;
 public record StartLocalRaidRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("serverId")]
     public string? ServerId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidResponseData.cs
index 3b960fab..c10d05b9 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidResponseData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidResponseData.cs
@@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match;
 public record StartLocalRaidResponseData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("serverId")]
     public string? ServerId { get; set; }
@@ -36,7 +36,7 @@ public record StartLocalRaidResponseData
 public record ProfileInsuredItems
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("insuredItems")]
     public List<InsuredItem>? InsuredItems { get; set; }
@@ -45,7 +45,7 @@ public record ProfileInsuredItems
 public record Transition
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("transitionType")]
     public TransitionType? TransitionType { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/UpdatePingRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/UpdatePingRequestData.cs
index 32b52a13..ee349bc1 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/UpdatePingRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/UpdatePingRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match;
 public record UpdatePingRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("servers")]
     public List<object>? servers { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Notes/NoteActionRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Notes/NoteActionRequest.cs
index e931460b..dd5c47f0 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Notes/NoteActionRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Notes/NoteActionRequest.cs
@@ -15,7 +15,7 @@ public record NoteActionRequest : BaseInteractionRequestData
 public record Note
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Time")]
     public double? Time { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/Notifier.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/Notifier.cs
index 2a887047..10a06cd0 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/Notifier.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/Notifier.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Notifier;
 public record NotifierChannel
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("server")]
     public string? Server { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/SelectProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/SelectProfileResponse.cs
index bc7210fa..bf354b2e 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/SelectProfileResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/SelectProfileResponse.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Notifier;
 public record SelectProfileResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("status")]
     public string? Status { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs
index e5c62845..991d2751 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Player;
 public record PlayerIncrementSkillLevelRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
     public string? Id { get; set; }
@@ -40,7 +40,7 @@ public record PlayerIncrementSkillLevelRequestData
 public record Items
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("new")]
     public List<object>? NewItems { get; set; }
@@ -55,11 +55,11 @@ public record Items
 public record Production
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 }
 
 public record TraderRelations
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs
index bef250db..5a4eaa1c 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.PresetBuild;
 public record PresetBuildActionRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Action")]
     public string? Action { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs
index 671e235d..ba54d771 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.PresetBuild;
 public record RemoveBuildRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/GetPrestigeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/GetPrestigeResponse.cs
index 1e1159de..f1e2f2aa 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/GetPrestigeResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/GetPrestigeResponse.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Prestige;
 public record GetPrestigeResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("elements")]
     public List<Common.Tables.Prestige>? Elements { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs
index 55fc71c3..1e9becc7 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs
@@ -8,7 +8,7 @@ public class ObtainPrestigeRequestList : List<ObtainPrestigeRequest>, IRequestDa
 public record ObtainPrestigeRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string Id { get; set; }
@@ -20,7 +20,7 @@ public record ObtainPrestigeRequest : IRequestData
 public record Location
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("x")]
     public int X { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CompletedAchievementsResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CompletedAchievementsResponse.cs
index 170907a4..caebd6b9 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CompletedAchievementsResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CompletedAchievementsResponse.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile;
 public record CompletedAchievementsResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("elements")]
     public Dictionary<string, int>? Elements { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ConnectResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ConnectResponse.cs
index 702e2bef..706a4c32 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ConnectResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ConnectResponse.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile;
 public record ConnectResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("backendUrl")]
     public string? BackendUrl { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CreateProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CreateProfileResponse.cs
index 09d374a1..932f83fc 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CreateProfileResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CreateProfileResponse.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile;
 public record CreateProfileResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("uid")]
     public string? UserId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetAchievementsResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetAchievementsResponse.cs
index 85969b03..9a7c9c34 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetAchievementsResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetAchievementsResponse.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile;
 public record GetAchievementsResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("elements")]
     public List<Achievement>? Elements { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileRequest.cs
index 85f457ba..3473252b 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile;
 public record GetOtherProfileRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("accountId")]
     public string? AccountId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileResponse.cs
index 00c76c91..b1733848 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileResponse.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile;
 public record GetOtherProfileResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
@@ -54,7 +54,7 @@ public record GetOtherProfileResponse
 public record OtherProfileInfo
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("nickname")]
     public string? Nickname { get; set; }
@@ -81,7 +81,7 @@ public record OtherProfileInfo
 public record OtherProfileCustomization
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("head")]
     public string? Head { get; set; }
@@ -102,7 +102,7 @@ public record OtherProfileCustomization
 public record OtherProfileEquipment
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Id")]
     public string? Id { get; set; }
@@ -114,7 +114,7 @@ public record OtherProfileEquipment
 public record OtherProfileStats
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("eft")]
     public OtherProfileSubStats? Eft { get; set; }
@@ -123,7 +123,7 @@ public record OtherProfileStats
 public record OtherProfileSubStats
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("totalInGameTime")]
     public long? TotalInGameTime { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileSettingsRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileSettingsRequest.cs
index 3970bb5f..a17c0080 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileSettingsRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileSettingsRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile;
 public record GetProfileSettingsRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Chosen value for profile.Info.SelectedMemberCategory
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileStatusResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileStatusResponseData.cs
index 3e5c5168..540725f5 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileStatusResponseData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileStatusResponseData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile;
 public record GetProfileStatusResponseData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("maxPveCountExceeded")]
     public bool? MaxPveCountExceeded { get; set; } = false;
@@ -17,7 +17,7 @@ public record GetProfileStatusResponseData
 public record ProfileStatusData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("profileid")]
     public string? ProfileId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/MessageContentRagfair.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/MessageContentRagfair.cs
index 5a791b81..b7bf729a 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/MessageContentRagfair.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/MessageContentRagfair.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile;
 public record MessageContentRagfair
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("offerId")]
     public string? OfferId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs
index 0a85beab..ff66beb1 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile;
 public record ProfileChangeNicknameRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("nickname")]
     public string? Nickname { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs
index 6caa4308..346ccf77 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile;
 public record ProfileChangeVoiceRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("voice")]
     public string? Voice { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileCreateRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileCreateRequestData.cs
index 1b2ca16d..29de1f75 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileCreateRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileCreateRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile;
 public record ProfileCreateRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("side")]
     public string? Side { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchFriendResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchFriendResponse.cs
index 2e3a3622..3f57bc4a 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchFriendResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchFriendResponse.cs
@@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile;
 public record SearchFriendResponse
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchProfilesRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchProfilesRequestData.cs
index fa5c1603..e4b1f79f 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchProfilesRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchProfilesRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile;
 public record SearchProfilesRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("nickname")]
     public string? Nickname { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs
index 412b4dc3..8b1ee037 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs
@@ -10,7 +10,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile;
 public record SptProfile
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("info")]
     public Info? ProfileInfo { get; set; }
@@ -71,7 +71,7 @@ public record SptProfile
 public record TraderPurchaseData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("count")]
     public double? PurchaseCount { get; set; }
@@ -83,7 +83,7 @@ public record TraderPurchaseData
 public record Info
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     main profile id
@@ -113,7 +113,7 @@ public record Info
 public record Characters
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("pmc")]
     public PmcData? PmcData { get; set; }
@@ -128,7 +128,7 @@ public record Characters
 public record UserBuilds
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("weaponBuilds")]
     public List<WeaponBuild>? WeaponBuilds { get; set; }
@@ -143,7 +143,7 @@ public record UserBuilds
 public record UserBuild
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Id")]
     public string? Id { get; set; }
@@ -192,7 +192,7 @@ public record MagazineBuild : UserBuild
 public record MagazineTemplateAmmoItem
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("TemplateId")]
     public string? TemplateId { get; set; }
@@ -213,7 +213,7 @@ public record DefaultEquipmentPreset : EquipmentBuild
 public record Dialogue
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("attachmentsNew")]
     public int? AttachmentsNew { get; set; }
@@ -241,7 +241,7 @@ public record Dialogue
 public record DialogueInfo
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("attachmentsNew")]
     public int? AttachmentsNew { get; set; }
@@ -268,7 +268,7 @@ public record DialogueInfo
 public record Message
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
     public string? Id { get; set; }
@@ -319,7 +319,7 @@ public record Message
 public record ReplyTo
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
     public string? Id { get; set; }
@@ -340,7 +340,7 @@ public record ReplyTo
 public record MessagePreview
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("uid")]
     public string? UserId { get; set; }
@@ -364,7 +364,7 @@ public record MessagePreview
 public record MessageItems
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("stash")]
     public string? Stash { get; set; }
@@ -376,7 +376,7 @@ public record MessageItems
 public record UpdatableChatMember
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Nickname")]
     public string? Nickname { get; set; }
@@ -400,7 +400,7 @@ public record UpdatableChatMember
 public record Spt
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     What version of SPT was this profile made with
@@ -454,7 +454,7 @@ public record Spt
 public record AcceptedCultistReward
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("timestamp")]
     public long? Timestamp { get; set; }
@@ -469,7 +469,7 @@ public record AcceptedCultistReward
 public record PendingPrestige
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("prestigeLevel")]
     public int? PrestigeLevel { get; set; }
@@ -481,7 +481,7 @@ public record PendingPrestige
 public record ModDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("name")]
     public string? Name { get; set; }
@@ -502,7 +502,7 @@ public record ModDetails
 public record ReceivedGift
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("giftId")]
     public string? GiftId { get; set; }
@@ -517,7 +517,7 @@ public record ReceivedGift
 public record Vitality
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Hydration")]
     public double? Hydration { get; set; }
@@ -535,7 +535,7 @@ public record Vitality
 public record Inraid
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("location")]
     public string? Location { get; set; }
@@ -547,7 +547,7 @@ public record Inraid
 public record Insurance
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("scheduledTime")]
     public int? ScheduledTime { get; set; }
@@ -574,7 +574,7 @@ public record Insurance
 public record BtrDelivery
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SystemData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SystemData.cs
index ad186bf7..d9072cde 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SystemData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SystemData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile;
 public record SystemData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("date")]
     public string? Date { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/UserDialogInfo.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/UserDialogInfo.cs
index 0785b237..d2fa5bdf 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/UserDialogInfo.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/UserDialogInfo.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile;
 public record UserDialogInfo
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     _id
@@ -24,7 +24,7 @@ public record UserDialogInfo
 public record UserDialogDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Nickname")]
     public string? Nickname { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ValidateNicknameRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ValidateNicknameRequestData.cs
index 3a9b90ef..578cc8c9 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ValidateNicknameRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ValidateNicknameRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile;
 public record ValidateNicknameRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("nickname")]
     public string? Nickname { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/AcceptQuestRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/AcceptQuestRequestData.cs
index 5bd2043b..a9efbc3a 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/AcceptQuestRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/AcceptQuestRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Quests;
 public record AcceptQuestRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("qid")]
     public string? QuestId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/CompleteQuestRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/CompleteQuestRequestData.cs
index a872797d..b5e5d357 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/CompleteQuestRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/CompleteQuestRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Quests;
 public record CompleteQuestRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Quest Id
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/FailQuestRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/FailQuestRequestData.cs
index 2d53addb..fc793ed3 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/FailQuestRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/FailQuestRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Quests;
 public record FailQuestRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("qid")]
     public string? QuestId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/HandoverQuestRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/HandoverQuestRequestData.cs
index 69177634..df942eea 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/HandoverQuestRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/HandoverQuestRequestData.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Quests;
 public record HandoverQuestRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("qid")]
     public string? QuestId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/ListQuestsRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/ListQuestsRequestData.cs
index 7b051efb..22697643 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/ListQuestsRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/ListQuestsRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Quests;
 public record ListQuestsRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("completed")]
     public bool? Completed { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs
index b3de496a..a3cca6fb 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Quests;
 public record RepeatableQuestChangeRequest : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("qid")]
     public string? QuestId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs
index 2c28a338..9341d0b0 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 public record AddOfferRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("sellInOnePiece")]
     public bool? SellInOnePiece { get; set; }
@@ -21,7 +21,7 @@ public record AddOfferRequestData : InventoryBaseActionRequestData
 public record Requirement
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_tpl")]
     public string? Template { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs
index 5821397d..8090cc23 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 public record ExtendOfferRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("offerId")]
     public string? OfferId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs
index edde9641..5fe36e90 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 public record GetMarketPriceRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("templateId")]
     public string? TemplateId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetOffersResult.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetOffersResult.cs
index 72eea840..8c4f57f7 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetOffersResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetOffersResult.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 public record GetOffersResult
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("categories")]
     public Dictionary<string, int>? Categories { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs
index f1e3b9e2..6ffeb9d9 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 public record GetRagfairOfferByIdRequest
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public int? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RagfairOffer.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RagfairOffer.cs
index afbb2242..31e368b5 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RagfairOffer.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RagfairOffer.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 public record RagfairOffer
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     private string? _id;
 
@@ -101,7 +101,7 @@ public record RagfairOffer
 public record OfferRequirement
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     private string? _tpl;
 
@@ -128,7 +128,7 @@ public record OfferRequirement
 public record RagfairOfferUser
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     private string? _id;
 
@@ -164,7 +164,7 @@ public record RagfairOfferUser
 public record SellResult
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("sellTime")]
     public long? SellTime { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs
index 29718686..71d237cb 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 public record RemoveOfferRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("offerId")]
     public string? OfferId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs
index 15147ed6..599e3bcf 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 public record SearchRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("page")]
     public int? Page { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs
index 610e88a1..d714d6db 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 public record SendRagfairReportRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("offerId")]
     public int? OfferId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs
index e90231fe..f951b5d0 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 public record StorePlayerOfferTaxAmountRequestData : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs
index 8fe2bf21..0834a6f5 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Repair;
 public record BaseRepairActionDataRequest
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Action")]
     public string? Action { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/RepairActionDataRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/RepairActionDataRequest.cs
index d90452b5..36704e58 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/RepairActionDataRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/RepairActionDataRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Repair;
 public record RepairActionDataRequest : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("repairKitsInfo")]
     public List<RepairKitsInfo>? RepairKitsInfo { get; set; }
@@ -21,7 +21,7 @@ public record RepairActionDataRequest : InventoryBaseActionRequestData
 public record RepairKitsInfo
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     id of repair kit to use
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs
index a7bd2cae..c2cb06ed 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Repair;
 public record TraderRepairActionDataRequest : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("tid")]
     public string? TId { get; set; }
@@ -18,7 +18,7 @@ public record TraderRepairActionDataRequest : InventoryBaseActionRequestData
 public record RepairItem
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs
index ff926847..64a847dd 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Trade;
 public record ProcessBaseTradeRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("type")]
     public string? Type { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs
index dc116bfa..77dac119 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Trade;
 public record ProcessRagfairTradeRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("offers")]
     public List<OfferRequest>? Offers { get; set; }
@@ -16,7 +16,7 @@ public record ProcessRagfairTradeRequestData : InventoryBaseActionRequestData
 public record OfferRequest
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs
index cc30f7a3..ec2e331d 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs
@@ -14,7 +14,7 @@ public record ProcessSellTradeRequestData : ProcessBaseTradeRequestData
 public record SoldItem
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs
index 0c10e643..8926d33c 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Trade;
 public record SellScavItemsToFenceRequestData : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("totalValue")]
     public double? TotalValue { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Weather/WeatherData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Weather/WeatherData.cs
index 599f3d00..6956fef4 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Weather/WeatherData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Weather/WeatherData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Weather;
 public record WeatherData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("acceleration")]
     public double? Acceleration { get; set; }
@@ -27,7 +27,7 @@ public record WeatherData
 public record Weather
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("pressure")]
     public double? Pressure { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/AddToWishlistRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/AddToWishlistRequest.cs
index 01545f55..13c55857 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/AddToWishlistRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/AddToWishlistRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Wishlist;
 public record AddToWishlistRequest : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("items")]
     public Dictionary<string, int>? Items { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs
index 21f96816..3ce50073 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Wishlist;
 public record ChangeWishlistItemCategoryRequest : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("item")]
     public string? Item { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs
index 9f84599b..b9f63df0 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Wishlist;
 public record RemoveFromWishlistRequest : InventoryBaseActionRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("items")]
     public List<string>? Items { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsNotificationEvent.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsNotificationEvent.cs
index cd5a839e..2735dd82 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsNotificationEvent.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsNotificationEvent.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ws;
 public record WsNotificationEvent
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("type")]
     [JsonConverter(typeof(JsonStringEnumConverter))]
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsRagfairNewRating.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsRagfairNewRating.cs
index 2867a089..b5fc4b0c 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsRagfairNewRating.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsRagfairNewRating.cs
@@ -1,4 +1,4 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace SPTarkov.Server.Core.Models.Eft.Ws
 {
diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/AccountTypes.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/AccountTypes.cs
index de941844..2727bfcc 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Enums/AccountTypes.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/AccountTypes.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Enums;
 public record AccountTypes
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public const string SPT_DEVELOPER = "spt developer";
 }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/GameEditions.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/GameEditions.cs
index 2b671811..0ad63197 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Enums/GameEditions.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/GameEditions.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Enums;
 public record GameEditions
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public const string STANDARD = "standard";
     public const string LEFT_BEHIND = "left_behind";
diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/HideoutEventActions.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/HideoutEventActions.cs
index ec172d8a..025d5256 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Enums/HideoutEventActions.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/HideoutEventActions.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Enums;
 public record HideoutEventActions
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public const string HIDEOUT_UPGRADE = "HideoutUpgrade";
     public const string HIDEOUT_UPGRADE_COMPLETE = "HideoutUpgradeComplete";
diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/ItemEventActions.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ItemEventActions.cs
index dfe7dd5e..2e64e945 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Enums/ItemEventActions.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ItemEventActions.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Enums;
 public record ItemEventActions
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public const string MOVE = "Move";
     public const string REMOVE = "Remove";
diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/Money.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/Money.cs
index 78c33cef..327c8b4b 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Enums/Money.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/Money.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Enums;
 public record Money
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public const string ROUBLES = "5449016a4bdc2d6f028b456f";
     public const string EUROS = "569668774bdc2da2298b4568";
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotDetailsForChatMessages.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotDetailsForChatMessages.cs
index ad12efab..dfd7d19e 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotDetailsForChatMessages.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotDetailsForChatMessages.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots;
 public record BotDetailsForChatMessages
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public string Nickname { get; set; } = string.Empty;
 
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotGenerationDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotGenerationDetails.cs
index da610084..2e945eee 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotGenerationDetails.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotGenerationDetails.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots;
 public record BotGenerationDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Should the bot be generated as a PMC
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotLootCache.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotLootCache.cs
index f800e0c5..81bcc6a2 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotLootCache.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotLootCache.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots;
 public record BotLootCache
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("backpackLoot")]
     public Dictionary<string, double> BackpackLoot { get; set; } = [];
@@ -50,7 +50,7 @@ public record BotLootCache
 public record LootCacheType
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public const string Special = "Special";
     public const string Backpack = "Backpack";
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/Bots.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/Bots.cs
index cfef04f5..7dfcdc37 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/Bots.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/Bots.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots;
 public record Bots
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("types")]
     public Dictionary<string, BotType?>? Types { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs
index 21b10eec..de225c51 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots;
 public record ChooseRandomCompatibleModResult
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("incompatible")]
     public bool? Incompatible { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs
index 1e08ff38..48d81e26 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots;
 public record FilterPlateModsForSlotByLevelResult
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("result")]
     public Result? Result { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateEquipmentProperties.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateEquipmentProperties.cs
index 91b1e0c6..71db8cf9 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateEquipmentProperties.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateEquipmentProperties.cs
@@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots;
 public record GenerateEquipmentProperties
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Root Slot being generated
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponRequest.cs
index 1e99a182..99c6ef75 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponRequest.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots;
 public record GenerateWeaponRequest
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Weapon to add mods to / result that is returned
@@ -72,7 +72,7 @@ public record GenerateWeaponRequest
 public record BotData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Role of bot weapon is generated for
@@ -96,7 +96,7 @@ public record BotData
 public record WeaponStats
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("hasOptic")]
     public bool? HasOptic { get; set; }
@@ -111,7 +111,7 @@ public record WeaponStats
 public record BotModLimits
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("scope")]
     public ItemCount? Scope { get; set; }
@@ -135,7 +135,7 @@ public record BotModLimits
 public record ItemCount
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("count")]
     public int? Count { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponResult.cs
index 19f380b3..ee2c885e 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponResult.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots;
 public record GenerateWeaponResult
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("weapon")]
     public List<Item>? Weapon { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs
index 17124fb6..86e8fd9f 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots;
 public record ItemSpawnLimitSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("currentLimits")]
     public Dictionary<string, double>? CurrentLimits { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ModToSpawnRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ModToSpawnRequest.cs
index 326da149..7bae1aa3 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ModToSpawnRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ModToSpawnRequest.cs
@@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots;
 public record ModToSpawnRequest
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Slot mod will fit into
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/AirdropConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/AirdropConfig.cs
index 38cdc050..97cf53e5 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/AirdropConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/AirdropConfig.cs
@@ -28,7 +28,7 @@ public record AirdropConfig : BaseConfig
 public record AirdropLoot
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("icon")]
     [JsonConverter(typeof(JsonStringEnumConverter))]
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BackupConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BackupConfig.cs
index 6166fb34..45a39c7e 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BackupConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BackupConfig.cs
@@ -23,7 +23,7 @@ public record BackupConfig : BaseConfig
 public record BackupConfigInterval
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("enabled")]
     public bool Enabled { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BaseConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BaseConfig.cs
index ef079711..f78d7834 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BaseConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BaseConfig.cs
@@ -11,7 +11,7 @@ public abstract record BaseConfig
 public record RunIntervalValues
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("inRaid")]
     public int InRaid { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs
index aa784e34..4b188d57 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs
@@ -146,7 +146,7 @@ public record BotConfig : BaseConfig
 public record PresetBatch
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("assault")]
     public int Assault { get; set; }
@@ -287,7 +287,7 @@ public record PresetBatch
 public record WalletLootSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Chance wallets have loot in them
@@ -314,7 +314,7 @@ public record WalletLootSettings
 public record EquipmentFilters
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Limits for mod types per weapon .e.g. scopes
@@ -425,7 +425,7 @@ public record EquipmentFilters
 public record ModLimits
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     How many scopes are allowed on a weapon - hard coded to work with OPTIC_SCOPE, ASSAULT_SCOPE, COLLIMATOR, COMPACT_COLLIMATOR
@@ -443,7 +443,7 @@ public record ModLimits
 public record RandomisationDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Between what levels do these randomisation setting apply to
@@ -497,7 +497,7 @@ public record RandomisationDetails
 public record NighttimeChanges
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Applies changes to values stored in equipmentMods
@@ -512,7 +512,7 @@ public record NighttimeChanges
 public record EquipmentFilterDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Between what levels do these equipment filter setting apply to
@@ -542,7 +542,7 @@ public record EquipmentFilterDetails
 public record WeightingAdjustmentDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Between what levels do these weight settings apply to
@@ -572,7 +572,7 @@ public record WeightingAdjustmentDetails
 public record AdjustmentDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("add")]
     public Dictionary<string, Dictionary<string, float>> Add { get; set; }
@@ -584,7 +584,7 @@ public record AdjustmentDetails
 public class ArmorPlateWeights
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("levelRange")]
     public MinMax<int> LevelRange { get; set; }
@@ -596,7 +596,7 @@ public class ArmorPlateWeights
 public record RandomisedResourceDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("food")]
     public RandomisedResourceValues Food { get; set; }
@@ -608,7 +608,7 @@ public record RandomisedResourceDetails
 public record RandomisedResourceValues
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Minimum percent of item to randomized between min and max resource
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotDurability.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotDurability.cs
index 401486e8..aadfa093 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotDurability.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotDurability.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Config;
 public record BotDurability
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("default")]
     public required DefaultDurability Default { get; set; }
@@ -23,7 +23,7 @@ public record BotDurability
 public record DefaultDurability
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("armor")]
     public required ArmorDurability Armor { get; set; }
@@ -35,7 +35,7 @@ public record DefaultDurability
 public record PmcDurability
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("armor")]
     public required PmcDurabilityArmor Armor { get; set; }
@@ -47,7 +47,7 @@ public record PmcDurability
 public record PmcDurabilityArmor
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("lowestMaxPercent")]
     public int LowestMaxPercent { get; set; }
@@ -68,7 +68,7 @@ public record PmcDurabilityArmor
 public record ArmorDurability
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("maxDelta")]
     public int MaxDelta { get; set; }
@@ -89,7 +89,7 @@ public record ArmorDurability
 public record WeaponDurability
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("lowestMax")]
     public int LowestMax { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BtrDeliveryConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BtrDeliveryConfig.cs
index 7f7b5ee4..53ee4dd8 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BtrDeliveryConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BtrDeliveryConfig.cs
@@ -1,4 +1,4 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace SPTarkov.Server.Core.Models.Spt.Config;
 
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/CoreConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/CoreConfig.cs
index b3bd6ad8..0118cbcc 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/CoreConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/CoreConfig.cs
@@ -66,7 +66,7 @@ public record CoreConfig : BaseConfig
 public record BsgLogging
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     verbosity of what to log, yes I know this is backwards, but its how nlog deals with ordinals. <br />
@@ -93,7 +93,7 @@ public record BsgLogging
 public record Release
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Disclaimer outlining the intended usage of bleeding edge
@@ -177,7 +177,7 @@ public record Release
 public record GameFixes
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Shotguns use a different value than normal guns causing huge pellet dispersion
@@ -207,7 +207,7 @@ public record GameFixes
 public record ServerFeatures
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("compressProfile")]
     public bool CompressProfile { get; set; }
@@ -231,7 +231,7 @@ public record ServerFeatures
 public record ChatbotFeatures
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("sptFriendGiftsEnabled")]
     public bool SptFriendGiftsEnabled { get; set; }
@@ -258,7 +258,7 @@ public record ChatbotFeatures
 public record CommandoFeatures
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("giveCommandEnabled")]
     public bool GiveCommandEnabled { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs
index 4f009fbc..8a70f92b 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs
@@ -18,7 +18,7 @@ public record GiftsConfig : BaseConfig
 public record Gift
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Items to send to player
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs
index 645c5b2d..8d007534 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs
@@ -17,7 +17,7 @@ public record HealthConfig : BaseConfig
 public record HealthMultipliers
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("death")]
     public double Death { get; set; }
@@ -29,7 +29,7 @@ public record HealthMultipliers
 public record HealthSave
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("health")]
     public bool Health { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs
index b0259919..204d3557 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs
@@ -49,7 +49,7 @@ public record HideoutConfig : BaseConfig
 public record HideoutCraftToAdd
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     The new mongoId for the craft to use
@@ -70,7 +70,7 @@ public record HideoutCraftToAdd
 public record CultistCircleSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("maxRewardItemCount")]
     public int MaxRewardItemCount { get; set; }
@@ -154,7 +154,7 @@ public record CraftTimeThreshold : MinMax<int>
 public record DirectRewardSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("reward")]
     public required List<string> Reward { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs
index a9db4848..ba59287c 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs
@@ -77,7 +77,7 @@ public record InRaidConfig : BaseConfig
 public record RaidMenuSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("aiAmount")]
     public required string AiAmount { get; set; }
@@ -107,7 +107,7 @@ public record RaidMenuSettings
 public record RaidSave
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Should loot gained from raid be saved
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs
index 403c641f..671b86b6 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs
@@ -42,7 +42,7 @@ public record InventoryConfig : BaseConfig
 public record RewardDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_type")]
     public string? Type { get; set; }
@@ -63,7 +63,7 @@ public record RewardDetails
 public record SealedAirdropContainerSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("weaponRewardWeight")]
     public required Dictionary<string, double> WeaponRewardWeight { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ItemConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ItemConfig.cs
index f218135d..57f2548c 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ItemConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ItemConfig.cs
@@ -51,7 +51,7 @@ public record ItemConfig : BaseConfig
 public record HandbookPriceOverride
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Price in roubles
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocationConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocationConfig.cs
index cfd3f175..80dbfd58 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocationConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocationConfig.cs
@@ -144,6 +144,9 @@ public record LocationConfig : BaseConfig
 
 public record TransitSettings
 {
+    [JsonExtensionData]
+    public Dictionary<string, object>? ExtensionData { get; set; }
+
     [JsonPropertyName("effectsToRemove")]
     public HashSet<string>? EffectsToRemove { get; set; }
 
@@ -157,7 +160,7 @@ public record TransitSettings
 public record ReserveRaiderSpawnChanceOverrides
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("nonTriggered")]
     public int NonTriggered { get; set; }
@@ -169,7 +172,7 @@ public record ReserveRaiderSpawnChanceOverrides
 public record EquipmentLootSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Percentage chance item will be added to equipment
@@ -181,7 +184,7 @@ public record EquipmentLootSettings
 public record RogueLighthouseSpawnTimeSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("enabled")]
     public bool Enabled { get; set; }
@@ -193,7 +196,7 @@ public record RogueLighthouseSpawnTimeSettings
 public record CustomWaves
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Bosses spawn on raid start
@@ -214,7 +217,7 @@ public record BotTypeLimit : MinMax<int>
 public record ContainerRandomisationSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("enabled")]
     public bool Enabled { get; set; }
@@ -241,7 +244,7 @@ public record ContainerRandomisationSettings
 public record ScavRaidTimeSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("settings")]
     public required ScavRaidTimeConfigSettings Settings { get; set; }
@@ -253,7 +256,7 @@ public record ScavRaidTimeSettings
 public record ScavRaidTimeConfigSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("trainArrivalDelayObservedSeconds")]
     public int TrainArrivalDelayObservedSeconds { get; set; }
@@ -262,7 +265,7 @@ public record ScavRaidTimeConfigSettings
 public record ScavRaidTimeLocationSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Should loot be reduced by same percent length of raid is reduced by
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LostOnDeathConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LostOnDeathConfig.cs
index f449482a..77a188c2 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LostOnDeathConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LostOnDeathConfig.cs
@@ -29,7 +29,7 @@ public record LostOnDeathConfig : BaseConfig
 public record LostEquipment
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("ArmBand")]
     public bool ArmBand { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs
index 7a8f16ab..6fb44903 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs
@@ -16,7 +16,7 @@ public record PlayerScavConfig : BaseConfig
 public record KarmaLevel
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("botTypeForLoot")]
     public required string BotTypeForLoot { get; set; }
@@ -40,7 +40,7 @@ public record KarmaLevel
 public record Modifiers
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("equipment")]
     public required Dictionary<string, double> Equipment { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcChatResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcChatResponse.cs
index 8e598a94..efc261ce 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcChatResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcChatResponse.cs
@@ -17,7 +17,7 @@ public record PmcChatResponse : BaseConfig
 public record ResponseSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("responseChancePercent")]
     public double ResponseChancePercent { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs
index 9fbdc545..a2d4cde5 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs
@@ -164,7 +164,7 @@ public record PmcConfig : BaseConfig
 public record HostilitySettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Bot roles that are 100% an enemy
@@ -200,7 +200,7 @@ public record HostilitySettings
 public record SlotLootSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Item Type whitelist
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/QuestConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/QuestConfig.cs
index e291b869..9f6ab18b 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/QuestConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/QuestConfig.cs
@@ -75,7 +75,7 @@ public record QuestConfig : BaseConfig
 public record RepeatableQuestTemplates
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Pmc repeatable quest template ids keyed by type of quest
@@ -95,7 +95,7 @@ public record RepeatableQuestTemplates
 public record EventQuestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Name of the event quest
@@ -132,7 +132,7 @@ public record EventQuestData
 public record RepeatableQuestConfig
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Id for type of repeatable quest
@@ -248,7 +248,7 @@ public record RepeatableQuestConfig
 public record RewardScaling
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Levels at which to increase to the next level of reward potential
@@ -308,7 +308,7 @@ public record RewardScaling
 public record TraderWhitelist
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Trader Id
@@ -350,7 +350,7 @@ public record TraderWhitelist
 public record RepeatableQuestTypesConfig
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Defines exploration repeatable task generation parameters
@@ -401,7 +401,7 @@ public record Exploration : BaseQuestConfig
 public record SpecificExits
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Chance that an operational task is generated with a specific extract
@@ -493,7 +493,7 @@ public record Pickup : BaseQuestConfig
 public record PickupTypeWithMaxCount
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("itemType")]
     public string? ItemType { get; set; }
@@ -627,7 +627,7 @@ public record EliminationConfig : BaseQuestConfig
 public record BaseQuestConfig
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Possible skills that can be rewarded expirence points
@@ -639,7 +639,7 @@ public record BaseQuestConfig
 public record BossInfo
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Is this target a boss
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs
index 6bb91415..6555238c 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs
@@ -42,7 +42,7 @@ public record RagfairConfig : BaseConfig
 public record Sell
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Should a fee be deducted from player when listing an item for sale
@@ -72,7 +72,7 @@ public record Sell
 public record Chance
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Base chance percent to sell an item
@@ -102,7 +102,7 @@ public record Chance
 public record Dynamic
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Should a purchased dynamic offers items be flagged as found in raid
@@ -243,7 +243,7 @@ public record Dynamic
 public record PriceRanges
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("default")]
     public MinMax<double> Default { get; set; }
@@ -258,7 +258,7 @@ public record PriceRanges
 public record BarterDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Percentage change an offer is listed as a barter
@@ -306,7 +306,7 @@ public record BarterDetails
 public record PackDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Percentage change an offer is listed as a pack
@@ -336,7 +336,7 @@ public record PackDetails
 public record OfferAdjustment
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Shuld offer price be adjusted when below handbook price
@@ -366,7 +366,7 @@ public record OfferAdjustment
 public record Condition
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Percentage change durability is altered
@@ -387,7 +387,7 @@ public record Condition
 public record RagfairBlacklist
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Damaged ammo packs
@@ -441,7 +441,7 @@ public record RagfairBlacklist
 public record ArmorPlateBlacklistSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Max level of plates an armor can have without being removed
@@ -459,7 +459,7 @@ public record ArmorPlateBlacklistSettings
 public record UnreasonableModPrices
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Enable a system that adjusts very high ragfair prices to be below a max multiple of items the handbook values
@@ -486,7 +486,7 @@ public record UnreasonableModPrices
 public record ArmorSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     % chance / 100 that armor plates will be removed from an offer before listing
@@ -504,7 +504,7 @@ public record ArmorSettings
 public record TieredFlea
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("enabled")]
     public bool Enabled { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs
index bfd7281e..dbc2770f 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs
@@ -42,7 +42,7 @@ public record RepairConfig : BaseConfig
 public record IntellectGainValues
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("weapon")]
     public double Weapon { get; set; }
@@ -54,7 +54,7 @@ public record IntellectGainValues
 public record MaxIntellectGainValues
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("kit")]
     public double Kit { get; set; }
@@ -66,7 +66,7 @@ public record MaxIntellectGainValues
 public record WeaponTreatmentRepairValues
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     The chance to gain more weapon maintenance skill
@@ -96,7 +96,7 @@ public record WeaponTreatmentRepairValues
 public record RepairKit
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("armor")]
     public required BonusSettings Armor { get; set; }
@@ -114,7 +114,7 @@ public record RepairKit
 public record BonusSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("rarityWeight")]
     public required Dictionary<string, double> RarityWeight { get; set; }
@@ -132,7 +132,7 @@ public record BonusSettings
 public record BonusValues
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("valuesMinMax")]
     public required MinMax<double> ValuesMinMax { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ScavCaseConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ScavCaseConfig.cs
index bdc3f733..23ddb7b9 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ScavCaseConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ScavCaseConfig.cs
@@ -36,7 +36,7 @@ public record ScavCaseConfig : BaseConfig
 public record MoneyRewards
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("moneyRewardChancePercent")]
     public int MoneyRewardChancePercent { get; set; }
@@ -57,7 +57,7 @@ public record MoneyRewards
 public record MoneyLevels
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("common")]
     public required MinMax<int> Common { get; set; }
@@ -72,7 +72,7 @@ public record MoneyLevels
 public record AmmoRewards
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("ammoRewardChancePercent")]
     public int AmmoRewardChancePercent { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/SeasonalEventConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/SeasonalEventConfig.cs
index 7219ab67..426f887c 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/SeasonalEventConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/SeasonalEventConfig.cs
@@ -77,7 +77,7 @@ public record SeasonalEventConfig : BaseConfig
 public record SeasonalEvent
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("enabled")]
     public bool Enabled { get; set; }
@@ -117,7 +117,7 @@ public record SeasonalEvent
 public record SeasonalEventSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("enableSummoning")]
     public bool? EnableSummoning { get; set; }
@@ -162,7 +162,7 @@ public record SeasonalEventSettings
 public record ZombieSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("enabled")]
     public bool? Enabled { get; set; }
@@ -180,7 +180,7 @@ public record ZombieSettings
 public record GifterSetting
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("map")]
     public string? Map { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs
index 433d771e..a9c43296 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs
@@ -37,7 +37,7 @@ public record TraderConfig : BaseConfig
 public record UpdateTime
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_name")]
     public string Name { get; set; } = string.Empty;
@@ -55,7 +55,7 @@ public record UpdateTime
 public record FenceConfig
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("discountOptions")]
     public required DiscountOptions DiscountOptions { get; set; }
@@ -160,7 +160,7 @@ public record FenceConfig
 public record ItemDurabilityCurrentMax
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("current")]
     public required MinMax<double> Current { get; set; }
@@ -187,7 +187,7 @@ public record CoopExtractReward : LootRequest
 public record DiscountOptions
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("assortSize")]
     public int AssortSize { get; set; }
@@ -211,7 +211,7 @@ public record DiscountOptions
 public record ModdedTraders
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Trader Ids to enable the clothing service for
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs
index 7ec97c9a..0e1d63b9 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs
@@ -26,7 +26,7 @@ public record WeatherConfig : BaseConfig
 public record SeasonDateTimes
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("seasonType")]
     public Season? SeasonType { get; set; }
@@ -54,7 +54,7 @@ public record SeasonDateTimes
 public record WeatherValues
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("seasonValues")]
     public Dictionary<string, SeasonalValues>? SeasonValues { get; set; }
@@ -75,7 +75,7 @@ public record WeatherValues
 public record SeasonalValues
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("clouds")]
     public WeatherSettings<double>? Clouds { get; set; }
@@ -108,7 +108,7 @@ public record SeasonalValues
 public record TempDayNight
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("day")]
     public MinMax<double>? Day { get; set; }
@@ -120,7 +120,7 @@ public record TempDayNight
 public record WeatherSettings<T>
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("values")]
     public List<T>? Values { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Dialog/SendMessageDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Dialog/SendMessageDetails.cs
index 68e33c5d..5713bc70 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Dialog/SendMessageDetails.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Dialog/SendMessageDetails.cs
@@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Dialog;
 public record SendMessageDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Player id
@@ -92,7 +92,7 @@ public record SendMessageDetails
 public record ProfileChangeEvent
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/CreateFenceAssortsResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/CreateFenceAssortsResult.cs
index 323261cd..62871cab 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/CreateFenceAssortsResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/CreateFenceAssortsResult.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Fence;
 public record CreateFenceAssortsResult
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("sptItems")]
     public List<List<Item>>? SptItems { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/FenceAssortGenerationValues.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/FenceAssortGenerationValues.cs
index 4ba19c30..c9e26446 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/FenceAssortGenerationValues.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/FenceAssortGenerationValues.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Fence;
 public record FenceAssortGenerationValues
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("normal")]
     public GenerationAssortValues? Normal { get; set; }
@@ -17,7 +17,7 @@ public record FenceAssortGenerationValues
 public record GenerationAssortValues
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("item")]
     public int? Item { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Helper/WeightedRandomResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Helper/WeightedRandomResult.cs
index 71a0e5c9..d0d26e23 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Helper/WeightedRandomResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Helper/WeightedRandomResult.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Helper;
 public record WeightedRandomResult<T>
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public required T Item { get; set; }
 
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/CircleCraftDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/CircleCraftDetails.cs
index e27d933b..c15b416b 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/CircleCraftDetails.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/CircleCraftDetails.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Hideout;
 public record CircleCraftDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("time")]
     public required long Time { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/Hideout.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/Hideout.cs
index ed3034f7..9ec39dee 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/Hideout.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/Hideout.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Hideout;
 public record Hideout
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("areas")]
     public List<HideoutArea>? Areas { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs
index 12b9a13f..236cd46a 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Hideout;
 public record ScavCaseRewardCountsAndPrices
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Common")]
     public RewardCountAndPriceDetails? Common { get; set; }
@@ -20,7 +20,7 @@ public record ScavCaseRewardCountsAndPrices
 public record RewardCountAndPriceDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("minCount")]
     public double? MinCount { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/ItemSize.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/ItemSize.cs
index 7127cd20..46b59120 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/ItemSize.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/ItemSize.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Inventory;
 public record ItemSize
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("width")]
     public required int Width { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/OwnerInventoryItems.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/OwnerInventoryItems.cs
index 50963447..672915ac 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/OwnerInventoryItems.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/OwnerInventoryItems.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Inventory;
 public record OwnerInventoryItems
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Inventory items from source
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs
index 502817c6..75cf6f56 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 public class LauncherV2CompatibleVersion : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public required string SptVersion { get; set; }
 
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs
index 754f6e14..4a051a69 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 public class LauncherV2LoginResponse : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public required bool Response { get; set; }
 }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs
index 17f7ef25..17e6ac85 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 public class LauncherV2ModsResponse : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public required Dictionary<string, AbstractModMetadata> Response { get; set; }
 }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs
index 85661de0..69f7d40f 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 public class LauncherV2PasswordChangeResponse : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public required bool Response { get; set; }
 
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PingResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PingResponse.cs
index b9b218c4..0d96d8e3 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PingResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PingResponse.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 public class LauncherV2PingResponse : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public required string Response { get; set; }
 }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs
index da90f2f1..b8e27290 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 public class LauncherV2ProfileResponse : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public SptProfile Response { get; set; }
 }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs
index e1701387..8c1864bd 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 public class LauncherV2ProfilesResponse : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public required List<MiniProfile> Response { get; set; }
 }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs
index 7238211a..cfa8107b 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 public class LauncherV2RegisterResponse : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public required bool Response { get; set; }
 
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs
index 3229da3f..1a58bdbe 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 public class LauncherV2RemoveResponse : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public required bool Response { get; set; }
 
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs
index ec819bd5..c7fbfb34 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 public class LauncherV2TypesResponse : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public required Dictionary<string, string> Response { get; set; }
 }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs
index 7e0124d2..2b9ec033 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 public record LauncherV2VersionResponse : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public required LauncherV2CompatibleVersion Response { get; set; }
 }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Location/RaidChanges.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Location/RaidChanges.cs
index bcb4547d..63e45614 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Location/RaidChanges.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Location/RaidChanges.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Location;
 public record RaidChanges
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     What percentage of dynamic loot should the map contain
@@ -53,7 +53,7 @@ public record RaidChanges
 public record ExtractChange
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Name")]
     public string? Name { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/ClientLogRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/ClientLogRequest.cs
index 34d4f932..ec3f9cb2 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/ClientLogRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/ClientLogRequest.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Logging;
 public record ClientLogRequest : IRequestData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Source")]
     public string? Source { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/SptLogger.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/SptLogger.cs
index 2d60d11a..9ef2418e 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/SptLogger.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/SptLogger.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Logging;
 public record SptLogger
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public object Error { get; set; } // error: (msg: string | Record<string, unknown>) => void;
 
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/ModOrder.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/ModOrder.cs
index 2785523d..d2ce8f08 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/ModOrder.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/ModOrder.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Mod;
 public class ModOrder
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("order")]
     public List<string> Order { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/NewItemDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/NewItemDetails.cs
index ff2c8130..3cf4b235 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/NewItemDetails.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/NewItemDetails.cs
@@ -40,7 +40,7 @@ public record NewItemFromCloneDetails : NewItemDetailsBase
 public record NewItemDetailsBase
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("fleaPriceRoubles")]
     public double? FleaPriceRoubles { get; set; }
@@ -58,7 +58,7 @@ public record NewItemDetailsBase
 public record LocaleDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("name")]
     public string? Name { get; set; }
@@ -73,7 +73,7 @@ public record LocaleDetails
 public record CreateItemResult
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public CreateItemResult()
     {
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/SptMod.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/SptMod.cs
index 59bd7ede..da599405 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/SptMod.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/SptMod.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Mod;
 public class SptMod
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("directory")]
     public string Directory { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs
index a7781b45..2df84e35 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Presets;
 public record PresetCacheDetails
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     // Preset Ids related to the tpl
     public HashSet<string> PresetIds { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Quests/GetRepeatableByIdResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Quests/GetRepeatableByIdResult.cs
index 6ee47bb1..652536c3 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Quests/GetRepeatableByIdResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Quests/GetRepeatableByIdResult.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Quests;
 public record GetRepeatableByIdResult
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("quest")]
     public RepeatableQuest? Quest { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/RagfairServerPrices.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/RagfairServerPrices.cs
index aa7292a7..de5f32f8 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/RagfairServerPrices.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/RagfairServerPrices.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Ragfair;
 public record RagfairServerPrices
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("staticPrices")]
     public Dictionary<string, double>? StaticPrices { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/TplWithFleaPrice.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/TplWithFleaPrice.cs
index 3b9302c2..45e1e7cf 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/TplWithFleaPrice.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/TplWithFleaPrice.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Ragfair;
 public record TplWithFleaPrice
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("tpl")]
     public string? Tpl { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestRewardValues.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestRewardValues.cs
index 83b7a489..682849e4 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestRewardValues.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestRewardValues.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Repeatable;
 public record QuestRewardValues
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("skillPointReward")]
     public required double SkillPointReward { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestTypePool.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestTypePool.cs
index 3300e357..29f13f46 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestTypePool.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestTypePool.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Repeatable;
 public record QuestTypePool
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("types")]
     public required List<string> Types { get; set; }
@@ -18,7 +18,7 @@ public record QuestTypePool
 public record QuestPool
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Exploration")]
     public required ExplorationPool Exploration { get; set; }
@@ -33,7 +33,7 @@ public record QuestPool
 public record ExplorationPool
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("locations")]
     public Dictionary<ELocationName, List<string>>? Locations { get; set; } // TODO: check the type, originally - Partial<Record<ELocationName, string[]>>
@@ -42,7 +42,7 @@ public record ExplorationPool
 public record EliminationPool
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("targets")]
     public Dictionary<string, TargetLocation>? Targets { get; set; }
@@ -51,7 +51,7 @@ public record EliminationPool
 public record TargetLocation
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("locations")]
     public List<string>? Locations { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/DatabaseTables.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/DatabaseTables.cs
index 9a33cb4e..a59cb49f 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/DatabaseTables.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/DatabaseTables.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Server;
 public record DatabaseTables
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public Bots.Bots? Bots { get; set; }
 
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/LocaleBase.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/LocaleBase.cs
index 680dace4..c407f26c 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/LocaleBase.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/LocaleBase.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Server;
 public record LocaleBase
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("global")]
     /// DO NOT USE THIS PROPERTY DIRECTLY, USE LOCALESERVICE INSTEAD
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/Locations.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/Locations.cs
index 399ad687..9b050af8 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/Locations.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/Locations.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Server;
 public record Locations
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     // sometimes we get the key or value given so save changing logic in each place
     // have it key both
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/ServerBase.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/ServerBase.cs
index d87e623b..38db5554 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/ServerBase.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/ServerBase.cs
@@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Server;
 public record ServerBase
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("ip")]
     public required string Ip { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/SettingsBase.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/SettingsBase.cs
index 7019cdbd..02ace495 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/SettingsBase.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/SettingsBase.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Server;
 public record SettingsBase
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("config")]
     public Config? Configuration { get; set; }
@@ -15,7 +15,7 @@ public record SettingsBase
 public record Config
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("AFKTimeoutSeconds")]
     public int? AFKTimeoutSeconds { get; set; }
@@ -105,7 +105,7 @@ public record Config
 public record AudioSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("AudioGroupPresets")]
     public List<AudioGroupPreset>? AudioGroupPresets { get; set; }
@@ -129,7 +129,7 @@ public record AudioSettings
 public record FramerateLimit
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("MaxFramerateGameLimit")]
     public int? MaxFramerateGameLimit { get; set; }
@@ -144,7 +144,7 @@ public record FramerateLimit
 public record MemoryManagementSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("AggressiveGC")]
     public bool? AggressiveGC { get; set; }
@@ -168,7 +168,7 @@ public record MemoryManagementSettings
 public record ReleaseProfiler
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("Enabled")]
     public bool? Enabled { get; set; }
@@ -183,7 +183,7 @@ public record ReleaseProfiler
 public record NetworkStateView
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("LossThreshold")]
     public int? LossThreshold { get; set; }
@@ -195,7 +195,7 @@ public record NetworkStateView
 public record AudioGroupPreset
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("AngleToAllowBinaural")]
     public double? AngleToAllowBinaural { get; set; }
@@ -231,7 +231,7 @@ public record AudioGroupPreset
 public record EnvironmentSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("AutumnLateSettings")]
     public SeasonEnvironmentSettings AutumnLateSettings { get; set; }
@@ -261,7 +261,7 @@ public record EnvironmentSettings
 public record SeasonEnvironmentSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("RainSettings")]
     public List<RainSetting> RainSettings { get; set; }
@@ -276,7 +276,7 @@ public record SeasonEnvironmentSettings
 public record SurfaceMultiplier
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public string SurfaceType { get; set; }
 
@@ -286,7 +286,7 @@ public record SurfaceMultiplier
 public record WindMultiplier
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("VolumeMult")]
     public double VolumeMult { get; set; }
@@ -298,7 +298,7 @@ public record WindMultiplier
 public record RainSetting
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("IndoorVolumeMult")]
     public int IndoorVolumeMult { get; set; }
@@ -313,7 +313,7 @@ public record RainSetting
 public record HeadphoneSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public double FadeDuration { get; set; }
 
@@ -325,7 +325,7 @@ public record HeadphoneSettings
 public record MetaXRAudioPluginSettings
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public bool? EnabledPluginErrorChecker { get; set; }
 
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs
index 9481f82e..0c7a0501 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Services;
 public record InsuranceEquipmentPkg
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("sessionID")]
     public string? SessionId { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootItem.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootItem.cs
index 85934679..ed26b72d 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootItem.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootItem.cs
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Services;
 public record LootItem
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("id")]
     public string? Id { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootRequest.cs
index f15dc3ea..07d14f08 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootRequest.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Services;
 public record LootRequest
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     /// <summary>
     ///     Count of weapons to generate
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/TraderServiceModel.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/TraderServiceModel.cs
index db2860a5..5e0f1587 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/TraderServiceModel.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/TraderServiceModel.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Services;
 public record TraderServiceModel
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("serviceType")]
     [JsonConverter(typeof(JsonStringEnumConverter))]
@@ -28,7 +28,7 @@ public record TraderServiceModel
 public record TraderServiceRequirementsModel
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("completedQuests")]
     public List<string>? CompletedQuests { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs
index 7cd042d2..9d85e516 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs
@@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Templates;
 public record Templates
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("character")]
     public List<string>? Character { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs
index 98017d6f..d32c3444 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs
@@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Weather;
 public record GetLocalWeatherResponseData
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("season")]
     public Season? Season { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Trader/Traders.cs b/Libraries/SPTarkov.Server.Core/Models/Trader/Traders.cs
index f1e15039..be64728a 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Trader/Traders.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Trader/Traders.cs
@@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models;
 public record Prapor() : ITrader
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public string Name { get; } = "Prapor";
     public string Id { get; } = Traders.PRAPOR;
@@ -18,7 +18,7 @@ public record Prapor() : ITrader
 public record Therapist() : ITrader
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public string Name { get; } = "Therapist";
     public string Id { get; } = Traders.THERAPIST;
@@ -28,7 +28,7 @@ public record Therapist() : ITrader
 public record Fence() : ITrader
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public string Name { get; } = "Fence";
     public string Id { get; } = Traders.FENCE;
@@ -38,7 +38,7 @@ public record Fence() : ITrader
 public record Skier() : ITrader
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public string Name { get; } = "Skier";
     public string Id { get; } = Traders.SKIER;
@@ -48,7 +48,7 @@ public record Skier() : ITrader
 public record Peacekeeper() : ITrader
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public string Name { get; } = "Peacekeeper";
     public string Id { get; } = Traders.PEACEKEEPER;
@@ -58,7 +58,7 @@ public record Peacekeeper() : ITrader
 public record Mechanic() : ITrader
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public string Name { get; } = "Mechanic";
     public string Id { get; } = Traders.MECHANIC;
@@ -68,7 +68,7 @@ public record Mechanic() : ITrader
 public record Ragman() : ITrader
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public string Name { get; } = "Ragman";
     public string Id { get; } = Traders.RAGMAN;
@@ -78,7 +78,7 @@ public record Ragman() : ITrader
 public record Jaeger() : ITrader
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public string Name { get; } = "Jaeger";
     public string Id { get; } = Traders.JAEGER;
@@ -88,7 +88,7 @@ public record Jaeger() : ITrader
 public record LighthouseKeeper() : ITrader
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public string Name { get; } = "LighthouseKeeper";
     public string Id { get; } = Traders.LIGHTHOUSEKEEPER;
@@ -98,7 +98,7 @@ public record LighthouseKeeper() : ITrader
 public record Btr() : ITrader
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public string Name { get; } = "Btr";
     public string Id { get; } = Traders.BTR;
@@ -108,7 +108,7 @@ public record Btr() : ITrader
 public record Ref() : ITrader
 {
     [JsonExtensionData]
-    public Dictionary<string, object> ExtensionData { get; set; }
+    public Dictionary<string, object>? ExtensionData { get; set; }
 
     public string Name { get; } = "Ref";
     public string Id { get; } = Traders.REF;