diff --git a/Libraries/Core/Models/Eft/Common/LocationBase.cs b/Libraries/Core/Models/Eft/Common/LocationBase.cs
index c69f0d05..a512be90 100644
--- a/Libraries/Core/Models/Eft/Common/LocationBase.cs
+++ b/Libraries/Core/Models/Eft/Common/LocationBase.cs
@@ -274,7 +274,7 @@ public record LocationBase
     public LocationEvents? Events { get; set; }
 
     [JsonPropertyName("exit_access_time")]
-    public int? ExitAccessTime { get; set; }
+    public double? ExitAccessTime { get; set; }
 
     [JsonPropertyName("ForceOnlineRaidInPVE")]
     public bool? ForceOnlineRaidInPVE { get; set; }
@@ -286,7 +286,7 @@ public record LocationBase
     public int? ExitCount { get; set; }
 
     [JsonPropertyName("exit_time")]
-    public int? ExitTime { get; set; }
+    public double? ExitTime { get; set; }
 
     [JsonPropertyName("exits")]
     public List<Exit>? Exits { get; set; }
@@ -361,7 +361,7 @@ public record Transit
     public string? Target { get; set; }
 
     [JsonPropertyName("time")]
-    public int? Time { get; set; }
+    public long? Time { get; set; }
 }
 
 public record NonWaveGroupScenario
@@ -628,7 +628,7 @@ public record MinPlayerWaitTime
     public int? MinPlayers { get; set; }
 
     [JsonPropertyName("time")]
-    public int? Time { get; set; }
+    public long? Time { get; set; }
 }
 
 public record Preview
diff --git a/Libraries/Core/Models/Eft/Common/Tables/Quest.cs b/Libraries/Core/Models/Eft/Common/Tables/Quest.cs
index 36f1cc88..fe9623da 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/Quest.cs
+++ b/Libraries/Core/Models/Eft/Common/Tables/Quest.cs
@@ -257,7 +257,7 @@ public record QuestCondition
     public QuestConditionCounter? Counter { get; set; }
 
     [JsonPropertyName("plantTime")]
-    public int? PlantTime { get; set; }
+    public double? PlantTime { get; set; }
 
     [JsonPropertyName("zoneId")]
     public string? ZoneId { get; set; }
@@ -266,7 +266,7 @@ public record QuestCondition
     public bool? CountInRaid { get; set; }
 
     [JsonPropertyName("completeInSeconds")]
-    public int? CompleteInSeconds { get; set; }
+    public double? CompleteInSeconds { get; set; }
 
     [JsonPropertyName("isEncoded")]
     public bool? IsEncoded { get; set; }
diff --git a/Libraries/Core/Models/Eft/Health/OffraidEatRequestData.cs b/Libraries/Core/Models/Eft/Health/OffraidEatRequestData.cs
index 75ac3647..f3cc4046 100644
--- a/Libraries/Core/Models/Eft/Health/OffraidEatRequestData.cs
+++ b/Libraries/Core/Models/Eft/Health/OffraidEatRequestData.cs
@@ -12,5 +12,5 @@ public record OffraidEatRequestData : BaseInteractionRequestData
     public int? Count { get; set; }
 
     [JsonPropertyName("time")]
-    public int? Time { get; set; }
+    public long? Time { get; set; }
 }
diff --git a/Libraries/Core/Models/Eft/Health/OffraidHealRequestData.cs b/Libraries/Core/Models/Eft/Health/OffraidHealRequestData.cs
index 5d26fe2a..5ce1a832 100644
--- a/Libraries/Core/Models/Eft/Health/OffraidHealRequestData.cs
+++ b/Libraries/Core/Models/Eft/Health/OffraidHealRequestData.cs
@@ -7,7 +7,7 @@ public record OffraidHealRequestData : BaseInteractionRequestData
     public string? Item { get; set; }
     public BodyPart? Part { get; set; }
     public int? Count { get; set; }
-    public int? Time { get; set; }
+    public long? Time { get; set; }
 }
 
 public enum BodyPart
diff --git a/Libraries/Core/Models/Eft/Hideout/QteData.cs b/Libraries/Core/Models/Eft/Hideout/QteData.cs
index 4edec65e..9d1e8739 100644
--- a/Libraries/Core/Models/Eft/Hideout/QteData.cs
+++ b/Libraries/Core/Models/Eft/Hideout/QteData.cs
@@ -99,7 +99,7 @@ public record QteEffect
     public List<SkillLevelMultiplier>? LevelMultipliers { get; set; }
 
     [JsonPropertyName("time")]
-    public int? Time { get; set; }
+    public long? Time { get; set; }
 
     [JsonPropertyName("weight")]
     public float? Weight { get; set; }
diff --git a/Libraries/Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs b/Libraries/Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs
index 3d7fb750..d6d0bfef 100644
--- a/Libraries/Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs
+++ b/Libraries/Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs
@@ -11,7 +11,7 @@ public record ItemEventRouterRequest : IRequestData
     public List<BaseInteractionRequestData>? Data { get; set; }
 
     [JsonPropertyName("tm")]
-    public int? Time { get; set; }
+    public long? Time { get; set; }
 
     [JsonPropertyName("reload")]
     public int? Reload { get; set; }
diff --git a/Libraries/Core/Models/Eft/Match/EndLocalRaidRequestData.cs b/Libraries/Core/Models/Eft/Match/EndLocalRaidRequestData.cs
index 09c9b788..f7400552 100644
--- a/Libraries/Core/Models/Eft/Match/EndLocalRaidRequestData.cs
+++ b/Libraries/Core/Models/Eft/Match/EndLocalRaidRequestData.cs
@@ -67,7 +67,7 @@ public record EndRaidResult
     /// Seconds in raid
     /// </summary>
     [JsonPropertyName("playTime")]
-    public int? PlayTime { get; set; }
+    public double? PlayTime { get; set; }
 }
 
 public record LocationTransit
diff --git a/Libraries/Core/Models/Eft/Notes/NoteActionData.cs b/Libraries/Core/Models/Eft/Notes/NoteActionData.cs
index c03729ef..86923f43 100644
--- a/Libraries/Core/Models/Eft/Notes/NoteActionData.cs
+++ b/Libraries/Core/Models/Eft/Notes/NoteActionData.cs
@@ -15,7 +15,7 @@ public record NoteActionData : BaseInteractionRequestData
 public record Note
 {
     [JsonPropertyName("Time")]
-    public int? Time { get; set; }
+    public long? Time { get; set; }
 
     [JsonPropertyName("Text")]
     public string? Text { get; set; }
diff --git a/Libraries/Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs b/Libraries/Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs
index 3a0e7a50..a53906d4 100644
--- a/Libraries/Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs
+++ b/Libraries/Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs
@@ -9,5 +9,5 @@ public record ExtendOfferRequestData : InventoryBaseActionRequestData
     public string? OfferId { get; set; }
 
     [JsonPropertyName("renewalTime")]
-    public int? RenewalTime { get; set; }
+    public long? RenewalTime { get; set; }
 }
diff --git a/Libraries/Core/Services/RagfairRequiredItemsService.cs b/Libraries/Core/Services/RagfairRequiredItemsService.cs
index 008fbf51..c5e0412b 100644
--- a/Libraries/Core/Services/RagfairRequiredItemsService.cs
+++ b/Libraries/Core/Services/RagfairRequiredItemsService.cs
@@ -33,7 +33,7 @@ public class RagfairRequiredItemsService(
                 _requiredItemsCache.TryAdd(requirement.Template, []);
 
                 // Add matching offer
-                _requiredItemsCache[requirement.Template].Add(offer);
+                _requiredItemsCache.GetValueOrDefault(requirement.Template)?.Add(offer);
             }
         }
     }