From c6e9cbeddac375e88fb106c6b8a9eb9e1e6969b0 Mon Sep 17 00:00:00 2001
From: Jan Laupetin <jan@laupetin.net>
Date: Tue, 14 Oct 2025 23:20:56 +0100
Subject: [PATCH] feat: report on unlinking progress

---
 src/ModMan/Context/FastFileContext.cpp        |  6 +--
 src/ModMan/Web/Binds/UnlinkingBinds.cpp       | 45 +++++++++++++++----
 src/ModMan/Web/Binds/UnlinkingBinds.h         |  2 +
 src/ModManUi/src/App.vue                      |  6 ++-
 src/ModManUi/src/native/UnlinkingBinds.ts     |  9 ++++
 src/ModManUi/src/native/index.ts              |  4 +-
 src/ObjWriting/Dumping/AbstractAssetDumper.h  | 39 +++++++++-------
 .../Dumping/AssetDumpingContext.cpp           | 33 ++++++++++++--
 src/ObjWriting/Dumping/AssetDumpingContext.h  | 14 +++++-
 src/ObjWriting/Dumping/IAssetDumper.h         |  3 +-
 .../Game/IW3/Image/ImageDumperIW3.cpp         | 11 ++---
 .../Game/IW3/Image/ImageDumperIW3.h           |  3 +-
 .../Game/IW3/Localize/LocalizeDumperIW3.cpp   | 13 ++++--
 .../Game/IW3/Localize/LocalizeDumperIW3.h     |  3 +-
 .../Game/IW3/Maps/MapEntsDumperIW3.cpp        | 11 ++---
 .../Game/IW3/Maps/MapEntsDumperIW3.h          |  3 +-
 src/ObjWriting/Game/IW3/ObjWriterIW3.cpp      | 15 ++++++-
 .../Game/IW3/RawFile/RawFileDumperIW3.cpp     | 11 ++---
 .../Game/IW3/RawFile/RawFileDumperIW3.h       |  3 +-
 .../Game/IW3/Sound/LoadedSoundDumperIW3.cpp   | 11 ++---
 .../Game/IW3/Sound/LoadedSoundDumperIW3.h     |  3 +-
 .../IW3/StringTable/StringTableDumperIW3.cpp  | 11 ++---
 .../IW3/StringTable/StringTableDumperIW3.h    |  3 +-
 .../Game/IW4/Image/ImageDumperIW4.cpp         | 11 ++---
 .../Game/IW4/Image/ImageDumperIW4.h           |  3 +-
 .../Leaderboard/LeaderboardJsonDumperIW4.cpp  | 11 ++---
 .../Leaderboard/LeaderboardJsonDumperIW4.h    |  3 +-
 .../Game/IW4/LightDef/LightDefDumperIW4.cpp   | 13 ++----
 .../Game/IW4/LightDef/LightDefDumperIW4.h     |  3 +-
 .../Game/IW4/Localize/LocalizeDumperIW4.cpp   | 14 ++++--
 .../Game/IW4/Localize/LocalizeDumperIW4.h     |  3 +-
 .../Game/IW4/Maps/AddonMapEntsDumperIW4.cpp   | 11 ++---
 .../Game/IW4/Maps/AddonMapEntsDumperIW4.h     |  3 +-
 .../Material/MaterialDecompilingDumperIW4.cpp |  9 +---
 .../Material/MaterialDecompilingDumperIW4.h   |  3 +-
 .../Game/IW4/Menu/MenuDumperIW4.cpp           | 17 +++----
 src/ObjWriting/Game/IW4/Menu/MenuDumperIW4.h  |  3 +-
 .../Game/IW4/Menu/MenuListDumperIW4.cpp       | 15 +++----
 .../Game/IW4/Menu/MenuListDumperIW4.h         |  9 ++--
 src/ObjWriting/Game/IW4/ObjWriterIW4.cpp      | 15 ++++++-
 .../IW4/PhysCollmap/PhysCollmapDumperIW4.cpp  | 11 ++---
 .../IW4/PhysCollmap/PhysCollmapDumperIW4.h    |  3 +-
 .../PhysPresetInfoStringDumperIW4.cpp         | 21 ++++-----
 .../PhysPresetInfoStringDumperIW4.h           |  3 +-
 .../Game/IW4/RawFile/RawFileDumperIW4.cpp     | 11 ++---
 .../Game/IW4/RawFile/RawFileDumperIW4.h       |  3 +-
 .../Game/IW4/Shader/PixelShaderDumperIW4.cpp  | 11 ++---
 .../Game/IW4/Shader/PixelShaderDumperIW4.h    |  3 +-
 .../Game/IW4/Shader/VertexShaderDumperIW4.cpp | 11 ++---
 .../Game/IW4/Shader/VertexShaderDumperIW4.h   |  3 +-
 .../Game/IW4/Sound/LoadedSoundDumperIW4.cpp   | 11 ++---
 .../Game/IW4/Sound/LoadedSoundDumperIW4.h     |  3 +-
 .../Game/IW4/Sound/SndCurveDumperIW4.cpp      | 11 +----
 .../Game/IW4/Sound/SndCurveDumperIW4.h        |  3 +-
 .../IW4/StringTable/StringTableDumperIW4.cpp  | 11 ++---
 .../IW4/StringTable/StringTableDumperIW4.h    |  3 +-
 .../StructuredDataDefDumperIW4.cpp            | 11 ++---
 .../StructuredDataDefDumperIW4.h              |  3 +-
 .../Game/IW4/Techset/TechsetDumperIW4.cpp     |  9 +---
 .../Game/IW4/Techset/TechsetDumperIW4.h       |  3 +-
 .../Game/IW4/Tracer/TracerDumperIW4.cpp       | 21 ++++-----
 .../Game/IW4/Tracer/TracerDumperIW4.h         |  3 +-
 .../Game/IW4/Vehicle/VehicleDumperIW4.cpp     | 21 ++++-----
 .../Game/IW4/Vehicle/VehicleDumperIW4.h       |  3 +-
 .../Game/IW4/Weapon/WeaponDumperIW4.cpp       | 25 +++++------
 .../Game/IW4/Weapon/WeaponDumperIW4.h         |  3 +-
 .../Game/IW5/Image/ImageDumperIW5.cpp         | 11 ++---
 .../Game/IW5/Image/ImageDumperIW5.h           |  3 +-
 .../Leaderboard/LeaderboardJsonDumperIW5.cpp  | 11 ++---
 .../Leaderboard/LeaderboardJsonDumperIW5.h    |  3 +-
 .../Game/IW5/Localize/LocalizeDumperIW5.cpp   | 13 ++++--
 .../Game/IW5/Localize/LocalizeDumperIW5.h     |  3 +-
 .../Game/IW5/Maps/AddonMapEntsDumperIW5.cpp   | 11 ++---
 .../Game/IW5/Maps/AddonMapEntsDumperIW5.h     |  3 +-
 .../Game/IW5/Menu/MenuDumperIW5.cpp           | 21 ++++-----
 src/ObjWriting/Game/IW5/Menu/MenuDumperIW5.h  |  3 +-
 .../Game/IW5/Menu/MenuListDumperIW5.cpp       | 11 ++---
 .../Game/IW5/Menu/MenuListDumperIW5.h         |  3 +-
 src/ObjWriting/Game/IW5/ObjWriterIW5.cpp      | 16 ++++++-
 .../Game/IW5/RawFile/RawFileDumperIW5.cpp     | 11 ++---
 .../Game/IW5/RawFile/RawFileDumperIW5.h       |  3 +-
 .../Game/IW5/Script/ScriptDumperIW5.cpp       | 19 +++-----
 .../Game/IW5/Script/ScriptDumperIW5.h         |  3 +-
 .../Game/IW5/Sound/LoadedSoundDumperIW5.cpp   | 11 ++---
 .../Game/IW5/Sound/LoadedSoundDumperIW5.h     |  3 +-
 .../IW5/StringTable/StringTableDumperIW5.cpp  | 11 ++---
 .../IW5/StringTable/StringTableDumperIW5.h    |  3 +-
 .../IW5/Weapon/AttachmentJsonDumperIW5.cpp    | 11 ++---
 .../Game/IW5/Weapon/AttachmentJsonDumperIW5.h |  3 +-
 .../Game/IW5/Weapon/WeaponDumperIW5.cpp       | 25 +++++------
 .../Game/IW5/Weapon/WeaponDumperIW5.h         |  3 +-
 .../Game/T5/Image/ImageDumperT5.cpp           | 11 ++---
 src/ObjWriting/Game/T5/Image/ImageDumperT5.h  |  3 +-
 .../Game/T5/Localize/LocalizeDumperT5.cpp     | 13 ++++--
 .../Game/T5/Localize/LocalizeDumperT5.h       |  3 +-
 src/ObjWriting/Game/T5/ObjWriterT5.cpp        | 15 ++++++-
 .../Game/T5/RawFile/RawFileDumperT5.cpp       | 15 +++----
 .../Game/T5/RawFile/RawFileDumperT5.h         |  3 +-
 .../T5/StringTable/StringTableDumperT5.cpp    | 11 ++---
 .../Game/T5/StringTable/StringTableDumperT5.h |  3 +-
 .../Game/T6/FontIcon/FontIconCsvDumperT6.cpp  | 11 ++---
 .../Game/T6/FontIcon/FontIconCsvDumperT6.h    |  3 +-
 .../Game/T6/FontIcon/FontIconJsonDumperT6.cpp | 11 ++---
 .../Game/T6/FontIcon/FontIconJsonDumperT6.h   |  3 +-
 .../Game/T6/Image/ImageDumperT6.cpp           | 11 ++---
 src/ObjWriting/Game/T6/Image/ImageDumperT6.h  |  3 +-
 .../Leaderboard/LeaderboardJsonDumperT6.cpp   | 11 ++---
 .../T6/Leaderboard/LeaderboardJsonDumperT6.h  |  3 +-
 .../Game/T6/Localize/LocalizeDumperT6.cpp     | 13 ++++--
 .../Game/T6/Localize/LocalizeDumperT6.h       |  3 +-
 .../Game/T6/Maps/MapEntsDumperT6.cpp          |  9 +---
 src/ObjWriting/Game/T6/Maps/MapEntsDumperT6.h |  3 +-
 src/ObjWriting/Game/T6/ObjWriterT6.cpp        | 27 +++++++++--
 .../PhysConstraintsInfoStringDumperT6.cpp     | 23 ++++------
 .../PhysConstraintsInfoStringDumperT6.h       |  3 +-
 .../PhysPresetInfoStringDumperT6.cpp          | 21 ++++-----
 .../PhysPreset/PhysPresetInfoStringDumperT6.h |  3 +-
 src/ObjWriting/Game/T6/Qdb/QdbDumperT6.cpp    | 11 ++---
 src/ObjWriting/Game/T6/Qdb/QdbDumperT6.h      |  3 +-
 .../Game/T6/RawFile/RawFileDumperT6.cpp       | 15 +++----
 .../Game/T6/RawFile/RawFileDumperT6.h         |  3 +-
 .../Game/T6/Script/ScriptDumperT6.cpp         | 11 ++---
 .../Game/T6/Script/ScriptDumperT6.h           |  3 +-
 src/ObjWriting/Game/T6/Slug/SlugDumperT6.cpp  | 11 ++---
 src/ObjWriting/Game/T6/Slug/SlugDumperT6.h    |  3 +-
 .../Game/T6/Sound/SndBankDumperT6.cpp         | 11 ++++-
 .../Game/T6/Sound/SndBankDumperT6.h           |  3 +-
 .../T6/Sound/SndDriverGlobalsDumperT6.cpp     | 13 ++++--
 .../Game/T6/Sound/SndDriverGlobalsDumperT6.h  |  3 +-
 .../T6/StringTable/StringTableDumperT6.cpp    | 11 ++---
 .../Game/T6/StringTable/StringTableDumperT6.h |  3 +-
 .../Game/T6/Techset/TechsetDumperT6.cpp       |  9 +---
 .../Game/T6/Techset/TechsetDumperT6.h         |  3 +-
 .../Game/T6/Tracer/TracerDumperT6.cpp         | 21 ++++-----
 .../Game/T6/Tracer/TracerDumperT6.h           |  3 +-
 .../Game/T6/Vehicle/VehicleDumperT6.cpp       | 21 ++++-----
 .../Game/T6/Vehicle/VehicleDumperT6.h         |  3 +-
 .../Game/T6/Weapon/AttachmentDumperT6.cpp     | 21 ++++-----
 .../Game/T6/Weapon/AttachmentDumperT6.h       |  3 +-
 .../T6/Weapon/AttachmentUniqueDumperT6.cpp    | 21 ++++-----
 .../Game/T6/Weapon/AttachmentUniqueDumperT6.h |  3 +-
 .../Game/T6/Weapon/CamoJsonDumperT6.cpp       | 11 ++---
 .../Game/T6/Weapon/CamoJsonDumperT6.h         |  3 +-
 .../Game/T6/Weapon/WeaponDumperT6.cpp         | 25 +++++------
 .../Game/T6/Weapon/WeaponDumperT6.h           |  3 +-
 .../Game/T6/ZBarrier/ZBarrierDumperT6.cpp     | 21 ++++-----
 .../Game/T6/ZBarrier/ZBarrierDumperT6.h       |  3 +-
 .../Material/MaterialJsonDumper.cpp.template  | 13 ++----
 .../Material/MaterialJsonDumper.h.template    |  5 +--
 .../XModel/XModelDumper.cpp.template          | 39 +++++++---------
 src/ObjWriting/XModel/XModelDumper.h.template |  3 +-
 src/Unlinker/Unlinker.cpp                     |  2 +-
 src/ZoneCommon/Pool/AssetPool.h               | 36 +++++++++++++++
 .../Material/MaterialJsonDumperIW3Test.cpp    |  4 +-
 .../Material/MaterialJsonDumperIW4Test.cpp    |  4 +-
 .../Material/MaterialJsonDumperIW5Test.cpp    |  4 +-
 .../T5/Material/MaterialJsonDumperT5Test.cpp  |  4 +-
 .../T6/FontIcon/FontIconJsonDumperT6Test.cpp  |  4 +-
 .../T6/Material/MaterialJsonDumperT6Test.cpp  |  4 +-
 159 files changed, 686 insertions(+), 802 deletions(-)

diff --git a/src/ModMan/Context/FastFileContext.cpp b/src/ModMan/Context/FastFileContext.cpp
index 5392cdae..2a5f8112 100644
--- a/src/ModMan/Context/FastFileContext.cpp
+++ b/src/ModMan/Context/FastFileContext.cpp
@@ -12,10 +12,10 @@ namespace
 {
     constexpr double MIN_PROGRESS_TO_REPORT = 0.005;
 
-    class EventProgressReporter : public ProgressCallback
+    class LoadingEventProgressReporter : public ProgressCallback
     {
     public:
-        explicit EventProgressReporter(std::string zoneName)
+        explicit LoadingEventProgressReporter(std::string zoneName)
             : m_zone_name(std::move(zoneName)),
               m_last_progress(0)
         {
@@ -46,7 +46,7 @@ void FastFileContext::Destroy()
 
 result::Expected<Zone*, std::string> FastFileContext::LoadFastFile(const std::string& path)
 {
-    auto zone = ZoneLoading::LoadZone(path, std::make_unique<EventProgressReporter>(fs::path(path).filename().replace_extension().string()));
+    auto zone = ZoneLoading::LoadZone(path, std::make_unique<LoadingEventProgressReporter>(fs::path(path).filename().replace_extension().string()));
     if (!zone)
         return result::Unexpected(std::move(zone.error()));
 
diff --git a/src/ModMan/Web/Binds/UnlinkingBinds.cpp b/src/ModMan/Web/Binds/UnlinkingBinds.cpp
index bc281dcf..82d9d9b2 100644
--- a/src/ModMan/Web/Binds/UnlinkingBinds.cpp
+++ b/src/ModMan/Web/Binds/UnlinkingBinds.cpp
@@ -14,22 +14,41 @@ namespace fs = std::filesystem;
 
 namespace
 {
-    class ZoneLoadedDto
+    class ZoneUnlinkProgressDto
     {
     public:
         std::string zoneName;
-        std::string filePath;
+        double percentage;
     };
 
-    NLOHMANN_DEFINE_TYPE_EXTENSION(ZoneLoadedDto, zoneName, filePath);
+    NLOHMANN_DEFINE_TYPE_EXTENSION(ZoneUnlinkProgressDto, zoneName, percentage);
 
-    class ZoneUnloadedDto
+    constexpr double MIN_PROGRESS_TO_REPORT = 0.005;
+
+    class UnlinkingEventProgressReporter : public ProgressCallback
     {
     public:
-        std::string zoneName;
-    };
+        explicit UnlinkingEventProgressReporter(std::string zoneName)
+            : m_zone_name(std::move(zoneName)),
+              m_last_progress(0)
+        {
+        }
 
-    NLOHMANN_DEFINE_TYPE_EXTENSION(ZoneUnloadedDto, zoneName);
+        void OnProgress(const size_t current, const size_t total) override
+        {
+            const double percentage = static_cast<double>(current) / static_cast<double>(total);
+
+            if (percentage - m_last_progress >= MIN_PROGRESS_TO_REPORT)
+            {
+                m_last_progress = percentage;
+                ui::NotifyZoneUnlinkProgress(m_zone_name, percentage);
+            }
+        }
+
+    private:
+        std::string m_zone_name;
+        double m_last_progress;
+    };
 
     result::Expected<NoResult, std::string> UnlinkZoneInDbThread(const std::string& zoneName)
     {
@@ -52,7 +71,8 @@ namespace
 
         OutputPathFilesystem outputFolderOutputPath(outputFolderPath);
         SearchPaths searchPaths;
-        AssetDumpingContext dumpingContext(zone, outputFolderPathStr, outputFolderOutputPath, searchPaths);
+        AssetDumpingContext dumpingContext(
+            zone, outputFolderPathStr, outputFolderOutputPath, searchPaths, std::make_unique<UnlinkingEventProgressReporter>(zoneName));
         objWriter->DumpZone(dumpingContext);
 
         return NoResult();
@@ -81,6 +101,15 @@ namespace
 
 namespace ui
 {
+    void NotifyZoneUnlinkProgress(std::string zoneName, const double percentage)
+    {
+        const ZoneUnlinkProgressDto dto{
+            .zoneName = std::move(zoneName),
+            .percentage = percentage,
+        };
+        Notify(*ModManContext::Get().m_main_webview, "zoneUnlinkProgress", dto);
+    }
+
     void RegisterUnlinkingBinds(webview::webview& wv)
     {
         BindAsync<std::string>(wv,
diff --git a/src/ModMan/Web/Binds/UnlinkingBinds.h b/src/ModMan/Web/Binds/UnlinkingBinds.h
index 4169a780..6d2ac0ed 100644
--- a/src/ModMan/Web/Binds/UnlinkingBinds.h
+++ b/src/ModMan/Web/Binds/UnlinkingBinds.h
@@ -4,5 +4,7 @@
 
 namespace ui
 {
+    void NotifyZoneUnlinkProgress(std::string zoneName, double percentage);
+
     void RegisterUnlinkingBinds(webview::webview& wv);
 } // namespace ui
diff --git a/src/ModManUi/src/App.vue b/src/ModManUi/src/App.vue
index c74edd92..4d5255fe 100644
--- a/src/ModManUi/src/App.vue
+++ b/src/ModManUi/src/App.vue
@@ -76,9 +76,13 @@ function onUnloadClicked(zoneName: string) {
 }
 
 webviewAddEventListener("zoneLoadProgress", (dto) => {
-  console.log(dto);
   lastPercentage.value = dto.percentage;
 });
+
+webviewAddEventListener("zoneUnlinkProgress", (dto) => {
+  lastPercentage.value = dto.percentage;
+  console.log("unlink", dto);
+});
 </script>
 
 <template>
diff --git a/src/ModManUi/src/native/UnlinkingBinds.ts b/src/ModManUi/src/native/UnlinkingBinds.ts
index 8fe73c71..68559d7a 100644
--- a/src/ModManUi/src/native/UnlinkingBinds.ts
+++ b/src/ModManUi/src/native/UnlinkingBinds.ts
@@ -1,3 +1,12 @@
+export interface ZoneUnlinkProgressDto {
+  zoneName: string;
+  percentage: number;
+}
+
 export interface UnlinkingBinds {
   unlinkZone(zoneName: string): Promise<void>;
 }
+
+export interface UnlinkingEventMap {
+  zoneUnlinkProgress: ZoneUnlinkProgressDto;
+}
diff --git a/src/ModManUi/src/native/index.ts b/src/ModManUi/src/native/index.ts
index dc455af9..09a0683e 100644
--- a/src/ModManUi/src/native/index.ts
+++ b/src/ModManUi/src/native/index.ts
@@ -1,10 +1,10 @@
 import type { DialogBinds } from "./DialogBinds";
-import type { UnlinkingBinds } from "./UnlinkingBinds";
+import type { UnlinkingBinds, UnlinkingEventMap } from "./UnlinkingBinds";
 import type { ZoneBinds, ZoneEventMap } from "./ZoneBinds";
 
 export type NativeMethods = DialogBinds & UnlinkingBinds & ZoneBinds;
 
-type NativeEventMap = ZoneEventMap;
+type NativeEventMap = UnlinkingEventMap & ZoneEventMap;
 
 type WebViewExtensions = {
   webviewBinds: NativeMethods;
diff --git a/src/ObjWriting/Dumping/AbstractAssetDumper.h b/src/ObjWriting/Dumping/AbstractAssetDumper.h
index 53fa97dc..f1b6aa27 100644
--- a/src/ObjWriting/Dumping/AbstractAssetDumper.h
+++ b/src/ObjWriting/Dumping/AbstractAssetDumper.h
@@ -4,25 +4,32 @@
 
 template<class T> class AbstractAssetDumper : public IAssetDumper<T>
 {
+public:
+    [[nodiscard]] size_t GetProgressTotalCount(const AssetPool<T>& pool) const override
+    {
+        return pool.m_asset_lookup.size();
+    }
+
+    void DumpPool(AssetDumpingContext& context, const AssetPool<T>& pool) override
+    {
+        for (const auto* assetInfo : pool)
+        {
+            if (assetInfo->m_name[0] == ',' || !ShouldDump(*assetInfo))
+            {
+                context.IncrementProgress();
+                continue;
+            }
+
+            DumpAsset(context, *assetInfo);
+            context.IncrementProgress();
+        }
+    }
+
 protected:
-    virtual bool ShouldDump(XAssetInfo<T>* asset)
+    virtual bool ShouldDump(const XAssetInfo<T>& asset)
     {
         return true;
     }
 
-    virtual void DumpAsset(AssetDumpingContext& context, XAssetInfo<T>* asset) = 0;
-
-public:
-    void DumpPool(AssetDumpingContext& context, AssetPool<T>* pool) override
-    {
-        for (auto assetInfo : *pool)
-        {
-            if (assetInfo->m_name[0] == ',' || !ShouldDump(assetInfo))
-            {
-                continue;
-            }
-
-            DumpAsset(context, assetInfo);
-        }
-    }
+    virtual void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T>& asset) = 0;
 };
diff --git a/src/ObjWriting/Dumping/AssetDumpingContext.cpp b/src/ObjWriting/Dumping/AssetDumpingContext.cpp
index ea3041e1..77e59fe0 100644
--- a/src/ObjWriting/Dumping/AssetDumpingContext.cpp
+++ b/src/ObjWriting/Dumping/AssetDumpingContext.cpp
@@ -1,18 +1,43 @@
 #include "AssetDumpingContext.h"
 
 #include <filesystem>
-#include <format>
-#include <fstream>
 
-AssetDumpingContext::AssetDumpingContext(const Zone& zone, const std::string& basePath, IOutputPath& outputPath, ISearchPath& objSearchPath)
+AssetDumpingContext::AssetDumpingContext(const Zone& zone,
+                                         const std::string& basePath,
+                                         IOutputPath& outputPath,
+                                         ISearchPath& objSearchPath,
+                                         std::optional<std::unique_ptr<ProgressCallback>> progressCallback)
     : m_zone(zone),
       m_base_path(basePath),
       m_output_path(outputPath),
-      m_obj_search_path(objSearchPath)
+      m_obj_search_path(objSearchPath),
+      m_current_progress(0uz),
+      m_total_progress(0uz)
 {
+    if (progressCallback)
+        m_progress_callback = *std::move(progressCallback);
 }
 
 std::unique_ptr<std::ostream> AssetDumpingContext::OpenAssetFile(const std::string& fileName) const
 {
     return m_output_path.Open(fileName);
 }
+
+void AssetDumpingContext::IncrementProgress()
+{
+    if (m_progress_callback)
+    {
+        m_current_progress++;
+        m_progress_callback->OnProgress(m_current_progress, m_total_progress);
+    }
+}
+
+void AssetDumpingContext::SetTotalProgress(const size_t value)
+{
+    m_total_progress = value;
+}
+
+bool AssetDumpingContext::ShouldTrackProgress() const
+{
+    return static_cast<bool>(m_progress_callback);
+}
diff --git a/src/ObjWriting/Dumping/AssetDumpingContext.h b/src/ObjWriting/Dumping/AssetDumpingContext.h
index bfc384de..4d6c86b3 100644
--- a/src/ObjWriting/Dumping/AssetDumpingContext.h
+++ b/src/ObjWriting/Dumping/AssetDumpingContext.h
@@ -4,6 +4,7 @@
 #include "Obj/Gdt/GdtStream.h"
 #include "SearchPath/IOutputPath.h"
 #include "SearchPath/ISearchPath.h"
+#include "Utils/ProgressCallback.h"
 #include "Zone/Zone.h"
 
 #include <memory>
@@ -14,10 +15,18 @@
 class AssetDumpingContext
 {
 public:
-    AssetDumpingContext(const Zone& zone, const std::string& basePath, IOutputPath& outputPath, ISearchPath& objSearchPath);
+    AssetDumpingContext(const Zone& zone,
+                        const std::string& basePath,
+                        IOutputPath& outputPath,
+                        ISearchPath& objSearchPath,
+                        std::optional<std::unique_ptr<ProgressCallback>> progressCallback);
 
     [[nodiscard]] std::unique_ptr<std::ostream> OpenAssetFile(const std::string& fileName) const;
 
+    void IncrementProgress();
+    void SetTotalProgress(size_t value);
+    [[nodiscard]] bool ShouldTrackProgress() const;
+
     template<typename T> T* GetZoneAssetDumperState()
     {
         static_assert(std::is_base_of_v<IZoneAssetDumperState, T>, "T must inherit IZoneAssetDumperState");
@@ -42,4 +51,7 @@ public:
 
 private:
     std::unordered_map<std::type_index, std::unique_ptr<IZoneAssetDumperState>> m_zone_asset_dumper_states;
+    std::unique_ptr<ProgressCallback> m_progress_callback;
+    size_t m_current_progress;
+    size_t m_total_progress;
 };
diff --git a/src/ObjWriting/Dumping/IAssetDumper.h b/src/ObjWriting/Dumping/IAssetDumper.h
index f712f1dd..44827fd9 100644
--- a/src/ObjWriting/Dumping/IAssetDumper.h
+++ b/src/ObjWriting/Dumping/IAssetDumper.h
@@ -13,5 +13,6 @@ public:
     IAssetDumper& operator=(const IAssetDumper& other) = default;
     IAssetDumper& operator=(IAssetDumper&& other) noexcept = default;
 
-    virtual void DumpPool(AssetDumpingContext& context, AssetPool<T>* pool) = 0;
+    [[nodiscard]] virtual size_t GetProgressTotalCount(const AssetPool<T>& pool) const = 0;
+    virtual void DumpPool(AssetDumpingContext& context, const AssetPool<T>& pool) = 0;
 };
diff --git a/src/ObjWriting/Game/IW3/Image/ImageDumperIW3.cpp b/src/ObjWriting/Game/IW3/Image/ImageDumperIW3.cpp
index fbc44a99..9ba662c1 100644
--- a/src/ObjWriting/Game/IW3/Image/ImageDumperIW3.cpp
+++ b/src/ObjWriting/Game/IW3/Image/ImageDumperIW3.cpp
@@ -79,19 +79,14 @@ namespace image
         }
     }
 
-    bool DumperIW3::ShouldDump(XAssetInfo<GfxImage>* asset)
+    void DumperIW3::DumpAsset(AssetDumpingContext& context, const XAssetInfo<GfxImage>& asset)
     {
-        return true;
-    }
-
-    void DumperIW3::DumpAsset(AssetDumpingContext& context, XAssetInfo<GfxImage>* asset)
-    {
-        const auto* image = asset->Asset();
+        const auto* image = asset.Asset();
         const auto texture = LoadImageData(context.m_obj_search_path, *image);
         if (!texture)
             return;
 
-        const auto assetFile = context.OpenAssetFile(GetFileNameForAsset(asset->m_name, m_writer->GetFileExtension()));
+        const auto assetFile = context.OpenAssetFile(GetFileNameForAsset(asset.m_name, m_writer->GetFileExtension()));
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/IW3/Image/ImageDumperIW3.h b/src/ObjWriting/Game/IW3/Image/ImageDumperIW3.h
index 7a1b181c..ef8552aa 100644
--- a/src/ObjWriting/Game/IW3/Image/ImageDumperIW3.h
+++ b/src/ObjWriting/Game/IW3/Image/ImageDumperIW3.h
@@ -14,8 +14,7 @@ namespace image
         DumperIW3();
 
     protected:
-        bool ShouldDump(XAssetInfo<IW3::GfxImage>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW3::GfxImage>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW3::GfxImage>& asset) override;
 
     private:
         std::unique_ptr<IImageWriter> m_writer;
diff --git a/src/ObjWriting/Game/IW3/Localize/LocalizeDumperIW3.cpp b/src/ObjWriting/Game/IW3/Localize/LocalizeDumperIW3.cpp
index 777c419b..2b683dd5 100644
--- a/src/ObjWriting/Game/IW3/Localize/LocalizeDumperIW3.cpp
+++ b/src/ObjWriting/Game/IW3/Localize/LocalizeDumperIW3.cpp
@@ -11,9 +11,14 @@ using namespace IW3;
 
 namespace localize
 {
-    void DumperIW3::DumpPool(AssetDumpingContext& context, AssetPool<LocalizeEntry>* pool)
+    size_t DumperIW3::GetProgressTotalCount(const AssetPool<IW3::LocalizeEntry>& pool) const
     {
-        if (pool->m_asset_lookup.empty())
+        return pool.m_asset_lookup.empty() ? 0uz : 1uz;
+    }
+
+    void DumperIW3::DumpPool(AssetDumpingContext& context, const AssetPool<LocalizeEntry>& pool)
+    {
+        if (pool.m_asset_lookup.empty())
             return;
 
         const auto language = LocalizeCommon::GetNameOfLanguage(context.m_zone.m_language);
@@ -30,7 +35,7 @@ namespace localize
 
             stringFileDumper.SetNotes("");
 
-            for (auto* localizeEntry : *pool)
+            for (const auto* localizeEntry : pool)
             {
                 stringFileDumper.WriteLocalizeEntry(localizeEntry->m_name, localizeEntry->Asset()->value);
             }
@@ -41,5 +46,7 @@ namespace localize
         {
             con::error("Could not create string file for dumping localized strings of zone '{}'", context.m_zone.m_name);
         }
+
+        context.IncrementProgress();
     }
 } // namespace localize
diff --git a/src/ObjWriting/Game/IW3/Localize/LocalizeDumperIW3.h b/src/ObjWriting/Game/IW3/Localize/LocalizeDumperIW3.h
index 4cebd7c8..da0718eb 100644
--- a/src/ObjWriting/Game/IW3/Localize/LocalizeDumperIW3.h
+++ b/src/ObjWriting/Game/IW3/Localize/LocalizeDumperIW3.h
@@ -8,6 +8,7 @@ namespace localize
     class DumperIW3 final : public IAssetDumper<IW3::LocalizeEntry>
     {
     public:
-        void DumpPool(AssetDumpingContext& context, AssetPool<IW3::LocalizeEntry>* pool) override;
+        [[nodiscard]] size_t GetProgressTotalCount(const AssetPool<IW3::LocalizeEntry>& pool) const override;
+        void DumpPool(AssetDumpingContext& context, const AssetPool<IW3::LocalizeEntry>& pool) override;
     };
 } // namespace localize
diff --git a/src/ObjWriting/Game/IW3/Maps/MapEntsDumperIW3.cpp b/src/ObjWriting/Game/IW3/Maps/MapEntsDumperIW3.cpp
index 759623e4..53af032e 100644
--- a/src/ObjWriting/Game/IW3/Maps/MapEntsDumperIW3.cpp
+++ b/src/ObjWriting/Game/IW3/Maps/MapEntsDumperIW3.cpp
@@ -4,15 +4,10 @@ using namespace IW3;
 
 namespace map_ents
 {
-    bool DumperIW3::ShouldDump(XAssetInfo<MapEnts>* asset)
+    void DumperIW3::DumpAsset(AssetDumpingContext& context, const XAssetInfo<MapEnts>& asset)
     {
-        return true;
-    }
-
-    void DumperIW3::DumpAsset(AssetDumpingContext& context, XAssetInfo<MapEnts>* asset)
-    {
-        const auto* mapEnts = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(asset->m_name + ".ents");
+        const auto* mapEnts = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(asset.m_name + ".ents");
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/IW3/Maps/MapEntsDumperIW3.h b/src/ObjWriting/Game/IW3/Maps/MapEntsDumperIW3.h
index cd41ccc8..04c3c380 100644
--- a/src/ObjWriting/Game/IW3/Maps/MapEntsDumperIW3.h
+++ b/src/ObjWriting/Game/IW3/Maps/MapEntsDumperIW3.h
@@ -8,7 +8,6 @@ namespace map_ents
     class DumperIW3 final : public AbstractAssetDumper<IW3::MapEnts>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW3::MapEnts>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW3::MapEnts>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW3::MapEnts>& asset) override;
     };
 } // namespace map_ents
diff --git a/src/ObjWriting/Game/IW3/ObjWriterIW3.cpp b/src/ObjWriting/Game/IW3/ObjWriterIW3.cpp
index 418e3156..93600335 100644
--- a/src/ObjWriting/Game/IW3/ObjWriterIW3.cpp
+++ b/src/ObjWriting/Game/IW3/ObjWriterIW3.cpp
@@ -19,11 +19,20 @@ bool ObjWriter::DumpZone(AssetDumpingContext& context) const
     if (assetPools->poolName && ObjWriting::ShouldHandleAssetType(assetType))                                                                                  \
     {                                                                                                                                                          \
         dumperType dumper;                                                                                                                                     \
-        dumper.DumpPool(context, assetPools->poolName.get());                                                                                                  \
+        totalProgress += dumper.GetProgressTotalCount(*assetPools->poolName);                                                                                  \
+        dumpingFunctions.emplace_back(                                                                                                                         \
+            [](AssetDumpingContext& funcContext, const GameAssetPoolIW3* funcPools)                                                                            \
+            {                                                                                                                                                  \
+                dumperType dumper;                                                                                                                             \
+                dumper.DumpPool(funcContext, *funcPools->poolName);                                                                                            \
+            });                                                                                                                                                \
     }
 
     const auto* assetPools = dynamic_cast<GameAssetPoolIW3*>(context.m_zone.m_pools.get());
 
+    size_t totalProgress = 0uz;
+    std::vector<std::function<void(AssetDumpingContext & context, const GameAssetPoolIW3*)>> dumpingFunctions;
+
     // DUMP_ASSET_POOL(AssetDumperPhysPreset, m_phys_preset, ASSET_TYPE_PHYSPRESET)
     // DUMP_ASSET_POOL(AssetDumperXAnimParts, m_xanim_parts, ASSET_TYPE_XANIMPARTS)
     DUMP_ASSET_POOL(xmodel::DumperIW3, m_xmodel, ASSET_TYPE_XMODEL)
@@ -51,6 +60,10 @@ bool ObjWriter::DumpZone(AssetDumpingContext& context) const
     DUMP_ASSET_POOL(raw_file::DumperIW3, m_raw_file, ASSET_TYPE_RAWFILE)
     DUMP_ASSET_POOL(string_table::DumperIW3, m_string_table, ASSET_TYPE_STRINGTABLE)
 
+    context.SetTotalProgress(totalProgress);
+    for (const auto& func : dumpingFunctions)
+        func(context, assetPools);
+
     return true;
 
 #undef DUMP_ASSET_POOL
diff --git a/src/ObjWriting/Game/IW3/RawFile/RawFileDumperIW3.cpp b/src/ObjWriting/Game/IW3/RawFile/RawFileDumperIW3.cpp
index 4b2eb11b..b6efba38 100644
--- a/src/ObjWriting/Game/IW3/RawFile/RawFileDumperIW3.cpp
+++ b/src/ObjWriting/Game/IW3/RawFile/RawFileDumperIW3.cpp
@@ -4,15 +4,10 @@ using namespace IW3;
 
 namespace raw_file
 {
-    bool DumperIW3::ShouldDump(XAssetInfo<RawFile>* asset)
+    void DumperIW3::DumpAsset(AssetDumpingContext& context, const XAssetInfo<RawFile>& asset)
     {
-        return true;
-    }
-
-    void DumperIW3::DumpAsset(AssetDumpingContext& context, XAssetInfo<RawFile>* asset)
-    {
-        const auto* rawFile = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(asset->m_name);
+        const auto* rawFile = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(asset.m_name);
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/IW3/RawFile/RawFileDumperIW3.h b/src/ObjWriting/Game/IW3/RawFile/RawFileDumperIW3.h
index 250bea7c..1b710800 100644
--- a/src/ObjWriting/Game/IW3/RawFile/RawFileDumperIW3.h
+++ b/src/ObjWriting/Game/IW3/RawFile/RawFileDumperIW3.h
@@ -8,7 +8,6 @@ namespace raw_file
     class DumperIW3 final : public AbstractAssetDumper<IW3::RawFile>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW3::RawFile>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW3::RawFile>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW3::RawFile>& asset) override;
     };
 } // namespace raw_file
diff --git a/src/ObjWriting/Game/IW3/Sound/LoadedSoundDumperIW3.cpp b/src/ObjWriting/Game/IW3/Sound/LoadedSoundDumperIW3.cpp
index 923d3d57..ca7b7109 100644
--- a/src/ObjWriting/Game/IW3/Sound/LoadedSoundDumperIW3.cpp
+++ b/src/ObjWriting/Game/IW3/Sound/LoadedSoundDumperIW3.cpp
@@ -25,15 +25,10 @@ namespace
 
 namespace sound
 {
-    bool LoadedSoundDumperIW3::ShouldDump(XAssetInfo<LoadedSound>* asset)
+    void LoadedSoundDumperIW3::DumpAsset(AssetDumpingContext& context, const XAssetInfo<LoadedSound>& asset)
     {
-        return true;
-    }
-
-    void LoadedSoundDumperIW3::DumpAsset(AssetDumpingContext& context, XAssetInfo<LoadedSound>* asset)
-    {
-        const auto* loadedSound = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(std::format("sound/{}", asset->m_name));
+        const auto* loadedSound = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(std::format("sound/{}", asset.m_name));
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/IW3/Sound/LoadedSoundDumperIW3.h b/src/ObjWriting/Game/IW3/Sound/LoadedSoundDumperIW3.h
index 458af961..746e82c4 100644
--- a/src/ObjWriting/Game/IW3/Sound/LoadedSoundDumperIW3.h
+++ b/src/ObjWriting/Game/IW3/Sound/LoadedSoundDumperIW3.h
@@ -8,7 +8,6 @@ namespace sound
     class LoadedSoundDumperIW3 final : public AbstractAssetDumper<IW3::LoadedSound>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW3::LoadedSound>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW3::LoadedSound>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW3::LoadedSound>& asset) override;
     };
 } // namespace sound
diff --git a/src/ObjWriting/Game/IW3/StringTable/StringTableDumperIW3.cpp b/src/ObjWriting/Game/IW3/StringTable/StringTableDumperIW3.cpp
index b7188a34..0dc0322c 100644
--- a/src/ObjWriting/Game/IW3/StringTable/StringTableDumperIW3.cpp
+++ b/src/ObjWriting/Game/IW3/StringTable/StringTableDumperIW3.cpp
@@ -6,15 +6,10 @@ using namespace IW3;
 
 namespace string_table
 {
-    bool DumperIW3::ShouldDump(XAssetInfo<StringTable>* asset)
+    void DumperIW3::DumpAsset(AssetDumpingContext& context, const XAssetInfo<StringTable>& asset)
     {
-        return true;
-    }
-
-    void DumperIW3::DumpAsset(AssetDumpingContext& context, XAssetInfo<StringTable>* asset)
-    {
-        const auto* stringTable = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(asset->m_name);
+        const auto* stringTable = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(asset.m_name);
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/IW3/StringTable/StringTableDumperIW3.h b/src/ObjWriting/Game/IW3/StringTable/StringTableDumperIW3.h
index 21ef05d5..1b9de2ff 100644
--- a/src/ObjWriting/Game/IW3/StringTable/StringTableDumperIW3.h
+++ b/src/ObjWriting/Game/IW3/StringTable/StringTableDumperIW3.h
@@ -8,7 +8,6 @@ namespace string_table
     class DumperIW3 final : public AbstractAssetDumper<IW3::StringTable>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW3::StringTable>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW3::StringTable>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW3::StringTable>& asset) override;
     };
 } // namespace string_table
diff --git a/src/ObjWriting/Game/IW4/Image/ImageDumperIW4.cpp b/src/ObjWriting/Game/IW4/Image/ImageDumperIW4.cpp
index 248c4098..216e36d3 100644
--- a/src/ObjWriting/Game/IW4/Image/ImageDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/Image/ImageDumperIW4.cpp
@@ -76,19 +76,14 @@ namespace image
         }
     }
 
-    bool DumperIW4::ShouldDump(XAssetInfo<GfxImage>* asset)
+    void DumperIW4::DumpAsset(AssetDumpingContext& context, const XAssetInfo<GfxImage>& asset)
     {
-        return true;
-    }
-
-    void DumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<GfxImage>* asset)
-    {
-        const auto* image = asset->Asset();
+        const auto* image = asset.Asset();
         const auto texture = LoadImageData(context.m_obj_search_path, *image);
         if (!texture)
             return;
 
-        const auto assetFile = context.OpenAssetFile(GetFileNameForAsset(asset->m_name, m_writer->GetFileExtension()));
+        const auto assetFile = context.OpenAssetFile(GetFileNameForAsset(asset.m_name, m_writer->GetFileExtension()));
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/IW4/Image/ImageDumperIW4.h b/src/ObjWriting/Game/IW4/Image/ImageDumperIW4.h
index 5d268ccc..b555f3e7 100644
--- a/src/ObjWriting/Game/IW4/Image/ImageDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/Image/ImageDumperIW4.h
@@ -14,8 +14,7 @@ namespace image
         DumperIW4();
 
     protected:
-        bool ShouldDump(XAssetInfo<IW4::GfxImage>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::GfxImage>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW4::GfxImage>& asset) override;
 
     private:
         std::unique_ptr<IImageWriter> m_writer;
diff --git a/src/ObjWriting/Game/IW4/Leaderboard/LeaderboardJsonDumperIW4.cpp b/src/ObjWriting/Game/IW4/Leaderboard/LeaderboardJsonDumperIW4.cpp
index 80ed3625..7e139ebb 100644
--- a/src/ObjWriting/Game/IW4/Leaderboard/LeaderboardJsonDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/Leaderboard/LeaderboardJsonDumperIW4.cpp
@@ -77,19 +77,14 @@ namespace
 
 namespace leaderboard
 {
-    bool JsonDumperIW4::ShouldDump(XAssetInfo<LeaderboardDef>* asset)
+    void JsonDumperIW4::DumpAsset(AssetDumpingContext& context, const XAssetInfo<LeaderboardDef>& asset)
     {
-        return true;
-    }
-
-    void JsonDumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<LeaderboardDef>* asset)
-    {
-        const auto assetFile = context.OpenAssetFile(GetJsonFileNameForAsset(asset->m_name));
+        const auto assetFile = context.OpenAssetFile(GetJsonFileNameForAsset(asset.m_name));
 
         if (!assetFile)
             return;
 
         Dumper dumper(*assetFile);
-        dumper.Dump(*asset->Asset());
+        dumper.Dump(*asset.Asset());
     }
 } // namespace leaderboard
diff --git a/src/ObjWriting/Game/IW4/Leaderboard/LeaderboardJsonDumperIW4.h b/src/ObjWriting/Game/IW4/Leaderboard/LeaderboardJsonDumperIW4.h
index a56e5127..341e46b1 100644
--- a/src/ObjWriting/Game/IW4/Leaderboard/LeaderboardJsonDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/Leaderboard/LeaderboardJsonDumperIW4.h
@@ -8,7 +8,6 @@ namespace leaderboard
     class JsonDumperIW4 final : public AbstractAssetDumper<IW4::LeaderboardDef>
     {
     protected:
-        [[nodiscard]] bool ShouldDump(XAssetInfo<IW4::LeaderboardDef>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::LeaderboardDef>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW4::LeaderboardDef>& asset) override;
     };
 } // namespace leaderboard
diff --git a/src/ObjWriting/Game/IW4/LightDef/LightDefDumperIW4.cpp b/src/ObjWriting/Game/IW4/LightDef/LightDefDumperIW4.cpp
index 205df266..1f4f9925 100644
--- a/src/ObjWriting/Game/IW4/LightDef/LightDefDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/LightDef/LightDefDumperIW4.cpp
@@ -2,21 +2,14 @@
 
 #include "LightDef/LightDefCommon.h"
 
-#include <sstream>
-
 using namespace IW4;
 
 namespace light_def
 {
-    bool DumperIW4::ShouldDump(XAssetInfo<GfxLightDef>* asset)
+    void DumperIW4::DumpAsset(AssetDumpingContext& context, const XAssetInfo<GfxLightDef>& asset)
     {
-        return true;
-    }
-
-    void DumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<GfxLightDef>* asset)
-    {
-        const auto* lightDef = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(GetFileNameForAsset(asset->m_name));
+        const auto* lightDef = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(GetFileNameForAsset(asset.m_name));
 
         if (!assetFile || lightDef->attenuation.image == nullptr || lightDef->attenuation.image->name == nullptr)
             return;
diff --git a/src/ObjWriting/Game/IW4/LightDef/LightDefDumperIW4.h b/src/ObjWriting/Game/IW4/LightDef/LightDefDumperIW4.h
index 29531abb..b6131929 100644
--- a/src/ObjWriting/Game/IW4/LightDef/LightDefDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/LightDef/LightDefDumperIW4.h
@@ -8,7 +8,6 @@ namespace light_def
     class DumperIW4 final : public AbstractAssetDumper<IW4::GfxLightDef>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW4::GfxLightDef>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::GfxLightDef>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW4::GfxLightDef>& asset) override;
     };
 } // namespace light_def
diff --git a/src/ObjWriting/Game/IW4/Localize/LocalizeDumperIW4.cpp b/src/ObjWriting/Game/IW4/Localize/LocalizeDumperIW4.cpp
index bff7b2ee..3c6bd176 100644
--- a/src/ObjWriting/Game/IW4/Localize/LocalizeDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/Localize/LocalizeDumperIW4.cpp
@@ -5,15 +5,19 @@
 #include "Utils/Logging/Log.h"
 
 #include <format>
-#include <sstream>
 
 using namespace IW4;
 
 namespace localize
 {
-    void DumperIW4::DumpPool(AssetDumpingContext& context, AssetPool<LocalizeEntry>* pool)
+    size_t DumperIW4::GetProgressTotalCount(const AssetPool<LocalizeEntry>& pool) const
     {
-        if (pool->m_asset_lookup.empty())
+        return pool.m_asset_lookup.empty() ? 0uz : 1uz;
+    }
+
+    void DumperIW4::DumpPool(AssetDumpingContext& context, const AssetPool<LocalizeEntry>& pool)
+    {
+        if (pool.m_asset_lookup.empty())
             return;
 
         const auto language = LocalizeCommon::GetNameOfLanguage(context.m_zone.m_language);
@@ -30,7 +34,7 @@ namespace localize
 
             stringFileDumper.SetNotes("");
 
-            for (auto* localizeEntry : *pool)
+            for (const auto* localizeEntry : pool)
             {
                 stringFileDumper.WriteLocalizeEntry(localizeEntry->m_name, localizeEntry->Asset()->value);
             }
@@ -41,5 +45,7 @@ namespace localize
         {
             con::error("Could not create string file for dumping localized strings of zone '{}'", context.m_zone.m_name);
         }
+
+        context.IncrementProgress();
     }
 } // namespace localize
diff --git a/src/ObjWriting/Game/IW4/Localize/LocalizeDumperIW4.h b/src/ObjWriting/Game/IW4/Localize/LocalizeDumperIW4.h
index fd88c200..7f36c074 100644
--- a/src/ObjWriting/Game/IW4/Localize/LocalizeDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/Localize/LocalizeDumperIW4.h
@@ -8,6 +8,7 @@ namespace localize
     class DumperIW4 final : public IAssetDumper<IW4::LocalizeEntry>
     {
     public:
-        void DumpPool(AssetDumpingContext& context, AssetPool<IW4::LocalizeEntry>* pool) override;
+        [[nodiscard]] size_t GetProgressTotalCount(const AssetPool<IW4::LocalizeEntry>& pool) const override;
+        void DumpPool(AssetDumpingContext& context, const AssetPool<IW4::LocalizeEntry>& pool) override;
     };
 } // namespace localize
diff --git a/src/ObjWriting/Game/IW4/Maps/AddonMapEntsDumperIW4.cpp b/src/ObjWriting/Game/IW4/Maps/AddonMapEntsDumperIW4.cpp
index 37b45249..6e1b0cb2 100644
--- a/src/ObjWriting/Game/IW4/Maps/AddonMapEntsDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/Maps/AddonMapEntsDumperIW4.cpp
@@ -7,15 +7,10 @@ using namespace IW4;
 
 namespace addon_map_ents
 {
-    bool DumperIW4::ShouldDump(XAssetInfo<AddonMapEnts>* asset)
+    void DumperIW4::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AddonMapEnts>& asset)
     {
-        return true;
-    }
-
-    void DumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<AddonMapEnts>* asset)
-    {
-        const auto* addonMapEnts = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(asset->m_name);
+        const auto* addonMapEnts = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(asset.m_name);
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/IW4/Maps/AddonMapEntsDumperIW4.h b/src/ObjWriting/Game/IW4/Maps/AddonMapEntsDumperIW4.h
index 4f1ef6c8..a2bb4339 100644
--- a/src/ObjWriting/Game/IW4/Maps/AddonMapEntsDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/Maps/AddonMapEntsDumperIW4.h
@@ -8,7 +8,6 @@ namespace addon_map_ents
     class DumperIW4 final : public AbstractAssetDumper<IW4::AddonMapEnts>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW4::AddonMapEnts>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::AddonMapEnts>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW4::AddonMapEnts>& asset) override;
     };
 } // namespace addon_map_ents
diff --git a/src/ObjWriting/Game/IW4/Material/MaterialDecompilingDumperIW4.cpp b/src/ObjWriting/Game/IW4/Material/MaterialDecompilingDumperIW4.cpp
index f706ed0e..de6c1636 100644
--- a/src/ObjWriting/Game/IW4/Material/MaterialDecompilingDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/Material/MaterialDecompilingDumperIW4.cpp
@@ -1110,17 +1110,12 @@ namespace
 
 namespace material
 {
-    bool DecompilingGdtDumperIW4::ShouldDump(XAssetInfo<Material>* asset)
-    {
-        return true;
-    }
-
-    void DecompilingGdtDumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<Material>* asset)
+    void DecompilingGdtDumperIW4::DumpAsset(AssetDumpingContext& context, const XAssetInfo<Material>& asset)
     {
         if (!context.m_gdt)
             return;
 
-        MaterialGdtDumper dumper(*asset->Asset());
+        MaterialGdtDumper dumper(*asset.Asset());
         context.m_gdt->WriteEntry(dumper.CreateGdtEntry());
     }
 } // namespace material
diff --git a/src/ObjWriting/Game/IW4/Material/MaterialDecompilingDumperIW4.h b/src/ObjWriting/Game/IW4/Material/MaterialDecompilingDumperIW4.h
index e6b73e35..ef1b4d99 100644
--- a/src/ObjWriting/Game/IW4/Material/MaterialDecompilingDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/Material/MaterialDecompilingDumperIW4.h
@@ -8,7 +8,6 @@ namespace material
     class DecompilingGdtDumperIW4 final : public AbstractAssetDumper<IW4::Material>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW4::Material>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::Material>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW4::Material>& asset) override;
     };
 } // namespace material
diff --git a/src/ObjWriting/Game/IW4/Menu/MenuDumperIW4.cpp b/src/ObjWriting/Game/IW4/Menu/MenuDumperIW4.cpp
index d3828080..42013e2e 100644
--- a/src/ObjWriting/Game/IW4/Menu/MenuDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/Menu/MenuDumperIW4.cpp
@@ -13,12 +13,12 @@ using namespace IW4;
 
 namespace
 {
-    std::string GetPathForMenu(menu::MenuDumpingZoneState* zoneState, XAssetInfo<menuDef_t>* asset)
+    std::string GetPathForMenu(menu::MenuDumpingZoneState* zoneState, const XAssetInfo<menuDef_t>& asset)
     {
-        const auto menuDumpingState = zoneState->m_menu_dumping_state_map.find(asset->Asset());
+        const auto menuDumpingState = zoneState->m_menu_dumping_state_map.find(asset.Asset());
 
         if (menuDumpingState == zoneState->m_menu_dumping_state_map.end())
-            return "ui_mp/" + std::string(asset->Asset()->window.name) + ".menu";
+            return "ui_mp/" + std::string(asset.Asset()->window.name) + ".menu";
 
         return menuDumpingState->second.m_path;
     }
@@ -26,20 +26,15 @@ namespace
 
 namespace menu
 {
-    bool MenuDumperIW4::ShouldDump(XAssetInfo<menuDef_t>* asset)
+    void MenuDumperIW4::DumpAsset(AssetDumpingContext& context, const XAssetInfo<menuDef_t>& asset)
     {
-        return true;
-    }
-
-    void MenuDumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<menuDef_t>* asset)
-    {
-        const auto* menu = asset->Asset();
+        const auto* menu = asset.Asset();
         auto* zoneState = context.GetZoneAssetDumperState<MenuDumpingZoneState>();
 
         if (!ObjWriting::ShouldHandleAssetType(ASSET_TYPE_MENULIST))
         {
             // Make sure menu paths based on menu lists are created
-            const auto* gameAssetPool = dynamic_cast<GameAssetPoolIW4*>(asset->m_zone->m_pools.get());
+            const auto* gameAssetPool = dynamic_cast<GameAssetPoolIW4*>(asset.m_zone->m_pools.get());
             for (auto* menuListAsset : *gameAssetPool->m_menu_list)
                 CreateDumpingStateForMenuListIW4(zoneState, menuListAsset->Asset());
         }
diff --git a/src/ObjWriting/Game/IW4/Menu/MenuDumperIW4.h b/src/ObjWriting/Game/IW4/Menu/MenuDumperIW4.h
index 43317e26..95e50569 100644
--- a/src/ObjWriting/Game/IW4/Menu/MenuDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/Menu/MenuDumperIW4.h
@@ -9,7 +9,6 @@ namespace menu
     class MenuDumperIW4 final : public AbstractAssetDumper<IW4::menuDef_t>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW4::menuDef_t>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::menuDef_t>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW4::menuDef_t>& asset) override;
     };
 } // namespace menu
diff --git a/src/ObjWriting/Game/IW4/Menu/MenuListDumperIW4.cpp b/src/ObjWriting/Game/IW4/Menu/MenuListDumperIW4.cpp
index 7946dfe9..7e98b598 100644
--- a/src/ObjWriting/Game/IW4/Menu/MenuListDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/Menu/MenuListDumperIW4.cpp
@@ -147,15 +147,10 @@ namespace menu
         }
     }
 
-    bool MenuListDumperIW4::ShouldDump(XAssetInfo<MenuList>* asset)
+    void MenuListDumperIW4::DumpAsset(AssetDumpingContext& context, const XAssetInfo<MenuList>& asset)
     {
-        return true;
-    }
-
-    void MenuListDumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<MenuList>* asset)
-    {
-        const auto* menuList = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(asset->m_name);
+        const auto* menuList = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(asset.m_name);
 
         if (!assetFile)
             return;
@@ -174,11 +169,11 @@ namespace menu
         menuWriter->End();
     }
 
-    void MenuListDumperIW4::DumpPool(AssetDumpingContext& context, AssetPool<MenuList>* pool)
+    void MenuListDumperIW4::DumpPool(AssetDumpingContext& context, const AssetPool<MenuList>& pool)
     {
         auto* zoneState = context.GetZoneAssetDumperState<MenuDumpingZoneState>();
 
-        for (auto* asset : *pool)
+        for (const auto* asset : pool)
             CreateDumpingStateForMenuListIW4(zoneState, asset->Asset());
 
         AbstractAssetDumper<MenuList>::DumpPool(context, pool);
diff --git a/src/ObjWriting/Game/IW4/Menu/MenuListDumperIW4.h b/src/ObjWriting/Game/IW4/Menu/MenuListDumperIW4.h
index b9329966..9a01b7f8 100644
--- a/src/ObjWriting/Game/IW4/Menu/MenuListDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/Menu/MenuListDumperIW4.h
@@ -11,11 +11,10 @@ namespace menu
 
     class MenuListDumperIW4 final : public AbstractAssetDumper<IW4::MenuList>
     {
-    protected:
-        bool ShouldDump(XAssetInfo<IW4::MenuList>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::MenuList>* asset) override;
-
     public:
-        void DumpPool(AssetDumpingContext& context, AssetPool<IW4::MenuList>* pool) override;
+        void DumpPool(AssetDumpingContext& context, const AssetPool<IW4::MenuList>& pool) override;
+
+    protected:
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW4::MenuList>& asset) override;
     };
 } // namespace menu
diff --git a/src/ObjWriting/Game/IW4/ObjWriterIW4.cpp b/src/ObjWriting/Game/IW4/ObjWriterIW4.cpp
index b749a985..416dbd82 100644
--- a/src/ObjWriting/Game/IW4/ObjWriterIW4.cpp
+++ b/src/ObjWriting/Game/IW4/ObjWriterIW4.cpp
@@ -34,11 +34,20 @@ bool ObjWriter::DumpZone(AssetDumpingContext& context) const
     if (assetPools->poolName && ObjWriting::ShouldHandleAssetType(assetType))                                                                                  \
     {                                                                                                                                                          \
         dumperType dumper;                                                                                                                                     \
-        dumper.DumpPool(context, assetPools->poolName.get());                                                                                                  \
+        totalProgress += dumper.GetProgressTotalCount(*assetPools->poolName);                                                                                  \
+        dumpingFunctions.emplace_back(                                                                                                                         \
+            [](AssetDumpingContext& funcContext, const GameAssetPoolIW4* funcPools)                                                                             \
+            {                                                                                                                                                  \
+                dumperType dumper;                                                                                                                             \
+                dumper.DumpPool(funcContext, *funcPools->poolName);                                                                                            \
+            });                                                                                                                                                \
     }
 
     const auto* assetPools = dynamic_cast<GameAssetPoolIW4*>(context.m_zone.m_pools.get());
 
+    size_t totalProgress = 0uz;
+    std::vector<std::function<void(AssetDumpingContext & context, const GameAssetPoolIW4*)>> dumpingFunctions;
+
     DUMP_ASSET_POOL(phys_preset::InfoStringDumperIW4, m_phys_preset, ASSET_TYPE_PHYSPRESET)
     DUMP_ASSET_POOL(phys_collmap::DumperIW4, m_phys_collmap, ASSET_TYPE_PHYSCOLLMAP)
     // DUMP_ASSET_POOL(AssetDumperXAnimParts, m_xanim_parts, ASSET_TYPE_XANIMPARTS)
@@ -78,6 +87,10 @@ bool ObjWriter::DumpZone(AssetDumpingContext& context) const
     DUMP_ASSET_POOL(vehicle::DumperIW4, m_vehicle, ASSET_TYPE_VEHICLE)
     DUMP_ASSET_POOL(addon_map_ents::DumperIW4, m_addon_map_ents, ASSET_TYPE_ADDON_MAP_ENTS)
 
+    context.SetTotalProgress(totalProgress);
+    for (const auto& func : dumpingFunctions)
+        func(context, assetPools);
+
     return true;
 
 #undef DUMP_ASSET_POOL
diff --git a/src/ObjWriting/Game/IW4/PhysCollmap/PhysCollmapDumperIW4.cpp b/src/ObjWriting/Game/IW4/PhysCollmap/PhysCollmapDumperIW4.cpp
index 523c64c8..48f148c3 100644
--- a/src/ObjWriting/Game/IW4/PhysCollmap/PhysCollmapDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/PhysCollmap/PhysCollmapDumperIW4.cpp
@@ -10,15 +10,10 @@ using namespace IW4;
 
 namespace phys_collmap
 {
-    bool DumperIW4::ShouldDump(XAssetInfo<PhysCollmap>* asset)
+    void DumperIW4::DumpAsset(AssetDumpingContext& context, const XAssetInfo<PhysCollmap>& asset)
     {
-        return true;
-    }
-
-    void DumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<PhysCollmap>* asset)
-    {
-        const auto* physCollmap = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(phys_collmap::GetFileNameForAssetName(asset->m_name));
+        const auto* physCollmap = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(phys_collmap::GetFileNameForAssetName(asset.m_name));
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/IW4/PhysCollmap/PhysCollmapDumperIW4.h b/src/ObjWriting/Game/IW4/PhysCollmap/PhysCollmapDumperIW4.h
index 4dbf68d6..da035d1d 100644
--- a/src/ObjWriting/Game/IW4/PhysCollmap/PhysCollmapDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/PhysCollmap/PhysCollmapDumperIW4.h
@@ -8,7 +8,6 @@ namespace phys_collmap
     class DumperIW4 final : public AbstractAssetDumper<IW4::PhysCollmap>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW4::PhysCollmap>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::PhysCollmap>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW4::PhysCollmap>& asset) override;
     };
 } // namespace phys_collmap
diff --git a/src/ObjWriting/Game/IW4/PhysPreset/PhysPresetInfoStringDumperIW4.cpp b/src/ObjWriting/Game/IW4/PhysPreset/PhysPresetInfoStringDumperIW4.cpp
index 41ac1f64..5521e14f 100644
--- a/src/ObjWriting/Game/IW4/PhysPreset/PhysPresetInfoStringDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/PhysPreset/PhysPresetInfoStringDumperIW4.cpp
@@ -57,21 +57,21 @@ namespace
         physPresetInfo->perSurfaceSndAlias = physPreset->perSurfaceSndAlias ? 1 : 0;
     }
 
-    InfoString CreateInfoString(XAssetInfo<PhysPreset>* asset)
+    InfoString CreateInfoString(const XAssetInfo<PhysPreset>& asset)
     {
         auto* physPresetInfo = new PhysPresetInfo;
-        CopyToPhysPresetInfo(asset->Asset(), physPresetInfo);
+        CopyToPhysPresetInfo(asset.Asset(), physPresetInfo);
 
         InfoStringFromPhysPresetConverter converter(physPresetInfo,
                                                     phys_preset_fields,
                                                     std::extent_v<decltype(phys_preset_fields)>,
                                                     [asset](const scr_string_t scrStr) -> std::string
                                                     {
-                                                        assert(scrStr < asset->m_zone->m_script_strings.Count());
-                                                        if (scrStr >= asset->m_zone->m_script_strings.Count())
+                                                        assert(scrStr < asset.m_zone->m_script_strings.Count());
+                                                        if (scrStr >= asset.m_zone->m_script_strings.Count())
                                                             return "";
 
-                                                        return asset->m_zone->m_script_strings[scrStr];
+                                                        return asset.m_zone->m_script_strings[scrStr];
                                                     });
 
         return converter.Convert();
@@ -80,24 +80,19 @@ namespace
 
 namespace phys_preset
 {
-    bool InfoStringDumperIW4::ShouldDump(XAssetInfo<IW4::PhysPreset>* asset)
-    {
-        return true;
-    }
-
-    void InfoStringDumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::PhysPreset>* asset)
+    void InfoStringDumperIW4::DumpAsset(AssetDumpingContext& context, const XAssetInfo<PhysPreset>& asset)
     {
         // Only dump raw when no gdt available
         if (context.m_gdt)
         {
             const auto infoString = CreateInfoString(asset);
-            GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_PHYS_PRESET);
+            GdtEntry gdtEntry(asset.m_name, ObjConstants::GDF_FILENAME_PHYS_PRESET);
             infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_PHYS_PRESET, gdtEntry);
             context.m_gdt->WriteEntry(gdtEntry);
         }
         else
         {
-            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset->m_name));
+            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset.m_name));
 
             if (!assetFile)
                 return;
diff --git a/src/ObjWriting/Game/IW4/PhysPreset/PhysPresetInfoStringDumperIW4.h b/src/ObjWriting/Game/IW4/PhysPreset/PhysPresetInfoStringDumperIW4.h
index 4651c1e0..1d3ee86b 100644
--- a/src/ObjWriting/Game/IW4/PhysPreset/PhysPresetInfoStringDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/PhysPreset/PhysPresetInfoStringDumperIW4.h
@@ -9,7 +9,6 @@ namespace phys_preset
     class InfoStringDumperIW4 final : public AbstractAssetDumper<IW4::PhysPreset>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW4::PhysPreset>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::PhysPreset>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW4::PhysPreset>& asset) override;
     };
 } // namespace phys_preset
diff --git a/src/ObjWriting/Game/IW4/RawFile/RawFileDumperIW4.cpp b/src/ObjWriting/Game/IW4/RawFile/RawFileDumperIW4.cpp
index a1e9a045..15a19469 100644
--- a/src/ObjWriting/Game/IW4/RawFile/RawFileDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/RawFile/RawFileDumperIW4.cpp
@@ -10,15 +10,10 @@ using namespace IW4;
 
 namespace raw_file
 {
-    bool DumperIW4::ShouldDump(XAssetInfo<RawFile>* asset)
+    void DumperIW4::DumpAsset(AssetDumpingContext& context, const XAssetInfo<RawFile>& asset)
     {
-        return true;
-    }
-
-    void DumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<RawFile>* asset)
-    {
-        const auto* rawFile = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(asset->m_name);
+        const auto* rawFile = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(asset.m_name);
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/IW4/RawFile/RawFileDumperIW4.h b/src/ObjWriting/Game/IW4/RawFile/RawFileDumperIW4.h
index 9b8966ea..184b2b3c 100644
--- a/src/ObjWriting/Game/IW4/RawFile/RawFileDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/RawFile/RawFileDumperIW4.h
@@ -8,7 +8,6 @@ namespace raw_file
     class DumperIW4 final : public AbstractAssetDumper<IW4::RawFile>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW4::RawFile>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::RawFile>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW4::RawFile>& asset) override;
     };
 } // namespace raw_file
diff --git a/src/ObjWriting/Game/IW4/Shader/PixelShaderDumperIW4.cpp b/src/ObjWriting/Game/IW4/Shader/PixelShaderDumperIW4.cpp
index 318c9a68..c34a06b1 100644
--- a/src/ObjWriting/Game/IW4/Shader/PixelShaderDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/Shader/PixelShaderDumperIW4.cpp
@@ -6,15 +6,10 @@ using namespace IW4;
 
 namespace shader
 {
-    bool PixelShaderDumperIW4::ShouldDump(XAssetInfo<IW4::MaterialPixelShader>* asset)
+    void PixelShaderDumperIW4::DumpAsset(AssetDumpingContext& context, const XAssetInfo<MaterialPixelShader>& asset)
     {
-        return true;
-    }
-
-    void PixelShaderDumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::MaterialPixelShader>* asset)
-    {
-        const auto* pixelShader = asset->Asset();
-        const auto shaderFile = context.OpenAssetFile(shader::GetFileNameForPixelShaderAssetName(asset->m_name));
+        const auto* pixelShader = asset.Asset();
+        const auto shaderFile = context.OpenAssetFile(shader::GetFileNameForPixelShaderAssetName(asset.m_name));
 
         if (!shaderFile)
             return;
diff --git a/src/ObjWriting/Game/IW4/Shader/PixelShaderDumperIW4.h b/src/ObjWriting/Game/IW4/Shader/PixelShaderDumperIW4.h
index 01404d0a..6f04dca1 100644
--- a/src/ObjWriting/Game/IW4/Shader/PixelShaderDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/Shader/PixelShaderDumperIW4.h
@@ -8,7 +8,6 @@ namespace shader
     class PixelShaderDumperIW4 final : public AbstractAssetDumper<IW4::MaterialPixelShader>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW4::MaterialPixelShader>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::MaterialPixelShader>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW4::MaterialPixelShader>& asset) override;
     };
 } // namespace shader
diff --git a/src/ObjWriting/Game/IW4/Shader/VertexShaderDumperIW4.cpp b/src/ObjWriting/Game/IW4/Shader/VertexShaderDumperIW4.cpp
index c3954562..763f7880 100644
--- a/src/ObjWriting/Game/IW4/Shader/VertexShaderDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/Shader/VertexShaderDumperIW4.cpp
@@ -6,15 +6,10 @@ using namespace IW4;
 
 namespace shader
 {
-    bool VertexShaderDumperIW4::ShouldDump(XAssetInfo<IW4::MaterialVertexShader>* asset)
+    void VertexShaderDumperIW4::DumpAsset(AssetDumpingContext& context, const XAssetInfo<MaterialVertexShader>& asset)
     {
-        return true;
-    }
-
-    void VertexShaderDumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::MaterialVertexShader>* asset)
-    {
-        const auto* vertexShader = asset->Asset();
-        const auto shaderFile = context.OpenAssetFile(shader::GetFileNameForVertexShaderAssetName(asset->m_name));
+        const auto* vertexShader = asset.Asset();
+        const auto shaderFile = context.OpenAssetFile(shader::GetFileNameForVertexShaderAssetName(asset.m_name));
 
         if (!shaderFile)
             return;
diff --git a/src/ObjWriting/Game/IW4/Shader/VertexShaderDumperIW4.h b/src/ObjWriting/Game/IW4/Shader/VertexShaderDumperIW4.h
index 1b722461..78e52040 100644
--- a/src/ObjWriting/Game/IW4/Shader/VertexShaderDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/Shader/VertexShaderDumperIW4.h
@@ -8,7 +8,6 @@ namespace shader
     class VertexShaderDumperIW4 final : public AbstractAssetDumper<IW4::MaterialVertexShader>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW4::MaterialVertexShader>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::MaterialVertexShader>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW4::MaterialVertexShader>& asset) override;
     };
 } // namespace shader
diff --git a/src/ObjWriting/Game/IW4/Sound/LoadedSoundDumperIW4.cpp b/src/ObjWriting/Game/IW4/Sound/LoadedSoundDumperIW4.cpp
index 20e34703..622bc8c5 100644
--- a/src/ObjWriting/Game/IW4/Sound/LoadedSoundDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/Sound/LoadedSoundDumperIW4.cpp
@@ -25,15 +25,10 @@ namespace
 
 namespace sound
 {
-    bool LoadedSoundDumperIW4::ShouldDump(XAssetInfo<LoadedSound>* asset)
+    void LoadedSoundDumperIW4::DumpAsset(AssetDumpingContext& context, const XAssetInfo<LoadedSound>& asset)
     {
-        return true;
-    }
-
-    void LoadedSoundDumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<LoadedSound>* asset)
-    {
-        const auto* loadedSound = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(std::format("sound/{}", asset->m_name));
+        const auto* loadedSound = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(std::format("sound/{}", asset.m_name));
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/IW4/Sound/LoadedSoundDumperIW4.h b/src/ObjWriting/Game/IW4/Sound/LoadedSoundDumperIW4.h
index 7256bc88..a1f53d62 100644
--- a/src/ObjWriting/Game/IW4/Sound/LoadedSoundDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/Sound/LoadedSoundDumperIW4.h
@@ -8,7 +8,6 @@ namespace sound
     class LoadedSoundDumperIW4 final : public AbstractAssetDumper<IW4::LoadedSound>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW4::LoadedSound>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::LoadedSound>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW4::LoadedSound>& asset) override;
     };
 } // namespace sound
diff --git a/src/ObjWriting/Game/IW4/Sound/SndCurveDumperIW4.cpp b/src/ObjWriting/Game/IW4/Sound/SndCurveDumperIW4.cpp
index b7e00629..d1afcb19 100644
--- a/src/ObjWriting/Game/IW4/Sound/SndCurveDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/Sound/SndCurveDumperIW4.cpp
@@ -3,20 +3,13 @@
 #include "Sound/SndCurveDumper.h"
 #include "Sound/SoundCurveCommon.h"
 
-#include <sstream>
-
 using namespace IW4;
 
 namespace sound_curve
 {
-    bool DumperIW4::ShouldDump(XAssetInfo<SndCurve>* asset)
+    void DumperIW4::DumpAsset(AssetDumpingContext& context, const XAssetInfo<SndCurve>& asset)
     {
-        return true;
-    }
-
-    void DumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<SndCurve>* asset)
-    {
-        const auto* sndCurve = asset->Asset();
+        const auto* sndCurve = asset.Asset();
 
         const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(sndCurve->filename));
 
diff --git a/src/ObjWriting/Game/IW4/Sound/SndCurveDumperIW4.h b/src/ObjWriting/Game/IW4/Sound/SndCurveDumperIW4.h
index 241b7a79..97b573eb 100644
--- a/src/ObjWriting/Game/IW4/Sound/SndCurveDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/Sound/SndCurveDumperIW4.h
@@ -8,7 +8,6 @@ namespace sound_curve
     class DumperIW4 final : public AbstractAssetDumper<IW4::SndCurve>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW4::SndCurve>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::SndCurve>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW4::SndCurve>& asset) override;
     };
 } // namespace sound_curve
diff --git a/src/ObjWriting/Game/IW4/StringTable/StringTableDumperIW4.cpp b/src/ObjWriting/Game/IW4/StringTable/StringTableDumperIW4.cpp
index 784164e2..c23980b1 100644
--- a/src/ObjWriting/Game/IW4/StringTable/StringTableDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/StringTable/StringTableDumperIW4.cpp
@@ -6,15 +6,10 @@ using namespace IW4;
 
 namespace string_table
 {
-    bool DumperIW4::ShouldDump(XAssetInfo<StringTable>* asset)
+    void DumperIW4::DumpAsset(AssetDumpingContext& context, const XAssetInfo<StringTable>& asset)
     {
-        return true;
-    }
-
-    void DumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<StringTable>* asset)
-    {
-        const auto* stringTable = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(asset->m_name);
+        const auto* stringTable = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(asset.m_name);
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/IW4/StringTable/StringTableDumperIW4.h b/src/ObjWriting/Game/IW4/StringTable/StringTableDumperIW4.h
index 93f1af2b..6aa82436 100644
--- a/src/ObjWriting/Game/IW4/StringTable/StringTableDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/StringTable/StringTableDumperIW4.h
@@ -8,7 +8,6 @@ namespace string_table
     class DumperIW4 final : public AbstractAssetDumper<IW4::StringTable>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW4::StringTable>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::StringTable>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW4::StringTable>& asset) override;
     };
 } // namespace string_table
diff --git a/src/ObjWriting/Game/IW4/StructuredDataDef/StructuredDataDefDumperIW4.cpp b/src/ObjWriting/Game/IW4/StructuredDataDef/StructuredDataDefDumperIW4.cpp
index 2e5cf317..28b2998b 100644
--- a/src/ObjWriting/Game/IW4/StructuredDataDef/StructuredDataDefDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/StructuredDataDef/StructuredDataDefDumperIW4.cpp
@@ -185,15 +185,10 @@ namespace
 
 namespace structured_data_def
 {
-    bool DumperIW4::ShouldDump(XAssetInfo<StructuredDataDefSet>* asset)
+    void DumperIW4::DumpAsset(AssetDumpingContext& context, const XAssetInfo<StructuredDataDefSet>& asset)
     {
-        return true;
-    }
-
-    void DumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<StructuredDataDefSet>* asset)
-    {
-        const auto* set = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(asset->m_name);
+        const auto* set = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(asset.m_name);
 
         if (!assetFile || set->defs == nullptr)
             return;
diff --git a/src/ObjWriting/Game/IW4/StructuredDataDef/StructuredDataDefDumperIW4.h b/src/ObjWriting/Game/IW4/StructuredDataDef/StructuredDataDefDumperIW4.h
index e03d8c61..b4bb4130 100644
--- a/src/ObjWriting/Game/IW4/StructuredDataDef/StructuredDataDefDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/StructuredDataDef/StructuredDataDefDumperIW4.h
@@ -11,7 +11,6 @@ namespace structured_data_def
     class DumperIW4 final : public AbstractAssetDumper<IW4::StructuredDataDefSet>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW4::StructuredDataDefSet>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::StructuredDataDefSet>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW4::StructuredDataDefSet>& asset) override;
     };
 } // namespace structured_data_def
diff --git a/src/ObjWriting/Game/IW4/Techset/TechsetDumperIW4.cpp b/src/ObjWriting/Game/IW4/Techset/TechsetDumperIW4.cpp
index f8eb6e90..1d5e5537 100644
--- a/src/ObjWriting/Game/IW4/Techset/TechsetDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/Techset/TechsetDumperIW4.cpp
@@ -536,14 +536,9 @@ namespace IW4
 
 namespace techset
 {
-    bool DumperIW4::ShouldDump(XAssetInfo<MaterialTechniqueSet>* asset)
+    void DumperIW4::DumpAsset(AssetDumpingContext& context, const XAssetInfo<MaterialTechniqueSet>& asset)
     {
-        return true;
-    }
-
-    void DumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<MaterialTechniqueSet>* asset)
-    {
-        const auto* techset = asset->Asset();
+        const auto* techset = asset.Asset();
 
         const auto techsetFile = context.OpenAssetFile(GetFileNameForTechsetName(techset->name));
 
diff --git a/src/ObjWriting/Game/IW4/Techset/TechsetDumperIW4.h b/src/ObjWriting/Game/IW4/Techset/TechsetDumperIW4.h
index 8115f527..10d060a7 100644
--- a/src/ObjWriting/Game/IW4/Techset/TechsetDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/Techset/TechsetDumperIW4.h
@@ -8,7 +8,6 @@ namespace techset
     class DumperIW4 final : public AbstractAssetDumper<IW4::MaterialTechniqueSet>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW4::MaterialTechniqueSet>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::MaterialTechniqueSet>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW4::MaterialTechniqueSet>& asset) override;
     };
 } // namespace techset
diff --git a/src/ObjWriting/Game/IW4/Tracer/TracerDumperIW4.cpp b/src/ObjWriting/Game/IW4/Tracer/TracerDumperIW4.cpp
index 2e3635f8..21821c81 100644
--- a/src/ObjWriting/Game/IW4/Tracer/TracerDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/Tracer/TracerDumperIW4.cpp
@@ -32,18 +32,18 @@ namespace
         }
     };
 
-    InfoString CreateInfoString(XAssetInfo<TracerDef>* asset)
+    InfoString CreateInfoString(const XAssetInfo<TracerDef>& asset)
     {
-        InfoStringFromTracerConverter converter(asset->Asset(),
+        InfoStringFromTracerConverter converter(asset.Asset(),
                                                 tracer_fields,
                                                 std::extent_v<decltype(tracer_fields)>,
                                                 [asset](const scr_string_t scrStr) -> std::string
                                                 {
-                                                    assert(scrStr < asset->m_zone->m_script_strings.Count());
-                                                    if (scrStr >= asset->m_zone->m_script_strings.Count())
+                                                    assert(scrStr < asset.m_zone->m_script_strings.Count());
+                                                    if (scrStr >= asset.m_zone->m_script_strings.Count())
                                                         return "";
 
-                                                    return asset->m_zone->m_script_strings[scrStr];
+                                                    return asset.m_zone->m_script_strings[scrStr];
                                                 });
 
         return converter.Convert();
@@ -52,24 +52,19 @@ namespace
 
 namespace tracer
 {
-    bool DumperIW4::ShouldDump(XAssetInfo<TracerDef>* asset)
-    {
-        return true;
-    }
-
-    void DumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<TracerDef>* asset)
+    void DumperIW4::DumpAsset(AssetDumpingContext& context, const XAssetInfo<TracerDef>& asset)
     {
         // Only dump raw when no gdt available
         if (context.m_gdt)
         {
             const auto infoString = CreateInfoString(asset);
-            GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_TRACER);
+            GdtEntry gdtEntry(asset.m_name, ObjConstants::GDF_FILENAME_TRACER);
             infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_TRACER, gdtEntry);
             context.m_gdt->WriteEntry(gdtEntry);
         }
         else
         {
-            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset->m_name));
+            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset.m_name));
 
             if (!assetFile)
                 return;
diff --git a/src/ObjWriting/Game/IW4/Tracer/TracerDumperIW4.h b/src/ObjWriting/Game/IW4/Tracer/TracerDumperIW4.h
index d13a9f60..b9fb1660 100644
--- a/src/ObjWriting/Game/IW4/Tracer/TracerDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/Tracer/TracerDumperIW4.h
@@ -9,7 +9,6 @@ namespace tracer
     class DumperIW4 final : public AbstractAssetDumper<IW4::TracerDef>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW4::TracerDef>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::TracerDef>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW4::TracerDef>& asset) override;
     };
 } // namespace tracer
diff --git a/src/ObjWriting/Game/IW4/Vehicle/VehicleDumperIW4.cpp b/src/ObjWriting/Game/IW4/Vehicle/VehicleDumperIW4.cpp
index 9110b559..ed121bfa 100644
--- a/src/ObjWriting/Game/IW4/Vehicle/VehicleDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/Vehicle/VehicleDumperIW4.cpp
@@ -73,18 +73,18 @@ namespace
         }
     };
 
-    InfoString CreateInfoString(XAssetInfo<VehicleDef>* asset)
+    InfoString CreateInfoString(const XAssetInfo<VehicleDef>& asset)
     {
-        InfoStringFromVehicleConverter converter(asset->Asset(),
+        InfoStringFromVehicleConverter converter(asset.Asset(),
                                                  vehicle_fields,
                                                  std::extent_v<decltype(vehicle_fields)>,
                                                  [asset](const scr_string_t scrStr) -> std::string
                                                  {
-                                                     assert(scrStr < asset->m_zone->m_script_strings.Count());
-                                                     if (scrStr >= asset->m_zone->m_script_strings.Count())
+                                                     assert(scrStr < asset.m_zone->m_script_strings.Count());
+                                                     if (scrStr >= asset.m_zone->m_script_strings.Count())
                                                          return "";
 
-                                                     return asset->m_zone->m_script_strings[scrStr];
+                                                     return asset.m_zone->m_script_strings[scrStr];
                                                  });
 
         return converter.Convert();
@@ -93,24 +93,19 @@ namespace
 
 namespace vehicle
 {
-    bool DumperIW4::ShouldDump(XAssetInfo<VehicleDef>* asset)
-    {
-        return true;
-    }
-
-    void DumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<VehicleDef>* asset)
+    void DumperIW4::DumpAsset(AssetDumpingContext& context, const XAssetInfo<VehicleDef>& asset)
     {
         // Only dump raw when no gdt available
         if (context.m_gdt)
         {
             const auto infoString = CreateInfoString(asset);
-            GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_VEHICLE);
+            GdtEntry gdtEntry(asset.m_name, ObjConstants::GDF_FILENAME_VEHICLE);
             infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_VEHICLE, gdtEntry);
             context.m_gdt->WriteEntry(gdtEntry);
         }
         else
         {
-            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset->m_name));
+            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset.m_name));
 
             if (!assetFile)
                 return;
diff --git a/src/ObjWriting/Game/IW4/Vehicle/VehicleDumperIW4.h b/src/ObjWriting/Game/IW4/Vehicle/VehicleDumperIW4.h
index 5afae348..3e46b1c8 100644
--- a/src/ObjWriting/Game/IW4/Vehicle/VehicleDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/Vehicle/VehicleDumperIW4.h
@@ -9,7 +9,6 @@ namespace vehicle
     class DumperIW4 final : public AbstractAssetDumper<IW4::VehicleDef>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW4::VehicleDef>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::VehicleDef>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW4::VehicleDef>& asset) override;
     };
 } // namespace vehicle
diff --git a/src/ObjWriting/Game/IW4/Weapon/WeaponDumperIW4.cpp b/src/ObjWriting/Game/IW4/Weapon/WeaponDumperIW4.cpp
index 1ebabfe7..0300836a 100644
--- a/src/ObjWriting/Game/IW4/Weapon/WeaponDumperIW4.cpp
+++ b/src/ObjWriting/Game/IW4/Weapon/WeaponDumperIW4.cpp
@@ -353,31 +353,31 @@ namespace
         }
     }
 
-    InfoString CreateInfoString(XAssetInfo<WeaponCompleteDef>* asset)
+    InfoString CreateInfoString(const XAssetInfo<WeaponCompleteDef>& asset)
     {
         const auto fullDef = std::make_unique<WeaponFullDef>();
         memset(fullDef.get(), 0, sizeof(WeaponFullDef));
-        CopyToFullDef(asset->Asset(), fullDef.get());
+        CopyToFullDef(asset.Asset(), fullDef.get());
 
         InfoStringFromWeaponConverter converter(fullDef.get(),
                                                 weapon_fields,
                                                 std::extent_v<decltype(weapon_fields)>,
                                                 [asset](const scr_string_t scrStr) -> std::string
                                                 {
-                                                    assert(scrStr < asset->m_zone->m_script_strings.Count());
-                                                    if (scrStr >= asset->m_zone->m_script_strings.Count())
+                                                    assert(scrStr < asset.m_zone->m_script_strings.Count());
+                                                    if (scrStr >= asset.m_zone->m_script_strings.Count())
                                                         return "";
 
-                                                    return asset->m_zone->m_script_strings[scrStr];
+                                                    return asset.m_zone->m_script_strings[scrStr];
                                                 });
 
         return converter.Convert();
     }
 
-    void DumpAccuracyGraphs(AssetDumpingContext& context, XAssetInfo<WeaponCompleteDef>* asset)
+    void DumpAccuracyGraphs(AssetDumpingContext& context, const XAssetInfo<WeaponCompleteDef>& asset)
     {
         auto* accuracyGraphWriter = context.GetZoneAssetDumperState<AccuracyGraphWriter>();
-        const auto weapon = asset->Asset();
+        const auto weapon = asset.Asset();
         const auto* weapDef = weapon->weapDef;
 
         if (!weapDef)
@@ -405,24 +405,19 @@ namespace
 
 namespace weapon
 {
-    bool DumperIW4::ShouldDump(XAssetInfo<WeaponCompleteDef>* asset)
-    {
-        return true;
-    }
-
-    void DumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponCompleteDef>* asset)
+    void DumperIW4::DumpAsset(AssetDumpingContext& context, const XAssetInfo<WeaponCompleteDef>& asset)
     {
         // Only dump raw when no gdt available
         if (context.m_gdt)
         {
             const auto infoString = CreateInfoString(asset);
-            GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_WEAPON);
+            GdtEntry gdtEntry(asset.m_name, ObjConstants::GDF_FILENAME_WEAPON);
             infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_WEAPON, gdtEntry);
             context.m_gdt->WriteEntry(gdtEntry);
         }
         else
         {
-            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset->m_name));
+            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset.m_name));
 
             if (!assetFile)
                 return;
diff --git a/src/ObjWriting/Game/IW4/Weapon/WeaponDumperIW4.h b/src/ObjWriting/Game/IW4/Weapon/WeaponDumperIW4.h
index d6935e77..6004947c 100644
--- a/src/ObjWriting/Game/IW4/Weapon/WeaponDumperIW4.h
+++ b/src/ObjWriting/Game/IW4/Weapon/WeaponDumperIW4.h
@@ -9,7 +9,6 @@ namespace weapon
     class DumperIW4 final : public AbstractAssetDumper<IW4::WeaponCompleteDef>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW4::WeaponCompleteDef>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::WeaponCompleteDef>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW4::WeaponCompleteDef>& asset) override;
     };
 } // namespace weapon
diff --git a/src/ObjWriting/Game/IW5/Image/ImageDumperIW5.cpp b/src/ObjWriting/Game/IW5/Image/ImageDumperIW5.cpp
index 038f94ea..0e67625a 100644
--- a/src/ObjWriting/Game/IW5/Image/ImageDumperIW5.cpp
+++ b/src/ObjWriting/Game/IW5/Image/ImageDumperIW5.cpp
@@ -77,19 +77,14 @@ namespace image
         }
     }
 
-    bool DumperIW5::ShouldDump(XAssetInfo<GfxImage>* asset)
+    void DumperIW5::DumpAsset(AssetDumpingContext& context, const XAssetInfo<GfxImage>& asset)
     {
-        return true;
-    }
-
-    void DumperIW5::DumpAsset(AssetDumpingContext& context, XAssetInfo<GfxImage>* asset)
-    {
-        const auto* image = asset->Asset();
+        const auto* image = asset.Asset();
         const auto texture = LoadImageData(context.m_obj_search_path, *image);
         if (!texture)
             return;
 
-        const auto assetFile = context.OpenAssetFile(GetFileNameForAsset(asset->m_name, m_writer->GetFileExtension()));
+        const auto assetFile = context.OpenAssetFile(GetFileNameForAsset(asset.m_name, m_writer->GetFileExtension()));
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/IW5/Image/ImageDumperIW5.h b/src/ObjWriting/Game/IW5/Image/ImageDumperIW5.h
index 414465aa..89418db2 100644
--- a/src/ObjWriting/Game/IW5/Image/ImageDumperIW5.h
+++ b/src/ObjWriting/Game/IW5/Image/ImageDumperIW5.h
@@ -14,8 +14,7 @@ namespace image
         DumperIW5();
 
     protected:
-        bool ShouldDump(XAssetInfo<IW5::GfxImage>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW5::GfxImage>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW5::GfxImage>& asset) override;
 
     private:
         std::unique_ptr<IImageWriter> m_writer;
diff --git a/src/ObjWriting/Game/IW5/Leaderboard/LeaderboardJsonDumperIW5.cpp b/src/ObjWriting/Game/IW5/Leaderboard/LeaderboardJsonDumperIW5.cpp
index f79ea849..446ab366 100644
--- a/src/ObjWriting/Game/IW5/Leaderboard/LeaderboardJsonDumperIW5.cpp
+++ b/src/ObjWriting/Game/IW5/Leaderboard/LeaderboardJsonDumperIW5.cpp
@@ -94,19 +94,14 @@ namespace
 
 namespace leaderboard
 {
-    bool JsonDumperIW5::ShouldDump(XAssetInfo<LeaderboardDef>* asset)
+    void JsonDumperIW5::DumpAsset(AssetDumpingContext& context, const XAssetInfo<LeaderboardDef>& asset)
     {
-        return true;
-    }
-
-    void JsonDumperIW5::DumpAsset(AssetDumpingContext& context, XAssetInfo<LeaderboardDef>* asset)
-    {
-        const auto assetFile = context.OpenAssetFile(GetJsonFileNameForAsset(asset->m_name));
+        const auto assetFile = context.OpenAssetFile(GetJsonFileNameForAsset(asset.m_name));
 
         if (!assetFile)
             return;
 
         Dumper dumper(*assetFile);
-        dumper.Dump(*asset->Asset());
+        dumper.Dump(*asset.Asset());
     }
 } // namespace leaderboard
diff --git a/src/ObjWriting/Game/IW5/Leaderboard/LeaderboardJsonDumperIW5.h b/src/ObjWriting/Game/IW5/Leaderboard/LeaderboardJsonDumperIW5.h
index 3e6ff7f8..f32722fb 100644
--- a/src/ObjWriting/Game/IW5/Leaderboard/LeaderboardJsonDumperIW5.h
+++ b/src/ObjWriting/Game/IW5/Leaderboard/LeaderboardJsonDumperIW5.h
@@ -8,7 +8,6 @@ namespace leaderboard
     class JsonDumperIW5 final : public AbstractAssetDumper<IW5::LeaderboardDef>
     {
     protected:
-        [[nodiscard]] bool ShouldDump(XAssetInfo<IW5::LeaderboardDef>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW5::LeaderboardDef>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW5::LeaderboardDef>& asset) override;
     };
 } // namespace leaderboard
diff --git a/src/ObjWriting/Game/IW5/Localize/LocalizeDumperIW5.cpp b/src/ObjWriting/Game/IW5/Localize/LocalizeDumperIW5.cpp
index a9f979ee..9ecc2717 100644
--- a/src/ObjWriting/Game/IW5/Localize/LocalizeDumperIW5.cpp
+++ b/src/ObjWriting/Game/IW5/Localize/LocalizeDumperIW5.cpp
@@ -11,9 +11,14 @@ using namespace IW5;
 
 namespace localize
 {
-    void DumperIW5::DumpPool(AssetDumpingContext& context, AssetPool<IW5::LocalizeEntry>* pool)
+    size_t DumperIW5::GetProgressTotalCount(const AssetPool<IW5::LocalizeEntry>& pool) const
     {
-        if (pool->m_asset_lookup.empty())
+        return pool.m_asset_lookup.empty() ? 0uz : 1uz;
+    }
+
+    void DumperIW5::DumpPool(AssetDumpingContext& context, const AssetPool<LocalizeEntry>& pool)
+    {
+        if (pool.m_asset_lookup.empty())
             return;
 
         const auto language = LocalizeCommon::GetNameOfLanguage(context.m_zone.m_language);
@@ -30,7 +35,7 @@ namespace localize
 
             stringFileDumper.SetNotes("");
 
-            for (auto* localizeEntry : *pool)
+            for (const auto* localizeEntry : pool)
             {
                 stringFileDumper.WriteLocalizeEntry(localizeEntry->m_name, localizeEntry->Asset()->value);
             }
@@ -41,5 +46,7 @@ namespace localize
         {
             con::error("Could not create string file for dumping localized strings of zone '{}'", context.m_zone.m_name);
         }
+
+        context.IncrementProgress();
     }
 } // namespace localize
diff --git a/src/ObjWriting/Game/IW5/Localize/LocalizeDumperIW5.h b/src/ObjWriting/Game/IW5/Localize/LocalizeDumperIW5.h
index 26373073..80549d97 100644
--- a/src/ObjWriting/Game/IW5/Localize/LocalizeDumperIW5.h
+++ b/src/ObjWriting/Game/IW5/Localize/LocalizeDumperIW5.h
@@ -8,6 +8,7 @@ namespace localize
     class DumperIW5 final : public IAssetDumper<IW5::LocalizeEntry>
     {
     public:
-        void DumpPool(AssetDumpingContext& context, AssetPool<IW5::LocalizeEntry>* pool) override;
+        [[nodiscard]] size_t GetProgressTotalCount(const AssetPool<IW5::LocalizeEntry>& pool) const override;
+        void DumpPool(AssetDumpingContext& context, const AssetPool<IW5::LocalizeEntry>& pool) override;
     };
 } // namespace localize
diff --git a/src/ObjWriting/Game/IW5/Maps/AddonMapEntsDumperIW5.cpp b/src/ObjWriting/Game/IW5/Maps/AddonMapEntsDumperIW5.cpp
index 3facfa1c..b381acc8 100644
--- a/src/ObjWriting/Game/IW5/Maps/AddonMapEntsDumperIW5.cpp
+++ b/src/ObjWriting/Game/IW5/Maps/AddonMapEntsDumperIW5.cpp
@@ -7,15 +7,10 @@ using namespace IW5;
 
 namespace addon_map_ents
 {
-    bool DumperIW5::ShouldDump(XAssetInfo<AddonMapEnts>* asset)
+    void DumperIW5::DumpAsset(AssetDumpingContext& context, const XAssetInfo<AddonMapEnts>& asset)
     {
-        return true;
-    }
-
-    void DumperIW5::DumpAsset(AssetDumpingContext& context, XAssetInfo<AddonMapEnts>* asset)
-    {
-        const auto* addonMapEnts = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(asset->m_name);
+        const auto* addonMapEnts = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(asset.m_name);
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/IW5/Maps/AddonMapEntsDumperIW5.h b/src/ObjWriting/Game/IW5/Maps/AddonMapEntsDumperIW5.h
index 6c251086..2dd3e716 100644
--- a/src/ObjWriting/Game/IW5/Maps/AddonMapEntsDumperIW5.h
+++ b/src/ObjWriting/Game/IW5/Maps/AddonMapEntsDumperIW5.h
@@ -8,7 +8,6 @@ namespace addon_map_ents
     class DumperIW5 final : public AbstractAssetDumper<IW5::AddonMapEnts>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW5::AddonMapEnts>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW5::AddonMapEnts>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW5::AddonMapEnts>& asset) override;
     };
 } // namespace addon_map_ents
diff --git a/src/ObjWriting/Game/IW5/Menu/MenuDumperIW5.cpp b/src/ObjWriting/Game/IW5/Menu/MenuDumperIW5.cpp
index 2abe44a0..a512ccc9 100644
--- a/src/ObjWriting/Game/IW5/Menu/MenuDumperIW5.cpp
+++ b/src/ObjWriting/Game/IW5/Menu/MenuDumperIW5.cpp
@@ -15,10 +15,10 @@ using namespace IW5;
 
 namespace
 {
-    const MenuList* GetParentMenuList(XAssetInfo<menuDef_t>* asset)
+    const MenuList* GetParentMenuList(const XAssetInfo<menuDef_t>& asset)
     {
-        const auto* menu = asset->Asset();
-        const auto* gameAssetPool = dynamic_cast<GameAssetPoolIW5*>(asset->m_zone->m_pools.get());
+        const auto* menu = asset.Asset();
+        const auto* gameAssetPool = dynamic_cast<GameAssetPoolIW5*>(asset.m_zone->m_pools.get());
         for (const auto* menuList : *gameAssetPool->m_menu_list)
         {
             const auto* menuListAsset = menuList->Asset();
@@ -33,32 +33,27 @@ namespace
         return nullptr;
     }
 
-    std::string GetPathForMenu(XAssetInfo<menuDef_t>* asset)
+    std::string GetPathForMenu(const XAssetInfo<menuDef_t>& asset)
     {
         const auto* list = GetParentMenuList(asset);
 
         if (!list)
-            return std::format("ui_mp/{}.menu", asset->Asset()->window.name);
+            return std::format("ui_mp/{}.menu", asset.Asset()->window.name);
 
         const fs::path p(list->name);
         std::string parentPath;
         if (p.has_parent_path())
             parentPath = p.parent_path().string() + "/";
 
-        return std::format("{}{}.menu", parentPath, asset->Asset()->window.name);
+        return std::format("{}{}.menu", parentPath, asset.Asset()->window.name);
     }
 } // namespace
 
 namespace menu
 {
-    bool MenuDumperIW5::ShouldDump(XAssetInfo<menuDef_t>* asset)
+    void MenuDumperIW5::DumpAsset(AssetDumpingContext& context, const XAssetInfo<menuDef_t>& asset)
     {
-        return true;
-    }
-
-    void MenuDumperIW5::DumpAsset(AssetDumpingContext& context, XAssetInfo<menuDef_t>* asset)
-    {
-        const auto* menu = asset->Asset();
+        const auto* menu = asset.Asset();
         const auto menuFilePath = GetPathForMenu(asset);
 
         if (ObjWriting::ShouldHandleAssetType(ASSET_TYPE_MENULIST))
diff --git a/src/ObjWriting/Game/IW5/Menu/MenuDumperIW5.h b/src/ObjWriting/Game/IW5/Menu/MenuDumperIW5.h
index 03577fcb..5ded9191 100644
--- a/src/ObjWriting/Game/IW5/Menu/MenuDumperIW5.h
+++ b/src/ObjWriting/Game/IW5/Menu/MenuDumperIW5.h
@@ -9,7 +9,6 @@ namespace menu
     class MenuDumperIW5 final : public AbstractAssetDumper<IW5::menuDef_t>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW5::menuDef_t>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW5::menuDef_t>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW5::menuDef_t>& asset) override;
     };
 } // namespace menu
diff --git a/src/ObjWriting/Game/IW5/Menu/MenuListDumperIW5.cpp b/src/ObjWriting/Game/IW5/Menu/MenuListDumperIW5.cpp
index 9a1d674c..8298dc8b 100644
--- a/src/ObjWriting/Game/IW5/Menu/MenuListDumperIW5.cpp
+++ b/src/ObjWriting/Game/IW5/Menu/MenuListDumperIW5.cpp
@@ -106,15 +106,10 @@ namespace
 
 namespace menu
 {
-    bool MenuListDumperIW5::ShouldDump(XAssetInfo<MenuList>* asset)
+    void MenuListDumperIW5::DumpAsset(AssetDumpingContext& context, const XAssetInfo<MenuList>& asset)
     {
-        return true;
-    }
-
-    void MenuListDumperIW5::DumpAsset(AssetDumpingContext& context, XAssetInfo<MenuList>* asset)
-    {
-        const auto* menuList = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(asset->m_name);
+        const auto* menuList = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(asset.m_name);
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/IW5/Menu/MenuListDumperIW5.h b/src/ObjWriting/Game/IW5/Menu/MenuListDumperIW5.h
index d4da415f..9a87fcf4 100644
--- a/src/ObjWriting/Game/IW5/Menu/MenuListDumperIW5.h
+++ b/src/ObjWriting/Game/IW5/Menu/MenuListDumperIW5.h
@@ -8,7 +8,6 @@ namespace menu
     class MenuListDumperIW5 final : public AbstractAssetDumper<IW5::MenuList>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW5::MenuList>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW5::MenuList>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW5::MenuList>& asset) override;
     };
 } // namespace menu
diff --git a/src/ObjWriting/Game/IW5/ObjWriterIW5.cpp b/src/ObjWriting/Game/IW5/ObjWriterIW5.cpp
index 4cbd3f31..65542a8d 100644
--- a/src/ObjWriting/Game/IW5/ObjWriterIW5.cpp
+++ b/src/ObjWriting/Game/IW5/ObjWriterIW5.cpp
@@ -25,10 +25,20 @@ bool ObjWriter::DumpZone(AssetDumpingContext& context) const
     if (assetPools->poolName && ObjWriting::ShouldHandleAssetType(assetType))                                                                                  \
     {                                                                                                                                                          \
         dumperType dumper;                                                                                                                                     \
-        dumper.DumpPool(context, assetPools->poolName.get());                                                                                                  \
+        totalProgress += dumper.GetProgressTotalCount(*assetPools->poolName);                                                                                  \
+        dumpingFunctions.emplace_back(                                                                                                                         \
+            [](AssetDumpingContext& funcContext, const GameAssetPoolIW5* funcPools)                                                                            \
+            {                                                                                                                                                  \
+                dumperType dumper;                                                                                                                             \
+                dumper.DumpPool(funcContext, *funcPools->poolName);                                                                                            \
+            });                                                                                                                                                \
     }
 
     const auto* assetPools = dynamic_cast<GameAssetPoolIW5*>(context.m_zone.m_pools.get());
+
+    size_t totalProgress = 0uz;
+    std::vector<std::function<void(AssetDumpingContext & context, const GameAssetPoolIW5*)>> dumpingFunctions;
+
     // DUMP_ASSET_POOL(AssetDumperPhysPreset, m_phys_preset, ASSET_TYPE_PHYSPRESET)
     // DUMP_ASSET_POOL(AssetDumperPhysCollmap, m_phys_collmap, ASSET_TYPE_PHYSCOLLMAP)
     // DUMP_ASSET_POOL(AssetDumperXAnimParts, m_xanim_parts, ASSET_TYPE_XANIMPARTS)
@@ -70,6 +80,10 @@ bool ObjWriter::DumpZone(AssetDumpingContext& context) const
     // DUMP_ASSET_POOL(AssetDumperVehicleDef, m_vehicle, ASSET_TYPE_VEHICLE)
     DUMP_ASSET_POOL(addon_map_ents::DumperIW5, m_addon_map_ents, ASSET_TYPE_ADDON_MAP_ENTS)
 
+    context.SetTotalProgress(totalProgress);
+    for (const auto& func : dumpingFunctions)
+        func(context, assetPools);
+
     return true;
 
 #undef DUMP_ASSET_POOL
diff --git a/src/ObjWriting/Game/IW5/RawFile/RawFileDumperIW5.cpp b/src/ObjWriting/Game/IW5/RawFile/RawFileDumperIW5.cpp
index 9021e3b3..f087ec0c 100644
--- a/src/ObjWriting/Game/IW5/RawFile/RawFileDumperIW5.cpp
+++ b/src/ObjWriting/Game/IW5/RawFile/RawFileDumperIW5.cpp
@@ -10,15 +10,10 @@ using namespace IW5;
 
 namespace raw_file
 {
-    bool DumperIW5::ShouldDump(XAssetInfo<RawFile>* asset)
+    void DumperIW5::DumpAsset(AssetDumpingContext& context, const XAssetInfo<RawFile>& asset)
     {
-        return true;
-    }
-
-    void DumperIW5::DumpAsset(AssetDumpingContext& context, XAssetInfo<RawFile>* asset)
-    {
-        const auto* rawFile = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(asset->m_name);
+        const auto* rawFile = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(asset.m_name);
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/IW5/RawFile/RawFileDumperIW5.h b/src/ObjWriting/Game/IW5/RawFile/RawFileDumperIW5.h
index ed2ceb4f..a88e1522 100644
--- a/src/ObjWriting/Game/IW5/RawFile/RawFileDumperIW5.h
+++ b/src/ObjWriting/Game/IW5/RawFile/RawFileDumperIW5.h
@@ -8,7 +8,6 @@ namespace raw_file
     class DumperIW5 final : public AbstractAssetDumper<IW5::RawFile>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW5::RawFile>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW5::RawFile>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW5::RawFile>& asset) override;
     };
 } // namespace raw_file
diff --git a/src/ObjWriting/Game/IW5/Script/ScriptDumperIW5.cpp b/src/ObjWriting/Game/IW5/Script/ScriptDumperIW5.cpp
index d334cb1c..9a73c8dd 100644
--- a/src/ObjWriting/Game/IW5/Script/ScriptDumperIW5.cpp
+++ b/src/ObjWriting/Game/IW5/Script/ScriptDumperIW5.cpp
@@ -4,16 +4,11 @@ using namespace IW5;
 
 namespace script
 {
-    bool DumperIW5::ShouldDump(XAssetInfo<IW5::ScriptFile>* asset)
-    {
-        return true;
-    }
-
     // See https://github.com/xensik/gsc-tool#file-format for an in-depth explanation about the .gscbin format
-    void DumperIW5::DumpAsset(AssetDumpingContext& context, XAssetInfo<IW5::ScriptFile>* asset)
+    void DumperIW5::DumpAsset(AssetDumpingContext& context, const XAssetInfo<ScriptFile>& asset)
     {
-        auto* scriptFile = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(asset->m_name + ".gscbin");
+        auto* scriptFile = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(asset.m_name + ".gscbin");
 
         if (!assetFile)
             return;
@@ -21,10 +16,10 @@ namespace script
         auto& stream = *assetFile;
 
         // Dump the name and the numeric fields
-        stream.write(asset->m_name.c_str(), asset->m_name.size() + 1);
-        stream.write(reinterpret_cast<char*>(&scriptFile->compressedLen), sizeof(scriptFile->compressedLen));
-        stream.write(reinterpret_cast<char*>(&scriptFile->len), sizeof(scriptFile->len));
-        stream.write(reinterpret_cast<char*>(&scriptFile->bytecodeLen), sizeof(scriptFile->bytecodeLen));
+        stream.write(asset.m_name.c_str(), asset.m_name.size() + 1);
+        stream.write(reinterpret_cast<const char*>(&scriptFile->compressedLen), sizeof(scriptFile->compressedLen));
+        stream.write(reinterpret_cast<const char*>(&scriptFile->len), sizeof(scriptFile->len));
+        stream.write(reinterpret_cast<const char*>(&scriptFile->bytecodeLen), sizeof(scriptFile->bytecodeLen));
 
         // Dump the buffers
         stream.write(scriptFile->buffer, scriptFile->compressedLen);
diff --git a/src/ObjWriting/Game/IW5/Script/ScriptDumperIW5.h b/src/ObjWriting/Game/IW5/Script/ScriptDumperIW5.h
index e1220f5f..dd8fa0c3 100644
--- a/src/ObjWriting/Game/IW5/Script/ScriptDumperIW5.h
+++ b/src/ObjWriting/Game/IW5/Script/ScriptDumperIW5.h
@@ -8,7 +8,6 @@ namespace script
     class DumperIW5 final : public AbstractAssetDumper<IW5::ScriptFile>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW5::ScriptFile>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW5::ScriptFile>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW5::ScriptFile>& asset) override;
     };
 } // namespace script
diff --git a/src/ObjWriting/Game/IW5/Sound/LoadedSoundDumperIW5.cpp b/src/ObjWriting/Game/IW5/Sound/LoadedSoundDumperIW5.cpp
index 4a50e20b..05d20518 100644
--- a/src/ObjWriting/Game/IW5/Sound/LoadedSoundDumperIW5.cpp
+++ b/src/ObjWriting/Game/IW5/Sound/LoadedSoundDumperIW5.cpp
@@ -25,15 +25,10 @@ namespace
 
 namespace sound
 {
-    bool LoadedSoundDumperIW5::ShouldDump(XAssetInfo<LoadedSound>* asset)
+    void LoadedSoundDumperIW5::DumpAsset(AssetDumpingContext& context, const XAssetInfo<LoadedSound>& asset)
     {
-        return true;
-    }
-
-    void LoadedSoundDumperIW5::DumpAsset(AssetDumpingContext& context, XAssetInfo<LoadedSound>* asset)
-    {
-        const auto* loadedSound = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(std::format("sound/{}", asset->m_name));
+        const auto* loadedSound = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(std::format("sound/{}", asset.m_name));
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/IW5/Sound/LoadedSoundDumperIW5.h b/src/ObjWriting/Game/IW5/Sound/LoadedSoundDumperIW5.h
index 8079f27d..449b4fc8 100644
--- a/src/ObjWriting/Game/IW5/Sound/LoadedSoundDumperIW5.h
+++ b/src/ObjWriting/Game/IW5/Sound/LoadedSoundDumperIW5.h
@@ -8,7 +8,6 @@ namespace sound
     class LoadedSoundDumperIW5 final : public AbstractAssetDumper<IW5::LoadedSound>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW5::LoadedSound>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW5::LoadedSound>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW5::LoadedSound>& asset) override;
     };
 } // namespace sound
diff --git a/src/ObjWriting/Game/IW5/StringTable/StringTableDumperIW5.cpp b/src/ObjWriting/Game/IW5/StringTable/StringTableDumperIW5.cpp
index 2bd7fa00..d8509a95 100644
--- a/src/ObjWriting/Game/IW5/StringTable/StringTableDumperIW5.cpp
+++ b/src/ObjWriting/Game/IW5/StringTable/StringTableDumperIW5.cpp
@@ -6,15 +6,10 @@ using namespace IW5;
 
 namespace string_table
 {
-    bool DumperIW5::ShouldDump(XAssetInfo<StringTable>* asset)
+    void DumperIW5::DumpAsset(AssetDumpingContext& context, const XAssetInfo<StringTable>& asset)
     {
-        return true;
-    }
-
-    void DumperIW5::DumpAsset(AssetDumpingContext& context, XAssetInfo<StringTable>* asset)
-    {
-        const auto* stringTable = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(asset->m_name);
+        const auto* stringTable = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(asset.m_name);
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/IW5/StringTable/StringTableDumperIW5.h b/src/ObjWriting/Game/IW5/StringTable/StringTableDumperIW5.h
index e826dfd0..9c16c6a8 100644
--- a/src/ObjWriting/Game/IW5/StringTable/StringTableDumperIW5.h
+++ b/src/ObjWriting/Game/IW5/StringTable/StringTableDumperIW5.h
@@ -8,7 +8,6 @@ namespace string_table
     class DumperIW5 final : public AbstractAssetDumper<IW5::StringTable>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW5::StringTable>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW5::StringTable>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW5::StringTable>& asset) override;
     };
 } // namespace string_table
diff --git a/src/ObjWriting/Game/IW5/Weapon/AttachmentJsonDumperIW5.cpp b/src/ObjWriting/Game/IW5/Weapon/AttachmentJsonDumperIW5.cpp
index c44f99a2..0e412898 100644
--- a/src/ObjWriting/Game/IW5/Weapon/AttachmentJsonDumperIW5.cpp
+++ b/src/ObjWriting/Game/IW5/Weapon/AttachmentJsonDumperIW5.cpp
@@ -395,19 +395,14 @@ namespace
 
 namespace attachment
 {
-    bool JsonDumperIW5::ShouldDump(XAssetInfo<WeaponAttachment>* asset)
+    void JsonDumperIW5::DumpAsset(AssetDumpingContext& context, const XAssetInfo<WeaponAttachment>& asset)
     {
-        return true;
-    }
-
-    void JsonDumperIW5::DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponAttachment>* asset)
-    {
-        const auto assetFile = context.OpenAssetFile(GetJsonFileNameForAssetName(asset->m_name));
+        const auto assetFile = context.OpenAssetFile(GetJsonFileNameForAssetName(asset.m_name));
 
         if (!assetFile)
             return;
 
         const JsonDumperImpl dumper(context, *assetFile);
-        dumper.Dump(asset->Asset());
+        dumper.Dump(asset.Asset());
     }
 } // namespace attachment
diff --git a/src/ObjWriting/Game/IW5/Weapon/AttachmentJsonDumperIW5.h b/src/ObjWriting/Game/IW5/Weapon/AttachmentJsonDumperIW5.h
index 81088a63..d956f0cc 100644
--- a/src/ObjWriting/Game/IW5/Weapon/AttachmentJsonDumperIW5.h
+++ b/src/ObjWriting/Game/IW5/Weapon/AttachmentJsonDumperIW5.h
@@ -8,7 +8,6 @@ namespace attachment
     class JsonDumperIW5 final : public AbstractAssetDumper<IW5::WeaponAttachment>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW5::WeaponAttachment>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW5::WeaponAttachment>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW5::WeaponAttachment>& asset) override;
     };
 } // namespace attachment
diff --git a/src/ObjWriting/Game/IW5/Weapon/WeaponDumperIW5.cpp b/src/ObjWriting/Game/IW5/Weapon/WeaponDumperIW5.cpp
index 67ab7628..c8a47ad8 100644
--- a/src/ObjWriting/Game/IW5/Weapon/WeaponDumperIW5.cpp
+++ b/src/ObjWriting/Game/IW5/Weapon/WeaponDumperIW5.cpp
@@ -681,31 +681,31 @@ namespace
         }
     }
 
-    InfoString CreateInfoString(XAssetInfo<WeaponCompleteDef>* asset)
+    InfoString CreateInfoString(const XAssetInfo<WeaponCompleteDef>& asset)
     {
         const auto fullDef = std::make_unique<WeaponFullDef>();
         memset(fullDef.get(), 0, sizeof(WeaponFullDef));
-        CopyToFullDef(asset->Asset(), fullDef.get());
+        CopyToFullDef(asset.Asset(), fullDef.get());
 
         InfoStringFromWeaponConverter converter(fullDef.get(),
                                                 weapon_fields,
                                                 std::extent_v<decltype(weapon_fields)>,
                                                 [asset](const scr_string_t scrStr) -> std::string
                                                 {
-                                                    assert(scrStr < asset->m_zone->m_script_strings.Count());
-                                                    if (scrStr >= asset->m_zone->m_script_strings.Count())
+                                                    assert(scrStr < asset.m_zone->m_script_strings.Count());
+                                                    if (scrStr >= asset.m_zone->m_script_strings.Count())
                                                         return "";
 
-                                                    return asset->m_zone->m_script_strings[scrStr];
+                                                    return asset.m_zone->m_script_strings[scrStr];
                                                 });
 
         return converter.Convert();
     }
 
-    void DumpAccuracyGraphs(AssetDumpingContext& context, XAssetInfo<WeaponCompleteDef>* asset)
+    void DumpAccuracyGraphs(AssetDumpingContext& context, const XAssetInfo<WeaponCompleteDef>& asset)
     {
         auto* accuracyGraphWriter = context.GetZoneAssetDumperState<AccuracyGraphWriter>();
-        const auto weapon = asset->Asset();
+        const auto weapon = asset.Asset();
         const auto* weapDef = weapon->weapDef;
 
         if (!weapDef)
@@ -733,12 +733,7 @@ namespace
 
 namespace weapon
 {
-    bool DumperIW5::ShouldDump(XAssetInfo<WeaponCompleteDef>* asset)
-    {
-        return true;
-    }
-
-    void DumperIW5::DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponCompleteDef>* asset)
+    void DumperIW5::DumpAsset(AssetDumpingContext& context, const XAssetInfo<WeaponCompleteDef>& asset)
     {
         // TODO: only dump infostring fields when non-default
 
@@ -746,13 +741,13 @@ namespace weapon
         if (context.m_gdt)
         {
             const auto infoString = CreateInfoString(asset);
-            GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_WEAPON);
+            GdtEntry gdtEntry(asset.m_name, ObjConstants::GDF_FILENAME_WEAPON);
             infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_WEAPON, gdtEntry);
             context.m_gdt->WriteEntry(gdtEntry);
         }
         else
         {
-            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset->m_name));
+            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset.m_name));
 
             if (!assetFile)
                 return;
diff --git a/src/ObjWriting/Game/IW5/Weapon/WeaponDumperIW5.h b/src/ObjWriting/Game/IW5/Weapon/WeaponDumperIW5.h
index 3e80c669..44457a92 100644
--- a/src/ObjWriting/Game/IW5/Weapon/WeaponDumperIW5.h
+++ b/src/ObjWriting/Game/IW5/Weapon/WeaponDumperIW5.h
@@ -9,7 +9,6 @@ namespace weapon
     class DumperIW5 final : public AbstractAssetDumper<IW5::WeaponCompleteDef>
     {
     protected:
-        bool ShouldDump(XAssetInfo<IW5::WeaponCompleteDef>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW5::WeaponCompleteDef>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<IW5::WeaponCompleteDef>& asset) override;
     };
 } // namespace weapon
diff --git a/src/ObjWriting/Game/T5/Image/ImageDumperT5.cpp b/src/ObjWriting/Game/T5/Image/ImageDumperT5.cpp
index 6843efa8..f3745621 100644
--- a/src/ObjWriting/Game/T5/Image/ImageDumperT5.cpp
+++ b/src/ObjWriting/Game/T5/Image/ImageDumperT5.cpp
@@ -76,19 +76,14 @@ namespace image
         }
     }
 
-    bool DumperT5::ShouldDump(XAssetInfo<GfxImage>* asset)
+    void DumperT5::DumpAsset(AssetDumpingContext& context, const XAssetInfo<GfxImage>& asset)
     {
-        return true;
-    }
-
-    void DumperT5::DumpAsset(AssetDumpingContext& context, XAssetInfo<GfxImage>* asset)
-    {
-        const auto* image = asset->Asset();
+        const auto* image = asset.Asset();
         const auto texture = LoadImageData(context.m_obj_search_path, *image);
         if (!texture)
             return;
 
-        const auto assetFile = context.OpenAssetFile(GetFileNameForAsset(asset->m_name, m_writer->GetFileExtension()));
+        const auto assetFile = context.OpenAssetFile(GetFileNameForAsset(asset.m_name, m_writer->GetFileExtension()));
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/T5/Image/ImageDumperT5.h b/src/ObjWriting/Game/T5/Image/ImageDumperT5.h
index 0be6b9bb..bf650bb3 100644
--- a/src/ObjWriting/Game/T5/Image/ImageDumperT5.h
+++ b/src/ObjWriting/Game/T5/Image/ImageDumperT5.h
@@ -14,8 +14,7 @@ namespace image
         DumperT5();
 
     protected:
-        bool ShouldDump(XAssetInfo<T5::GfxImage>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T5::GfxImage>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T5::GfxImage>& asset) override;
 
     private:
         std::unique_ptr<IImageWriter> m_writer;
diff --git a/src/ObjWriting/Game/T5/Localize/LocalizeDumperT5.cpp b/src/ObjWriting/Game/T5/Localize/LocalizeDumperT5.cpp
index 0ed7388b..44aac168 100644
--- a/src/ObjWriting/Game/T5/Localize/LocalizeDumperT5.cpp
+++ b/src/ObjWriting/Game/T5/Localize/LocalizeDumperT5.cpp
@@ -11,9 +11,14 @@ using namespace T5;
 
 namespace localize
 {
-    void DumperT5::DumpPool(AssetDumpingContext& context, AssetPool<LocalizeEntry>* pool)
+    size_t DumperT5::GetProgressTotalCount(const AssetPool<T5::LocalizeEntry>& pool) const
     {
-        if (pool->m_asset_lookup.empty())
+        return pool.m_asset_lookup.empty() ? 0uz : 1uz;
+    }
+
+    void DumperT5::DumpPool(AssetDumpingContext& context, const AssetPool<LocalizeEntry>& pool)
+    {
+        if (pool.m_asset_lookup.empty())
             return;
 
         const auto language = LocalizeCommon::GetNameOfLanguage(context.m_zone.m_language);
@@ -30,7 +35,7 @@ namespace localize
 
             stringFileDumper.SetNotes("");
 
-            for (auto* localizeEntry : *pool)
+            for (const auto* localizeEntry : pool)
             {
                 stringFileDumper.WriteLocalizeEntry(localizeEntry->m_name, localizeEntry->Asset()->value);
             }
@@ -41,5 +46,7 @@ namespace localize
         {
             con::error("Could not create string file for dumping localized strings of zone '{}'", context.m_zone.m_name);
         }
+
+        context.IncrementProgress();
     }
 } // namespace localize
diff --git a/src/ObjWriting/Game/T5/Localize/LocalizeDumperT5.h b/src/ObjWriting/Game/T5/Localize/LocalizeDumperT5.h
index 321a9aef..9648668b 100644
--- a/src/ObjWriting/Game/T5/Localize/LocalizeDumperT5.h
+++ b/src/ObjWriting/Game/T5/Localize/LocalizeDumperT5.h
@@ -8,6 +8,7 @@ namespace localize
     class DumperT5 final : public IAssetDumper<T5::LocalizeEntry>
     {
     public:
-        void DumpPool(AssetDumpingContext& context, AssetPool<T5::LocalizeEntry>* pool) override;
+        [[nodiscard]] size_t GetProgressTotalCount(const AssetPool<T5::LocalizeEntry>& pool) const override;
+        void DumpPool(AssetDumpingContext& context, const AssetPool<T5::LocalizeEntry>& pool) override;
     };
 } // namespace localize
diff --git a/src/ObjWriting/Game/T5/ObjWriterT5.cpp b/src/ObjWriting/Game/T5/ObjWriterT5.cpp
index 208f14ba..101339a4 100644
--- a/src/ObjWriting/Game/T5/ObjWriterT5.cpp
+++ b/src/ObjWriting/Game/T5/ObjWriterT5.cpp
@@ -17,11 +17,20 @@ bool ObjWriter::DumpZone(AssetDumpingContext& context) const
     if (assetPools->poolName && ObjWriting::ShouldHandleAssetType(assetType))                                                                                  \
     {                                                                                                                                                          \
         dumperType dumper;                                                                                                                                     \
-        dumper.DumpPool(context, assetPools->poolName.get());                                                                                                  \
+        totalProgress += dumper.GetProgressTotalCount(*assetPools->poolName);                                                                                  \
+        dumpingFunctions.emplace_back(                                                                                                                         \
+            [](AssetDumpingContext& funcContext, const GameAssetPoolT5* funcPools)                                                                             \
+            {                                                                                                                                                  \
+                dumperType dumper;                                                                                                                             \
+                dumper.DumpPool(funcContext, *funcPools->poolName);                                                                                            \
+            });                                                                                                                                                \
     }
 
     const auto* assetPools = dynamic_cast<GameAssetPoolT5*>(context.m_zone.m_pools.get());
 
+    size_t totalProgress = 0uz;
+    std::vector<std::function<void(AssetDumpingContext & context, const GameAssetPoolT5*)>> dumpingFunctions;
+
     // DUMP_ASSET_POOL(AssetDumperPhysPreset, m_phys_preset, ASSET_TYPE_PHYSPRESET)
     // DUMP_ASSET_POOL(AssetDumperPhysConstraints, m_phys_constraints, ASSET_TYPE_PHYSCONSTRAINTS)
     // DUMP_ASSET_POOL(AssetDumperDestructibleDef, m_destructible_def, ASSET_TYPE_DESTRUCTIBLEDEF)
@@ -55,6 +64,10 @@ bool ObjWriter::DumpZone(AssetDumpingContext& context) const
     // DUMP_ASSET_POOL(AssetDumperGlasses, m_glasses, ASSET_TYPE_GLASSES)
     // DUMP_ASSET_POOL(AssetDumperEmblemSet, m_emblem_set, ASSET_TYPE_EMBLEMSET)
 
+    context.SetTotalProgress(totalProgress);
+    for (const auto& func : dumpingFunctions)
+        func(context, assetPools);
+
     return true;
 
 #undef DUMP_ASSET_POOL
diff --git a/src/ObjWriting/Game/T5/RawFile/RawFileDumperT5.cpp b/src/ObjWriting/Game/T5/RawFile/RawFileDumperT5.cpp
index a3d41751..ac6d8922 100644
--- a/src/ObjWriting/Game/T5/RawFile/RawFileDumperT5.cpp
+++ b/src/ObjWriting/Game/T5/RawFile/RawFileDumperT5.cpp
@@ -15,9 +15,9 @@ namespace
 {
     constexpr static size_t GSC_MAX_SIZE = 0xC000000;
 
-    void DumpGsc(AssetDumpingContext& context, XAssetInfo<RawFile>* asset, std::ostream& stream)
+    void DumpGsc(AssetDumpingContext& context, const XAssetInfo<RawFile>& asset, std::ostream& stream)
     {
-        const auto* rawFile = asset->Asset();
+        const auto* rawFile = asset.Asset();
 
         if (rawFile->len <= 8)
         {
@@ -96,15 +96,10 @@ namespace
 
 namespace raw_file
 {
-    bool DumperT5::ShouldDump(XAssetInfo<RawFile>* asset)
+    void DumperT5::DumpAsset(AssetDumpingContext& context, const XAssetInfo<RawFile>& asset)
     {
-        return true;
-    }
-
-    void DumperT5::DumpAsset(AssetDumpingContext& context, XAssetInfo<RawFile>* asset)
-    {
-        const auto* rawFile = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(asset->m_name);
+        const auto* rawFile = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(asset.m_name);
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/T5/RawFile/RawFileDumperT5.h b/src/ObjWriting/Game/T5/RawFile/RawFileDumperT5.h
index 056266ae..38b46813 100644
--- a/src/ObjWriting/Game/T5/RawFile/RawFileDumperT5.h
+++ b/src/ObjWriting/Game/T5/RawFile/RawFileDumperT5.h
@@ -8,7 +8,6 @@ namespace raw_file
     class DumperT5 final : public AbstractAssetDumper<T5::RawFile>
     {
     protected:
-        bool ShouldDump(XAssetInfo<T5::RawFile>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T5::RawFile>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T5::RawFile>& asset) override;
     };
 } // namespace raw_file
diff --git a/src/ObjWriting/Game/T5/StringTable/StringTableDumperT5.cpp b/src/ObjWriting/Game/T5/StringTable/StringTableDumperT5.cpp
index 0acc3587..2aa544e5 100644
--- a/src/ObjWriting/Game/T5/StringTable/StringTableDumperT5.cpp
+++ b/src/ObjWriting/Game/T5/StringTable/StringTableDumperT5.cpp
@@ -6,15 +6,10 @@ using namespace T5;
 
 namespace string_table
 {
-    bool DumperT5::ShouldDump(XAssetInfo<StringTable>* asset)
+    void DumperT5::DumpAsset(AssetDumpingContext& context, const XAssetInfo<StringTable>& asset)
     {
-        return true;
-    }
-
-    void DumperT5::DumpAsset(AssetDumpingContext& context, XAssetInfo<StringTable>* asset)
-    {
-        const auto* stringTable = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(asset->m_name);
+        const auto* stringTable = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(asset.m_name);
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/T5/StringTable/StringTableDumperT5.h b/src/ObjWriting/Game/T5/StringTable/StringTableDumperT5.h
index 12ee953b..8257c607 100644
--- a/src/ObjWriting/Game/T5/StringTable/StringTableDumperT5.h
+++ b/src/ObjWriting/Game/T5/StringTable/StringTableDumperT5.h
@@ -8,7 +8,6 @@ namespace string_table
     class DumperT5 final : public AbstractAssetDumper<T5::StringTable>
     {
     protected:
-        bool ShouldDump(XAssetInfo<T5::StringTable>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T5::StringTable>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T5::StringTable>& asset) override;
     };
 } // namespace string_table
diff --git a/src/ObjWriting/Game/T6/FontIcon/FontIconCsvDumperT6.cpp b/src/ObjWriting/Game/T6/FontIcon/FontIconCsvDumperT6.cpp
index 95c6f1cc..d8687eae 100644
--- a/src/ObjWriting/Game/T6/FontIcon/FontIconCsvDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/FontIcon/FontIconCsvDumperT6.cpp
@@ -133,19 +133,14 @@ namespace
 
 namespace font_icon
 {
-    bool CsvDumperT6::ShouldDump(XAssetInfo<FontIcon>* asset)
+    void CsvDumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<FontIcon>& asset)
     {
-        return true;
-    }
-
-    void CsvDumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<FontIcon>* asset)
-    {
-        const auto assetFile = context.OpenAssetFile(asset->m_name);
+        const auto assetFile = context.OpenAssetFile(asset.m_name);
 
         if (!assetFile)
             return;
 
         Dumper dumper(*assetFile);
-        dumper.Dump(*asset->Asset());
+        dumper.Dump(*asset.Asset());
     }
 } // namespace font_icon
diff --git a/src/ObjWriting/Game/T6/FontIcon/FontIconCsvDumperT6.h b/src/ObjWriting/Game/T6/FontIcon/FontIconCsvDumperT6.h
index aeaa8877..dfd0798e 100644
--- a/src/ObjWriting/Game/T6/FontIcon/FontIconCsvDumperT6.h
+++ b/src/ObjWriting/Game/T6/FontIcon/FontIconCsvDumperT6.h
@@ -8,7 +8,6 @@ namespace font_icon
     class CsvDumperT6 final : public AbstractAssetDumper<T6::FontIcon>
     {
     protected:
-        bool ShouldDump(XAssetInfo<T6::FontIcon>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::FontIcon>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::FontIcon>& asset) override;
     };
 } // namespace font_icon
diff --git a/src/ObjWriting/Game/T6/FontIcon/FontIconJsonDumperT6.cpp b/src/ObjWriting/Game/T6/FontIcon/FontIconJsonDumperT6.cpp
index e82b3b36..034e9c69 100644
--- a/src/ObjWriting/Game/T6/FontIcon/FontIconJsonDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/FontIcon/FontIconJsonDumperT6.cpp
@@ -78,18 +78,13 @@ namespace
 
 namespace font_icon
 {
-    bool JsonDumperT6::ShouldDump(XAssetInfo<FontIcon>* asset)
+    void JsonDumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<FontIcon>& asset)
     {
-        return true;
-    }
-
-    void JsonDumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<FontIcon>* asset)
-    {
-        const auto assetFile = context.OpenAssetFile(GetJsonFileNameForAssetName(asset->m_name));
+        const auto assetFile = context.OpenAssetFile(GetJsonFileNameForAssetName(asset.m_name));
 
         if (!assetFile)
             return;
 
-        DumpFontIcon(*assetFile, *asset->Asset());
+        DumpFontIcon(*assetFile, *asset.Asset());
     }
 } // namespace font_icon
diff --git a/src/ObjWriting/Game/T6/FontIcon/FontIconJsonDumperT6.h b/src/ObjWriting/Game/T6/FontIcon/FontIconJsonDumperT6.h
index aa1c0017..5921d75c 100644
--- a/src/ObjWriting/Game/T6/FontIcon/FontIconJsonDumperT6.h
+++ b/src/ObjWriting/Game/T6/FontIcon/FontIconJsonDumperT6.h
@@ -8,7 +8,6 @@ namespace font_icon
     class JsonDumperT6 final : public AbstractAssetDumper<T6::FontIcon>
     {
     protected:
-        bool ShouldDump(XAssetInfo<T6::FontIcon>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::FontIcon>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::FontIcon>& asset) override;
     };
 } // namespace font_icon
diff --git a/src/ObjWriting/Game/T6/Image/ImageDumperT6.cpp b/src/ObjWriting/Game/T6/Image/ImageDumperT6.cpp
index 02317695..eaa87f4c 100644
--- a/src/ObjWriting/Game/T6/Image/ImageDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Image/ImageDumperT6.cpp
@@ -94,19 +94,14 @@ namespace image
         }
     }
 
-    bool DumperT6::ShouldDump(XAssetInfo<GfxImage>* asset)
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<GfxImage>& asset)
     {
-        return true;
-    }
-
-    void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<GfxImage>* asset)
-    {
-        const auto* image = asset->Asset();
+        const auto* image = asset.Asset();
         const auto texture = LoadImageData(context.m_obj_search_path, *image);
         if (!texture)
             return;
 
-        const auto assetFile = context.OpenAssetFile(GetFileNameForAsset(asset->m_name, m_writer->GetFileExtension()));
+        const auto assetFile = context.OpenAssetFile(GetFileNameForAsset(asset.m_name, m_writer->GetFileExtension()));
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/T6/Image/ImageDumperT6.h b/src/ObjWriting/Game/T6/Image/ImageDumperT6.h
index 5fac0233..16072342 100644
--- a/src/ObjWriting/Game/T6/Image/ImageDumperT6.h
+++ b/src/ObjWriting/Game/T6/Image/ImageDumperT6.h
@@ -14,8 +14,7 @@ namespace image
         DumperT6();
 
     protected:
-        bool ShouldDump(XAssetInfo<T6::GfxImage>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::GfxImage>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::GfxImage>& asset) override;
 
     private:
         std::unique_ptr<IImageWriter> m_writer;
diff --git a/src/ObjWriting/Game/T6/Leaderboard/LeaderboardJsonDumperT6.cpp b/src/ObjWriting/Game/T6/Leaderboard/LeaderboardJsonDumperT6.cpp
index 4a90d7b2..5fef2615 100644
--- a/src/ObjWriting/Game/T6/Leaderboard/LeaderboardJsonDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Leaderboard/LeaderboardJsonDumperT6.cpp
@@ -98,19 +98,14 @@ namespace
 
 namespace leaderboard
 {
-    bool JsonDumperT6::ShouldDump(XAssetInfo<LeaderboardDef>* asset)
+    void JsonDumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<LeaderboardDef>& asset)
     {
-        return true;
-    }
-
-    void JsonDumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<LeaderboardDef>* asset)
-    {
-        const auto assetFile = context.OpenAssetFile(GetJsonFileNameForAsset(asset->m_name));
+        const auto assetFile = context.OpenAssetFile(GetJsonFileNameForAsset(asset.m_name));
 
         if (!assetFile)
             return;
 
         Dumper dumper(*assetFile);
-        dumper.Dump(*asset->Asset());
+        dumper.Dump(*asset.Asset());
     }
 } // namespace leaderboard
diff --git a/src/ObjWriting/Game/T6/Leaderboard/LeaderboardJsonDumperT6.h b/src/ObjWriting/Game/T6/Leaderboard/LeaderboardJsonDumperT6.h
index ebbe4c9f..2dae1d7c 100644
--- a/src/ObjWriting/Game/T6/Leaderboard/LeaderboardJsonDumperT6.h
+++ b/src/ObjWriting/Game/T6/Leaderboard/LeaderboardJsonDumperT6.h
@@ -8,7 +8,6 @@ namespace leaderboard
     class JsonDumperT6 final : public AbstractAssetDumper<T6::LeaderboardDef>
     {
     protected:
-        [[nodiscard]] bool ShouldDump(XAssetInfo<T6::LeaderboardDef>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::LeaderboardDef>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::LeaderboardDef>& asset) override;
     };
 } // namespace leaderboard
diff --git a/src/ObjWriting/Game/T6/Localize/LocalizeDumperT6.cpp b/src/ObjWriting/Game/T6/Localize/LocalizeDumperT6.cpp
index c6281264..cce11ec0 100644
--- a/src/ObjWriting/Game/T6/Localize/LocalizeDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Localize/LocalizeDumperT6.cpp
@@ -11,9 +11,14 @@ using namespace T6;
 
 namespace localize
 {
-    void DumperT6::DumpPool(AssetDumpingContext& context, AssetPool<LocalizeEntry>* pool)
+    size_t DumperT6::GetProgressTotalCount(const AssetPool<T6::LocalizeEntry>& pool) const
     {
-        if (pool->m_asset_lookup.empty())
+        return pool.m_asset_lookup.empty() ? 0uz : 1uz;
+    }
+
+    void DumperT6::DumpPool(AssetDumpingContext& context, const AssetPool<LocalizeEntry>& pool)
+    {
+        if (pool.m_asset_lookup.empty())
             return;
 
         const auto language = LocalizeCommon::GetNameOfLanguage(context.m_zone.m_language);
@@ -30,7 +35,7 @@ namespace localize
 
             stringFileDumper.SetNotes("");
 
-            for (auto* localizeEntry : *pool)
+            for (const auto* localizeEntry : pool)
             {
                 stringFileDumper.WriteLocalizeEntry(localizeEntry->m_name, localizeEntry->Asset()->value);
             }
@@ -41,5 +46,7 @@ namespace localize
         {
             con::error("Could not create string file for dumping localized strings of zone '{}'", context.m_zone.m_name);
         }
+
+        context.IncrementProgress();
     }
 } // namespace localize
diff --git a/src/ObjWriting/Game/T6/Localize/LocalizeDumperT6.h b/src/ObjWriting/Game/T6/Localize/LocalizeDumperT6.h
index 1a39defe..d8791f8a 100644
--- a/src/ObjWriting/Game/T6/Localize/LocalizeDumperT6.h
+++ b/src/ObjWriting/Game/T6/Localize/LocalizeDumperT6.h
@@ -8,6 +8,7 @@ namespace localize
     class DumperT6 final : public IAssetDumper<T6::LocalizeEntry>
     {
     public:
-        void DumpPool(AssetDumpingContext& context, AssetPool<T6::LocalizeEntry>* pool) override;
+        [[nodiscard]] size_t GetProgressTotalCount(const AssetPool<T6::LocalizeEntry>& pool) const override;
+        void DumpPool(AssetDumpingContext& context, const AssetPool<T6::LocalizeEntry>& pool) override;
     };
 } // namespace localize
diff --git a/src/ObjWriting/Game/T6/Maps/MapEntsDumperT6.cpp b/src/ObjWriting/Game/T6/Maps/MapEntsDumperT6.cpp
index caf8abd5..12a92da8 100644
--- a/src/ObjWriting/Game/T6/Maps/MapEntsDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Maps/MapEntsDumperT6.cpp
@@ -6,14 +6,9 @@ using namespace T6;
 
 namespace map_ents
 {
-    bool DumperT6::ShouldDump(XAssetInfo<MapEnts>* asset)
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<MapEnts>& asset)
     {
-        return true;
-    }
-
-    void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<MapEnts>* asset)
-    {
-        const auto* mapEnts = asset->Asset();
+        const auto* mapEnts = asset.Asset();
 
         const auto mapEntsFile = context.OpenAssetFile(std::format("{}.ents", mapEnts->name));
 
diff --git a/src/ObjWriting/Game/T6/Maps/MapEntsDumperT6.h b/src/ObjWriting/Game/T6/Maps/MapEntsDumperT6.h
index 9dbf36bb..6782a09f 100644
--- a/src/ObjWriting/Game/T6/Maps/MapEntsDumperT6.h
+++ b/src/ObjWriting/Game/T6/Maps/MapEntsDumperT6.h
@@ -8,7 +8,6 @@ namespace map_ents
     class DumperT6 final : public AbstractAssetDumper<T6::MapEnts>
     {
     protected:
-        bool ShouldDump(XAssetInfo<T6::MapEnts>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::MapEnts>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::MapEnts>& asset) override;
     };
 } // namespace map_ents
diff --git a/src/ObjWriting/Game/T6/ObjWriterT6.cpp b/src/ObjWriting/Game/T6/ObjWriterT6.cpp
index 06c66520..dea39dfe 100644
--- a/src/ObjWriting/Game/T6/ObjWriterT6.cpp
+++ b/src/ObjWriting/Game/T6/ObjWriterT6.cpp
@@ -27,6 +27,8 @@
 #include "Weapon/WeaponDumperT6.h"
 #include "ZBarrier/ZBarrierDumperT6.h"
 
+#include <functional>
+
 using namespace T6;
 
 bool ObjWriter::DumpZone(AssetDumpingContext& context) const
@@ -35,17 +37,32 @@ bool ObjWriter::DumpZone(AssetDumpingContext& context) const
     if (assetPools->poolName && ObjWriting::ShouldHandleAssetType(assetType))                                                                                  \
     {                                                                                                                                                          \
         dumperType dumper;                                                                                                                                     \
-        dumper.DumpPool(context, assetPools->poolName.get());                                                                                                  \
+        totalProgress += dumper.GetProgressTotalCount(*assetPools->poolName);                                                                                  \
+        dumpingFunctions.emplace_back(                                                                                                                         \
+            [](AssetDumpingContext& funcContext, const GameAssetPoolT6* funcPools)                                                                             \
+            {                                                                                                                                                  \
+                dumperType dumper;                                                                                                                             \
+                dumper.DumpPool(funcContext, *funcPools->poolName);                                                                                            \
+            });                                                                                                                                                \
     }
 #define DUMP_ASSET_POOL_WITH_FACTORY(createDumper, poolName, assetType)                                                                                        \
     if (assetPools->poolName && ObjWriting::ShouldHandleAssetType(assetType))                                                                                  \
     {                                                                                                                                                          \
-        const auto dumper = createDumper;                                                                                                                      \
-        dumper->DumpPool(context, assetPools->poolName.get());                                                                                                 \
+        auto dumper = createDumper;                                                                                                                            \
+        totalProgress += dumper->GetProgressTotalCount(*assetPools->poolName);                                                                                 \
+        dumpingFunctions.emplace_back(                                                                                                                         \
+            [](AssetDumpingContext& funcContext, const GameAssetPoolT6* funcPools)                                                                             \
+            {                                                                                                                                                  \
+                auto dumper = createDumper;                                                                                                                    \
+                dumper->DumpPool(funcContext, *funcPools->poolName);                                                                                           \
+            });                                                                                                                                                \
     }
 
     const auto* assetPools = dynamic_cast<GameAssetPoolT6*>(context.m_zone.m_pools.get());
 
+    size_t totalProgress = 0uz;
+    std::vector<std::function<void(AssetDumpingContext & context, const GameAssetPoolT6*)>> dumpingFunctions;
+
     DUMP_ASSET_POOL(phys_preset::InfoStringDumperT6, m_phys_preset, ASSET_TYPE_PHYSPRESET)
     DUMP_ASSET_POOL(phys_constraints::InfoStringDumperT6, m_phys_constraints, ASSET_TYPE_PHYSCONSTRAINTS)
     // DUMP_ASSET_POOL(AssetDumperDestructibleDef, m_destructible_def, ASSET_TYPE_DESTRUCTIBLEDEF)
@@ -95,6 +112,10 @@ bool ObjWriter::DumpZone(AssetDumpingContext& context) const
     // DUMP_ASSET_POOL(AssetDumperFootstepFXTableDef, m_footstep_fx_table, ASSET_TYPE_FOOTSTEPFX_TABLE)
     DUMP_ASSET_POOL(z_barrier::DumperT6, m_zbarrier, ASSET_TYPE_ZBARRIER)
 
+    context.SetTotalProgress(totalProgress);
+    for (const auto& func : dumpingFunctions)
+        func(context, assetPools);
+
     return true;
 
 #undef DUMP_ASSET_POOL
diff --git a/src/ObjWriting/Game/T6/PhysConstraints/PhysConstraintsInfoStringDumperT6.cpp b/src/ObjWriting/Game/T6/PhysConstraints/PhysConstraintsInfoStringDumperT6.cpp
index c0c2d7ce..53bc219f 100644
--- a/src/ObjWriting/Game/T6/PhysConstraints/PhysConstraintsInfoStringDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/PhysConstraints/PhysConstraintsInfoStringDumperT6.cpp
@@ -39,20 +39,20 @@ namespace
         }
     };
 
-    InfoString CreateInfoString(XAssetInfo<PhysConstraints>* asset)
+    InfoString CreateInfoString(const XAssetInfo<PhysConstraints>& asset)
     {
-        assert(asset->Asset()->count <= 4);
+        assert(asset.Asset()->count <= 4);
 
-        InfoStringFromPhysConstraintsConverter converter(asset->Asset(),
+        InfoStringFromPhysConstraintsConverter converter(asset.Asset(),
                                                          phys_constraints_fields,
                                                          std::extent_v<decltype(phys_constraints_fields)>,
                                                          [asset](const scr_string_t scrStr) -> std::string
                                                          {
-                                                             assert(scrStr < asset->m_zone->m_script_strings.Count());
-                                                             if (scrStr >= asset->m_zone->m_script_strings.Count())
+                                                             assert(scrStr < asset.m_zone->m_script_strings.Count());
+                                                             if (scrStr >= asset.m_zone->m_script_strings.Count())
                                                                  return "";
 
-                                                             return asset->m_zone->m_script_strings[scrStr];
+                                                             return asset.m_zone->m_script_strings[scrStr];
                                                          });
 
         return converter.Convert();
@@ -61,24 +61,19 @@ namespace
 
 namespace phys_constraints
 {
-    bool InfoStringDumperT6::ShouldDump(XAssetInfo<PhysConstraints>* asset)
-    {
-        return true;
-    }
-
-    void InfoStringDumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<PhysConstraints>* asset)
+    void InfoStringDumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<PhysConstraints>& asset)
     {
         // Only dump raw when no gdt available
         if (context.m_gdt)
         {
             const auto infoString = CreateInfoString(asset);
-            GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_PHYS_CONSTRAINTS);
+            GdtEntry gdtEntry(asset.m_name, ObjConstants::GDF_FILENAME_PHYS_CONSTRAINTS);
             infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_PHYS_CONSTRAINTS, gdtEntry);
             context.m_gdt->WriteEntry(gdtEntry);
         }
         else
         {
-            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset->m_name));
+            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset.m_name));
 
             if (!assetFile)
                 return;
diff --git a/src/ObjWriting/Game/T6/PhysConstraints/PhysConstraintsInfoStringDumperT6.h b/src/ObjWriting/Game/T6/PhysConstraints/PhysConstraintsInfoStringDumperT6.h
index 4d1c5e70..1f118d90 100644
--- a/src/ObjWriting/Game/T6/PhysConstraints/PhysConstraintsInfoStringDumperT6.h
+++ b/src/ObjWriting/Game/T6/PhysConstraints/PhysConstraintsInfoStringDumperT6.h
@@ -9,7 +9,6 @@ namespace phys_constraints
     class InfoStringDumperT6 final : public AbstractAssetDumper<T6::PhysConstraints>
     {
     protected:
-        bool ShouldDump(XAssetInfo<T6::PhysConstraints>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::PhysConstraints>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::PhysConstraints>& asset) override;
     };
 } // namespace phys_constraints
diff --git a/src/ObjWriting/Game/T6/PhysPreset/PhysPresetInfoStringDumperT6.cpp b/src/ObjWriting/Game/T6/PhysPreset/PhysPresetInfoStringDumperT6.cpp
index c4f5dd85..56c5ad63 100644
--- a/src/ObjWriting/Game/T6/PhysPreset/PhysPresetInfoStringDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/PhysPreset/PhysPresetInfoStringDumperT6.cpp
@@ -59,21 +59,21 @@ namespace
         physPresetInfo->buoyancyBoxMax = physPreset->buoyancyBoxMax;
     }
 
-    InfoString CreateInfoString(XAssetInfo<PhysPreset>* asset)
+    InfoString CreateInfoString(const XAssetInfo<PhysPreset>& asset)
     {
         auto* physPresetInfo = new PhysPresetInfo;
-        CopyToPhysPresetInfo(asset->Asset(), physPresetInfo);
+        CopyToPhysPresetInfo(asset.Asset(), physPresetInfo);
 
         InfoStringFromPhysPresetConverter converter(physPresetInfo,
                                                     phys_preset_fields,
                                                     std::extent_v<decltype(phys_preset_fields)>,
                                                     [asset](const scr_string_t scrStr) -> std::string
                                                     {
-                                                        assert(scrStr < asset->m_zone->m_script_strings.Count());
-                                                        if (scrStr >= asset->m_zone->m_script_strings.Count())
+                                                        assert(scrStr < asset.m_zone->m_script_strings.Count());
+                                                        if (scrStr >= asset.m_zone->m_script_strings.Count())
                                                             return "";
 
-                                                        return asset->m_zone->m_script_strings[scrStr];
+                                                        return asset.m_zone->m_script_strings[scrStr];
                                                     });
 
         return converter.Convert();
@@ -82,24 +82,19 @@ namespace
 
 namespace phys_preset
 {
-    bool InfoStringDumperT6::ShouldDump(XAssetInfo<PhysPreset>* asset)
-    {
-        return true;
-    }
-
-    void InfoStringDumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<PhysPreset>* asset)
+    void InfoStringDumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<PhysPreset>& asset)
     {
         // Only dump raw when no gdt available
         if (context.m_gdt)
         {
             const auto infoString = CreateInfoString(asset);
-            GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_PHYS_PRESET);
+            GdtEntry gdtEntry(asset.m_name, ObjConstants::GDF_FILENAME_PHYS_PRESET);
             infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_PHYS_PRESET, gdtEntry);
             context.m_gdt->WriteEntry(gdtEntry);
         }
         else
         {
-            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset->m_name));
+            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset.m_name));
 
             if (!assetFile)
                 return;
diff --git a/src/ObjWriting/Game/T6/PhysPreset/PhysPresetInfoStringDumperT6.h b/src/ObjWriting/Game/T6/PhysPreset/PhysPresetInfoStringDumperT6.h
index df52d539..abc0f8be 100644
--- a/src/ObjWriting/Game/T6/PhysPreset/PhysPresetInfoStringDumperT6.h
+++ b/src/ObjWriting/Game/T6/PhysPreset/PhysPresetInfoStringDumperT6.h
@@ -9,7 +9,6 @@ namespace phys_preset
     class InfoStringDumperT6 final : public AbstractAssetDumper<T6::PhysPreset>
     {
     protected:
-        bool ShouldDump(XAssetInfo<T6::PhysPreset>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::PhysPreset>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::PhysPreset>& asset) override;
     };
 } // namespace phys_preset
diff --git a/src/ObjWriting/Game/T6/Qdb/QdbDumperT6.cpp b/src/ObjWriting/Game/T6/Qdb/QdbDumperT6.cpp
index f990de0d..9cb3b67d 100644
--- a/src/ObjWriting/Game/T6/Qdb/QdbDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Qdb/QdbDumperT6.cpp
@@ -4,15 +4,10 @@ using namespace T6;
 
 namespace qdb
 {
-    bool DumperT6::ShouldDump(XAssetInfo<Qdb>* asset)
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<Qdb>& asset)
     {
-        return true;
-    }
-
-    void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<Qdb>* asset)
-    {
-        const auto* qdb = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(asset->m_name);
+        const auto* qdb = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(asset.m_name);
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/T6/Qdb/QdbDumperT6.h b/src/ObjWriting/Game/T6/Qdb/QdbDumperT6.h
index eb452510..9df957ef 100644
--- a/src/ObjWriting/Game/T6/Qdb/QdbDumperT6.h
+++ b/src/ObjWriting/Game/T6/Qdb/QdbDumperT6.h
@@ -8,7 +8,6 @@ namespace qdb
     class DumperT6 final : public AbstractAssetDumper<T6::Qdb>
     {
     protected:
-        bool ShouldDump(XAssetInfo<T6::Qdb>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::Qdb>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::Qdb>& asset) override;
     };
 } // namespace qdb
diff --git a/src/ObjWriting/Game/T6/RawFile/RawFileDumperT6.cpp b/src/ObjWriting/Game/T6/RawFile/RawFileDumperT6.cpp
index 9388c216..6e4cb2f4 100644
--- a/src/ObjWriting/Game/T6/RawFile/RawFileDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/RawFile/RawFileDumperT6.cpp
@@ -14,9 +14,9 @@ namespace
 {
     constexpr size_t ANIMTREE_MAX_SIZE = 0xC000000;
 
-    void DumpAnimtree(AssetDumpingContext& context, XAssetInfo<RawFile>* asset, std::ostream& stream)
+    void DumpAnimtree(AssetDumpingContext& context, const XAssetInfo<RawFile>& asset, std::ostream& stream)
     {
-        const auto* rawFile = asset->Asset();
+        const auto* rawFile = asset.Asset();
 
         if (rawFile->len <= 4)
         {
@@ -77,15 +77,10 @@ namespace
 
 namespace raw_file
 {
-    bool DumperT6::ShouldDump(XAssetInfo<RawFile>* asset)
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<RawFile>& asset)
     {
-        return true;
-    }
-
-    void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<RawFile>* asset)
-    {
-        const auto* rawFile = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(asset->m_name);
+        const auto* rawFile = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(asset.m_name);
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/T6/RawFile/RawFileDumperT6.h b/src/ObjWriting/Game/T6/RawFile/RawFileDumperT6.h
index c2faa0f9..12c87d56 100644
--- a/src/ObjWriting/Game/T6/RawFile/RawFileDumperT6.h
+++ b/src/ObjWriting/Game/T6/RawFile/RawFileDumperT6.h
@@ -8,7 +8,6 @@ namespace raw_file
     class DumperT6 final : public AbstractAssetDumper<T6::RawFile>
     {
     protected:
-        bool ShouldDump(XAssetInfo<T6::RawFile>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::RawFile>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::RawFile>& asset) override;
     };
 } // namespace raw_file
diff --git a/src/ObjWriting/Game/T6/Script/ScriptDumperT6.cpp b/src/ObjWriting/Game/T6/Script/ScriptDumperT6.cpp
index 2b2be090..b68d1d4f 100644
--- a/src/ObjWriting/Game/T6/Script/ScriptDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Script/ScriptDumperT6.cpp
@@ -4,15 +4,10 @@ using namespace T6;
 
 namespace script
 {
-    bool DumperT6::ShouldDump(XAssetInfo<ScriptParseTree>* asset)
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<ScriptParseTree>& asset)
     {
-        return true;
-    }
-
-    void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<ScriptParseTree>* asset)
-    {
-        const auto* scriptParseTree = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(asset->m_name);
+        const auto* scriptParseTree = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(asset.m_name);
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/T6/Script/ScriptDumperT6.h b/src/ObjWriting/Game/T6/Script/ScriptDumperT6.h
index 895b55b4..d2a18e44 100644
--- a/src/ObjWriting/Game/T6/Script/ScriptDumperT6.h
+++ b/src/ObjWriting/Game/T6/Script/ScriptDumperT6.h
@@ -8,7 +8,6 @@ namespace script
     class DumperT6 final : public AbstractAssetDumper<T6::ScriptParseTree>
     {
     protected:
-        bool ShouldDump(XAssetInfo<T6::ScriptParseTree>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::ScriptParseTree>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::ScriptParseTree>& asset) override;
     };
 } // namespace script
diff --git a/src/ObjWriting/Game/T6/Slug/SlugDumperT6.cpp b/src/ObjWriting/Game/T6/Slug/SlugDumperT6.cpp
index d02a11d0..fbad9570 100644
--- a/src/ObjWriting/Game/T6/Slug/SlugDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Slug/SlugDumperT6.cpp
@@ -4,15 +4,10 @@ using namespace T6;
 
 namespace slug
 {
-    bool DumperT6::ShouldDump(XAssetInfo<Slug>* asset)
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<Slug>& asset)
     {
-        return true;
-    }
-
-    void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<Slug>* asset)
-    {
-        const auto* slug = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(asset->m_name);
+        const auto* slug = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(asset.m_name);
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/T6/Slug/SlugDumperT6.h b/src/ObjWriting/Game/T6/Slug/SlugDumperT6.h
index 3dd202e5..2aa55101 100644
--- a/src/ObjWriting/Game/T6/Slug/SlugDumperT6.h
+++ b/src/ObjWriting/Game/T6/Slug/SlugDumperT6.h
@@ -8,7 +8,6 @@ namespace slug
     class DumperT6 final : public AbstractAssetDumper<T6::Slug>
     {
     protected:
-        bool ShouldDump(XAssetInfo<T6::Slug>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::Slug>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::Slug>& asset) override;
     };
 } // namespace slug
diff --git a/src/ObjWriting/Game/T6/Sound/SndBankDumperT6.cpp b/src/ObjWriting/Game/T6/Sound/SndBankDumperT6.cpp
index aca65ad7..195ff587 100644
--- a/src/ObjWriting/Game/T6/Sound/SndBankDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Sound/SndBankDumperT6.cpp
@@ -914,16 +914,23 @@ namespace
 
 namespace sound
 {
-    void SndBankDumperT6::DumpPool(AssetDumpingContext& context, AssetPool<SndBank>* pool)
+    size_t SndBankDumperT6::GetProgressTotalCount(const AssetPool<SndBank>& pool) const
+    {
+        return pool.m_asset_lookup.size();
+    }
+
+    void SndBankDumperT6::DumpPool(AssetDumpingContext& context, const AssetPool<SndBank>& pool)
     {
         LoadedSoundBankHashes soundBankHashes;
         soundBankHashes.Initialize();
-        for (const auto* assetInfo : *pool)
+        for (const auto* assetInfo : pool)
         {
             if (!assetInfo->m_name.empty() && assetInfo->m_name[0] == ',')
                 continue;
 
             DumpSndBank(context, soundBankHashes, *assetInfo);
+
+            context.IncrementProgress();
         }
     }
 } // namespace sound
diff --git a/src/ObjWriting/Game/T6/Sound/SndBankDumperT6.h b/src/ObjWriting/Game/T6/Sound/SndBankDumperT6.h
index f5d4f59d..cc209b0c 100644
--- a/src/ObjWriting/Game/T6/Sound/SndBankDumperT6.h
+++ b/src/ObjWriting/Game/T6/Sound/SndBankDumperT6.h
@@ -8,6 +8,7 @@ namespace sound
     class SndBankDumperT6 final : public IAssetDumper<T6::SndBank>
     {
     public:
-        void DumpPool(AssetDumpingContext& context, AssetPool<T6::SndBank>* pool) override;
+        [[nodiscard]] size_t GetProgressTotalCount(const AssetPool<T6::SndBank>& pool) const override;
+        void DumpPool(AssetDumpingContext& context, const AssetPool<T6::SndBank>& pool) override;
     };
 } // namespace sound
diff --git a/src/ObjWriting/Game/T6/Sound/SndDriverGlobalsDumperT6.cpp b/src/ObjWriting/Game/T6/Sound/SndDriverGlobalsDumperT6.cpp
index 57649091..d62de41c 100644
--- a/src/ObjWriting/Game/T6/Sound/SndDriverGlobalsDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Sound/SndDriverGlobalsDumperT6.cpp
@@ -108,9 +108,9 @@ namespace
         {
         }
 
-        void DumpPool(AssetPool<SndDriverGlobals>* pool)
+        void DumpPool(const AssetPool<SndDriverGlobals>& pool)
         {
-            for (const auto* assetInfo : *pool)
+            for (const auto* assetInfo : pool)
             {
                 if (!assetInfo->m_name.empty() && assetInfo->m_name[0] == ',')
                     continue;
@@ -385,9 +385,16 @@ namespace
 
 namespace sound
 {
-    void SndDriverGlobalsDumperT6::DumpPool(AssetDumpingContext& context, AssetPool<SndDriverGlobals>* pool)
+    size_t SndDriverGlobalsDumperT6::GetProgressTotalCount(const AssetPool<T6::SndDriverGlobals>& pool) const
+    {
+        return pool.m_asset_lookup.empty() ? 0uz : 1uz;
+    }
+
+    void SndDriverGlobalsDumperT6::DumpPool(AssetDumpingContext& context, const AssetPool<SndDriverGlobals>& pool)
     {
         Internal internal(context);
         internal.DumpPool(pool);
+
+        context.IncrementProgress();
     }
 } // namespace sound
diff --git a/src/ObjWriting/Game/T6/Sound/SndDriverGlobalsDumperT6.h b/src/ObjWriting/Game/T6/Sound/SndDriverGlobalsDumperT6.h
index 042de43c..317280df 100644
--- a/src/ObjWriting/Game/T6/Sound/SndDriverGlobalsDumperT6.h
+++ b/src/ObjWriting/Game/T6/Sound/SndDriverGlobalsDumperT6.h
@@ -8,6 +8,7 @@ namespace sound
     class SndDriverGlobalsDumperT6 final : public IAssetDumper<T6::SndDriverGlobals>
     {
     public:
-        void DumpPool(AssetDumpingContext& context, AssetPool<T6::SndDriverGlobals>* pool) override;
+        [[nodiscard]] size_t GetProgressTotalCount(const AssetPool<T6::SndDriverGlobals>& pool) const override;
+        void DumpPool(AssetDumpingContext& context, const AssetPool<T6::SndDriverGlobals>& pool) override;
     };
 } // namespace sound
diff --git a/src/ObjWriting/Game/T6/StringTable/StringTableDumperT6.cpp b/src/ObjWriting/Game/T6/StringTable/StringTableDumperT6.cpp
index 4bd96479..fd184837 100644
--- a/src/ObjWriting/Game/T6/StringTable/StringTableDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/StringTable/StringTableDumperT6.cpp
@@ -6,15 +6,10 @@ using namespace T6;
 
 namespace string_table
 {
-    bool DumperT6::ShouldDump(XAssetInfo<StringTable>* asset)
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<StringTable>& asset)
     {
-        return true;
-    }
-
-    void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<StringTable>* asset)
-    {
-        const auto* stringTable = asset->Asset();
-        const auto assetFile = context.OpenAssetFile(asset->m_name);
+        const auto* stringTable = asset.Asset();
+        const auto assetFile = context.OpenAssetFile(asset.m_name);
 
         if (!assetFile)
             return;
diff --git a/src/ObjWriting/Game/T6/StringTable/StringTableDumperT6.h b/src/ObjWriting/Game/T6/StringTable/StringTableDumperT6.h
index b61a4380..7d0cbe8a 100644
--- a/src/ObjWriting/Game/T6/StringTable/StringTableDumperT6.h
+++ b/src/ObjWriting/Game/T6/StringTable/StringTableDumperT6.h
@@ -8,7 +8,6 @@ namespace string_table
     class DumperT6 final : public AbstractAssetDumper<T6::StringTable>
     {
     protected:
-        bool ShouldDump(XAssetInfo<T6::StringTable>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::StringTable>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::StringTable>& asset) override;
     };
 } // namespace string_table
diff --git a/src/ObjWriting/Game/T6/Techset/TechsetDumperT6.cpp b/src/ObjWriting/Game/T6/Techset/TechsetDumperT6.cpp
index a2d7273c..8ed50d5e 100644
--- a/src/ObjWriting/Game/T6/Techset/TechsetDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Techset/TechsetDumperT6.cpp
@@ -77,14 +77,9 @@ namespace
 
 namespace techset
 {
-    bool DumperT6::ShouldDump(XAssetInfo<MaterialTechniqueSet>* asset)
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<MaterialTechniqueSet>& asset)
     {
-        return true;
-    }
-
-    void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<MaterialTechniqueSet>* asset)
-    {
-        const auto* techniqueSet = asset->Asset();
+        const auto* techniqueSet = asset.Asset();
         auto* shaderState = context.GetZoneAssetDumperState<ShaderZoneState>();
 
         for (const auto* technique : techniqueSet->techniques)
diff --git a/src/ObjWriting/Game/T6/Techset/TechsetDumperT6.h b/src/ObjWriting/Game/T6/Techset/TechsetDumperT6.h
index 59a48f3f..d9acbe4c 100644
--- a/src/ObjWriting/Game/T6/Techset/TechsetDumperT6.h
+++ b/src/ObjWriting/Game/T6/Techset/TechsetDumperT6.h
@@ -8,7 +8,6 @@ namespace techset
     class DumperT6 final : public AbstractAssetDumper<T6::MaterialTechniqueSet>
     {
     protected:
-        bool ShouldDump(XAssetInfo<T6::MaterialTechniqueSet>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::MaterialTechniqueSet>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::MaterialTechniqueSet>& asset) override;
     };
 } // namespace techset
diff --git a/src/ObjWriting/Game/T6/Tracer/TracerDumperT6.cpp b/src/ObjWriting/Game/T6/Tracer/TracerDumperT6.cpp
index 854a45af..48c377c8 100644
--- a/src/ObjWriting/Game/T6/Tracer/TracerDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Tracer/TracerDumperT6.cpp
@@ -40,18 +40,18 @@ namespace
         }
     };
 
-    InfoString CreateInfoString(XAssetInfo<TracerDef>* asset)
+    InfoString CreateInfoString(const XAssetInfo<TracerDef>& asset)
     {
-        InfoStringFromTracerConverter converter(asset->Asset(),
+        InfoStringFromTracerConverter converter(asset.Asset(),
                                                 tracer_fields,
                                                 std::extent_v<decltype(tracer_fields)>,
                                                 [asset](const scr_string_t scrStr) -> std::string
                                                 {
-                                                    assert(scrStr < asset->m_zone->m_script_strings.Count());
-                                                    if (scrStr >= asset->m_zone->m_script_strings.Count())
+                                                    assert(scrStr < asset.m_zone->m_script_strings.Count());
+                                                    if (scrStr >= asset.m_zone->m_script_strings.Count())
                                                         return "";
 
-                                                    return asset->m_zone->m_script_strings[scrStr];
+                                                    return asset.m_zone->m_script_strings[scrStr];
                                                 });
 
         return converter.Convert();
@@ -60,24 +60,19 @@ namespace
 
 namespace tracer
 {
-    bool DumperT6::ShouldDump(XAssetInfo<TracerDef>* asset)
-    {
-        return true;
-    }
-
-    void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<TracerDef>* asset)
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<TracerDef>& asset)
     {
         // Only dump raw when no gdt available
         if (context.m_gdt)
         {
             const auto infoString = CreateInfoString(asset);
-            GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_TRACER);
+            GdtEntry gdtEntry(asset.m_name, ObjConstants::GDF_FILENAME_TRACER);
             infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_TRACER, gdtEntry);
             context.m_gdt->WriteEntry(gdtEntry);
         }
         else
         {
-            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset->m_name));
+            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset.m_name));
 
             if (!assetFile)
                 return;
diff --git a/src/ObjWriting/Game/T6/Tracer/TracerDumperT6.h b/src/ObjWriting/Game/T6/Tracer/TracerDumperT6.h
index 0bfb6d75..a26bca26 100644
--- a/src/ObjWriting/Game/T6/Tracer/TracerDumperT6.h
+++ b/src/ObjWriting/Game/T6/Tracer/TracerDumperT6.h
@@ -9,7 +9,6 @@ namespace tracer
     class DumperT6 final : public AbstractAssetDumper<T6::TracerDef>
     {
     protected:
-        bool ShouldDump(XAssetInfo<T6::TracerDef>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::TracerDef>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::TracerDef>& asset) override;
     };
 } // namespace tracer
diff --git a/src/ObjWriting/Game/T6/Vehicle/VehicleDumperT6.cpp b/src/ObjWriting/Game/T6/Vehicle/VehicleDumperT6.cpp
index 1178b394..7b012aac 100644
--- a/src/ObjWriting/Game/T6/Vehicle/VehicleDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Vehicle/VehicleDumperT6.cpp
@@ -91,18 +91,18 @@ namespace
         }
     };
 
-    InfoString CreateInfoString(XAssetInfo<VehicleDef>* asset)
+    InfoString CreateInfoString(const XAssetInfo<VehicleDef>& asset)
     {
-        InfoStringFromVehicleConverter converter(asset->Asset(),
+        InfoStringFromVehicleConverter converter(asset.Asset(),
                                                  vehicle_fields,
                                                  std::extent_v<decltype(vehicle_fields)>,
                                                  [asset](const scr_string_t scrStr) -> std::string
                                                  {
-                                                     assert(scrStr < asset->m_zone->m_script_strings.Count());
-                                                     if (scrStr >= asset->m_zone->m_script_strings.Count())
+                                                     assert(scrStr < asset.m_zone->m_script_strings.Count());
+                                                     if (scrStr >= asset.m_zone->m_script_strings.Count())
                                                          return "";
 
-                                                     return asset->m_zone->m_script_strings[scrStr];
+                                                     return asset.m_zone->m_script_strings[scrStr];
                                                  });
 
         return converter.Convert();
@@ -111,24 +111,19 @@ namespace
 
 namespace vehicle
 {
-    bool DumperT6::ShouldDump(XAssetInfo<VehicleDef>* asset)
-    {
-        return true;
-    }
-
-    void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<VehicleDef>* asset)
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<VehicleDef>& asset)
     {
         // Only dump raw when no gdt available
         if (context.m_gdt)
         {
             const auto infoString = CreateInfoString(asset);
-            GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_VEHICLE);
+            GdtEntry gdtEntry(asset.m_name, ObjConstants::GDF_FILENAME_VEHICLE);
             infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_VEHICLE, gdtEntry);
             context.m_gdt->WriteEntry(gdtEntry);
         }
         else
         {
-            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset->m_name));
+            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset.m_name));
 
             if (!assetFile)
                 return;
diff --git a/src/ObjWriting/Game/T6/Vehicle/VehicleDumperT6.h b/src/ObjWriting/Game/T6/Vehicle/VehicleDumperT6.h
index 5d328e87..cc6c5cf6 100644
--- a/src/ObjWriting/Game/T6/Vehicle/VehicleDumperT6.h
+++ b/src/ObjWriting/Game/T6/Vehicle/VehicleDumperT6.h
@@ -9,7 +9,6 @@ namespace vehicle
     class DumperT6 final : public AbstractAssetDumper<T6::VehicleDef>
     {
     protected:
-        bool ShouldDump(XAssetInfo<T6::VehicleDef>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::VehicleDef>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::VehicleDef>& asset) override;
     };
 } // namespace vehicle
diff --git a/src/ObjWriting/Game/T6/Weapon/AttachmentDumperT6.cpp b/src/ObjWriting/Game/T6/Weapon/AttachmentDumperT6.cpp
index d7fcc4c7..72630b2e 100644
--- a/src/ObjWriting/Game/T6/Weapon/AttachmentDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Weapon/AttachmentDumperT6.cpp
@@ -47,18 +47,18 @@ namespace
         }
     };
 
-    InfoString CreateInfoString(XAssetInfo<WeaponAttachment>* asset)
+    InfoString CreateInfoString(const XAssetInfo<WeaponAttachment>& asset)
     {
-        InfoStringFromAttachmentConverter converter(asset->Asset(),
+        InfoStringFromAttachmentConverter converter(asset.Asset(),
                                                     attachment_fields,
                                                     std::extent_v<decltype(attachment_fields)>,
                                                     [asset](const scr_string_t scrStr) -> std::string
                                                     {
-                                                        assert(scrStr < asset->m_zone->m_script_strings.Count());
-                                                        if (scrStr >= asset->m_zone->m_script_strings.Count())
+                                                        assert(scrStr < asset.m_zone->m_script_strings.Count());
+                                                        if (scrStr >= asset.m_zone->m_script_strings.Count())
                                                             return "";
 
-                                                        return asset->m_zone->m_script_strings[scrStr];
+                                                        return asset.m_zone->m_script_strings[scrStr];
                                                     });
 
         return converter.Convert();
@@ -67,24 +67,19 @@ namespace
 
 namespace attachment
 {
-    bool DumperT6::ShouldDump(XAssetInfo<WeaponAttachment>* asset)
-    {
-        return true;
-    }
-
-    void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponAttachment>* asset)
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<WeaponAttachment>& asset)
     {
         // Only dump raw when no gdt available
         if (context.m_gdt)
         {
             const auto infoString = CreateInfoString(asset);
-            GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_WEAPON_ATTACHMENT);
+            GdtEntry gdtEntry(asset.m_name, ObjConstants::GDF_FILENAME_WEAPON_ATTACHMENT);
             infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_WEAPON_ATTACHMENT, gdtEntry);
             context.m_gdt->WriteEntry(gdtEntry);
         }
         else
         {
-            const auto assetFile = context.OpenAssetFile(GetInfoStringFileNameForAssetName(asset->m_name));
+            const auto assetFile = context.OpenAssetFile(GetInfoStringFileNameForAssetName(asset.m_name));
 
             if (!assetFile)
                 return;
diff --git a/src/ObjWriting/Game/T6/Weapon/AttachmentDumperT6.h b/src/ObjWriting/Game/T6/Weapon/AttachmentDumperT6.h
index 0472e2a0..99d06d9d 100644
--- a/src/ObjWriting/Game/T6/Weapon/AttachmentDumperT6.h
+++ b/src/ObjWriting/Game/T6/Weapon/AttachmentDumperT6.h
@@ -9,7 +9,6 @@ namespace attachment
     class DumperT6 final : public AbstractAssetDumper<T6::WeaponAttachment>
     {
     protected:
-        bool ShouldDump(XAssetInfo<T6::WeaponAttachment>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::WeaponAttachment>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::WeaponAttachment>& asset) override;
     };
 } // namespace attachment
diff --git a/src/ObjWriting/Game/T6/Weapon/AttachmentUniqueDumperT6.cpp b/src/ObjWriting/Game/T6/Weapon/AttachmentUniqueDumperT6.cpp
index c10605ac..e6f893ab 100644
--- a/src/ObjWriting/Game/T6/Weapon/AttachmentUniqueDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Weapon/AttachmentUniqueDumperT6.cpp
@@ -107,22 +107,22 @@ namespace
         }
     }
 
-    InfoString CreateInfoString(XAssetInfo<WeaponAttachmentUnique>* asset)
+    InfoString CreateInfoString(const XAssetInfo<WeaponAttachmentUnique>& asset)
     {
         const auto fullDef = std::make_unique<WeaponAttachmentUniqueFull>();
         memset(fullDef.get(), 0, sizeof(WeaponAttachmentUniqueFull));
-        CopyToFullDef(asset->Asset(), fullDef.get());
+        CopyToFullDef(asset.Asset(), fullDef.get());
 
         InfoStringFromWeaponAttachmentUniqueConverter converter(fullDef.get(),
                                                                 attachment_unique_fields,
                                                                 std::extent_v<decltype(attachment_unique_fields)>,
                                                                 [asset](const scr_string_t scrStr) -> std::string
                                                                 {
-                                                                    assert(scrStr < asset->m_zone->m_script_strings.Count());
-                                                                    if (scrStr >= asset->m_zone->m_script_strings.Count())
+                                                                    assert(scrStr < asset.m_zone->m_script_strings.Count());
+                                                                    if (scrStr >= asset.m_zone->m_script_strings.Count())
                                                                         return "";
 
-                                                                    return asset->m_zone->m_script_strings[scrStr];
+                                                                    return asset.m_zone->m_script_strings[scrStr];
                                                                 });
 
         return converter.Convert();
@@ -131,24 +131,19 @@ namespace
 
 namespace attachment_unique
 {
-    bool DumperT6::ShouldDump(XAssetInfo<WeaponAttachmentUnique>* asset)
-    {
-        return true;
-    }
-
-    void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponAttachmentUnique>* asset)
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<WeaponAttachmentUnique>& asset)
     {
         // Only dump raw when no gdt available
         if (context.m_gdt)
         {
             const auto infoString = CreateInfoString(asset);
-            GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_WEAPON_ATTACHMENT_UNIQUE);
+            GdtEntry gdtEntry(asset.m_name, ObjConstants::GDF_FILENAME_WEAPON_ATTACHMENT_UNIQUE);
             infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_WEAPON_ATTACHMENT_UNIQUE, gdtEntry);
             context.m_gdt->WriteEntry(gdtEntry);
         }
         else
         {
-            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset->m_name));
+            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset.m_name));
 
             if (!assetFile)
                 return;
diff --git a/src/ObjWriting/Game/T6/Weapon/AttachmentUniqueDumperT6.h b/src/ObjWriting/Game/T6/Weapon/AttachmentUniqueDumperT6.h
index b3e2ae1a..3c5dbe16 100644
--- a/src/ObjWriting/Game/T6/Weapon/AttachmentUniqueDumperT6.h
+++ b/src/ObjWriting/Game/T6/Weapon/AttachmentUniqueDumperT6.h
@@ -9,7 +9,6 @@ namespace attachment_unique
     class DumperT6 final : public AbstractAssetDumper<T6::WeaponAttachmentUnique>
     {
     protected:
-        bool ShouldDump(XAssetInfo<T6::WeaponAttachmentUnique>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::WeaponAttachmentUnique>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::WeaponAttachmentUnique>& asset) override;
     };
 } // namespace attachment_unique
diff --git a/src/ObjWriting/Game/T6/Weapon/CamoJsonDumperT6.cpp b/src/ObjWriting/Game/T6/Weapon/CamoJsonDumperT6.cpp
index 4a68492e..7d7f68bd 100644
--- a/src/ObjWriting/Game/T6/Weapon/CamoJsonDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Weapon/CamoJsonDumperT6.cpp
@@ -104,20 +104,15 @@ namespace
 
 namespace camo
 {
-    bool JsonDumperT6::ShouldDump(XAssetInfo<WeaponCamo>* asset)
+    void JsonDumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<WeaponCamo>& asset)
     {
-        return true;
-    }
-
-    void JsonDumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponCamo>* asset)
-    {
-        const auto fileName = GetJsonFileNameForAssetName(asset->m_name);
+        const auto fileName = GetJsonFileNameForAssetName(asset.m_name);
         const auto assetFile = context.OpenAssetFile(fileName);
 
         if (!assetFile)
             return;
 
         const JsonDumperImpl dumper(*assetFile);
-        dumper.Dump(asset->Asset());
+        dumper.Dump(asset.Asset());
     }
 } // namespace camo
diff --git a/src/ObjWriting/Game/T6/Weapon/CamoJsonDumperT6.h b/src/ObjWriting/Game/T6/Weapon/CamoJsonDumperT6.h
index 8bb91f12..0a514a84 100644
--- a/src/ObjWriting/Game/T6/Weapon/CamoJsonDumperT6.h
+++ b/src/ObjWriting/Game/T6/Weapon/CamoJsonDumperT6.h
@@ -8,7 +8,6 @@ namespace camo
     class JsonDumperT6 final : public AbstractAssetDumper<T6::WeaponCamo>
     {
     protected:
-        bool ShouldDump(XAssetInfo<T6::WeaponCamo>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::WeaponCamo>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::WeaponCamo>& asset) override;
     };
 } // namespace camo
diff --git a/src/ObjWriting/Game/T6/Weapon/WeaponDumperT6.cpp b/src/ObjWriting/Game/T6/Weapon/WeaponDumperT6.cpp
index 96c5bcdc..a6e39534 100644
--- a/src/ObjWriting/Game/T6/Weapon/WeaponDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/Weapon/WeaponDumperT6.cpp
@@ -409,31 +409,31 @@ namespace
         }
     }
 
-    InfoString CreateInfoString(XAssetInfo<WeaponVariantDef>* asset)
+    InfoString CreateInfoString(const XAssetInfo<WeaponVariantDef>& asset)
     {
         const auto fullDef = std::make_unique<WeaponFullDef>();
         memset(fullDef.get(), 0, sizeof(WeaponFullDef));
-        CopyToFullDef(asset->Asset(), fullDef.get());
+        CopyToFullDef(asset.Asset(), fullDef.get());
 
         InfoStringFromWeaponConverter converter(fullDef.get(),
                                                 weapon_fields,
                                                 std::extent_v<decltype(weapon_fields)>,
                                                 [asset](const scr_string_t scrStr) -> std::string
                                                 {
-                                                    assert(scrStr < asset->m_zone->m_script_strings.Count());
-                                                    if (scrStr >= asset->m_zone->m_script_strings.Count())
+                                                    assert(scrStr < asset.m_zone->m_script_strings.Count());
+                                                    if (scrStr >= asset.m_zone->m_script_strings.Count())
                                                         return "";
 
-                                                    return asset->m_zone->m_script_strings[scrStr];
+                                                    return asset.m_zone->m_script_strings[scrStr];
                                                 });
 
         return converter.Convert();
     }
 
-    void DumpAccuracyGraphs(AssetDumpingContext& context, XAssetInfo<WeaponVariantDef>* asset)
+    void DumpAccuracyGraphs(AssetDumpingContext& context, const XAssetInfo<WeaponVariantDef>& asset)
     {
         auto* accuracyGraphWriter = context.GetZoneAssetDumperState<AccuracyGraphWriter>();
-        const auto weapon = asset->Asset();
+        const auto weapon = asset.Asset();
         const auto* weapDef = weapon->weapDef;
 
         if (!weapDef)
@@ -461,24 +461,19 @@ namespace
 
 namespace weapon
 {
-    bool DumperT6::ShouldDump(XAssetInfo<WeaponVariantDef>* asset)
-    {
-        return true;
-    }
-
-    void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponVariantDef>* asset)
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<WeaponVariantDef>& asset)
     {
         // Only dump raw when no gdt available
         if (context.m_gdt)
         {
             const auto infoString = CreateInfoString(asset);
-            GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_WEAPON);
+            GdtEntry gdtEntry(asset.m_name, ObjConstants::GDF_FILENAME_WEAPON);
             infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_WEAPON, gdtEntry);
             context.m_gdt->WriteEntry(gdtEntry);
         }
         else
         {
-            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset->m_name));
+            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset.m_name));
 
             if (!assetFile)
                 return;
diff --git a/src/ObjWriting/Game/T6/Weapon/WeaponDumperT6.h b/src/ObjWriting/Game/T6/Weapon/WeaponDumperT6.h
index 4b3b500f..9067889d 100644
--- a/src/ObjWriting/Game/T6/Weapon/WeaponDumperT6.h
+++ b/src/ObjWriting/Game/T6/Weapon/WeaponDumperT6.h
@@ -8,7 +8,6 @@ namespace weapon
     class DumperT6 final : public AbstractAssetDumper<T6::WeaponVariantDef>
     {
     protected:
-        bool ShouldDump(XAssetInfo<T6::WeaponVariantDef>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::WeaponVariantDef>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::WeaponVariantDef>& asset) override;
     };
 } // namespace weapon
diff --git a/src/ObjWriting/Game/T6/ZBarrier/ZBarrierDumperT6.cpp b/src/ObjWriting/Game/T6/ZBarrier/ZBarrierDumperT6.cpp
index 1a7edb80..c8af5610 100644
--- a/src/ObjWriting/Game/T6/ZBarrier/ZBarrierDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/ZBarrier/ZBarrierDumperT6.cpp
@@ -30,18 +30,18 @@ namespace
         }
     };
 
-    InfoString CreateInfoString(XAssetInfo<ZBarrierDef>* asset)
+    InfoString CreateInfoString(const XAssetInfo<ZBarrierDef>& asset)
     {
-        InfoStringFromZBarrierConverter converter(asset->Asset(),
+        InfoStringFromZBarrierConverter converter(asset.Asset(),
                                                   zbarrier_fields,
                                                   std::extent_v<decltype(zbarrier_fields)>,
                                                   [asset](const scr_string_t scrStr) -> std::string
                                                   {
-                                                      assert(scrStr < asset->m_zone->m_script_strings.Count());
-                                                      if (scrStr >= asset->m_zone->m_script_strings.Count())
+                                                      assert(scrStr < asset.m_zone->m_script_strings.Count());
+                                                      if (scrStr >= asset.m_zone->m_script_strings.Count())
                                                           return "";
 
-                                                      return asset->m_zone->m_script_strings[scrStr];
+                                                      return asset.m_zone->m_script_strings[scrStr];
                                                   });
 
         return converter.Convert();
@@ -50,24 +50,19 @@ namespace
 
 namespace z_barrier
 {
-    bool DumperT6::ShouldDump(XAssetInfo<ZBarrierDef>* asset)
-    {
-        return true;
-    }
-
-    void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<ZBarrierDef>* asset)
+    void DumperT6::DumpAsset(AssetDumpingContext& context, const XAssetInfo<ZBarrierDef>& asset)
     {
         // Only dump raw when no gdt available
         if (context.m_gdt)
         {
             const auto infoString = CreateInfoString(asset);
-            GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_ZBARRIER);
+            GdtEntry gdtEntry(asset.m_name, ObjConstants::GDF_FILENAME_ZBARRIER);
             infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_ZBARRIER, gdtEntry);
             context.m_gdt->WriteEntry(gdtEntry);
         }
         else
         {
-            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset->m_name));
+            const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset.m_name));
 
             if (!assetFile)
                 return;
diff --git a/src/ObjWriting/Game/T6/ZBarrier/ZBarrierDumperT6.h b/src/ObjWriting/Game/T6/ZBarrier/ZBarrierDumperT6.h
index 9e60f414..66f18a16 100644
--- a/src/ObjWriting/Game/T6/ZBarrier/ZBarrierDumperT6.h
+++ b/src/ObjWriting/Game/T6/ZBarrier/ZBarrierDumperT6.h
@@ -9,7 +9,6 @@ namespace z_barrier
     class DumperT6 final : public AbstractAssetDumper<T6::ZBarrierDef>
     {
     protected:
-        bool ShouldDump(XAssetInfo<T6::ZBarrierDef>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::ZBarrierDef>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<T6::ZBarrierDef>& asset) override;
     };
 } // namespace z_barrier
diff --git a/src/ObjWriting/Material/MaterialJsonDumper.cpp.template b/src/ObjWriting/Material/MaterialJsonDumper.cpp.template
index 7eb8ad51..5e238517 100644
--- a/src/ObjWriting/Material/MaterialJsonDumper.cpp.template
+++ b/src/ObjWriting/Material/MaterialJsonDumper.cpp.template
@@ -361,7 +361,7 @@ namespace
 
 namespace material
 {
-    void CLASS_NAME::DumpPool(AssetDumpingContext& context, AssetPool<Material>* pool)
+    void CLASS_NAME::DumpPool(AssetDumpingContext& context, const AssetPool<Material>& pool)
     {
         auto* materialConstantState = context.GetZoneAssetDumperState<MaterialConstantZoneState>();
         materialConstantState->ExtractNamesFromZone();
@@ -369,19 +369,14 @@ namespace material
         AbstractAssetDumper::DumpPool(context, pool);
     }
 
-    bool CLASS_NAME::ShouldDump(XAssetInfo<Material>* asset)
+    void CLASS_NAME::DumpAsset(AssetDumpingContext& context, const XAssetInfo<Material>& asset)
     {
-        return true;
-    }
-
-    void CLASS_NAME::DumpAsset(AssetDumpingContext& context, XAssetInfo<Material>* asset)
-    {
-        const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset->m_name));
+        const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset.m_name));
 
         if (!assetFile)
             return;
 
-        const auto* material = asset->Asset();
+        const auto* material = asset.Asset();
 #if defined(FEATURE_T5)
         assert(material->info.gameFlags < 0x400);
         assert(material->maxStreamedMips == 0);
diff --git a/src/ObjWriting/Material/MaterialJsonDumper.h.template b/src/ObjWriting/Material/MaterialJsonDumper.h.template
index f8a41515..c820a20a 100644
--- a/src/ObjWriting/Material/MaterialJsonDumper.h.template
+++ b/src/ObjWriting/Material/MaterialJsonDumper.h.template
@@ -20,10 +20,9 @@ namespace material
     class CLASS_NAME final : public AbstractAssetDumper<GAME::Material>
     {
     public:
-        void DumpPool(AssetDumpingContext& context, AssetPool<GAME::Material>* pool) override;
+        void DumpPool(AssetDumpingContext& context, const AssetPool<GAME::Material>& pool) override;
         
     protected:
-        [[nodiscard]] bool ShouldDump(XAssetInfo<GAME::Material>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<GAME::Material>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<GAME::Material>& asset) override;
     };
 } // namespace material
diff --git a/src/ObjWriting/XModel/XModelDumper.cpp.template b/src/ObjWriting/XModel/XModelDumper.cpp.template
index 4a569a56..9f6f8ccf 100644
--- a/src/ObjWriting/XModel/XModelDumper.cpp.template
+++ b/src/ObjWriting/XModel/XModelDumper.cpp.template
@@ -560,9 +560,9 @@ namespace
         }
     }
 
-    void DumpObjMtl(const XModelCommon& common, const AssetDumpingContext& context, const XAssetInfo<XModel>* asset)
+    void DumpObjMtl(const XModelCommon& common, const AssetDumpingContext& context, const XAssetInfo<XModel>& asset)
     {
-        const auto* model = asset->Asset();
+        const auto* model = asset.Asset();
         const auto mtlFile = context.OpenAssetFile(std::format("model_export/{}.mtl", model->name));
 
         if (!mtlFile)
@@ -575,9 +575,9 @@ namespace
         writer->Write(common);
     }
 
-    void DumpObjLod(const XModelCommon& common, const AssetDumpingContext& context, const XAssetInfo<XModel>* asset, const unsigned lod)
+    void DumpObjLod(const XModelCommon& common, const AssetDumpingContext& context, const XAssetInfo<XModel>& asset, const unsigned lod)
     {
-        const auto* model = asset->Asset();
+        const auto* model = asset.Asset();
         const auto assetFile = context.OpenAssetFile(GetFileNameForLod(model->name, lod, ".obj"));
 
         if (!assetFile)
@@ -591,9 +591,9 @@ namespace
         writer->Write(common);
     }
 
-    void DumpXModelExportLod(const XModelCommon& common, const AssetDumpingContext& context, const XAssetInfo<XModel>* asset, const unsigned lod)
+    void DumpXModelExportLod(const XModelCommon& common, const AssetDumpingContext& context, const XAssetInfo<XModel>& asset, const unsigned lod)
     {
-        const auto* model = asset->Asset();
+        const auto* model = asset.Asset();
         const auto assetFile = context.OpenAssetFile(GetFileNameForLod(model->name, lod, ".xmodel_export"));
 
         if (!assetFile)
@@ -604,9 +604,9 @@ namespace
         writer->Write(common);
     }
 
-    void DumpXModelBinLod(const XModelCommon& common, const AssetDumpingContext& context, const XAssetInfo<XModel>* asset, const unsigned lod)
+    void DumpXModelBinLod(const XModelCommon& common, const AssetDumpingContext& context, const XAssetInfo<XModel>& asset, const unsigned lod)
     {
-        const auto* model = asset->Asset();
+        const auto* model = asset.Asset();
         const auto assetFile = context.OpenAssetFile(GetFileNameForLod(model->name, lod, ".xmodel_bin"));
 
         if (!assetFile)
@@ -619,9 +619,9 @@ namespace
 
     template<typename T>
     void DumpGltfLod(
-        const XModelCommon& common, const AssetDumpingContext& context, const XAssetInfo<XModel>* asset, const unsigned lod, const std::string& extension)
+        const XModelCommon& common, const AssetDumpingContext& context, const XAssetInfo<XModel>& asset, const unsigned lod, const std::string& extension)
     {
-        const auto* model = asset->Asset();
+        const auto* model = asset.Asset();
         const auto assetFile = context.OpenAssetFile(GetFileNameForLod(model->name, lod, extension));
 
         if (!assetFile)
@@ -634,14 +634,14 @@ namespace
         writer->Write(common);
     }
 
-    void DumpXModelSurfs(const AssetDumpingContext& context, const XAssetInfo<XModel>* asset)
+    void DumpXModelSurfs(const AssetDumpingContext& context, const XAssetInfo<XModel>& asset)
     {
-        const auto* model = asset->Asset();
+        const auto* model = asset.Asset();
 
         for (auto currentLod = 0u; currentLod < model->numLods; currentLod++)
         {
             XModelCommon common;
-            PopulateXModelWriter(common, context, currentLod, asset->Asset());
+            PopulateXModelWriter(common, context, currentLod, asset.Asset());
 
             switch (ObjWriting::Configuration.ModelOutputFormat)
             {
@@ -841,25 +841,20 @@ namespace
         std::ostream& m_stream;
     };
 
-    void DumpXModelJson(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
+    void DumpXModelJson(AssetDumpingContext& context, const XAssetInfo<XModel>& asset)
     {
-        const auto assetFile = context.OpenAssetFile(xmodel::GetJsonFileNameForAssetName(asset->m_name));
+        const auto assetFile = context.OpenAssetFile(xmodel::GetJsonFileNameForAssetName(asset.m_name));
         if (!assetFile)
             return;
 
         const JsonDumper dumper(context, *assetFile);
-        dumper.Dump(asset->Asset());
+        dumper.Dump(asset.Asset());
     }
 } // namespace
 
 namespace xmodel
 {
-    bool CLASS_NAME::ShouldDump(XAssetInfo<XModel>* asset)
-    {
-        return !asset->m_name.empty() && asset->m_name[0] != ',';
-    }
-
-    void CLASS_NAME::DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
+    void CLASS_NAME::DumpAsset(AssetDumpingContext& context, const XAssetInfo<XModel>& asset)
     {
         DumpXModelJson(context, asset);
         DumpXModelSurfs(context, asset);
diff --git a/src/ObjWriting/XModel/XModelDumper.h.template b/src/ObjWriting/XModel/XModelDumper.h.template
index 5483e209..c6127af3 100644
--- a/src/ObjWriting/XModel/XModelDumper.h.template
+++ b/src/ObjWriting/XModel/XModelDumper.h.template
@@ -20,7 +20,6 @@ namespace xmodel
     class CLASS_NAME final : public AbstractAssetDumper<GAME::XModel>
     {
     protected:
-        bool ShouldDump(XAssetInfo<GAME::XModel>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<GAME::XModel>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, const XAssetInfo<GAME::XModel>& asset) override;
     };
 } // namespace xmodel
diff --git a/src/Unlinker/Unlinker.cpp b/src/Unlinker/Unlinker.cpp
index 35d0d25b..e1f6ee76 100644
--- a/src/Unlinker/Unlinker.cpp
+++ b/src/Unlinker/Unlinker.cpp
@@ -176,7 +176,7 @@ private:
                 return false;
 
             OutputPathFilesystem outputFolderOutputPath(outputFolderPath);
-            AssetDumpingContext context(zone, outputFolderPathStr, outputFolderOutputPath, searchPath);
+            AssetDumpingContext context(zone, outputFolderPathStr, outputFolderOutputPath, searchPath, std::nullopt);
 
             std::ofstream gdtStream;
             if (m_args.m_use_gdt)
diff --git a/src/ZoneCommon/Pool/AssetPool.h b/src/ZoneCommon/Pool/AssetPool.h
index 7b4794a2..f22c71cd 100644
--- a/src/ZoneCommon/Pool/AssetPool.h
+++ b/src/ZoneCommon/Pool/AssetPool.h
@@ -41,6 +41,32 @@ public:
         }
     };
 
+    class CIterator
+    {
+        typename std::map<std::string, XAssetInfo<T>*>::const_iterator m_iterator;
+
+    public:
+        explicit CIterator(typename std::map<std::string, XAssetInfo<T>*>::const_iterator i)
+        {
+            m_iterator = i;
+        }
+
+        bool operator!=(CIterator rhs)
+        {
+            return m_iterator != rhs.m_iterator;
+        }
+
+        const XAssetInfo<T>* operator*()
+        {
+            return m_iterator.operator*().second;
+        }
+
+        void operator++()
+        {
+            ++m_iterator;
+        }
+    };
+
     AssetPool()
     {
         m_asset_lookup = std::map<std::string, XAssetInfo<T>*>();
@@ -70,4 +96,14 @@ public:
     {
         return Iterator(m_asset_lookup.end());
     }
+
+    CIterator begin() const
+    {
+        return CIterator(m_asset_lookup.cbegin());
+    }
+
+    CIterator end() const
+    {
+        return CIterator(m_asset_lookup.cend());
+    }
 };
diff --git a/test/ObjWritingTests/Game/IW3/Material/MaterialJsonDumperIW3Test.cpp b/test/ObjWritingTests/Game/IW3/Material/MaterialJsonDumperIW3Test.cpp
index 66b71dd6..911a8fdd 100644
--- a/test/ObjWritingTests/Game/IW3/Material/MaterialJsonDumperIW3Test.cpp
+++ b/test/ObjWritingTests/Game/IW3/Material/MaterialJsonDumperIW3Test.cpp
@@ -556,14 +556,14 @@ namespace
         MemoryManager memory;
         MockSearchPath mockObjPath;
         MockOutputPath mockOutput;
-        AssetDumpingContext context(zone, "", mockOutput, mockObjPath);
+        AssetDumpingContext context(zone, "", mockOutput, mockObjPath, std::nullopt);
 
         AssetPoolDynamic<Material> materialPool(0);
 
         GivenMaterial("wc/ch_plasterwall_long", materialPool, memory);
 
         material::JsonDumperIW3 dumper;
-        dumper.DumpPool(context, &materialPool);
+        dumper.DumpPool(context, materialPool);
 
         const auto* file = mockOutput.GetMockedFile("materials/wc/ch_plasterwall_long.json");
         REQUIRE(file);
diff --git a/test/ObjWritingTests/Game/IW4/Material/MaterialJsonDumperIW4Test.cpp b/test/ObjWritingTests/Game/IW4/Material/MaterialJsonDumperIW4Test.cpp
index ea108592..f0908753 100644
--- a/test/ObjWritingTests/Game/IW4/Material/MaterialJsonDumperIW4Test.cpp
+++ b/test/ObjWritingTests/Game/IW4/Material/MaterialJsonDumperIW4Test.cpp
@@ -537,14 +537,14 @@ namespace
         MemoryManager memory;
         MockSearchPath mockObjPath;
         MockOutputPath mockOutput;
-        AssetDumpingContext context(zone, "", mockOutput, mockObjPath);
+        AssetDumpingContext context(zone, "", mockOutput, mockObjPath, std::nullopt);
 
         AssetPoolDynamic<Material> materialPool(0);
 
         GivenMaterial("mc/ch_rubble01", materialPool, memory);
 
         material::JsonDumperIW4 dumper;
-        dumper.DumpPool(context, &materialPool);
+        dumper.DumpPool(context, materialPool);
 
         const auto* file = mockOutput.GetMockedFile("materials/mc/ch_rubble01.json");
         REQUIRE(file);
diff --git a/test/ObjWritingTests/Game/IW5/Material/MaterialJsonDumperIW5Test.cpp b/test/ObjWritingTests/Game/IW5/Material/MaterialJsonDumperIW5Test.cpp
index 941c961d..2c3ab4ee 100644
--- a/test/ObjWritingTests/Game/IW5/Material/MaterialJsonDumperIW5Test.cpp
+++ b/test/ObjWritingTests/Game/IW5/Material/MaterialJsonDumperIW5Test.cpp
@@ -590,14 +590,14 @@ namespace
         MemoryManager memory;
         MockSearchPath mockObjPath;
         MockOutputPath mockOutput;
-        AssetDumpingContext context(zone, "", mockOutput, mockObjPath);
+        AssetDumpingContext context(zone, "", mockOutput, mockObjPath, std::nullopt);
 
         AssetPoolDynamic<Material> materialPool(0);
 
         GivenMaterial("wc/me_metal_rust_02", materialPool, memory);
 
         material::JsonDumperIW5 dumper;
-        dumper.DumpPool(context, &materialPool);
+        dumper.DumpPool(context, materialPool);
 
         const auto* file = mockOutput.GetMockedFile("materials/wc/me_metal_rust_02.json");
         REQUIRE(file);
diff --git a/test/ObjWritingTests/Game/T5/Material/MaterialJsonDumperT5Test.cpp b/test/ObjWritingTests/Game/T5/Material/MaterialJsonDumperT5Test.cpp
index 704ea0d5..354605f4 100644
--- a/test/ObjWritingTests/Game/T5/Material/MaterialJsonDumperT5Test.cpp
+++ b/test/ObjWritingTests/Game/T5/Material/MaterialJsonDumperT5Test.cpp
@@ -619,14 +619,14 @@ namespace
         MemoryManager memory;
         MockSearchPath mockObjPath;
         MockOutputPath mockOutput;
-        AssetDumpingContext context(zone, "", mockOutput, mockObjPath);
+        AssetDumpingContext context(zone, "", mockOutput, mockObjPath, std::nullopt);
 
         AssetPoolDynamic<Material> materialPool(0);
 
         GivenMaterial("mc/ch_rubble01", materialPool, memory);
 
         material::JsonDumperT5 dumper;
-        dumper.DumpPool(context, &materialPool);
+        dumper.DumpPool(context, materialPool);
 
         const auto* file = mockOutput.GetMockedFile("materials/mc/ch_rubble01.json");
         REQUIRE(file);
diff --git a/test/ObjWritingTests/Game/T6/FontIcon/FontIconJsonDumperT6Test.cpp b/test/ObjWritingTests/Game/T6/FontIcon/FontIconJsonDumperT6Test.cpp
index eaeb798d..2a568569 100644
--- a/test/ObjWritingTests/Game/T6/FontIcon/FontIconJsonDumperT6Test.cpp
+++ b/test/ObjWritingTests/Game/T6/FontIcon/FontIconJsonDumperT6Test.cpp
@@ -146,13 +146,13 @@ namespace
         MemoryManager memory;
         MockSearchPath mockObjPath;
         MockOutputPath mockOutput;
-        AssetDumpingContext context(zone, "", mockOutput, mockObjPath);
+        AssetDumpingContext context(zone, "", mockOutput, mockObjPath, std::nullopt);
 
         AssetPoolDynamic<FontIcon> fontIconPool(0);
         GivenFontIcon("fonticon/test.csv", fontIconPool, memory);
 
         font_icon::JsonDumperT6 dumper;
-        dumper.DumpPool(context, &fontIconPool);
+        dumper.DumpPool(context, fontIconPool);
 
         const auto* file = mockOutput.GetMockedFile("fonticon/test.json");
         REQUIRE(file);
diff --git a/test/ObjWritingTests/Game/T6/Material/MaterialJsonDumperT6Test.cpp b/test/ObjWritingTests/Game/T6/Material/MaterialJsonDumperT6Test.cpp
index f7b70376..b1331966 100644
--- a/test/ObjWritingTests/Game/T6/Material/MaterialJsonDumperT6Test.cpp
+++ b/test/ObjWritingTests/Game/T6/Material/MaterialJsonDumperT6Test.cpp
@@ -467,13 +467,13 @@ namespace
         MemoryManager memory;
         MockSearchPath mockObjPath;
         MockOutputPath mockOutput;
-        AssetDumpingContext context(zone, "", mockOutput, mockObjPath);
+        AssetDumpingContext context(zone, "", mockOutput, mockObjPath, std::nullopt);
 
         AssetPoolDynamic<Material> materialPool(0);
         GivenMaterial("wpc/metal_ac_duct", materialPool, memory);
 
         material::JsonDumperT6 dumper;
-        dumper.DumpPool(context, &materialPool);
+        dumper.DumpPool(context, materialPool);
 
         const auto* file = mockOutput.GetMockedFile("materials/wpc/metal_ac_duct.json");
         REQUIRE(file);