diff --git a/Libraries/SPTarkov.Server.Core/Generators/RagfairOfferGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/RagfairOfferGenerator.cs
index 6778458c..cece78b4 100644
--- a/Libraries/SPTarkov.Server.Core/Generators/RagfairOfferGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/RagfairOfferGenerator.cs
@@ -647,14 +647,14 @@ public class RagfairOfferGenerator(
     /// <summary>
     ///     Generate trader offers on flea using the traders assort data
     /// </summary>
-    /// <param name="traderID"> Trader to generate offers for </param>
-    public void GenerateFleaOffersForTrader(string traderID)
+    /// <param name="traderId"> Trader to generate offers for </param>
+    public void GenerateFleaOffersForTrader(MongoId traderId)
     {
         // Purge
-        ragfairOfferService.RemoveAllOffersByTrader(traderID);
+        ragfairOfferService.RemoveAllOffersByTrader(traderId);
 
         var time = timeUtil.GetTimeStamp();
-        var trader = databaseService.GetTrader(traderID);
+        var trader = databaseService.GetTrader(traderId);
         var assortsClone = cloner.Clone(trader.Assort);
 
         // Trader assorts / assort items are missing
@@ -729,7 +729,7 @@ public class RagfairOfferGenerator(
             var loyalLevel = assortsClone.LoyalLevelItems[item.Id];
 
             CreateAndAddFleaOffer(
-                traderID,
+                traderId,
                 time,
                 items,
                 barterSchemeItems,
diff --git a/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGeneration/RepeatableQuestRewardGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGeneration/RepeatableQuestRewardGenerator.cs
index 4ddccb51..4da82d57 100644
--- a/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGeneration/RepeatableQuestRewardGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGeneration/RepeatableQuestRewardGenerator.cs
@@ -123,7 +123,7 @@ public class RepeatableQuestRewardGenerator(
 
         if (traderWhitelistDetails is null)
         {
-            logger.Error($"Cound not find trader id: {traderId} in whitelist");
+            logger.Error($"Unable to find trader id: {traderId.ToString()} in whitelist");
             return null;
         }
 
@@ -164,7 +164,7 @@ public class RepeatableQuestRewardGenerator(
         if (logger.IsLogEnabled(LogLevel.Debug))
         {
             logger.Debug(
-                $"Generating: {repeatableConfig.Name} quest for: {traderId} with budget: {itemRewardBudget} totalling: {rewardParams.RewardNumItems} items"
+                $"Generating: {repeatableConfig.Name} quest for: {traderId.ToString()} with budget: {itemRewardBudget} totalling: {rewardParams.RewardNumItems} items"
             );
         }
 
@@ -207,7 +207,7 @@ public class RepeatableQuestRewardGenerator(
             if (logger.IsLogEnabled(LogLevel.Debug))
             {
                 logger.Debug(
-                    $"Adding: {rewardParams.RewardReputation} {traderId} trader reputation reward"
+                    $"Adding: {rewardParams.RewardReputation} {traderId.ToString()} trader reputation reward"
                 );
             }
         }
@@ -542,7 +542,7 @@ public class RepeatableQuestRewardGenerator(
     protected List<TemplateItem> ChooseRewardItemsWithinBudget(
         RepeatableQuestConfig repeatableConfig,
         double? roublesBudget,
-        string traderId
+        MongoId traderId
     )
     {
         // First filter for type and baseclass to avoid lookup in handbook for non-available items
@@ -770,7 +770,7 @@ public class RepeatableQuestRewardGenerator(
     /// <returns> List of rewardable items [[_tpl, itemTemplate],...] </returns>
     public List<TemplateItem> GetRewardableItems(
         RepeatableQuestConfig repeatableQuestConfig,
-        string traderId
+        MongoId traderId
     )
     {
         // Get an array of seasonal items that should not be shown right now as seasonal event is not active
diff --git a/Libraries/SPTarkov.Server.Core/Helpers/TradeHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/TradeHelper.cs
index 9291c4fb..0cf76f56 100644
--- a/Libraries/SPTarkov.Server.Core/Helpers/TradeHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/TradeHelper.cs
@@ -410,7 +410,7 @@ public record PurchaseDetails
 {
     public List<PurchaseItems> Items { get; set; }
 
-    public string TraderId { get; set; }
+    public MongoId TraderId { get; set; }
 }
 
 public record PurchaseItems
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 940a3ebb..0f7c32f1 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs
@@ -25,7 +25,7 @@ public record Reward
     public int? Index { get; set; }
 
     [JsonPropertyName("target")]
-    public string? Target { get; set; }
+    public string? Target { get; set; } // Can be more than just mongoId
 
     [JsonPropertyName("items")]
     public List<Item>? Items { get; set; }