diff --git a/source/LootDumpProcessor/Process/Processor/DumpProcessor/MultithreadSteppedDumpProcessor.cs b/source/LootDumpProcessor/Process/Processor/DumpProcessor/MultithreadSteppedDumpProcessor.cs
index 18b9e36..f8b8d94 100644
--- a/source/LootDumpProcessor/Process/Processor/DumpProcessor/MultithreadSteppedDumpProcessor.cs
+++ b/source/LootDumpProcessor/Process/Processor/DumpProcessor/MultithreadSteppedDumpProcessor.cs
@@ -191,9 +191,9 @@ public class MultithreadSteppedDumpProcessor(
         output.Add(OutputFileType.StaticContainer, staticContainers);
         if (LoggerFactory.GetInstance().CanBeLogged(LogLevel.Info))
             LoggerFactory.GetInstance().Log("Processing ammo distribution", LogLevel.Info);
-        
+
         var staticAmmo = new ConcurrentDictionary<string, IReadOnlyDictionary<string, List<AmmoDistribution>>>();
-        Parallel.ForEach(dumpProcessData.ContainerCounts.Keys, (mapId) =>
+        Parallel.ForEach(dumpProcessData.ContainerCounts.Keys, mapId =>
         {
             var preProcessedStaticLoots = dumpProcessData.ContainerCounts[mapId];
             var ammoDistribution = _ammoProcessor.CreateAmmoDistribution(mapId, preProcessedStaticLoots);
@@ -207,10 +207,19 @@ public class MultithreadSteppedDumpProcessor(
 
         if (LoggerFactory.GetInstance().CanBeLogged(LogLevel.Info))
             LoggerFactory.GetInstance().Log("Processing static loot distribution", LogLevel.Info);
+
+        var staticLoot = new ConcurrentDictionary<string, IReadOnlyDictionary<string, StaticItemDistribution>>();
+        Parallel.ForEach(dumpProcessData.ContainerCounts.Keys, mapId =>
+        {
+            var preProcessedStaticLoots = dumpProcessData.ContainerCounts[mapId];
+            var staticLootDistribution =
+                _staticLootProcessor.CreateStaticLootDistribution(mapId, preProcessedStaticLoots);
+            staticLoot[mapId] = staticLootDistribution;
+        });
         // Static loot distribution
         output.Add(
             OutputFileType.StaticLoot,
-            _staticLootProcessor.CreateStaticLootDistribution(dumpProcessData.ContainerCounts, staticContainers)
+            staticLoot
         );
 
         if (LoggerFactory.GetInstance().CanBeLogged(LogLevel.Info))
diff --git a/source/LootDumpProcessor/Process/Processor/v2/StaticLootProcessor/IStaticLootProcessor.cs b/source/LootDumpProcessor/Process/Processor/v2/StaticLootProcessor/IStaticLootProcessor.cs
index 6a810d7..e58579b 100644
--- a/source/LootDumpProcessor/Process/Processor/v2/StaticLootProcessor/IStaticLootProcessor.cs
+++ b/source/LootDumpProcessor/Process/Processor/v2/StaticLootProcessor/IStaticLootProcessor.cs
@@ -1,6 +1,5 @@
 using LootDumpProcessor.Model;
 using LootDumpProcessor.Model.Output;
-using LootDumpProcessor.Model.Output.StaticContainer;
 using LootDumpProcessor.Model.Processing;
 
 namespace LootDumpProcessor.Process.Processor.v2.StaticLootProcessor;
@@ -9,7 +8,7 @@ public interface IStaticLootProcessor
 {
     IReadOnlyList<PreProcessedStaticLoot> PreProcessStaticLoot(IReadOnlyList<Template> staticLoot);
 
-    IReadOnlyDictionary<string, IReadOnlyDictionary<string, StaticItemDistribution>> CreateStaticLootDistribution(
-        IReadOnlyDictionary<string, List<PreProcessedStaticLoot>> containerCounts,
-        IReadOnlyDictionary<string, MapStaticLoot> staticContainers);
+    IReadOnlyDictionary<string, StaticItemDistribution> CreateStaticLootDistribution(
+        string mapName,
+        IReadOnlyList<PreProcessedStaticLoot> containers);
 }
\ No newline at end of file
diff --git a/source/LootDumpProcessor/Process/Processor/v2/StaticLootProcessor/StaticLootProcessor.cs b/source/LootDumpProcessor/Process/Processor/v2/StaticLootProcessor/StaticLootProcessor.cs
index 0da6f17..233fe16 100644
--- a/source/LootDumpProcessor/Process/Processor/v2/StaticLootProcessor/StaticLootProcessor.cs
+++ b/source/LootDumpProcessor/Process/Processor/v2/StaticLootProcessor/StaticLootProcessor.cs
@@ -1,6 +1,5 @@
 using LootDumpProcessor.Model;
 using LootDumpProcessor.Model.Output;
-using LootDumpProcessor.Model.Output.StaticContainer;
 using LootDumpProcessor.Model.Processing;
 using Microsoft.Extensions.Logging;
 
@@ -43,48 +42,39 @@ public class StaticLootProcessor(ILogger<StaticLootProcessor> logger) : IStaticL
         return nonWeaponContainers;
     }
 
-    public IReadOnlyDictionary<string, IReadOnlyDictionary<string, StaticItemDistribution>>
-        CreateStaticLootDistribution(
-            IReadOnlyDictionary<string, List<PreProcessedStaticLoot>> containerCounts,
-            IReadOnlyDictionary<string, MapStaticLoot> staticContainers)
+    public IReadOnlyDictionary<string, StaticItemDistribution> CreateStaticLootDistribution(
+        string mapName,
+        IReadOnlyList<PreProcessedStaticLoot> containers)
     {
-        var allMapsStaticLootDistribution =
-            new Dictionary<string, IReadOnlyDictionary<string, StaticItemDistribution>>();
+        var staticLootDistribution = new Dictionary<string, StaticItemDistribution>();
+        var uniqueContainerTypes = containers.Select(container => container.Type).Distinct();
 
-        foreach (var (mapName, containers) in containerCounts)
+        foreach (var containerType in uniqueContainerTypes)
         {
-            var staticLootDistribution = new Dictionary<string, StaticItemDistribution>();
-            var uniqueContainerTypes = containers.Select(container => container.Type).Distinct();
+            var selectedContainers = containers.Where(container => container.Type == containerType).ToArray();
+            var itemCounts = GetItemCountsInContainers(selectedContainers);
+            var itemDistribution = GenerateItemDistribution(selectedContainers);
 
-            foreach (var containerType in uniqueContainerTypes)
+            staticLootDistribution[containerType] = new StaticItemDistribution
             {
-                var selectedContainers = containers.Where(container => container.Type == containerType).ToArray();
-                var itemCounts = GetItemCountsInContainers(selectedContainers);
-                var itemDistribution = GenerateItemDistribution(selectedContainers);
+                ItemCountDistribution = itemCounts
+                    .GroupBy(count => count)
+                    .Select(group => new ItemCountDistribution
+                    {
+                        Count = group.Key,
+                        RelativeProbability = group.Count()
+                    })
+                    .ToList(),
+                ItemDistribution = itemDistribution
+            };
 
-                staticLootDistribution[containerType] = new StaticItemDistribution
-                {
-                    ItemCountDistribution = itemCounts
-                        .GroupBy(count => count)
-                        .Select(group => new ItemCountDistribution
-                        {
-                            Count = group.Key,
-                            RelativeProbability = group.Count()
-                        })
-                        .ToList(),
-                    ItemDistribution = itemDistribution
-                };
-
-                _logger.LogDebug(
-                    "Processed static loot distribution for ContainerType {ContainerType} in Map {MapName}.",
-                    containerType, mapName);
-            }
-
-            allMapsStaticLootDistribution[mapName] = staticLootDistribution;
-            _logger.LogInformation("Created static loot distribution for Map {MapName}.", mapName);
+            _logger.LogDebug(
+                "Processed static loot distribution for ContainerType `{ContainerType}` in Map `{MapName}`.",
+                containerType, mapName);
         }
 
-        return allMapsStaticLootDistribution;
+        _logger.LogInformation("Created static loot distribution for Map `{MapName}`.", mapName);
+        return staticLootDistribution;
     }
 
     private static IReadOnlyList<int> GetItemCountsInContainers(IReadOnlyList<PreProcessedStaticLoot> selectedContainers)
@@ -112,6 +102,6 @@ public class StaticLootProcessor(ILogger<StaticLootProcessor> logger) : IStaticL
         {
             Tpl = kv.Key,
             RelativeProbability = kv.Value
-        }).ToArray();
+        }).ToList();
     }
 }
\ No newline at end of file