diff --git a/libultraship b/libultraship
index e1db4936..dedbf8c3 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit e1db49367bb3743a304d763be34830b4c1999873
+Subproject commit dedbf8c3887e2c4e68a9719d1552ac4e8f8f1393
diff --git a/src/port/resource/importers/AnimFactory.cpp b/src/port/resource/importers/AnimFactory.cpp
index f4682b4d..f3b87aee 100644
--- a/src/port/resource/importers/AnimFactory.cpp
+++ b/src/port/resource/importers/AnimFactory.cpp
@@ -9,7 +9,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryAnimV0::ReadResource(std::
         return nullptr;
     }
 
-    auto anim = std::make_shared<Animation>(file->InitData);
+    auto anim = std::make_shared<Animation>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     int16_t frameCount = reader->ReadInt16();
diff --git a/src/port/resource/importers/ColPolyFactory.cpp b/src/port/resource/importers/ColPolyFactory.cpp
index fe00078e..70410289 100644
--- a/src/port/resource/importers/ColPolyFactory.cpp
+++ b/src/port/resource/importers/ColPolyFactory.cpp
@@ -9,7 +9,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryColPolyV0::ReadResource(st
         return nullptr;
     }
 
-    auto colPoly = std::make_shared<ColPoly>(file->InitData);
+    auto colPoly = std::make_shared<ColPoly>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     auto colPolysCount = reader->ReadUInt32();
diff --git a/src/port/resource/importers/EnvSettingsFactory.cpp b/src/port/resource/importers/EnvSettingsFactory.cpp
index 6e7da09c..b76d8523 100644
--- a/src/port/resource/importers/EnvSettingsFactory.cpp
+++ b/src/port/resource/importers/EnvSettingsFactory.cpp
@@ -12,7 +12,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryEnvSettingsV0::ReadResourc
         return nullptr;
     }
 
-    auto env = std::make_shared<EnvSettings>(file->InitData);
+    auto env = std::make_shared<EnvSettings>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     env->mSettings.type = reader->ReadInt32();
diff --git a/src/port/resource/importers/GenericArrayFactory.cpp b/src/port/resource/importers/GenericArrayFactory.cpp
index 4e6bec07..7389c060 100644
--- a/src/port/resource/importers/GenericArrayFactory.cpp
+++ b/src/port/resource/importers/GenericArrayFactory.cpp
@@ -9,7 +9,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryGenericArrayV0::ReadResour
         return nullptr;
     }
 
-    auto arr = std::make_shared<GenericArray>(file->InitData);
+    auto arr = std::make_shared<GenericArray>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     auto type = reader->ReadUInt32();
diff --git a/src/port/resource/importers/HitboxFactory.cpp b/src/port/resource/importers/HitboxFactory.cpp
index fcf7763d..daa1c198 100644
--- a/src/port/resource/importers/HitboxFactory.cpp
+++ b/src/port/resource/importers/HitboxFactory.cpp
@@ -9,7 +9,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryHitboxV0::ReadResource(std
         return nullptr;
     }
 
-    auto hitbox = std::make_shared<Hitbox>(file->InitData);
+    auto hitbox = std::make_shared<Hitbox>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     auto count = reader->ReadUInt32();
diff --git a/src/port/resource/importers/LimbFactory.cpp b/src/port/resource/importers/LimbFactory.cpp
index 8f35cbc7..e9216c94 100644
--- a/src/port/resource/importers/LimbFactory.cpp
+++ b/src/port/resource/importers/LimbFactory.cpp
@@ -13,7 +13,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryLimbV0::ReadResource(std::
         return nullptr;
     }
 
-    auto limb = std::make_shared<Limb>(file->InitData);
+    auto limb = std::make_shared<Limb>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
        
     uint64_t dlist = reader->ReadUInt64();
diff --git a/src/port/resource/importers/MessageFactory.cpp b/src/port/resource/importers/MessageFactory.cpp
index 3f04d046..b544e32d 100644
--- a/src/port/resource/importers/MessageFactory.cpp
+++ b/src/port/resource/importers/MessageFactory.cpp
@@ -9,7 +9,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryMessageV0::ReadResource(st
         return nullptr;
     }
 
-    auto msg = std::make_shared<Message>(file->InitData);
+    auto msg = std::make_shared<Message>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     auto size = reader->ReadUInt32();
diff --git a/src/port/resource/importers/MessageLookupFactory.cpp b/src/port/resource/importers/MessageLookupFactory.cpp
index 6d6e1f0f..3fa01480 100644
--- a/src/port/resource/importers/MessageLookupFactory.cpp
+++ b/src/port/resource/importers/MessageLookupFactory.cpp
@@ -11,7 +11,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryMessageLookupV0::ReadResou
         return nullptr;
     }
 
-    auto table = std::make_shared<MessageLookup>(file->InitData);
+    auto table = std::make_shared<MessageLookup>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
     auto count = reader->ReadUInt32();
 
diff --git a/src/port/resource/importers/ObjectInitFactory.cpp b/src/port/resource/importers/ObjectInitFactory.cpp
index db7df4ad..9ebe330c 100644
--- a/src/port/resource/importers/ObjectInitFactory.cpp
+++ b/src/port/resource/importers/ObjectInitFactory.cpp
@@ -12,7 +12,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryObjectInitV0::ReadResource
         return nullptr;
     }
 
-    auto obj = std::make_shared<ObjectInit>(file->InitData);
+    auto obj = std::make_shared<ObjectInit>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
     auto count = reader->ReadUInt32();
 
diff --git a/src/port/resource/importers/ScriptCommandFactory.cpp b/src/port/resource/importers/ScriptCommandFactory.cpp
index 1b70e79b..e0aaba4d 100644
--- a/src/port/resource/importers/ScriptCommandFactory.cpp
+++ b/src/port/resource/importers/ScriptCommandFactory.cpp
@@ -10,7 +10,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryScriptCMDV0::ReadResource(
         return nullptr;
     }
 
-    auto cmds = std::make_shared<ScriptCMDs>(file->InitData);
+    auto cmds = std::make_shared<ScriptCMDs>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     auto size = reader->ReadUInt32();
diff --git a/src/port/resource/importers/ScriptFactory.cpp b/src/port/resource/importers/ScriptFactory.cpp
index ed661efd..3480ece0 100644
--- a/src/port/resource/importers/ScriptFactory.cpp
+++ b/src/port/resource/importers/ScriptFactory.cpp
@@ -10,7 +10,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryScriptV0::ReadResource(std
         return nullptr;
     }
 
-    auto script = std::make_shared<Script>(file->InitData);
+    auto script = std::make_shared<Script>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     auto size = reader->ReadUInt32();
diff --git a/src/port/resource/importers/SkeletonFactory.cpp b/src/port/resource/importers/SkeletonFactory.cpp
index 2c3fd204..c09543ee 100644
--- a/src/port/resource/importers/SkeletonFactory.cpp
+++ b/src/port/resource/importers/SkeletonFactory.cpp
@@ -11,7 +11,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinarySkeletonV0::ReadResource(s
         return nullptr;
     }
 
-    auto skel = std::make_shared<Skeleton>(file->InitData);
+    auto skel = std::make_shared<Skeleton>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     auto count = reader->ReadUInt32();
diff --git a/src/port/resource/importers/Vec3fFactory.cpp b/src/port/resource/importers/Vec3fFactory.cpp
index 4076860e..59c86e67 100644
--- a/src/port/resource/importers/Vec3fFactory.cpp
+++ b/src/port/resource/importers/Vec3fFactory.cpp
@@ -9,7 +9,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryVec3fV0::ReadResource(std:
         return nullptr;
     }
 
-    auto vec = std::make_shared<Vec3fArray>(file->InitData);
+    auto vec = std::make_shared<Vec3fArray>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     auto vecCount = reader->ReadUInt32();
diff --git a/src/port/resource/importers/Vec3sFactory.cpp b/src/port/resource/importers/Vec3sFactory.cpp
index 9a43deb2..48579eb5 100644
--- a/src/port/resource/importers/Vec3sFactory.cpp
+++ b/src/port/resource/importers/Vec3sFactory.cpp
@@ -9,7 +9,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryVec3sV0::ReadResource(std:
         return nullptr;
     }
 
-    auto vec = std::make_shared<Vec3sArray>(file->InitData);
+    auto vec = std::make_shared<Vec3sArray>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     auto vecCount = reader->ReadUInt32();
diff --git a/src/port/resource/importers/audio/AudioTableFactory.cpp b/src/port/resource/importers/audio/AudioTableFactory.cpp
index 80b02f56..7833e8bc 100644
--- a/src/port/resource/importers/audio/AudioTableFactory.cpp
+++ b/src/port/resource/importers/audio/AudioTableFactory.cpp
@@ -9,7 +9,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryAudioTableV0::ReadResource
         return nullptr;
     }
 
-    auto table = std::make_shared<AudioTable>(file->InitData);
+    auto table = std::make_shared<AudioTable>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     int16_t med = reader->ReadInt16();
diff --git a/src/port/resource/importers/audio/BookFactory.cpp b/src/port/resource/importers/audio/BookFactory.cpp
index 6643d13e..a4693f98 100644
--- a/src/port/resource/importers/audio/BookFactory.cpp
+++ b/src/port/resource/importers/audio/BookFactory.cpp
@@ -8,7 +8,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryAdpcmBookV0::ReadResource(
         return nullptr;
     }
 
-    auto book = std::make_shared<AdpcmBook>(file->InitData);
+    auto book = std::make_shared<AdpcmBook>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     book->mBook.order = reader->ReadUInt32();
diff --git a/src/port/resource/importers/audio/DrumFactory.cpp b/src/port/resource/importers/audio/DrumFactory.cpp
index b850dee3..d93fb0f9 100644
--- a/src/port/resource/importers/audio/DrumFactory.cpp
+++ b/src/port/resource/importers/audio/DrumFactory.cpp
@@ -9,7 +9,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryDrumV0::ReadResource(std::
         return nullptr;
     }
 
-    auto drum = std::make_shared<Drum>(file->InitData);
+    auto drum = std::make_shared<Drum>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     drum->mDrum.adsrDecayIndex = reader->ReadUByte();
diff --git a/src/port/resource/importers/audio/EnvelopeFactory.cpp b/src/port/resource/importers/audio/EnvelopeFactory.cpp
index ab789cb2..4a3804db 100644
--- a/src/port/resource/importers/audio/EnvelopeFactory.cpp
+++ b/src/port/resource/importers/audio/EnvelopeFactory.cpp
@@ -8,7 +8,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryEnvelopeV0::ReadResource(s
         return nullptr;
     }
 
-    auto envelope = std::make_shared<Envelope>(file->InitData);
+    auto envelope = std::make_shared<Envelope>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     uint32_t count = reader->ReadUInt32();
diff --git a/src/port/resource/importers/audio/InstrumentFactory.cpp b/src/port/resource/importers/audio/InstrumentFactory.cpp
index 442ccff0..5bda4ecd 100644
--- a/src/port/resource/importers/audio/InstrumentFactory.cpp
+++ b/src/port/resource/importers/audio/InstrumentFactory.cpp
@@ -9,7 +9,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryInstrumentV0::ReadResource
         return nullptr;
     }
 
-    auto instrument = std::make_shared<Instrument>(file->InitData);
+    auto instrument = std::make_shared<Instrument>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     instrument->mInstrument.isRelocated = reader->ReadUByte();
diff --git a/src/port/resource/importers/audio/LoopFactory.cpp b/src/port/resource/importers/audio/LoopFactory.cpp
index 485c800a..6a60f1e5 100644
--- a/src/port/resource/importers/audio/LoopFactory.cpp
+++ b/src/port/resource/importers/audio/LoopFactory.cpp
@@ -8,7 +8,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryAdpcmLoopV0::ReadResource(
         return nullptr;
     }
 
-    auto loop = std::make_shared<AdpcmLoop>(file->InitData);
+    auto loop = std::make_shared<AdpcmLoop>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     loop->mLoop.start = reader->ReadUInt32();
diff --git a/src/port/resource/importers/audio/SampleFactory.cpp b/src/port/resource/importers/audio/SampleFactory.cpp
index c83e49c8..87f6ec14 100644
--- a/src/port/resource/importers/audio/SampleFactory.cpp
+++ b/src/port/resource/importers/audio/SampleFactory.cpp
@@ -17,7 +17,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinarySampleV1::ReadResource(std
         return nullptr;
     }
 
-    auto sample = std::make_shared<Sample>(file->InitData);
+    auto sample = std::make_shared<Sample>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     sample->mSample.codec = reader->ReadUByte();
@@ -149,12 +149,12 @@ std::shared_ptr<Ship::IResource> ResourceFactoryXMLSampleV0::ReadResource(std::s
         return nullptr;
     }
 
-    auto sample = std::make_shared<Sample>(file->InitData);
+    auto sample = std::make_shared<Sample>(initData);
     auto child = std::get<std::shared_ptr<tinyxml2::XMLDocument>>(file->Reader)->FirstChildElement();
     const char* customFormatStr = child->Attribute("CustomFormat");
     memset(&sample->mSample, 0, sizeof(sample->mSample));
     sample->mSample.isRelocated = 0;
-    sample->mSample.codec = CodecStrToInt(child->Attribute("Codec"), file->InitData->Path.c_str());
+    sample->mSample.codec = CodecStrToInt(child->Attribute("Codec"), initData->Path.c_str());
     sample->mSample.medium = MediumStrToInt(child->Attribute("Medium"));
     sample->mSample.unk = child->IntAttribute("bit26");
 
diff --git a/src/port/resource/importers/audio/SoundFontFactory.cpp b/src/port/resource/importers/audio/SoundFontFactory.cpp
index c0730360..126b43fe 100644
--- a/src/port/resource/importers/audio/SoundFontFactory.cpp
+++ b/src/port/resource/importers/audio/SoundFontFactory.cpp
@@ -11,7 +11,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinarySoundFontV0::ReadResource(
         return nullptr;
     }
 
-    auto font = std::make_shared<SoundFont>(file->InitData);
+    auto font = std::make_shared<SoundFont>(initData);
     auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
 
     font->mFont.numInstruments = reader->ReadUByte();
@@ -216,7 +216,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryXMLSoundFontV0::ReadResource(std
     if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
-    auto audioSoundFont = std::make_shared<SoundFont>(file->InitData);
+    auto audioSoundFont = std::make_shared<SoundFont>(initData);
     auto child = std::get<std::shared_ptr<tinyxml2::XMLDocument>>(file->Reader)->FirstChildElement();
     // Header data
     memset(&audioSoundFont->mFont, 0, sizeof(audioSoundFont->mFont));