diff --git a/DataSpec/DNAMP1/ScriptObjects/NewCameraShaker.hpp b/DataSpec/DNAMP1/ScriptObjects/NewCameraShaker.hpp
index d0b15961e..9705d2acd 100644
--- a/DataSpec/DNAMP1/ScriptObjects/NewCameraShaker.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/NewCameraShaker.hpp
@@ -15,32 +15,23 @@ struct NewCameraShaker : IScriptObject
     String<-1> name;
     Value<atVec3f> location;
     Value<bool> unknown1;
-    struct LongBool : BigYAML
-    {
-        DECL_YAML
-        Value<atUint32> unknown1;
-        Value<bool> unknown2;
-    } unknown2;
-
+    PlayerParameters playerParams;
     Value<float> unknown3;
     Value<float> unknown4;
     struct CameraShakerParameters : BigYAML
     {
         DECL_YAML
-        Value<atUint32> unknown1;
-        Value<bool> unknown2;
-        Value<atUint32> unknown3;
-        Value<bool> unknown4;
-        Value<float> unknown5;
-        Value<float> unknown6;
-        Value<float> unknown7;
-        Value<float> unknown8;
-        Value<atUint32> unknown9;
-        Value<bool> unknown10;
-        Value<float> unknown11;
-        Value<float> unknown12;
-        Value<float> unknown13;
-        Value<float> unknown14;
+        PlayerParameters playerParams;
+        struct ShakerInfo : BigYAML
+        {
+            DECL_YAML
+            PlayerParameters playerParams;
+            Value<float> unknown1;
+            Value<float> unknown2;
+            Value<float> unknown3;
+            Value<float> unknown4;
+        };
+        ShakerInfo shakers[2];
     } cameraShakerParameters1, cameraShakerParameters2, cameraShakerParameters3;
 };
 }
diff --git a/DataSpec/DNAMP1/ScriptObjects/Parameters.hpp b/DataSpec/DNAMP1/ScriptObjects/Parameters.hpp
index e84671c5e..340c077b3 100644
--- a/DataSpec/DNAMP1/ScriptObjects/Parameters.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Parameters.hpp
@@ -347,6 +347,13 @@ struct VisorParameters : BigYAML
     Value<atUint32> unknown3;
 };
 
+struct PlayerParameters : BigYAML
+{
+    DECL_YAML
+    Value<atUint32> propertyCount;
+    Vector<bool, DNA_COUNT(propertyCount)> bools;
+};
+
 struct ActorParameters : BigYAML
 {
     DECL_YAML
diff --git a/DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp b/DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp
index 2812d6b78..e66203b6a 100644
--- a/DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp
@@ -29,12 +29,7 @@ struct PlayerActor : IScriptObject
     Value<bool> unknown5;
     Value<bool> unknown6;
     Value<bool> unknown7;
-    struct PlayerParameters : BigYAML
-    {
-        DECL_YAML
-        Value<atUint32> propertyCount;
-        Vector<bool, DNA_COUNT(propertyCount)> bools;
-    } playerParameters;
+    PlayerParameters playerParameters;
     Value<atUint32> unknown8;
 
     void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
diff --git a/DataSpec/DNAMP1/ScriptObjects/SpindleCamera.hpp b/DataSpec/DNAMP1/ScriptObjects/SpindleCamera.hpp
index bf30a5f2b..20183f092 100644
--- a/DataSpec/DNAMP1/ScriptObjects/SpindleCamera.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/SpindleCamera.hpp
@@ -16,7 +16,7 @@ struct SpindleCamera : IScriptObject
     Value<atVec3f> location;
     Value<atVec3f> orientation;
     Value<bool> unknown1;
-    PlayerHintParameters playerHint;
+    PlayerParameters playerParameters;
     Value<float> unknown2;
     Value<float> unknown3;
     Value<float> unknown4;
@@ -25,9 +25,7 @@ struct SpindleCamera : IScriptObject
     {
         DECL_YAML
         Value<atUint32> unknown1;
-        Value<atUint32> unknown2;
-        Value<bool> unknown3;
-        Value<bool> unknown4;
+        PlayerParameters playerParameters;
         Value<float> unknown5;
         Value<float> unknown6;
         Value<float> unknown7;
diff --git a/Runtime/CMakeLists.txt b/Runtime/CMakeLists.txt
index 071046bb8..c8d74babc 100644
--- a/Runtime/CMakeLists.txt
+++ b/Runtime/CMakeLists.txt
@@ -48,7 +48,6 @@ add_library(RuntimeCommon
             CCRC32.hpp CCRC32.cpp
             IFactory.hpp
             IObjFactory.hpp
-            ScriptObjectSupport.hpp ScriptObjectSupport.cpp
             CObjectList.hpp CObjectList.cpp
             GameObjectLists.hpp GameObjectLists.cpp
             CSortedLists.hpp CSortedLists.cpp
diff --git a/Runtime/CScriptMailbox.hpp b/Runtime/CScriptMailbox.hpp
index 1f5f539eb..7e35ac2d8 100644
--- a/Runtime/CScriptMailbox.hpp
+++ b/Runtime/CScriptMailbox.hpp
@@ -2,7 +2,7 @@
 #define __URDE_CSCRIPTMAILBOX_HPP__
 
 #include "IOStreams.hpp"
-#include "ScriptObjectSupport.hpp"
+#include "World/ScriptObjectSupport.hpp"
 #include "RetroTypes.hpp"
 
 namespace urde
diff --git a/Runtime/CStateManager.hpp b/Runtime/CStateManager.hpp
index 9495f38ff..5f743e91b 100644
--- a/Runtime/CStateManager.hpp
+++ b/Runtime/CStateManager.hpp
@@ -4,7 +4,7 @@
 #include <memory>
 #include <set>
 #include "CBasics.hpp"
-#include "ScriptObjectSupport.hpp"
+#include "World/ScriptObjectSupport.hpp"
 #include "GameObjectLists.hpp"
 #include "Camera/CCameraManager.hpp"
 #include "Camera/CCameraFilter.hpp"
diff --git a/Runtime/Camera/CGameCamera.hpp b/Runtime/Camera/CGameCamera.hpp
index ff363d93f..643d2f684 100644
--- a/Runtime/Camera/CGameCamera.hpp
+++ b/Runtime/Camera/CGameCamera.hpp
@@ -9,9 +9,8 @@ namespace urde
 
 class CGameCamera : public CActor
 {
-    zeus::CTransform x34_;
 public:
-    const zeus::CTransform& GetTransform() const {return x34_;}
+    const zeus::CTransform& GetTransform() const {return x34_transform;}
 };
 
 }
diff --git a/Runtime/World/CActorParameters.hpp b/Runtime/World/CActorParameters.hpp
new file mode 100644
index 000000000..fce4cd351
--- /dev/null
+++ b/Runtime/World/CActorParameters.hpp
@@ -0,0 +1,36 @@
+#ifndef __URDE_CACTORPARAMETERS_HPP__
+#define __URDE_CACTORPARAMETERS_HPP__
+
+#include "CLightParameters.hpp"
+#include "CScannableParameters.hpp"
+#include "CVisorParameters.hpp"
+
+namespace urde
+{
+
+class CActorParameters
+{
+    CLightParameters x4_lightParms;
+    CScannableParameters x40_scanParms;
+    std::pair<ResId, ResId> x44_xrayAssets = {};
+    std::pair<ResId, ResId> x4c_thermalAssets = {};
+    CVisorParameters x54_visorParms;
+    bool b1 : 1;
+    bool b2 : 1;
+    bool b3 : 1;
+    bool b4 : 1;
+public:
+    CActorParameters()
+    : b1(true), b2(false), b3(false), b4(false) {}
+    CActorParameters(const CLightParameters& lightParms, const CScannableParameters& scanParms,
+                     const std::pair<ResId, ResId>& xrayAssets, const std::pair<ResId, ResId>& thermalAssets,
+                     const CVisorParameters& visorParms, bool a, bool b, bool c, bool d)
+    : x4_lightParms(lightParms), x40_scanParms(scanParms),
+      x44_xrayAssets(xrayAssets), x4c_thermalAssets(thermalAssets),
+      x54_visorParms(visorParms), b1(a), b2(b), b3(c), b4(d) {}
+    static CActorParameters None() {return CActorParameters();}
+};
+
+}
+
+#endif // __URDE_CACTORPARAMETERS_HPP__
diff --git a/Runtime/World/CGrappleParameters.hpp b/Runtime/World/CGrappleParameters.hpp
new file mode 100644
index 000000000..fd93fd5d3
--- /dev/null
+++ b/Runtime/World/CGrappleParameters.hpp
@@ -0,0 +1,25 @@
+#ifndef __URDE_CGRAPPLEPARAMETERS_HPP__
+#define __URDE_CGRAPPLEPARAMETERS_HPP__
+
+namespace urde
+{
+
+class CGrappleParameters
+{
+    float x0_;
+    float x4_;
+    float x8_;
+    float xc_;
+    float x10_;
+    float x14_;
+    float x18_;
+    float x1c_;
+    float x20_;
+    float x24_;
+    float x28_;
+    bool x2c_;
+};
+
+}
+
+#endif // __URDE_CGRAPPLEPARAMETERS_HPP__
diff --git a/Runtime/World/CLightParameters.hpp b/Runtime/World/CLightParameters.hpp
new file mode 100644
index 000000000..5656a4501
--- /dev/null
+++ b/Runtime/World/CLightParameters.hpp
@@ -0,0 +1,43 @@
+#ifndef __URDE_CLIGHTPARAMETERS_HPP__
+#define __URDE_CLIGHTPARAMETERS_HPP__
+
+#include "RetroTypes.hpp"
+#include "zeus/CColor.hpp"
+
+namespace urde
+{
+
+class CLightParameters
+{
+    bool x4_a = false;
+    float x8_b = 0.f;
+    u32 xc_c = 0;
+    float x10_d = 0.f;
+    float x14_e = 0.f;
+    zeus::CColor x18_f;
+    bool x1c_g = false;
+    bool x1d_h = false;
+    u32 x20_i = 0;
+    u32 x24_j = 1;
+    u32 x28_k = 0;
+    zeus::CVector3f x2c_l;
+    u32 x38_m = 4;
+    u32 x3c_n = 4;
+public:
+    CLightParameters() = default;
+    CLightParameters(bool a, float b, u32 c, float d, float e, const zeus::CColor& f,
+                     bool g, u32 i, u32 j, const zeus::CVector3f& l, u32 m, u32 n, bool h, u32 k)
+    : x4_a(a), x8_b(b), xc_c(c), x10_d(d), x14_e(e), x18_f(f), x1c_g(g), x1d_h(h), x20_i(i),
+      x24_j(j), x28_k(k), x2c_l(l), x38_m(m), x3c_n(n)
+    {
+        if (x38_m > 4 || x38_m == -1)
+            x38_m = 4;
+        if (x3c_n > 4 || x3c_n == -1)
+            x3c_n = 4;
+    }
+    static CLightParameters None() {return CLightParameters();}
+};
+
+}
+
+#endif // __URDE_CLIGHTPARAMETERS_HPP__
diff --git a/Runtime/World/CMakeLists.txt b/Runtime/World/CMakeLists.txt
index 55b0d67d2..e724e2866 100644
--- a/Runtime/World/CMakeLists.txt
+++ b/Runtime/World/CMakeLists.txt
@@ -12,5 +12,11 @@ add_library(RuntimeCommonWorld
             CEnvFxManager.hpp CEnvFxManager.cpp
             CActorModelParticles.hpp CActorModelParticles.cpp
             CTeamAiTypes.hpp CTeamAiTypes.cpp
+            ScriptObjectSupport.hpp ScriptObjectSupport.cpp
             ScriptLoader.hpp ScriptLoader.cpp
-            CScriptWater.hpp CScriptWater.cpp)
+            CScriptWater.hpp CScriptWater.cpp
+            CGrappleParameters.hpp
+            CActorParameters.hpp
+            CLightParameters.hpp
+            CScannableParameters.hpp
+            CVisorParameters.hpp)
diff --git a/Runtime/World/CScannableParameters.hpp b/Runtime/World/CScannableParameters.hpp
new file mode 100644
index 000000000..3518fd8ff
--- /dev/null
+++ b/Runtime/World/CScannableParameters.hpp
@@ -0,0 +1,17 @@
+#ifndef __URDE_CSCANNABLEPARAMETERS_HPP__
+#define __URDE_CSCANNABLEPARAMETERS_HPP__
+
+#include "RetroTypes.hpp"
+
+namespace urde
+{
+
+class CScannableParameters
+{
+    ResId x0_scanId = -1;
+public:
+};
+
+}
+
+#endif // __URDE_CSCANNABLEPARAMETERS_HPP__
diff --git a/Runtime/World/CVisorParameters.hpp b/Runtime/World/CVisorParameters.hpp
new file mode 100644
index 000000000..79bfa28b8
--- /dev/null
+++ b/Runtime/World/CVisorParameters.hpp
@@ -0,0 +1,21 @@
+#ifndef __URDE_CVISORPARAMETERS_HPP__
+#define __URDE_CVISORPARAMETERS_HPP__
+
+#include "RetroTypes.hpp"
+
+namespace urde
+{
+
+class CVisorParameters
+{
+    u8 mask : 4;
+    bool b1 : 1;
+    bool b2 : 1;
+public:
+    CVisorParameters()
+    : mask(0xf), b1(false), b2(false) {}
+};
+
+}
+
+#endif // __URDE_CVISORPARAMETERS_HPP__
diff --git a/Runtime/World/ScriptLoader.cpp b/Runtime/World/ScriptLoader.cpp
index eb99e9176..a5e40cec3 100644
--- a/Runtime/World/ScriptLoader.cpp
+++ b/Runtime/World/ScriptLoader.cpp
@@ -1,514 +1,541 @@
 #include "ScriptLoader.hpp"
+#include "logvisor/logvisor.hpp"
 
 namespace urde
 {
+static logvisor::Module Log("urde::ScriptLoader");
 
-CEntity* ScriptLoader::LoadActor(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+static bool EnsurePropertyCount(int count, int expected, const char* structName)
 {
+    if (count < expected)
+    {
+        Log.report(logvisor::Fatal, "Insufficient number of props (%d/%d) for %s entity",
+                   count, expected, structName);
+        return false;
+    }
+    return true;
 }
 
-CEntity* ScriptLoader::LoadWaypoint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadActor(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+{
+    if (!EnsurePropertyCount(propCount, 24, "Actor"))
+        return nullptr;
+
+
+}
+
+CEntity* ScriptLoader::LoadWaypoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
+{
+}
+
+CEntity* ScriptLoader::LoadDoorArea(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadDoorArea(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadTrigger(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadTrigger(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadTimer(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadTimer(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadCounter(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadCounter(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadEffect(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadEffect(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPlatform(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPlatform(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSound(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSound(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadGenerator(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadGenerator(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadDock(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadDock(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadCamera(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadCamera(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadCameraWaypoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadCameraWaypoint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadNewIntroBoss(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadNewIntroBoss(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSpawnPoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSpawnPoint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadCameraHint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadCameraHint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPickup(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPickup(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadMemoryRelay(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadMemoryRelay(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadRandomRelay(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadRandomRelay(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadRelay(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadRelay(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadBeetle(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadBeetle(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadHUDMemo(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadHUDMemo(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadCameraFilterKeyframe(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadCameraFilterKeyframe(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadCameraBlurKeyframe(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadCameraBlurKeyframe(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadDamageableTrigger(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadDamageableTrigger(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadDebris(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadDebris(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadCameraShaker(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadCameraShaker(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadActorKeyframe(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadActorKeyframe(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadWater(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadWater(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadWarwasp(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadWarwasp(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSpacePirate(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSpacePirate(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadFlyingPirate(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadFlyingPirate(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadElitePirate(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadElitePirate(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadMetroidBeta(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadMetroidBeta(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadChozoGhost(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadChozoGhost(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadCoverPoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadCoverPoint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSpiderBallWaypoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSpiderBallWaypoint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadBloodFlower(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadBloodFlower(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadFlickerBat(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadFlickerBat(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPathCamera(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPathCamera(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadGrapplePoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadGrapplePoint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPuddleSpore(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPuddleSpore(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadDebugCameraWaypoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadDebugCameraWaypoint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSpiderBallAttractionSurface(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSpiderBallAttractionSurface(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPuddleToadGamma(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPuddleToadGamma(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadDistanceFog(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadDistanceFog(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadFireFlea(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadFireFlea(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadMetareeAlpha(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadMetareeAlpha(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadDockAreaChange(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadDockAreaChange(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadActorRotate(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadActorRotate(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSpecialFunction(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSpecialFunction(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSpankWeed(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSpankWeed(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadParasite(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadParasite(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPlayerHint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPlayerHint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadRipper(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadRipper(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPickupGenerator(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPickupGenerator(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadAIKeyframe(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadAIKeyframe(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPointOfInterest(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPointOfInterest(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadDrone(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadDrone(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadMetroidAlpha(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadMetroidAlpha(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadDebrisExtended(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadDebrisExtended(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSteam(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSteam(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadRipple(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadRipple(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadBallTrigger(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadBallTrigger(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadTargetingPoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadTargetingPoint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadElectroMagneticPulse(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadElectroMagneticPulse(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadIceSheegoth(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadIceSheegoth(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPlayerActor(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPlayerActor(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadFlaahgra(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadFlaahgra(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadAreaAttributes(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadAreaAttributes(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadFishCloud(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadFishCloud(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadFishCloudModifier(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadFishCloudModifier(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadVisorFlare(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadVisorFlare(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadWorldTeleporter(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadWorldTeleporter(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadVisorGoo(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadVisorGoo(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadJellyZap(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadJellyZap(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadControllerAction(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadControllerAction(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSwitch(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSwitch(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPlayerStateChange(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPlayerStateChange(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadThardus(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadThardus(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadWallCrawlerSwarm(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadWallCrawlerSwarm(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadAIJumpPoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadAIJumpPoint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadFlaahgraTentacle(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadFlaahgraTentacle(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadRoomAcoustics(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadRoomAcoustics(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadColorModulate(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadColorModulate(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadThardusRockProjectile(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadThardusRockProjectile(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadMidi(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadMidi(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadStreamedAudio(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadStreamedAudio(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadRepulsor(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadRepulsor(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadGunTurret(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadGunTurret(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadFogVolume(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadFogVolume(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadBabygoth(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadBabygoth(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadEyeball(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadEyeball(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadRadialDamage(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadRadialDamage(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadCameraPitchVolume(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadCameraPitchVolume(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadEnvFxDensityController(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadEnvFxDensityController(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadMagdolite(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadMagdolite(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadTeamAIMgr(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadTeamAIMgr(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSnakeWeedSwarm(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSnakeWeedSwarm(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::Load(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::Load(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadActorContraption(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadActorContraption(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadOculus(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadOculus(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadGeemer(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadGeemer(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSpindleCamera(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSpindleCamera(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadAtomicAlpha(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadAtomicAlpha(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadCameraHintTrigger(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadCameraHintTrigger(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadRumbleEffect(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadRumbleEffect(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadAmbientAI(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadAmbientAI(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadAtomicBeta(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadAtomicBeta(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadIceZoomer(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadIceZoomer(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPuffer(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPuffer(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadTryclops(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadTryclops(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadRidley(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadRidley(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadSeedling(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadSeedling(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadThermalHeatFader(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadThermalHeatFader(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadBurrower(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadBurrower(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadScriptBeam(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadScriptBeam(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadWorldLightFader(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadWorldLightFader(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadMetroidPrimeStage2(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadMetroidPrimeStage2(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadMetroidPrimeStage1(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadMetroidPrimeStage1(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadMazeNode(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadMazeNode(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadOmegaPirate(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadOmegaPirate(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPhazonPool(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPhazonPool(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadPhazonHealingNodule(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadPhazonHealingNodule(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadNewCameraShaker(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadNewCameraShaker(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadShadowProjector(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadShadowProjector(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+CEntity* ScriptLoader::LoadEnergyBall(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
 {
 }
 
-CEntity* ScriptLoader::LoadEnergyBall(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info)
+u32 ScriptLoader::LoadParameterFlags(CInputStream& in)
 {
+    u32 count = in.readUint32Big();
+    u32 ret = 0;
+    for (u32 i=0 ; i<count ; ++i)
+        if (in.readBool())
+            ret |= 1 << i;
+    return ret;
 }
 
 }
diff --git a/Runtime/World/ScriptLoader.hpp b/Runtime/World/ScriptLoader.hpp
index d258b60b2..9c40ea6a3 100644
--- a/Runtime/World/ScriptLoader.hpp
+++ b/Runtime/World/ScriptLoader.hpp
@@ -8,140 +8,145 @@ namespace urde
 class CStateManager;
 class CEntityInfo;
 class CEntity;
+class CGrappleParameters;
 
 using FScriptLoader = std::function<CEntity*(CStateManager& mgr, CInputStream& in,
-                                             int, const CEntityInfo& info)>;
+                                             int propCount, const CEntityInfo& info)>;
 
 class ScriptLoader
 {
 public:
-    static CEntity* LoadActor(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadWaypoint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadDoorArea(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadTrigger(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadTimer(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadCounter(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadEffect(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadPlatform(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadSound(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadGenerator(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadDock(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadCamera(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadCameraWaypoint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadNewIntroBoss(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadSpawnPoint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadCameraHint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadPickup(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadMemoryRelay(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadRandomRelay(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadRelay(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadBeetle(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadHUDMemo(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadCameraFilterKeyframe(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadCameraBlurKeyframe(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadDamageableTrigger(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadDebris(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadCameraShaker(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadActorKeyframe(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadWater(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadWarwasp(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadSpacePirate(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadFlyingPirate(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadElitePirate(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadMetroidBeta(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadChozoGhost(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadCoverPoint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadSpiderBallWaypoint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadBloodFlower(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadFlickerBat(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadPathCamera(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadGrapplePoint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadPuddleSpore(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadDebugCameraWaypoint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadSpiderBallAttractionSurface(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadPuddleToadGamma(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadDistanceFog(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadFireFlea(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadMetareeAlpha(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadDockAreaChange(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadActorRotate(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadSpecialFunction(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadSpankWeed(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadParasite(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadPlayerHint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadRipper(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadPickupGenerator(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadAIKeyframe(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadPointOfInterest(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadDrone(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadMetroidAlpha(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadDebrisExtended(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadSteam(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadRipple(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadBallTrigger(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadTargetingPoint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadElectroMagneticPulse(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadIceSheegoth(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadPlayerActor(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadFlaahgra(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadAreaAttributes(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadFishCloud(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadFishCloudModifier(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadVisorFlare(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadWorldTeleporter(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadVisorGoo(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadJellyZap(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadControllerAction(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadSwitch(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadPlayerStateChange(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadThardus(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadWallCrawlerSwarm(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadAIJumpPoint(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadFlaahgraTentacle(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadRoomAcoustics(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadColorModulate(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadThardusRockProjectile(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadMidi(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadStreamedAudio(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadRepulsor(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadGunTurret(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadFogVolume(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadBabygoth(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadEyeball(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadRadialDamage(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadCameraPitchVolume(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadEnvFxDensityController(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadMagdolite(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadTeamAIMgr(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadSnakeWeedSwarm(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* Load(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadActorContraption(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadOculus(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadGeemer(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadSpindleCamera(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadAtomicAlpha(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadCameraHintTrigger(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadRumbleEffect(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadAmbientAI(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadAtomicBeta(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadIceZoomer(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadPuffer(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadTryclops(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadRidley(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadSeedling(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadThermalHeatFader(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadBurrower(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadScriptBeam(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadWorldLightFader(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadMetroidPrimeStage2(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadMetroidPrimeStage1(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadMazeNode(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadOmegaPirate(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadPhazonPool(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadPhazonHealingNodule(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadNewCameraShaker(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadShadowProjector(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
-    static CEntity* LoadEnergyBall(CStateManager& mgr, CInputStream& in, int, const CEntityInfo& info);
+    static CEntity* LoadActor(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadWaypoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadDoorArea(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadTrigger(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadTimer(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadCounter(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadEffect(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadPlatform(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadSound(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadGenerator(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadDock(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadCamera(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadCameraWaypoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadNewIntroBoss(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadSpawnPoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadCameraHint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadPickup(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadMemoryRelay(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadRandomRelay(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadRelay(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadBeetle(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadHUDMemo(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadCameraFilterKeyframe(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadCameraBlurKeyframe(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadDamageableTrigger(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadDebris(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadCameraShaker(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadActorKeyframe(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadWater(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadWarwasp(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadSpacePirate(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadFlyingPirate(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadElitePirate(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadMetroidBeta(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadChozoGhost(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadCoverPoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadSpiderBallWaypoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadBloodFlower(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadFlickerBat(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadPathCamera(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadGrapplePoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadPuddleSpore(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadDebugCameraWaypoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadSpiderBallAttractionSurface(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadPuddleToadGamma(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadDistanceFog(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadFireFlea(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadMetareeAlpha(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadDockAreaChange(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadActorRotate(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadSpecialFunction(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadSpankWeed(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadParasite(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadPlayerHint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadRipper(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadPickupGenerator(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadAIKeyframe(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadPointOfInterest(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadDrone(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadMetroidAlpha(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadDebrisExtended(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadSteam(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadRipple(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadBallTrigger(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadTargetingPoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadElectroMagneticPulse(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadIceSheegoth(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadPlayerActor(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadFlaahgra(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadAreaAttributes(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadFishCloud(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadFishCloudModifier(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadVisorFlare(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadWorldTeleporter(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadVisorGoo(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadJellyZap(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadControllerAction(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadSwitch(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadPlayerStateChange(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadThardus(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadWallCrawlerSwarm(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadAIJumpPoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadFlaahgraTentacle(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadRoomAcoustics(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadColorModulate(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadThardusRockProjectile(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadMidi(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadStreamedAudio(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadRepulsor(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadGunTurret(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadFogVolume(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadBabygoth(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadEyeball(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadRadialDamage(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadCameraPitchVolume(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadEnvFxDensityController(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadMagdolite(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadTeamAIMgr(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadSnakeWeedSwarm(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* Load(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadActorContraption(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadOculus(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadGeemer(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadSpindleCamera(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadAtomicAlpha(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadCameraHintTrigger(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadRumbleEffect(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadAmbientAI(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadAtomicBeta(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadIceZoomer(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadPuffer(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadTryclops(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadRidley(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadSeedling(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadThermalHeatFader(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadBurrower(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadScriptBeam(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadWorldLightFader(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadMetroidPrimeStage2(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadMetroidPrimeStage1(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadMazeNode(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadOmegaPirate(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadPhazonPool(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadPhazonHealingNodule(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadNewCameraShaker(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadShadowProjector(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+    static CEntity* LoadEnergyBall(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);
+
+    static u32 LoadParameterFlags(CInputStream& in);
+    static CGrappleParameters LoadGrappleParameters(CInputStream& in);
+
 };
 
 }
diff --git a/Runtime/ScriptObjectSupport.cpp b/Runtime/World/ScriptObjectSupport.cpp
similarity index 100%
rename from Runtime/ScriptObjectSupport.cpp
rename to Runtime/World/ScriptObjectSupport.cpp
diff --git a/Runtime/ScriptObjectSupport.hpp b/Runtime/World/ScriptObjectSupport.hpp
similarity index 100%
rename from Runtime/ScriptObjectSupport.hpp
rename to Runtime/World/ScriptObjectSupport.hpp