diff --git a/Controls/SourceBar.xaml b/Controls/SourceBar.xaml
index 69a2bd6..89e9349 100644
--- a/Controls/SourceBar.xaml
+++ b/Controls/SourceBar.xaml
@@ -17,10 +17,10 @@
                    RenderOptions.BitmapScalingMode="NearestNeighbor"
                    RenderOptions.ClearTypeHint="Enabled"/>
         </Border>
-        <Label Name="ModName" HorizontalAlignment="Left"
-               Margin="16,16,0,0" VerticalAlignment="Top"
-               Content="{Binding Name}" Foreground="White"
-               FontSize="15" Style="{StaticResource xFont}"/>
+        <TextBlock Name="ModName" HorizontalAlignment="Left"
+                   Margin="16,16,0,0" VerticalAlignment="Top"
+                   Text="{Binding Name}" Foreground="White"
+                   FontSize="15" Style="{StaticResource sFont}"/>
         <Button x:Name="CompileButton" Width="120" Height="39"
                 VerticalAlignment="Bottom" HorizontalAlignment="Right"
                 Margin="0,0,168,12" Padding="0" BorderBrush="Transparent"
diff --git a/DataLoader.cs b/DataLoader.cs
index 9b88e4c..526ee26 100644
--- a/DataLoader.cs
+++ b/DataLoader.cs
@@ -122,9 +122,16 @@ private static string ComputeChecksum(FileStream stream)
         private static bool CompareChecksum(FileStream stream)
         {
             string hash = ComputeChecksum(stream);
-            const string hashGog = "6E37E076EDFDC25468195EC1FFA937A5";
-            const string hashSteam = "392EE0E8C6A09A16DED58C5737ECF1B5";
-            return hash ==  hashGog || hash == hashSteam;
+            // Log.Information(hash); // uncomment to log the checksum of new versions and add to the array
+            string[] checksums =
+            {
+                "6E37E076EDFDC25468195EC1FFA937A5", // GOG 0.8.2.10
+                "392EE0E8C6A09A16DED58C5737ECF1B5", // Steam 0.8.2.10
+                "5F91989CA7E2A2B1234B2CD2A6AF9821", // Steam 0.9.1.16-vm
+                "2BD331F728428746FA337D6C7B67040A", // Steam 0.9.1.17-vm
+                "6F9F1E29275EEF60E3A725ECA1033DF8" // Steam 0.9.1.18-vm
+            };
+            return checksums.Contains(hash);
         }
         private static bool LoadUmt(string filename)
         {
@@ -133,7 +140,7 @@ private static bool LoadUmt(string filename)
             {
                 if(!CompareChecksum(stream))
                 {
-                    Log.Warning("Checksum inconsistency, {{{0}}} is not vanilla.", filename);
+                    Log.Warning("Checksum inconsistency, {{{0}}} may not be vanilla or is a new version.", filename);
                 }
                 data = UndertaleIO.Read(
                     stream, warning =>
diff --git a/Main.xaml.cs b/Main.xaml.cs
index 751929f..6382b3d 100644
--- a/Main.xaml.cs
+++ b/Main.xaml.cs
@@ -13,6 +13,7 @@
 using System.Runtime.InteropServices;
 using ModShardLauncher.Mods;
 using System.Diagnostics;
+using UndertaleModLib.Models;
 
 namespace ModShardLauncher
 {
@@ -36,6 +37,7 @@ public partial class Main : Window
         public const int SW_SHOW = 5;
         public static IntPtr handle;
         public string mslVersion;
+        public string utmtlibVersion;
         //
         private const double DefaultWidth = 960;                  // Исходная ширина
         private const double DefaultHeight = 800;                 // Исходная высота
@@ -75,13 +77,14 @@ public Main()
                 ProcessModule mainProcess = Msl.ThrowIfNull(Process.GetCurrentProcess().MainModule);
                 string mainProcessName = Msl.ThrowIfNull(mainProcess.FileName);
                 mslVersion = "v" + FileVersionInfo.GetVersionInfo(mainProcessName).FileVersion;
+                utmtlibVersion = "v" + FileVersionInfo.GetVersionInfo(typeof(UndertaleCode).Assembly.Location).FileVersion;
             }
             catch (FileNotFoundException ex)
             {
                 Log.Error(ex, "Cannot find the dll of ModShardLauncher");
                 throw;
             }
-            Log.Information("Launching msl {{{0}}}", mslVersion);
+            Log.Information("Launching msl {{{0}}} using UTMT {{{1}}}", mslVersion, utmtlibVersion);
 
             try
             {
diff --git a/ModLoader.cs b/ModLoader.cs
index 188b531..519d4cc 100644
--- a/ModLoader.cs
+++ b/ModLoader.cs
@@ -36,7 +36,7 @@ public static void ShowMessage(string msg)
         public static void Initalize()
         {
             Weapons = Msl.ThrowIfNull(GetTable("gml_GlobalScript_table_weapons"));
-            WeaponDescriptions = Msl.ThrowIfNull(GetTable("gml_GlobalScript_table_weapons_text"));
+            WeaponDescriptions = Msl.ThrowIfNull(GetTable("gml_GlobalScript_table_equipment"));
         }
         internal static void AddCredit(string modNameShort, string[] authors)
         {
@@ -175,6 +175,8 @@ public static void PatchMods()
             Disclaimers = new();
             List<ModFile> mods = ModInfos.Instance.Mods;
             Menus = new();
+
+            Stopwatch watch = Stopwatch.StartNew();
             foreach (ModFile mod in mods)
             {
                 if (!mod.isEnabled) continue;
@@ -202,6 +204,10 @@ public static void PatchMods()
             Msl.AddDisclaimerRoom(Credits.Select(x => x.Item1).ToArray(), Credits.SelectMany(x => x.Item2).Distinct().ToArray());
             Msl.ChainDisclaimerRooms(Disclaimers);
             Msl.CreateMenu(Menus);
+
+            watch.Stop();
+            long elapsedMs = watch.ElapsedMilliseconds;
+            Log.Information("Patching lasts {{{0}}} ms", elapsedMs);
         }
         public static void LoadWeapon(Type type)
         {
@@ -226,8 +232,8 @@ public static void PatchFile()
         }
         internal static void PatchInnerFile()
         {
-            if (Data.Code.All(x => x.Name.Content != "print"))
-                Msl.AddInnerFunction("print");
+            if (Data.Code.All(x => x.Name.Content != "msl_print"))
+                Msl.AddInnerFunction("msl_print");
             if (Data.Code.All(x => x.Name.Content != "give"))
                 Msl.AddInnerFunction("give");
             if (Data.Code.All(x => x.Name.Content != "SendMsg"))
diff --git a/ModShardLauncher.csproj b/ModShardLauncher.csproj
index e1dcbd1..9cb4345 100644
--- a/ModShardLauncher.csproj
+++ b/ModShardLauncher.csproj
@@ -9,17 +9,22 @@
     <ApplicationIcon>ico.ico</ApplicationIcon>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
 	  <SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
-    <FileVersion>0.12.1.0</FileVersion>
+    <FileVersion>0.13.1.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup> <!-- Include the specific files to exclude the ones in the test folder -->
     <Compile Include="*.cs" Exclude="bin\**;obj\**;ModShardLauncherTest\**.*cs" />
-    <Compile Include="ModUtils\TableUtils\ConsumParam.cs" />
-    <Compile Include="ModUtils\TableUtils\Contract.cs" />
-    <Compile Include="ModUtils\TableUtils\CreditsBackers.cs" />
-    <Compile Include="ModUtils\TableUtils\EnemyBalance.cs" />
-    <Compile Include="ModUtils\TableUtils\Potion.cs" />
-    <Compile Include="ModUtils\TableUtils\SkillsStat.cs" />
+    <Compile Include="ModUtils\TableUtils\Backers.cs" />
+    <Compile Include="ModUtils\TableUtils\ContractsStats.cs" />
+    <Compile Include="ModUtils\TableUtils\Drops.cs" />
+    <Compile Include="ModUtils\TableUtils\DungeonsSpawn.cs" />
+    <Compile Include="ModUtils\TableUtils\ItemStats.cs" />
+    <Compile Include="ModUtils\TableUtils\MobsStats.cs" />
+    <Compile Include="ModUtils\TableUtils\PotionsStats.cs" />
+    <Compile Include="ModUtils\TableUtils\RecipesCook.cs" />
+    <Compile Include="ModUtils\TableUtils\RecipesCraft.cs" />
+    <Compile Include="ModUtils\TableUtils\SkillsStats.cs" />
+    <Compile Include="ModUtils\TableUtils\SurfaceSpawn.cs" />
     <Compile Include="ModUtils\TableUtils\TableArmor.cs" />
     <Compile Include="ModUtils\TableUtils\TableUtils.cs" />
     <Compile Include="ModUtils\TableUtils\LocalizationUtils.cs" />
@@ -211,4 +216,11 @@
     <Copy SourceFiles="ModReference\netstandard.dll;ModReference\System.Collections.dll;ModReference\System.Runtime.dll;ModReference\System.Linq.dll;ModReference\System.ObjectModel.dll" DestinationFolder="$(OutDir)" />
   </Target>
 
+  <Target Name="CopyDevFiles" AfterTargets="Publish">
+    <Copy SourceFiles="Resources\ExportRoom.csx" DestinationFolder="$(PublishDir)" />
+    <Copy SourceFiles="Reference\UndertaleModLib.dll" DestinationFolder="$(PublishDir)" />
+    <Copy SourceFiles="Reference\UndertaleModTool.dll" DestinationFolder="$(PublishDir)" />
+    <Copy SourceFiles="$(OutputPath)ModShardLauncher.dll" DestinationFolder="$(PublishDir)" />
+  </Target>
+
 </Project>
diff --git a/ModUtils/CodeUtils.cs b/ModUtils/CodeUtils.cs
index ae878bb..256f3f1 100644
--- a/ModUtils/CodeUtils.cs
+++ b/ModUtils/CodeUtils.cs
@@ -444,20 +444,6 @@ public static string Collect(this FileEnumerable<(Match, string)> fe)
             if (otherEnumerator.MoveNext())
                 otherString = otherEnumerator.Current;
 
-            //TODO Delete (Necromancy)
-            if (otherString == "var XP = math_round((")
-            {
-                otherString = "var XP = math_round(";
-            }
-            else if (otherString == "return 1")
-            {
-                otherString = "return false";
-            }
-
-            //TODO Delete (UI+ 2.0.0)
-            if (otherString == "        is_activate = _notEmpty")
-                otherString = "is_activate = _notEmpty";
-
             foreach (string element in ienumerable)
             {
                 if (m != Match.After && otherString != null && element.Contains(otherString))
@@ -471,16 +457,6 @@ public static string Collect(this FileEnumerable<(Match, string)> fe)
                         m = Match.After;
                     }
 
-                    //TODO Delete (CraftableArrows)
-                    if(otherString == "            select = 1")
-                    {
-                        otherString = "            select = true";
-                    }
-                    else if(otherString == "            global.inv_select = 1")
-                    {
-                        otherString = "            global.inv_select = true";
-                    }
-                        
                 }
                 else
                 {
@@ -633,12 +609,6 @@ public static string Collect(this FileEnumerable<(Match, string)> fe)
             if (otherUntilEnumerator.MoveNext())
                 otherUntilString = otherUntilEnumerator.Current;
 
-            //TODO Delete (ArtifactKnowledge)
-            if(otherUntilString == "                _create_exit = 1")
-            {
-                otherUntilString = "                _create_exit = true";
-            }
-
             foreach ((Match m, string element) in ienumerable.MatchFrom(otherfrom))
             {
                 if (m == Match.Before || m == Match.Matching)
@@ -973,141 +943,6 @@ public static IEnumerable<string> Apply(this IEnumerable<string> ienumerable, Fu
         /// </summary>
         public static FileEnumerable<string> Apply(this FileEnumerable<string> fe, Func<IEnumerable<string>, IEnumerable<string>> iterator)
         {
-            //TODO Delete SpeedShard
-            #region SpeedShard
-            if (fe.header.fileName == "gml_GlobalScript_scr_loot_chestRemoteBastion")
-            {
-                var newEnumerable = new List<string>
-        {
-            "var _temp_local_var_2;",
-            "function scr_loot_chestRemoteBastion() //gml_Script_scr_loot_chestRemoteBastion",
-            "{",
-            "    var lvl = 1;",
-            "    var min_lvl = scr_globaltile_dungeon_get(\"mob_lvl_min\");",
-            "    var max_lvl = scr_globaltile_dungeon_get(\"mob_lvl_max\");",
-            "    var tier = floor(((max_lvl + min_lvl) / 2));",
-            "    lootScriptShowData(tier);",
-            "    var predicat = scr_loot_allweapon();",
-            "    with (o_player)",
-            "        lvl = (scr_atr(\"LVL\") + random_range(0, 4));",
-            "    var _temp_local_var_2 = tier;",
-            "    with (scr_inventory_add_item(o_inv_moneybag))",
-            "        ds_map_replace(data, \"Stack\", (300 + irandom_range(300, 600)));",
-            "    if scr_chance_value(50)",
-            "        scr_inventory_add_weapon(scr_find_weapon_params(15, 25, scr_loot_weapon()));",
-            "    else if scr_chance_value(50)",
-            "        scr_inventory_add_weapon(scr_find_weapon_params(15, 25, scr_loot_armor()));",
-            "    if scr_chance_value(75)",
-            "        scr_inventory_add_item(choose(3050, 3086));",
-            "    if scr_chance_value(100)",
-            "    {",
-            "        var gems = choose(3016, 3014, 3017, 3013);",
-            "        var precious = choose(2951, 2952, 2953);",
-            "        var goods = choose(2963, 2964, 2966, 2961);",
-            "        scr_inventory_add_item(choose(gems, precious, goods));",
-            "    }",
-            "    if scr_chance_value(50)",
-            "        scr_inventory_add_item(choose(3243, 4570, 340, 579, 2609), id, -4, 1, -4, 1, 1);",
-            "    else",
-            "    {",
-            "        with (scr_inventory_add_weapon(choose(\"Jarl Blade\", \"Royal Sword\", \"Relict Blade\", \"Guard Broadsword\", \"Decorated Saber\", \"Ancient Scimitar\", \"Gilded Axe\", \"Feudal Axe\", \"Decorated Flanged Mace\", \"Decorated Warhammer\", \"Ornate Greatsword\", \"Espadon\", \"Faceless Spear\", \"Decorated Voulge\", \"Ornate Longaxe\", \"Exquisite Grandmace\", \"Relict Polehammer\", \"Decorated Longbow\", \"Relic Bow\", \"Guard Crossbow\", \"Orient Staff\", \"Relict Staff\", \"Hermit Staff\", \"Guardian Shield\", \"Sun Shield\", \"Uroboros Shield\", \"Engraved Boots\", \"Decorated Barbute\", \"Joust Bascinet\", \"Joust Topfhelm\", \"Pigfaced Bascinet\", \"Decorated Sallet\", \"Mastercrafted Sallet\", \"Hermit Circlet\", \"Royal Ranger Gambeson\", \"Ceremonial Cuirass\", \"Vagabond Knight Armor\", \"Joust Armor\", \"Hermit Ring\"), (6 << 0)))",
-            "            scr_inv_atr_set(\"Duration\", irandom_range(35, 60));",
-            "    }",
-            "    scr_random_speech(\"containerRich\");",
-            "}"
-        };
-
-                return new FileEnumerable<string>(fe.header, iterator(newEnumerable));
-            }
-            else if (fe.header.fileName == "gml_GlobalScript_scr_loot_chestRemoteCrypt")
-            {
-                var newEnumerable = new List<string>
-        {
-            "var _temp_local_var_2;",
-            "function scr_loot_chestRemoteCrypt() //gml_Script_scr_loot_chestRemoteCrypt",
-            "{",
-            "    var lvl = 1;",
-            "    var min_lvl = scr_globaltile_dungeon_get(\"mob_lvl_min\");",
-            "    var max_lvl = scr_globaltile_dungeon_get(\"mob_lvl_max\");",
-            "    var tier = floor(((max_lvl + min_lvl) / 2));",
-            "    lootScriptShowData(tier);",
-            "    var predicat = scr_loot_allweapon();",
-            "    with (o_player)",
-            "        lvl = (scr_atr(\"LVL\") + random_range(0, 4));",
-            "    var _temp_local_var_2 = tier;",
-            "    with (scr_inventory_add_item(o_inv_moneybag))",
-            "        ds_map_replace(data, \"Stack\", (300 + irandom_range(300, 600)));",
-            "    if scr_chance_value(50)",
-            "        scr_inventory_add_weapon(scr_find_weapon_params(15, 25, scr_loot_weapon()));",
-            "    else if scr_chance_value(50)",
-            "        scr_inventory_add_weapon(scr_find_weapon_params(15, 25, scr_loot_armor()));",
-            "    if scr_chance_value(75)",
-            "        scr_inventory_add_item(choose(3050, 3086));",
-            "    if scr_chance_value(100)",
-            "    {",
-            "        var gems = choose(3016, 3014, 3017, 3013);",
-            "        var precious = choose(2951, 2952, 2953);",
-            "        var goods = choose(2963, 2964, 2966, 2961);",
-            "        scr_inventory_add_item(choose(gems, precious, goods));",
-            "    }",
-            "    if scr_chance_value(50)",
-            "        scr_inventory_add_item(choose(6365, 818, 1579, 104, 822, 2609), id, -4, 1, -4, 1, 1);",
-            "    else",
-            "    {",
-            "        with (scr_inventory_add_weapon(choose(\"Jarl Blade\", \"Royal Sword\", \"Relict Blade\", \"Guard Broadsword\", \"Decorated Saber\", \"Ancient Scimitar\", \"Gilded Axe\", \"Feudal Axe\", \"Decorated Flanged Mace\", \"Decorated Warhammer\", \"Ornate Greatsword\", \"Espadon\", \"Faceless Spear\", \"Decorated Voulge\", \"Ornate Longaxe\", \"Exquisite Grandmace\", \"Relict Polehammer\", \"Decorated Longbow\", \"Relic Bow\", \"Guard Crossbow\", \"Orient Staff\", \"Relict Staff\", \"Hermit Staff\", \"Guardian Shield\", \"Sun Shield\", \"Uroboros Shield\", \"Engraved Boots\", \"Decorated Barbute\", \"Joust Bascinet\", \"Joust Topfhelm\", \"Pigfaced Bascinet\", \"Decorated Sallet\", \"Mastercrafted Sallet\", \"Hermit Circlet\", \"Royal Ranger Gambeson\", \"Ceremonial Cuirass\", \"Vagabond Knight Armor\", \"Joust Armor\", \"Druid Robe\", \"Hermit Ring\"), (6 << 0)))",
-            "            scr_inv_atr_set(\"Duration\", irandom_range(35, 60));",
-            "    }",
-            "    scr_random_speech(\"containerRich\");",
-            "}"
-        };
-
-                return new FileEnumerable<string>(fe.header, iterator(newEnumerable));
-            }
-            else if (fe.header.fileName == "gml_GlobalScript_scr_loot_chestRemoteCatacombs")
-            {
-                var newEnumerable = new List<string>
-        {
-            "var _temp_local_var_2;",
-            "function scr_loot_chestRemoteCatacombs() //gml_Script_scr_loot_chestRemoteCatacombs",
-            "{",
-            "    var lvl = 1;",
-            "    var min_lvl = scr_globaltile_dungeon_get(\"mob_lvl_min\");",
-            "    var max_lvl = scr_globaltile_dungeon_get(\"mob_lvl_max\");",
-            "    var tier = floor(((max_lvl + min_lvl) / 2));",
-            "    lootScriptShowData(tier);",
-            "    var predicat = scr_loot_allweapon();",
-            "    with (o_player)",
-            "        lvl = (scr_atr(\"LVL\") + random_range(0, 4));",
-            "    var _temp_local_var_2 = tier;",
-            "    with (scr_inventory_add_item(o_inv_moneybag))",
-            "        ds_map_replace(data, \"Stack\", (300 + irandom_range(300, 600)));",
-            "    if scr_chance_value(25)",
-            "        scr_inventory_add_weapon(scr_find_weapon_params(15, 25, scr_loot_weapon()));",
-            "    else if scr_chance_value(25)",
-            "        scr_inventory_add_weapon(scr_find_weapon_params(15, 25, scr_loot_armor()));",
-            "    if scr_chance_value(50)",
-            "        scr_inventory_add_item(choose(3050, 3086));",
-            "    if scr_chance_value(100)",
-            "    {",
-            "        var gems = choose(3016, 3014, 3017, 3013);",
-            "        var precious = choose(2951, 2952, 2953);",
-            "        var goods = choose(2963, 2964, 2966, 2961);",
-            "        scr_inventory_add_item(choose(gems, precious, goods));",
-            "    }",
-            "    if scr_chance_value(50)",
-            "        scr_inventory_add_item(choose(818, 104, 6365, 579, 2609), id, -4, 1, -4, 1, 1);",
-            "    else",
-            "    {",
-            "        with (scr_inventory_add_weapon(choose(\"Jarl Blade\", \"Royal Sword\", \"Relict Blade\", \"Guard Broadsword\", \"Decorated Saber\", \"Ancient Scimitar\", \"Gilded Axe\", \"Feudal Axe\", \"Decorated Flanged Mace\", \"Decorated Warhammer\", \"Ornate Greatsword\", \"Espadon\", \"Faceless Spear\", \"Decorated Voulge\", \"Ornate Longaxe\", \"Exquisite Grandmace\", \"Relict Polehammer\", \"Decorated Longbow\", \"Relic Bow\", \"Guard Crossbow\", \"Orient Staff\", \"Relict Staff\", \"Guardian Shield\", \"Sun Shield\", \"Uroboros Shield\", \"Engraved Boots\", \"Decorated Barbute\", \"Joust Bascinet\", \"Joust Topfhelm\", \"Pigfaced Bascinet\", \"Decorated Sallet\", \"Mastercrafted Sallet\", \"Royal Ranger Gambeson\", \"Ceremonial Cuirass\", \"Vagabond Knight Armor\", \"Druid Robe\", \"Hermit Ring\"), (6 << 0)))",
-            "            scr_inv_atr_set(\"Duration\", irandom_range(35, 60));",
-            "    }",
-            "    scr_random_speech(\"containerRich\");",
-            "}"
-        };
-
-                return new FileEnumerable<string>(fe.header, iterator(newEnumerable));
-            }
-            #endregion
             return new(fe.header, fe.ienumerable.Apply(iterator));
         }
         /// <summary>
diff --git a/ModUtils/LogUtils.cs b/ModUtils/LogUtils.cs
index 21e3722..80c2513 100644
--- a/ModUtils/LogUtils.cs
+++ b/ModUtils/LogUtils.cs
@@ -39,7 +39,7 @@ public static void InjectLog()
         
         if (global._msl_log.timer == noone || !instance_exists(global._msl_log.timer))
         {
-            var t = instance_create(0, 0, o_msl_timer);
+            var t = instance_create_depth(0, 0, -100, o_msl_timer);
             t.end_time = 5;
             t.func = gml_Script_scr_msl_log_save;
 
@@ -102,7 +102,7 @@ public static void InjectLog()
         Msl.AddFunction(mslLog, "scr_msl_log");
         Msl.LoadGML(Msl.EventName("o_gameLoader", EventType.Create, 0))
             .MatchAll()
-            .InsertBelow(@"global._msl_log = instance_create(0, 0, o_msl_log);")
+            .InsertBelow(@"global._msl_log = instance_create_depth(0, 0, -100, o_msl_log);")
             .Save();       
     }
 }
\ No newline at end of file
diff --git a/ModUtils/RoomUtils.cs b/ModUtils/RoomUtils.cs
index 2ff0c69..148b4e7 100644
--- a/ModUtils/RoomUtils.cs
+++ b/ModUtils/RoomUtils.cs
@@ -5,6 +5,12 @@
 using UndertaleModLib;
 using UndertaleModLib.Models;
 using UndertaleModTool;
+using System.Text;
+using System.Text.Json;
+using UndertaleModLib.Scripting;
+using System.Xml.Linq;
+using System;
+
 
 namespace ModShardLauncher
 {
@@ -14,6 +20,723 @@ public static IEnumerable<UndertaleRoom> GetRooms()
         {
             return ModLoader.Data.Rooms;
         }
+
+        public static void AddRoomJson(string jsonString)
+        {
+            UndertaleRoom newRoom = new UndertaleRoom();
+
+            Log.Information($"A room is being added or edited");
+            byte[] jsonUtf8Bytes = Encoding.UTF8.GetBytes(jsonString);
+
+            JsonReaderOptions options = new JsonReaderOptions
+            {
+                AllowTrailingCommas = true,
+                CommentHandling = JsonCommentHandling.Skip
+            };
+
+            Utf8JsonReader reader = new Utf8JsonReader(jsonUtf8Bytes, options);
+
+            ReadAnticipateJSONObject(ref reader, JsonTokenType.StartObject);
+
+            ReadName(ref reader, ref newRoom);
+            ReadMainValues(ref reader, ref newRoom);
+
+            ClearRoomLists(ref newRoom);
+
+            ReadBackgrounds(ref reader, ref newRoom);
+            ReadViews(ref reader, ref newRoom);
+            ReadGameObjects(ref reader, ref newRoom);
+            ReadTiles(ref reader, ref newRoom);
+            ReadLayers(ref reader, ref newRoom);
+
+            if (ModLoader.Data.Rooms.ByName(newRoom.Name.Content) == null)
+                ModLoader.Data.Rooms.Add(newRoom);
+
+            Log.Information($"Successfully created room {newRoom.Name}.");
+        }
+
+        #region AddRoomJson
+        static void ReadMainValues(ref Utf8JsonReader reader,ref UndertaleRoom newRoom)
+        {
+            string caption = ReadString(ref reader);
+
+            newRoom.Width = (uint)ReadNum(ref reader);
+            newRoom.Height = (uint)ReadNum(ref reader);
+            newRoom.Speed = (uint)ReadNum(ref reader);
+            newRoom.Persistent = ReadBool(ref reader);
+            newRoom.BackgroundColor = (uint)(0xFF000000 | ReadNum(ref reader)); // make alpha 255 (BG color doesn't have alpha)
+            newRoom.DrawBackgroundColor = ReadBool(ref reader);
+
+            string ccIdName = ReadString(ref reader);
+
+            newRoom.Flags = (UndertaleRoom.RoomEntryFlags)ReadNum(ref reader);
+            newRoom.World = ReadBool(ref reader);
+            newRoom.Top = (uint)ReadNum(ref reader);
+            newRoom.Left = (uint)ReadNum(ref reader);
+            newRoom.Right = (uint)ReadNum(ref reader);
+            newRoom.Bottom = (uint)ReadNum(ref reader);
+            newRoom.GravityX = ReadFloat(ref reader);
+            newRoom.GravityY = ReadFloat(ref reader);
+            newRoom.MetersPerPixel = ReadFloat(ref reader);
+
+            newRoom.Caption = (caption == null) ? null : new UndertaleString(caption);
+
+            var captionToAdd = newRoom.Caption;
+
+            if ((newRoom.Caption != null) && !ModLoader.Data.Strings.Any(s => s == captionToAdd))
+                ModLoader.Data.Strings.Add(newRoom.Caption);
+
+            newRoom.CreationCodeId = (ccIdName == null) ? null : ModLoader.Data.Code.ByName(ccIdName);
+        }
+
+        static void ReadName(ref Utf8JsonReader reader, ref UndertaleRoom newRoom)
+        {
+            string name = ReadString(ref reader);
+            if (name == null)
+                throw new ScriptException("ERROR: Object name was null - object name must be defined!");
+
+            if (ModLoader.Data.Rooms.ByName(name) != null)
+            {
+                newRoom = ModLoader.Data.Rooms.ByName(name);
+            }
+            else
+            {
+                newRoom = new UndertaleRoom();
+                newRoom.Name = new UndertaleString(name);
+                ModLoader.Data.Strings.Add(newRoom.Name);
+            }
+        }
+
+        static void ClearRoomLists(ref UndertaleRoom newRoom)
+        {
+            newRoom.Backgrounds.Clear();
+            newRoom.Views.Clear();
+            newRoom.GameObjects.Clear();
+            newRoom.Tiles.Clear();
+            newRoom.Layers.Clear();
+        }
+
+        static void ReadBackgrounds(ref Utf8JsonReader reader,ref UndertaleRoom newRoom)
+        {
+            ReadAnticipateJSONObject(ref reader, JsonTokenType.StartArray);
+            while (reader.Read())
+            {
+                if (reader.TokenType == JsonTokenType.StartObject)
+                {
+                    UndertaleRoom.Background newBg = new UndertaleRoom.Background();
+
+                    newBg.ParentRoom = newRoom;
+
+                    newBg.Enabled = ReadBool(ref reader);
+                    newBg.Foreground = ReadBool(ref reader);
+                    string bgDefName = ReadString(ref reader);
+                    newBg.X = (int)ReadNum(ref reader);
+                    newBg.Y = (int)ReadNum(ref reader);
+                    newBg.TiledHorizontally = ReadBool(ref reader);
+                    newBg.TiledVertically = ReadBool(ref reader);
+                    newBg.SpeedX = (int)ReadNum(ref reader);
+                    newBg.SpeedY = (int)ReadNum(ref reader);
+                    newBg.Stretch = ReadBool(ref reader);
+
+                    newBg.BackgroundDefinition = (bgDefName == null) ? null : ModLoader.Data.Backgrounds.ByName(bgDefName);
+
+                    ReadAnticipateJSONObject(ref reader, JsonTokenType.EndObject);
+
+                    newRoom.Backgrounds.Add(newBg);
+                    continue;
+                }
+
+                if (reader.TokenType == JsonTokenType.EndArray)
+                    break;
+
+                throw new ScriptException($"ERROR: Unexpected token type. Expected Integer - found {reader.TokenType}");
+            }
+        }
+
+        static void ReadViews(ref Utf8JsonReader reader,ref UndertaleRoom newRoom)
+        {
+            ReadAnticipateJSONObject(ref reader, JsonTokenType.StartArray);
+            while (reader.Read())
+            {
+                if (reader.TokenType == JsonTokenType.StartObject)
+                {
+                    UndertaleRoom.View newView = new UndertaleRoom.View();
+
+                    newView.Enabled = ReadBool(ref reader);
+                    newView.ViewX = (int)ReadNum(ref reader);
+                    newView.ViewY = (int)ReadNum(ref reader);
+                    newView.ViewWidth = (int)ReadNum(ref reader);
+                    newView.ViewHeight = (int)ReadNum(ref reader);
+                    newView.PortX = (int)ReadNum(ref reader);
+                    newView.PortY = (int)ReadNum(ref reader);
+                    newView.PortWidth = (int)ReadNum(ref reader);
+                    newView.PortHeight = (int)ReadNum(ref reader);
+                    newView.BorderX = (uint)ReadNum(ref reader);
+                    newView.BorderY = (uint)ReadNum(ref reader);
+                    newView.SpeedX = (int)ReadNum(ref reader);
+                    newView.SpeedY = (int)ReadNum(ref reader);
+                    string objIdName = ReadString(ref reader);
+
+                    newView.ObjectId = (objIdName == null) ? null : ModLoader.Data.GameObjects.ByName(objIdName);
+
+                    ReadAnticipateJSONObject(ref reader, JsonTokenType.EndObject);
+
+                    newRoom.Views.Add(newView);
+                    continue;
+                }
+
+                if (reader.TokenType == JsonTokenType.EndArray)
+                    break;
+
+                throw new ScriptException($"ERROR: Unexpected token type. Expected Integer - found {reader.TokenType}");
+            }
+        }
+
+        static void ReadGameObjects(ref Utf8JsonReader reader,ref UndertaleRoom newRoom)
+        {
+            ReadAnticipateJSONObject(ref reader, JsonTokenType.StartArray);
+            while (reader.Read())
+            {
+                if (reader.TokenType == JsonTokenType.StartObject)
+                {
+                    UndertaleRoom.GameObject newObj = new UndertaleRoom.GameObject();
+
+                    newObj.X = (int)ReadNum(ref reader);
+                    newObj.Y = (int)ReadNum(ref reader);
+
+                    string objDefName = ReadString(ref reader);
+
+                    uint ids = (uint)ReadNum(ref reader);
+                    newObj.InstanceID = ModLoader.Data.GeneralInfo.LastObj++;
+
+                    string ccIdName = ReadString(ref reader);
+
+                    newObj.ScaleX = ReadFloat(ref reader);
+                    newObj.ScaleY = ReadFloat(ref reader);
+                    newObj.Color = (uint)ReadNum(ref reader);
+                    newObj.Rotation = ReadFloat(ref reader);
+
+                    string preCcIdName = ReadString(ref reader);
+
+                    newObj.ImageSpeed = ReadFloat(ref reader);
+                    newObj.ImageIndex = (int)ReadNum(ref reader);
+
+                    newObj.ObjectDefinition = (objDefName == null) ? null : ModLoader.Data.GameObjects.ByName(objDefName);
+                    newObj.CreationCode = (ccIdName == null) ? null : ModLoader.Data.Code.ByName(ccIdName);
+                    newObj.PreCreateCode = (preCcIdName == null) ? null : ModLoader.Data.Code.ByName(preCcIdName);
+                    ReadAnticipateJSONObject(ref reader, JsonTokenType.EndObject);
+                    //remove empty instances
+                    if (!ModLoader.Data.IsGameMaker2() && newObj.ObjectDefinition != null && ModLoader.Data.GameObjects.ByName(objDefName) != null)
+                        newRoom.GameObjects.Add(newObj);
+                    continue;
+                }
+
+                if (reader.TokenType == JsonTokenType.EndArray)
+                    break;
+
+                throw new ScriptException($"ERROR: Unexpected token type. Expected Integer - found {reader.TokenType}");
+            }
+        }
+
+        static void ReadTiles(ref Utf8JsonReader reader,ref UndertaleRoom newRoom)
+        {
+            ReadAnticipateJSONObject(ref reader, JsonTokenType.StartArray);
+            while (reader.Read())
+            {
+                if (reader.TokenType == JsonTokenType.StartObject)
+                {
+                    UndertaleRoom.Tile newTile = new UndertaleRoom.Tile();
+
+                    newTile.spriteMode = ReadBool(ref reader);
+                    newTile.X = (int)ReadNum(ref reader);
+                    newTile.Y = (int)ReadNum(ref reader);
+
+                    string bgDefName = ReadString(ref reader);
+                    string sprDefName = ReadString(ref reader);
+
+                    newTile.SourceX = (uint)ReadNum(ref reader);
+                    newTile.SourceY = (uint)ReadNum(ref reader);
+                    newTile.Width = (uint)ReadNum(ref reader);
+                    newTile.Height = (uint)ReadNum(ref reader);
+                    newTile.TileDepth = (int)ReadNum(ref reader);
+                    newTile.InstanceID = (uint)ReadNum(ref reader);
+                    newTile.ScaleX = ReadFloat(ref reader);
+                    newTile.ScaleY = ReadFloat(ref reader);
+                    newTile.Color = (uint)ReadNum(ref reader);
+
+                    newTile.BackgroundDefinition = (bgDefName == null) ? null : ModLoader.Data.Backgrounds.ByName(bgDefName);
+                    newTile.SpriteDefinition = (sprDefName == null) ? null : ModLoader.Data.Sprites.ByName(sprDefName);
+
+                    ReadAnticipateJSONObject(ref reader, JsonTokenType.EndObject);
+
+                    newRoom.Tiles.Add(newTile);
+                    continue;
+                }
+
+                if (reader.TokenType == JsonTokenType.EndArray)
+                    break;
+
+                throw new ScriptException($"ERROR: Unexpected token type. Expected Integer - found {reader.TokenType}");
+            }
+        }
+
+        static void ReadLayers(ref Utf8JsonReader reader,ref UndertaleRoom newRoom)
+        {
+            ReadAnticipateJSONObject(ref reader, JsonTokenType.StartArray);
+            while (reader.Read())
+            {
+                if (reader.TokenType == JsonTokenType.StartObject)
+                {
+                    UndertaleRoom.Layer newLayer = new UndertaleRoom.Layer();
+
+                    string layerName = ReadString(ref reader);
+
+                    newLayer.LayerId = (uint)ReadNum(ref reader);
+                    newLayer.LayerType = (UndertaleRoom.LayerType)ReadNum(ref reader);
+                    newLayer.LayerDepth = (int)ReadNum(ref reader);
+                    newLayer.XOffset = ReadFloat(ref reader);
+                    newLayer.YOffset = ReadFloat(ref reader);
+                    newLayer.HSpeed = ReadFloat(ref reader);
+                    newLayer.VSpeed = ReadFloat(ref reader);
+                    newLayer.IsVisible = ReadBool(ref reader);
+
+
+                    newLayer.LayerName = (layerName == null) ? null : new UndertaleString(layerName);
+
+                    if ((layerName != null) && !ModLoader.Data.Strings.Any(s => s == newLayer.LayerName))
+                        ModLoader.Data.Strings.Add(newLayer.LayerName);
+
+                    switch (newLayer.LayerType)
+                    {
+                        case UndertaleRoom.LayerType.Background:
+                            ReadBackgroundLayer(ref reader, newLayer,ref newRoom);
+                            break;
+                        case UndertaleRoom.LayerType.Instances:
+                            ReadInstancesLayer(ref reader, newLayer,ref newRoom);
+                            break;
+                        case UndertaleRoom.LayerType.Assets:
+                            ReadAssetsLayer(ref reader, newLayer, ref newRoom);
+                            break;
+                        case UndertaleRoom.LayerType.Tiles:
+                            ReadTilesLayer(ref reader, newLayer,ref newRoom);
+                            break;
+                        default:
+                            throw new ScriptException("ERROR: Invalid value for layer data type.");
+                    }
+
+                    ReadAnticipateJSONObject(ref reader, JsonTokenType.EndObject);
+
+                    newRoom.Layers.Add(newLayer);
+                    continue;
+                }
+
+                if (reader.TokenType == JsonTokenType.EndArray)
+                    break;
+
+                throw new ScriptException($"ERROR: Unexpected token type. Expected Integer - found {reader.TokenType}");
+            }
+        }
+
+        static void ReadBackgroundLayer(ref Utf8JsonReader reader, UndertaleRoom.Layer newLayer,ref UndertaleRoom newRoom)
+        {
+            ReadAnticipateJSONObject(ref reader, JsonTokenType.StartObject);
+            //Layer needs to have a Parent Room otherwise a sprite update will cause a null refrence.
+            newLayer.ParentRoom = newRoom;
+            UndertaleRoom.Layer.LayerBackgroundData newLayerData = new UndertaleRoom.Layer.LayerBackgroundData();
+            newLayerData.Visible = ReadBool(ref reader);
+            newLayerData.Foreground = ReadBool(ref reader);
+            string sprite = ReadString(ref reader);
+            newLayerData.TiledHorizontally = ReadBool(ref reader);
+            newLayerData.TiledVertically = ReadBool(ref reader);
+            newLayerData.Stretch = ReadBool(ref reader);
+            newLayerData.Color = (uint)ReadNum(ref reader);
+            newLayerData.FirstFrame = ReadFloat(ref reader);
+            newLayerData.AnimationSpeed = ReadFloat(ref reader);
+            newLayerData.AnimationSpeedType = (AnimationSpeedType)ReadNum(ref reader);
+            newLayerData.Sprite = null;
+            newLayerData.ParentLayer = newLayer;
+            UndertaleSprite bgsprite = ModLoader.Data.Sprites.ByName(sprite);
+            if (bgsprite is not null)
+                newLayerData.Sprite = bgsprite;
+            ReadAnticipateJSONObject(ref reader, JsonTokenType.EndObject);
+            newLayer.Data = newLayerData;
+
+        }
+
+        static void ReadInstancesLayer(ref Utf8JsonReader reader, UndertaleRoom.Layer newLayer,ref UndertaleRoom newRoom)
+        {
+            ReadAnticipateJSONObject(ref reader, JsonTokenType.StartObject);
+            while (reader.Read())
+            {
+                if (reader.TokenType == JsonTokenType.PropertyName)
+                    continue;
+
+                if (reader.TokenType != JsonTokenType.StartArray)
+                    throw new ScriptException("ERROR: Did not correctly stop reading instances layer");
+
+                UndertaleRoom.Layer.LayerInstancesData newLayerData = new UndertaleRoom.Layer.LayerInstancesData();
+
+                while (reader.Read())
+                {
+                    if (reader.TokenType == JsonTokenType.PropertyName)
+                        continue;
+
+                    if (reader.TokenType == JsonTokenType.StartObject)
+                    {
+                        UndertaleRoom.GameObject newObj = new UndertaleRoom.GameObject();
+
+                        newObj.X = (int)ReadNum(ref reader);
+                        newObj.Y = (int)ReadNum(ref reader);
+
+                        string objDefName = ReadString(ref reader);
+
+                        uint ids = (uint)ReadNum(ref reader);
+                        newObj.InstanceID = ModLoader.Data.GeneralInfo.LastObj++;
+
+                        string ccIdName = ReadString(ref reader);
+
+                        newObj.ScaleX = ReadFloat(ref reader);
+                        newObj.ScaleY = ReadFloat(ref reader);
+                        newObj.Color = (uint)ReadNum(ref reader);
+                        newObj.Rotation = ReadFloat(ref reader);
+
+                        string preCcIdName = ReadString(ref reader);
+
+                        newObj.ImageSpeed = ReadFloat(ref reader);
+                        newObj.ImageIndex = (int)ReadNum(ref reader);
+
+                        newObj.ObjectDefinition = (objDefName == null) ? null : ModLoader.Data.GameObjects.ByName(objDefName);
+
+                        newObj.CreationCode = (ccIdName == null) ? null : ModLoader.Data.Code.ByName(ccIdName);
+
+                        newObj.PreCreateCode = (preCcIdName == null) ? null : ModLoader.Data.Code.ByName(preCcIdName);
+
+                        ReadAnticipateJSONObject(ref reader, JsonTokenType.EndObject);
+                        //get rid of those nasty empty instances
+                        if (newObj.ObjectDefinition != null && ModLoader.Data.GameObjects.ByName(objDefName) != null)
+                        {
+                            newLayerData.Instances.Add(newObj);
+                            newRoom.GameObjects.Add(newObj);
+                        }
+                        continue;
+                    }
+
+                    if (reader.TokenType == JsonTokenType.EndArray)
+                        break;
+
+                    throw new ScriptException("ERROR: Did not correctly stop reading instances in instance layer");
+                }
+
+                ReadAnticipateJSONObject(ref reader, JsonTokenType.EndObject);
+
+                newLayer.Data = newLayerData;
+
+                return;
+
+            }
+        }
+
+        static void ReadAssetsLayer(ref Utf8JsonReader reader, UndertaleRoom.Layer newLayer,ref UndertaleRoom newRoom)
+        {
+            ReadAnticipateJSONObject(ref reader, JsonTokenType.StartObject);
+            ReadAnticipateJSONObject(ref reader, JsonTokenType.StartArray);
+            UndertaleRoom.Layer.LayerAssetsData newLayerData = new UndertaleRoom.Layer.LayerAssetsData();
+
+            newLayerData.LegacyTiles = new UndertalePointerList<UndertaleRoom.Tile>();
+            newLayerData.Sprites = new UndertalePointerList<UndertaleRoom.SpriteInstance>();
+            newLayerData.Sequences = new UndertalePointerList<UndertaleRoom.SequenceInstance>();
+            newLayerData.NineSlices = new UndertalePointerList<UndertaleRoom.SpriteInstance>();
+
+            while (reader.Read())
+            {
+                if (reader.TokenType == JsonTokenType.StartObject)
+                {
+                    UndertaleRoom.Tile newTile = new UndertaleRoom.Tile();
+
+                    newTile.spriteMode = ReadBool(ref reader);
+                    newTile.X = (int)ReadNum(ref reader);
+                    newTile.Y = (int)ReadNum(ref reader);
+
+                    string bgDefName = ReadString(ref reader);
+                    string sprDefName = ReadString(ref reader);
+
+                    newTile.SourceX = (uint)ReadNum(ref reader);
+                    newTile.SourceY = (uint)ReadNum(ref reader);
+                    newTile.Width = (uint)ReadNum(ref reader);
+                    newTile.Height = (uint)ReadNum(ref reader);
+                    newTile.TileDepth = (int)ReadNum(ref reader);
+                    newTile.InstanceID = (uint)ReadNum(ref reader);
+                    newTile.ScaleX = ReadFloat(ref reader);
+                    newTile.ScaleY = ReadFloat(ref reader);
+                    newTile.Color = (uint)ReadNum(ref reader);
+
+                    newTile.BackgroundDefinition = (bgDefName == null) ? null : ModLoader.Data.Backgrounds.ByName(bgDefName);
+
+                    newTile.SpriteDefinition = (sprDefName == null) ? null : ModLoader.Data.Sprites.ByName(sprDefName);
+
+                    ReadAnticipateJSONObject(ref reader, JsonTokenType.EndObject);
+
+                    newLayerData.LegacyTiles.Add(newTile);
+                    continue;
+                }
+
+                if (reader.TokenType == JsonTokenType.EndArray)
+                    break;
+
+                throw new ScriptException($"ERROR: Unexpected token type. Expected Integer - found {reader.TokenType}");
+            }
+
+            ReadAnticipateJSONObject(ref reader, JsonTokenType.StartArray);
+            while (reader.Read())
+            {
+                if (reader.TokenType == JsonTokenType.PropertyName)
+                    continue;
+
+                if (reader.TokenType == JsonTokenType.StartObject)
+                {
+                    UndertaleRoom.SpriteInstance newSpr = new UndertaleRoom.SpriteInstance();
+
+                    string name = ReadString(ref reader);
+                    string spriteName = ReadString(ref reader);
+
+                    newSpr.X = (int)ReadNum(ref reader);
+                    newSpr.Y = (int)ReadNum(ref reader);
+                    newSpr.ScaleX = ReadFloat(ref reader);
+                    newSpr.ScaleY = ReadFloat(ref reader);
+                    newSpr.Color = (uint)ReadNum(ref reader);
+                    newSpr.AnimationSpeed = ReadFloat(ref reader);
+                    newSpr.AnimationSpeedType = (AnimationSpeedType)ReadNum(ref reader);
+                    newSpr.FrameIndex = ReadFloat(ref reader);
+                    newSpr.Rotation = ReadFloat(ref reader);
+
+                    newSpr.Name = (name == null) ? null : new UndertaleString(name);
+
+                    if ((name != null) && !ModLoader.Data.Strings.Any(s => s == newSpr.Name))
+                        ModLoader.Data.Strings.Add(newSpr.Name);
+
+                    newSpr.Sprite = (spriteName == null) ? null : ModLoader.Data.Sprites.ByName(spriteName);
+
+                    ReadAnticipateJSONObject(ref reader, JsonTokenType.EndObject);
+
+                    newLayerData.Sprites.Add(newSpr);
+                    continue;
+                }
+
+                if (reader.TokenType == JsonTokenType.EndArray)
+                    break;
+
+                throw new ScriptException("ERROR: Did not correctly stop reading instances in instance layer");
+            }
+
+            ReadAnticipateJSONObject(ref reader, JsonTokenType.StartArray);
+            while (reader.Read())
+            {
+                if (reader.TokenType == JsonTokenType.PropertyName)
+                    continue;
+
+                if (reader.TokenType == JsonTokenType.StartObject)
+                {
+                    UndertaleRoom.SequenceInstance newSeq = new UndertaleRoom.SequenceInstance();
+
+                    string name = ReadString(ref reader);
+                    string sequenceName = ReadString(ref reader);
+
+                    newSeq.X = (int)ReadNum(ref reader);
+                    newSeq.Y = (int)ReadNum(ref reader);
+                    newSeq.ScaleX = ReadFloat(ref reader);
+                    newSeq.ScaleY = ReadFloat(ref reader);
+                    newSeq.Color = (uint)ReadNum(ref reader);
+                    newSeq.AnimationSpeed = ReadFloat(ref reader);
+                    newSeq.AnimationSpeedType = (AnimationSpeedType)ReadNum(ref reader);
+                    newSeq.FrameIndex = ReadFloat(ref reader);
+                    newSeq.Rotation = ReadFloat(ref reader);
+
+
+                    newSeq.Name = (name == null) ? null : new UndertaleString(name);
+
+                    if ((name != null) && !ModLoader.Data.Strings.Any(s => s == newSeq.Name))
+                        ModLoader.Data.Strings.Add(newSeq.Name);
+
+                    newSeq.Sequence = (sequenceName == null) ? null : ModLoader.Data.Sequences.ByName(sequenceName);
+
+                    ReadAnticipateJSONObject(ref reader, JsonTokenType.EndObject);
+
+                    newLayerData.Sequences.Add(newSeq);
+                    continue;
+                }
+
+                if (reader.TokenType == JsonTokenType.EndArray)
+                    break;
+
+                throw new ScriptException("ERROR: Did not correctly stop reading instances in instance layer");
+            }
+
+            ReadAnticipateJSONObject(ref reader, JsonTokenType.StartArray);
+            while (reader.Read())
+            {
+                if (reader.TokenType == JsonTokenType.PropertyName)
+                    continue;
+
+                if (reader.TokenType == JsonTokenType.StartObject)
+                {
+                    UndertaleRoom.SpriteInstance newSpr = new UndertaleRoom.SpriteInstance();
+
+                    string name = ReadString(ref reader);
+                    string spriteName = ReadString(ref reader);
+
+                    newSpr.X = (int)ReadNum(ref reader);
+                    newSpr.Y = (int)ReadNum(ref reader);
+                    newSpr.ScaleX = ReadFloat(ref reader);
+                    newSpr.ScaleY = ReadFloat(ref reader);
+                    newSpr.Color = (uint)ReadNum(ref reader);
+                    newSpr.AnimationSpeed = ReadFloat(ref reader);
+                    newSpr.AnimationSpeedType = (AnimationSpeedType)ReadNum(ref reader);
+                    newSpr.FrameIndex = ReadFloat(ref reader);
+                    newSpr.Rotation = ReadFloat(ref reader);
+
+                    newSpr.Name = (name == null) ? null : new UndertaleString(name);
+
+                    if ((name != null) && !ModLoader.Data.Strings.Any(s => s == newSpr.Name))
+                        ModLoader.Data.Strings.Add(newSpr.Name);
+
+                    newSpr.Sprite = spriteName == null ? null : ModLoader.Data.Sprites.ByName(spriteName);
+
+                    ReadAnticipateJSONObject(ref reader, JsonTokenType.EndObject);
+
+                    newLayerData.NineSlices.Add(newSpr);
+                    continue;
+                }
+
+                if (reader.TokenType == JsonTokenType.EndArray)
+                    break;
+
+                throw new ScriptException("ERROR: Did not correctly stop reading instances in instance layer");
+            }
+
+            newLayer.Data = newLayerData;
+            ReadAnticipateJSONObject(ref reader, JsonTokenType.EndObject);
+        }
+
+        static void ReadTilesLayer(ref Utf8JsonReader reader, UndertaleRoom.Layer newLayer,ref UndertaleRoom newRoom)
+        {
+            ReadAnticipateJSONObject(ref reader, JsonTokenType.StartObject);
+            UndertaleRoom.Layer.LayerTilesData newLayerData = new UndertaleRoom.Layer.LayerTilesData();
+
+            string backgroundName = ReadString(ref reader);
+
+            newLayerData.TilesX = (uint)ReadNum(ref reader);
+            newLayerData.TilesY = (uint)ReadNum(ref reader);
+
+            newLayerData.Background = (backgroundName == null) ? null : ModLoader.Data.Backgrounds.ByName(backgroundName);
+
+            uint[][] tileIds = new uint[newLayerData.TilesY][];
+            for (int i = 0; i < newLayerData.TilesY; i++)
+            {
+                tileIds[i] = new uint[newLayerData.TilesX];
+            }
+
+            ReadAnticipateJSONObject(ref reader, JsonTokenType.StartArray);
+            for (int y = 0; y < newLayerData.TilesY; y++)
+            {
+                ReadAnticipateJSONObject(ref reader, JsonTokenType.StartArray);
+                for (int x = 0; x < newLayerData.TilesX; x++)
+                {
+                    ReadAnticipateJSONObject(ref reader, JsonTokenType.StartObject);
+                    (tileIds[y])[x] = (uint)ReadNum(ref reader);
+                    ReadAnticipateJSONObject(ref reader, JsonTokenType.EndObject);
+                }
+
+                ReadAnticipateJSONObject(ref reader, JsonTokenType.EndArray);
+            }
+
+            newLayerData.TileData = tileIds;
+            ReadAnticipateJSONObject(ref reader, JsonTokenType.EndArray);
+            ReadAnticipateJSONObject(ref reader, JsonTokenType.EndObject);
+
+            newLayer.Data = newLayerData;
+        }
+
+        // Read tokens of specified type
+
+        static bool ReadBool(ref Utf8JsonReader reader)
+        {
+            while (reader.Read())
+            {
+                switch (reader.TokenType)
+                {
+                    case JsonTokenType.PropertyName: continue;
+                    case JsonTokenType.True: return true;
+                    case JsonTokenType.False: return false;
+                    default: throw new ScriptException($"ERROR: Unexpected token type. Expected Boolean - found {reader.TokenType}");
+                }
+            }
+
+            throw new ScriptException("ERROR: Did not find value of expected type. Expected Boolean.");
+        }
+
+        static long ReadNum(ref Utf8JsonReader reader)
+        {
+            while (reader.Read())
+            {
+                switch (reader.TokenType)
+                {
+                    case JsonTokenType.PropertyName: continue;
+                    case JsonTokenType.Number: return reader.GetInt64();
+                    default: throw new ScriptException($"ERROR: Unexpected token type. Expected Integer - found {reader.TokenType}");
+                }
+            }
+
+            throw new ScriptException("ERROR: Did not find value of expected type. Expected Integer.");
+        }
+
+       static float ReadFloat(ref Utf8JsonReader reader)
+        {
+            while (reader.Read())
+            {
+                switch (reader.TokenType)
+                {
+                    case JsonTokenType.PropertyName: continue;
+                    case JsonTokenType.Number: return reader.GetSingle();
+                    default: throw new ScriptException($"ERROR: Unexpected token type. Expected Decimal - found {reader.TokenType}");
+                }
+            }
+
+            throw new ScriptException("ERROR: Did not find value of expected type. Expected Decimal.");
+        }
+
+        static string ReadString(ref Utf8JsonReader reader)
+        {
+            while (reader.Read())
+            {
+                switch (reader.TokenType)
+                {
+                    case JsonTokenType.PropertyName: continue;
+                    case JsonTokenType.String: return reader.GetString();
+                    case JsonTokenType.Null: return null;
+                    default: throw new ScriptException($"ERROR: Unexpected token type. Expected String - found {reader.TokenType}");
+                }
+            }
+
+            throw new ScriptException("ERROR: Did not find value of expected type. Expected String.");
+        }
+
+        static void ReadAnticipateJSONObject(ref Utf8JsonReader reader, JsonTokenType allowedTokenType)
+        {
+            while (reader.Read())
+            {
+                if (reader.TokenType == JsonTokenType.PropertyName)
+                    continue;
+                if (reader.TokenType == allowedTokenType)
+                    return;
+                throw new ScriptException($"ERROR: Unexpected token type. Expected {allowedTokenType} - found {reader.TokenType}");
+            }
+
+            throw new ScriptException("ERROR: Did not find value of expected type. Expected String.");
+        }
+
+        #endregion
+
+
         public static UndertaleRoom GetRoom(string name)
         {
             try
@@ -52,7 +775,7 @@ public static UndertaleRoom AddRoom(string name, uint width, uint height)
         {
             UndertaleRoom room = AddRoom(name);
             room.Width = width;
-            room.Height = height; 
+            room.Height = height;
             return room;
         }
         private static UndertaleRoom.Layer CreateLayer<T>(UndertaleRoom room, UndertaleRoom.LayerType type, string name) where T : UndertaleRoom.Layer.LayerData, new()
@@ -283,11 +1006,11 @@ public static UndertaleRoom.GameObject GetGameObject(this UndertaleRoom room, st
         internal static UndertaleRoom AddDisclaimerRoom(string[] modName, string[] authorsName)
         {
             UndertaleGameObject o_msl_mod_disclaimer = AddObject(
-                name: "o_msl_mod_disclaimer", 
-                spriteName: "", 
-                parentName: "", 
-                isVisible: true, 
-                isPersistent: false, 
+                name: "o_msl_mod_disclaimer",
+                spriteName: "",
+                parentName: "",
+                isVisible: true,
+                isPersistent: false,
                 isAwake: true,
                 collisionShapeFlags: CollisionShapeFlags.Circle
             );
@@ -301,21 +1024,21 @@ internal static UndertaleRoom AddDisclaimerRoom(string[] modName, string[] autho
 
             string disclaimerText = $@"scr_draw_text_doublecolor((global.cameraWidth / 2), (global.cameraHeight / 2), ""{intro}\nPlease do not report bugs to main developers."", """", 16777215, make_color_rgb(155, 27, 49), 1, 1, 0.69999999999999996, global.f_digits, 0, 16777215, "" Only report bugs to modding team."")";
             int delta = 55;
-            foreach(string author in authorsName)
+            foreach (string author in authorsName)
             {
                 disclaimerText += $@"
 scr_draw_text_doublecolor((global.cameraWidth / 2), ((global.cameraHeight / 2) + {delta}), ""By: {author}"", """", 16777215, make_color_rgb(155, 27, 49), 1, 1, 0.69999999999999996, global.f_digits, 0, 16777215)";
                 delta += 30;
             }
-            
+
             AddNewEvent(o_msl_mod_disclaimer, disclaimerText, EventType.Draw, 0);
-            
+
             UndertaleRoom room = AddRoom("r_msl_mod_disclaimer");
 
             //room.AddLayerBackground("NewBackgroundLayer");
             UndertaleRoom.Layer layerInstance = room.AddLayerInstance("NewInstancesLayer");
-            
-            
+
+
             UndertaleRoom.GameObject overlay = room.AddGameObject(layerInstance, "o_init_overlay");
             room.AddGameObject(layerInstance, $"o_msl_mod_disclaimer");
 
@@ -342,11 +1065,11 @@ internal static void ChainDisclaimerRooms(List<(string, UndertaleRoom.GameObject
                 .ReplaceBy($"roomNext = {roomName}")
                 .Save();
 
-            foreach((string, UndertaleRoom.GameObject) disclaimer in disclaimers)
+            foreach ((string, UndertaleRoom.GameObject) disclaimer in disclaimers)
             {
-                if (index+1 < disclaimers.Count && index < 3)
+                if (index + 1 < disclaimers.Count && index < 3)
                 {
-                    roomName = disclaimers[index+1].Item1;
+                    roomName = disclaimers[index + 1].Item1;
                 }
                 else
                 {
diff --git a/ModUtils/TableUtils/CreditsBackers.cs b/ModUtils/TableUtils/Backers.cs
similarity index 71%
rename from ModUtils/TableUtils/CreditsBackers.cs
rename to ModUtils/TableUtils/Backers.cs
index eadb262..1c90c36 100644
--- a/ModUtils/TableUtils/CreditsBackers.cs
+++ b/ModUtils/TableUtils/Backers.cs
@@ -5,10 +5,10 @@ namespace ModShardLauncher;
 
 public partial class Msl
 {
-    public static void InjectTableCreditsBackers(string? name = null, string? nickname = null)
+    public static void InjectTableBackers(string? name = null, string? nickname = null)
     {
         // Table filename
-        const string tableName = "gml_GlobalScript_table_credits_backers";
+        const string tableName = "gml_GlobalScript_table_backers";
         
         // Load table if it exists
         List<string> table = ThrowIfNull(ModLoader.GetTable(tableName));
@@ -16,7 +16,7 @@ public static void InjectTableCreditsBackers(string? name = null, string? nickna
         // Prepare line
         string newline = $"{name};{nickname};";
         
-        // Add line to end of table
+        // Add line to table
         table.Add(newline);
         ModLoader.SetTable(table, tableName);
         Log.Information($"Injected {name}:{nickname} into {tableName} table.");
diff --git a/ModUtils/TableUtils/ConsumParam.cs b/ModUtils/TableUtils/ConsumParam.cs
deleted file mode 100644
index fb3e622..0000000
--- a/ModUtils/TableUtils/ConsumParam.cs
+++ /dev/null
@@ -1,295 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.Serialization;
-using Serilog;
-using Serilog.Core;
-
-namespace ModShardLauncher;
-
-[SuppressMessage("ReSharper", "InconsistentNaming")]
-[SuppressMessage("ReSharper", "IdentifierTypo")]
-public partial class Msl
-{
-    /// <summary>
-    /// <para>Enum used in the Consumable Parameters table.</para>
-    /// Defines the group to insert the consumable in.
-    /// </summary>
-    public enum ConsumParamMetaGroup
-    {
-        TOOLS,
-        MEDICINE,
-        DRINKS,
-        MEAT,
-        SEAFOOD,
-        FOOD,
-        DISHES,
-        FRUITS,
-        VEGETABLES,
-        BERRIES,
-        MUSHROOMS,
-        HERBS,
-        GEMS,
-        VALUABLES,
-        COMMODITIES,
-        [EnumMember(Value = "QUEST ITEMS")]
-        QUESTITEMS,
-        [EnumMember(Value = "LEGENDARY TREASURES")]
-        LEGENDARYTREASURES,
-        [EnumMember(Value = "CARAVAN UPGRADES")]
-        CARAVANUPGRADES,
-        [EnumMember(Value = "JUNK & MATERIALS")]
-        JUNKMATERIALS,
-        [EnumMember(Value = "ANIMAL LOOT")]
-        ANIMALLOOT,
-        [EnumMember(Value = "MAPS, SCROLLS & BOOKS")]
-        MAPSSCROLLSBOOKS
-    }
-    /// <summary>
-    /// <para>Enum used in Consumable Parameters table. </para>
-    /// Defines the category of the consumable.
-    /// </summary>
-    public enum ConsumParamCategory
-    {
-        trap,
-        tool,
-        valuable,
-        material,
-        other,
-        bag,
-        medicine,
-        junk,
-        beverage,
-        food,
-        ingredient,
-        commodity,
-        book,
-        quest,
-        scroll,
-        treasure,
-        upgrade,
-        treatise
-    }
-    /// <summary>
-    /// <para>Enum used in Consumable Parameters table. </para>
-    /// Defines the subcategory of the consumable.
-    /// </summary>
-    public enum ConsumParamSubCategory
-    {
-        [EnumMember(Value = "")]
-        none,
-        drug,
-        alco,
-        alcohol,
-        meat,
-        Fish,
-        fish,
-        dairy,
-        pastry,
-        dish,
-        r,
-        fruit,
-        herb,
-        vegetable,
-        berry,
-        mushroom,
-        gem,
-        quest
-    }
-    /// <summary>
-    /// <para>Enum used in Consumable Parameters table. </para>
-    /// Defines the material the consumable is made of.
-    /// </summary>
-    public enum ConsumParamMaterial
-    {
-        metal,
-        glass,
-        cloth,
-        leather,
-        wood,
-        leather2,
-        organic,
-        pottery,
-        gem,
-        stone,
-        paper,
-    }
-    /// <summary>
-    /// <para>Enum used in Consumable Parameters table. </para>
-    /// Defines the weight class of the consumable.
-    /// </summary>
-    public enum ConsumParamWeight
-    {
-        Light,
-        Medium,
-        Heavy,
-        Net,
-        VeryLight
-    }
-    /// <summary>
-    /// <para>Enum used in Consumable Parameters table. </para>
-    /// Defines the rarity of the consumable.
-    /// </summary>
-    public enum ConsumParamTags
-    {
-        [EnumMember(Value = "")]
-        none,
-        common,
-        uncommon,
-        special,
-        rare,
-        [EnumMember(Value = "elven rare")]
-        elvenrare,
-        [EnumMember(Value = "elven uncommon")]
-        elvenuncommon,
-        [EnumMember(Value = "elven common")]
-        elvencommon
-    }
-    
-    // https://stackoverflow.com/questions/27372816/how-to-read-the-value-for-an-enummember-attribute
-    /// <summary>
-    /// Adds a line to the Consumable Parameters table with the given parameters.
-    /// </summary>
-    /// <param name="metaGroup">The group in which to inject the consumable.</param>
-    /// <param name="id">The unique id of the consumable.</param>
-    /// <param name="Cat">The category the consumable belongs to.</param>
-    /// <param name="Material">The material the consumable is made out of.</param>
-    /// <param name="Weight">The weight class of the consumable.</param>
-    /// <param name="Subcat">The subcategory the consumable belongs to.</param>
-    /// <param name="tags">The rarity of the consumable.</param>
-    /// <param name="Price">The price of the consumable.</param>
-    /// <param name="EffPrice"></param>
-    /// <param name="Fresh"></param>
-    /// <param name="Duration"></param>
-    /// <param name="Hunger"></param>
-    /// <param name="Hunger_Change"></param>
-    /// <param name="Hunger_Resistance"></param>
-    /// <param name="Thirsty"></param>
-    /// <param name="Thirst_Change"></param>
-    /// <param name="Intoxication"></param>
-    /// <param name="Toxicity_Change"></param>
-    /// <param name="Toxicity_Resistance"></param>
-    /// <param name="Pain"></param>
-    /// <param name="Pain_Resistance"></param>
-    /// <param name="Pain_Change"></param>
-    /// <param name="Pain_Limit"></param>
-    /// <param name="Sanity"></param>
-    /// <param name="Sanity_Change"></param>
-    /// <param name="Morale"></param>
-    /// <param name="Morale_Change"></param>
-    /// <param name="max_mp_res"></param>
-    /// <param name="MP_Restoration"></param>
-    /// <param name="max_hp_res"></param>
-    /// <param name="Health_Restoration"></param>
-    /// <param name="Healing_Received"></param>
-    /// <param name="Condition"></param>
-    /// <param name="Immunity"></param>
-    /// <param name="Fatigue"></param>
-    /// <param name="Fatigue_Change"></param>
-    /// <param name="Fatigue_Gain"></param>
-    /// <param name="Physical_Resistance"></param>
-    /// <param name="Nature_Resistance"></param>
-    /// <param name="Magic_Resistance"></param>
-    /// <param name="Slashing_Resistance"></param>
-    /// <param name="Piercing_Resistance"></param>
-    /// <param name="Blunt_Resistance"></param>
-    /// <param name="Rending_Resistance"></param>
-    /// <param name="Fire_Resistance"></param>
-    /// <param name="Shock_Resistance"></param>
-    /// <param name="Poison_Resistance"></param>
-    /// <param name="Caustic_Resistance"></param>
-    /// <param name="Frost_Resistance"></param>
-    /// <param name="Arcane_Resistance"></param>
-    /// <param name="Unholy_Resistance"></param>
-    /// <param name="Sacred_Resistance"></param>
-    /// <param name="Psionic_Resistance"></param>
-    /// <param name="Bleeding_Resistance"></param>
-    /// <param name="purse"></param>
-    /// <param name="bottle"></param>
-    public static void InjectTableConsumableParameters(
-        ConsumParamMetaGroup metaGroup,
-        string id,
-        ConsumParamCategory Cat,
-        ConsumParamMaterial Material,
-        ConsumParamWeight Weight,
-        ConsumParamSubCategory Subcat = ConsumParamSubCategory.none,
-        ConsumParamTags tags = ConsumParamTags.none,
-        int? Price = null,
-        float? EffPrice = null,
-        int? Fresh = null,
-        int? Duration = null,
-        int? Hunger = null,
-        float? Hunger_Change = null,
-        int? Hunger_Resistance = null,
-        int? Thirsty = null,
-        float? Thirst_Change = null,
-        int? Intoxication = null,
-        float? Toxicity_Change = null,
-        int? Toxicity_Resistance = null,
-        int? Pain = null,
-        int? Pain_Resistance = null,
-        float? Pain_Change = null,
-        string? Pain_Limit = null,
-        int? Sanity = null,
-        float? Sanity_Change = null,
-        int? Morale = null,
-        float? Morale_Change = null,
-        int? max_mp_res = null,
-        int? MP_Restoration = null,
-        int? max_hp_res = null,
-        int? Health_Restoration = null,
-        int? Healing_Received = null,
-        int? Condition = null,
-        int? Immunity = null,
-        int? Fatigue = null,
-        float? Fatigue_Change = null,
-        int? Fatigue_Gain = null,
-        int? Physical_Resistance = null,
-        int? Nature_Resistance = null,
-        int? Magic_Resistance = null,
-        int? Slashing_Resistance = null,
-        int? Piercing_Resistance = null,
-        int? Blunt_Resistance = null,
-        int? Rending_Resistance = null,
-        int? Fire_Resistance = null,
-        int? Shock_Resistance = null,
-        int? Poison_Resistance = null,
-        int? Caustic_Resistance = null,
-        int? Frost_Resistance = null,
-        int? Arcane_Resistance = null,
-        int? Unholy_Resistance = null,
-        int? Sacred_Resistance = null,
-        int? Psionic_Resistance = null,
-        int? Bleeding_Resistance = null,
-        bool purse = false,
-        bool bottle = false)
-    {
-        // Table filename
-        const string tableName = "gml_GlobalScript_table_Consumable_Parameters";
-        
-        // Load table if it exists
-        List<string> table = ThrowIfNull(ModLoader.GetTable(tableName));
-        
-        // Prepare line
-        string newline = $"{id};{Cat};{GetEnumMemberValue(Subcat)};{Price};{EffPrice};{Material};{Weight};{Fresh};{Duration};{Hunger};{Hunger_Change};{Hunger_Resistance};{Thirsty};{Thirst_Change};{Intoxication};{Toxicity_Change};{Toxicity_Resistance};{Pain};{Pain_Resistance};{Pain_Change};{Pain_Limit};{Sanity};{Sanity_Change};{Morale};{Morale_Change};{max_mp_res};{MP_Restoration};{max_hp_res};{Health_Restoration};{Healing_Received};{Condition};{Immunity};{Fatigue};{Fatigue_Change};{Fatigue_Gain};{Physical_Resistance};{Nature_Resistance};{Magic_Resistance};{Slashing_Resistance};{Piercing_Resistance};{Blunt_Resistance};{Rending_Resistance};{Fire_Resistance};{Shock_Resistance};{Poison_Resistance};{Caustic_Resistance};{Frost_Resistance};{Arcane_Resistance};{Unholy_Resistance};{Sacred_Resistance};{Psionic_Resistance};{Bleeding_Resistance};{(purse ? "1" : "")};{(bottle ? "1" : "")};{GetEnumMemberValue(tags)};";
-        
-        // Find Meta Category in table
-        string metaGroupStr = ThrowIfNull(GetEnumMemberValue(metaGroup));
-        (int ind, string? foundLine) = table.Enumerate().FirstOrDefault(x => x.Item2.Contains(metaGroupStr));
-        
-        // Add line to table
-        if (foundLine != null)
-        {
-            table.Insert(ind + 1, newline);
-            ModLoader.SetTable(table, tableName);
-        }
-        else
-        {
-            Log.Error($"Cannot find Meta Group {metaGroup} in Consumable Parameters table");
-            throw new Exception("Meta Group not found in Consumable Parameters table");
-        }
-    }
-}
diff --git a/ModUtils/TableUtils/Contract.cs b/ModUtils/TableUtils/Contract.cs
deleted file mode 100644
index af5d140..0000000
--- a/ModUtils/TableUtils/Contract.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using Serilog;
-
-namespace ModShardLauncher;
-
-[SuppressMessage("ReSharper", "InconsistentNaming")]
-[SuppressMessage("ReSharper", "IdentifierTypo")]
-public partial class Msl
-{
-    public enum ContractCategory
-    {
-        rescue,
-        killing,
-        search,
-        destroy,
-        clear,
-        interact,
-        find
-    }
-
-    public enum ContractFaction
-    {
-        o_Bandit,
-        o_Undead,
-        o_vamp
-    }
-
-    public enum ContractDungeonType
-    {
-        Bastion,
-        Crypt,
-        Catacombs
-    }
-
-    public enum ContractVillageType
-    {
-        all,
-        r_Osbrook,
-        r_Brynn_NW
-    }
-    
-    public static void InjectTableContract(
-        string? name,
-        string id,
-        ContractCategory Category,
-        ContractFaction Faction,
-        int Time,
-        string? Script,
-        int Gold,
-        ContractDungeonType DungeonType,
-        int? Position = null,
-        int Amount = 1,
-        ContractVillageType Village_Type = ContractVillageType.all,
-        int RepVillage = 400,
-        int RepFaction = 80,
-        int BadRepVillage = -400,
-        int BadRepFaction = -160,
-        int? BadDangerMod = null,
-        int? ModTime = null
-        )
-    {
-        // Table filename
-        const string tableName = "gml_GlobalScript_table_Contract";
-        
-        // Load table if it exists
-        List<string> table = ThrowIfNull(ModLoader.GetTable(tableName));
-        
-        // Prepare line
-        string newline = $"{Position};{id};{Amount};{GetEnumMemberValue(Category)};{GetEnumMemberValue(Faction)};{Time};{GetEnumMemberValue(DungeonType)};{Script};{Gold};{GetEnumMemberValue(Village_Type)};{RepVillage};{RepFaction};{BadRepVillage};{BadRepFaction};{BadDangerMod};;{name};;;{ModTime};";
-        
-        // Find hook
-        (int ind, string? foundLine) = table.Enumerate().FirstOrDefault(x => x.Item2.Contains("NEW CONTRACTS"));
-        
-        // Add line to table
-        if (foundLine != null)
-        {
-            table.Insert(ind + 1, newline);
-            ModLoader.SetTable(table, tableName);
-            Log.Information($"Injected contract {id} into {tableName}");
-        }
-        else
-        {
-            Log.Error($"Hook not found in {tableName}. {id} was not injected.");
-            throw new Exception($"Hook not found in {tableName}. {id} was not injected.");
-        }
-    }
-}
\ No newline at end of file
diff --git a/ModUtils/TableUtils/ContractsStats.cs b/ModUtils/TableUtils/ContractsStats.cs
new file mode 100644
index 0000000..ff378e8
--- /dev/null
+++ b/ModUtils/TableUtils/ContractsStats.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using Serilog;
+
+namespace ModShardLauncher;
+
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+[SuppressMessage("ReSharper", "IdentifierTypo")]
+
+public partial class Msl
+{
+    public enum ContractsStatsCategory
+    {
+        kill,
+        destroy,
+        clear,
+        interact,
+        find
+    }
+
+    public enum ContractsStatsDungeonType
+    {
+        Crypt,
+        Catacombs,
+        Bastion
+    }
+    
+    public static void InjectTableContractsStats(
+        string id,
+        byte Amount,
+        ContractsStatsCategory Category,
+        string Faction, // Could be an enum ? Leaving as string for modded factions for now
+        string Village_Type, // Could be an enum ? Leaving as string for modded villages and multiple choices
+        ContractsStatsDungeonType DungeonType,
+        string Script,
+        byte Contract_Deadline,
+        byte Contract_Expiration,
+        short Contract_Reward,
+        short Contract_Reputation,
+        short Contract_Reputation_Loss,
+        byte Village_Aftermath,
+        string Dungeon_Aftermath, // Could be an enum ? Leaving as string for multiple choices
+        string Contract_NPC,
+        byte Contract_Respawn, // Unknown type, assuming byte for now
+        byte Mod_time, // Unknown type, assuming byte for now
+        bool Can_Generate,
+        float k
+        )
+    {
+        // Table filename
+        const string tableName = "gml_GlobalScript_table_contracts_stats";
+        
+        // Load table if it exists
+        List<string> table = ThrowIfNull(ModLoader.GetTable(tableName));
+        
+        // Prepare line
+        string newline = $"{id};{Amount};{Category};{Faction};{Village_Type};{DungeonType};{Script};{Contract_Deadline};{Contract_Expiration};{Contract_Reward};{Contract_Reputation};{Contract_Reputation_Loss};{Village_Aftermath};{Dungeon_Aftermath};{Contract_NPC};{Contract_Respawn};{Mod_time};{Can_Generate};{k};";
+        
+        // Find hook
+        (int ind, string? foundLine) = table.Enumerate().FirstOrDefault(x => x.Item2.Contains("bastion_HostageRottenWillow"));
+        
+        // Add line to table
+        if (foundLine != null)
+        {
+            table.Insert(ind + 1, newline);
+            ModLoader.SetTable(table, tableName);
+            Log.Information($"Injected contract {id} into {tableName}");
+        }
+        else
+        {
+            Log.Error($"Hook not found in {tableName}. {id} was not injected.");
+            throw new Exception($"Hook not found in {tableName}. {id} was not injected.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/ModUtils/TableUtils/Drops.cs b/ModUtils/TableUtils/Drops.cs
new file mode 100644
index 0000000..0506d62
--- /dev/null
+++ b/ModUtils/TableUtils/Drops.cs
@@ -0,0 +1,148 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Runtime.Serialization;
+using Serilog;
+using Serilog.Debugging;
+
+namespace ModShardLauncher;
+
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+public partial class Msl
+{
+    private static string EqTypeParser(HashSet<DropsEqType> eqTypes)
+    {
+        string eqTypesStr = "";
+        foreach (DropsEqType t in eqTypes)
+            eqTypesStr += $"{GetEnumMemberValue(t)}, ";
+        eqTypesStr = eqTypesStr.TrimEnd(',', ' ');
+        return eqTypesStr;
+    }
+    
+    public enum DropsHook
+    {
+        CRYPTS,
+        CATACOMBS,
+        BASTIONS,
+        OTHER
+    }
+
+    public enum DropsTier
+    {
+        [EnumMember(Value = "1")]
+        Tier1,
+        [EnumMember(Value = "2")]
+        Tier2,
+        [EnumMember(Value = "3")]
+        Tier3,
+        [EnumMember(Value = "4")]
+        Tier4,
+        [EnumMember(Value = "5")]
+        Tier5
+    }
+    
+    [Flags]
+    public enum DropsSlotTags
+    {
+        raw = 1,
+        common = 2
+    }
+
+    public enum DropsEqType
+    {
+        weapon,
+        dagger,
+        [EnumMember(Value = "2HStaff")]
+        TwoHandedStaff,
+        Chest,
+        Legs,
+        Waist,
+        Arms,
+        Head,
+        jewelry,
+        sword,
+        mace,
+        axe,
+        spear,
+        crossbow
+    }
+    
+    [Flags]
+    public enum DropsEqTags
+    {
+        aldor = 1,
+        magic = 2,
+        elven = 4,
+        unique = 8
+    }
+    
+    [Flags]
+    public enum DropsEqRarity
+    {
+        common = 1,
+        uncommon = 2,
+        rare = 4,
+        unique = 8
+    }
+
+    public record DropsSlot(string id, DropsSlotTags? tags, string count, byte chance);
+    public record DropsEq(HashSet<DropsEqType> types, DropsEqTags tags, DropsEqRarity? rarity, string dur, byte chance);
+    
+    public static void InjectTableDrops(
+        DropsHook hook,
+        string id,
+        DropsTier tier,
+        HashSet<DropsTier>? tierMod = null,
+        DropsSlot? slot_1 = null,
+        DropsSlot? slot_2 = null,
+        DropsSlot? slot_3 = null,
+        DropsSlot? slot_4 = null,
+        DropsSlot? slot_5 = null,
+        DropsSlot? slot_6 = null,
+        DropsSlot? slot_7 = null,
+        DropsSlot? slot_8 = null,
+        DropsSlot? slot_9 = null,
+        DropsEq? eq_1 = null,
+        DropsEq? eq_2 = null,
+        DropsEq? eq_3 = null,
+        DropsEq? eq_4 = null,
+        DropsEq? eq_5 = null
+        )
+    {
+        // Table filename
+        const string tableName = "gml_GlobalScript_table_drops";
+        
+        // Load table if it exists
+        List<string> table = ThrowIfNull(ModLoader.GetTable(tableName));
+        
+        // Parse tier
+        string tierModStr = "";
+        if (tierMod != null)
+        {
+            foreach (SurfaceSpawnTier t in tierMod)
+                tierModStr += $"{GetEnumMemberValue(t)}, ";
+            tierModStr = tierModStr.TrimEnd(',', ' ');
+        }
+        
+        // Prepare line
+        string newline = $"{id};{GetEnumMemberValue(tier)};{tierModStr};{slot_1?.id};{slot_1?.tags};{slot_1?.count};{slot_1?.chance};;{slot_2?.id};{slot_2?.tags};{slot_2?.count};{slot_2?.chance};;{slot_3?.id};{slot_3?.tags};{slot_3?.count};{slot_3?.chance};;{slot_4?.id};{slot_4?.tags};{slot_4?.count};{slot_4?.chance};;{slot_5?.id};{slot_5?.tags};{slot_5?.count};{slot_5?.chance};;{slot_6?.id};{slot_6?.tags};{slot_6?.count};{slot_6?.chance};;{slot_7?.id};{slot_7?.tags};{slot_7?.count};{slot_7?.chance};;{slot_8?.id};{slot_8?.tags};{slot_8?.count};{slot_8?.chance};;{slot_9?.id};{slot_9?.tags};{slot_9?.count};{slot_9?.chance};;{(eq_1 != null ? EqTypeParser(eq_1.types) : "")};{eq_1?.tags};{eq_1?.rarity};{eq_1?.dur};{eq_1?.chance};;{(eq_2 != null ? EqTypeParser(eq_2.types) : "")};{eq_2?.rarity};{eq_2?.dur};{eq_2?.chance};;{(eq_3 != null ? EqTypeParser(eq_3.types) : "")};{eq_3?.rarity};{eq_3?.dur};{eq_3?.chance};;{(eq_4 != null ? EqTypeParser(eq_4.types) : "")};{eq_4?.rarity};{eq_4?.dur};{eq_4?.chance};;{(eq_5 != null ? EqTypeParser(eq_5.types) : "")};{eq_5?.rarity};{eq_5?.dur};{eq_5?.chance};";
+        
+        // Find hook
+        string hookStr = "// " + hook;
+        (int ind, string? foundLine) = table.Enumerate().FirstOrDefault(x => x.Item2.Contains(hookStr));
+        
+        // Add line to table
+        if (foundLine != null)
+        {
+            table.Insert(ind + 1, newline);
+            ModLoader.SetTable(table, tableName);
+            Log.Information($"Injected Drop {id} into table {tableName} under {hook}");
+        }
+        else
+        {
+            Log.Error($"Cannot find hook {hook} in table {tableName}");
+            throw new Exception($"Cannot find hook {hook} in table {tableName}");
+        }
+    }
+}
\ No newline at end of file
diff --git a/ModUtils/TableUtils/DungeonsSpawn.cs b/ModUtils/TableUtils/DungeonsSpawn.cs
new file mode 100644
index 0000000..ee1715c
--- /dev/null
+++ b/ModUtils/TableUtils/DungeonsSpawn.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Runtime.Serialization;
+using Serilog;
+
+namespace ModShardLauncher;
+
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+public partial class Msl
+{
+    public enum DungeonsSpawnHook
+    {
+        GENERIC,
+        UNDEAD
+    }
+    
+    public enum DungeonsSpawnTemplateType
+    {
+        Normal,
+        Advanced,
+        Special
+    }
+    
+    public enum DungeonsSpawnTier
+    {
+        [EnumMember(Value = "1")]
+        Tier1,
+        [EnumMember(Value = "2")]
+        Tier2,
+        [EnumMember(Value = "3")]
+        Tier3,
+        [EnumMember(Value = "4")]
+        Tier4,
+        [EnumMember(Value = "5")]
+        Tier5    
+    }
+
+    [Flags]
+    public enum DungeonsSpawnFaction
+    {
+        Undead = 1,
+        Vampire = 2,
+        Brigand = 4
+    }
+    
+    public static void InjectTableDungeonsSpawn(
+        DungeonsSpawnHook hook,
+        string id, // Could be byte, not sure how it's used
+        DungeonsSpawnTemplateType Template_Type,
+        HashSet<DungeonsSpawnTier> Dungeon_Tier,
+        DungeonsSpawnFaction Faction,
+        string Enemy1,
+        string? Enemy2 = null,
+        string? Enemy3 = null,
+        string? Enemy4 = null,
+        string? Enemy5 = null,
+        string? Enemy6 = null
+            )
+    {
+        // Table filename
+        const string tableName = "gml_GlobalScript_table_dungeons_spawn";
+        
+        // Load table if it exists
+        List<string> table = ThrowIfNull(ModLoader.GetTable(tableName));
+        
+        // Parse Dungeon_Tier
+        string dungeonTierStr = "";
+        foreach (DungeonsSpawnTier tier in Dungeon_Tier)
+            dungeonTierStr += $"{GetEnumMemberValue(tier)}, ";
+        dungeonTierStr = dungeonTierStr.TrimEnd(',', ' ');
+        
+        // Prepare new line
+        string newline = $"{id};{Template_Type};{dungeonTierStr};{Faction};{Enemy1};{Enemy2};{Enemy3};{Enemy4};{Enemy5};{Enemy6};";
+        
+        // Find hook
+        string hookStr = "// " + GetEnumMemberValue(hook);
+        (int ind, string? foundLine) = table.Enumerate().FirstOrDefault(x => x.Item2.Contains(hookStr));
+        
+        // Add line to table
+        if (foundLine != null)
+        {
+            table.Insert(ind + 1, newline);
+            ModLoader.SetTable(table, tableName);
+            Log.Information($"Injected Dungeon Spawn {id} into {tableName} under {hook}");
+        }
+        else
+        {
+            Log.Error($"Cannot find Hook {hook} in table {tableName}");
+            throw new Exception($"Hook {hook} not found in table {tableName}");
+        }
+    }
+}
\ No newline at end of file
diff --git a/ModUtils/TableUtils/EnemyBalance.cs b/ModUtils/TableUtils/EnemyBalance.cs
deleted file mode 100644
index 9c2553c..0000000
--- a/ModUtils/TableUtils/EnemyBalance.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.Serialization;
-using Serilog;
-
-namespace ModShardLauncher;
-
-[SuppressMessage("ReSharper", "InconsistentNaming")]
-[SuppressMessage("ReSharper", "IdentifierTypo")]
-public partial class Msl
-{
-    public enum EnemyBalanceType
-    {
-        undead,
-        human,
-        spectre,
-        beast,
-        vampire,
-        neutral,
-        spawner,
-        arachnid,
-        elf
-    }
-
-    public enum EnemyBalanceFaction
-    {
-        Undead,
-        Brigand,
-        Vampire,
-        Neutral,
-        omnivore,
-        carnivore,
-        herbivore,
-        GrandMagistrate,
-        RottenWillow
-    }
-
-    public enum EnemyBalancePattern
-    {
-        Melee,
-        Ranger,
-        Mage
-    }
-
-    public enum EnemyBalanceSpawnType1
-    {
-        Fighter,
-        Ranger,
-        Mage,
-        Boss,
-        Assassin,
-        Tank,
-        Expendable,
-        Support
-    }
-
-    public enum EnemyBalanceSpawnType2
-    {
-        [EnumMember(Value = "")]
-        None,
-        Support,
-        Assassin,
-        Fighter,
-        Mage,
-        Tank
-    }
-
-    public enum EnemyBalanceWeapon
-    {
-        sword,
-        axe,
-        mace,
-        spear,
-        bow,
-        claws,
-        dagger,
-        staff,
-        crossbow,
-        [EnumMember(Value = "2hsword")]
-        twohandedsword,
-        [EnumMember(Value = "2hspear")]
-        twohandedspear,
-        [EnumMember(Value = "2hmace")]
-        twohandedmace,
-        [EnumMember(Value = "2haxe")]
-        twohandedaxe,
-        fangs,
-        antlers,
-        sting,
-        fists
-    }
-
-    public enum EnemyBalanceArmor
-    {
-        Light,
-        Medium,
-        Heavy
-    }
-
-    public enum EnemyBalanceSize
-    {
-        medium,
-        small,
-        large,
-        tiny,
-        giant
-    }
-
-    public enum EnemyBalanceMatter
-    {
-        bones,
-        flesh,
-        ectoplasm,
-        chitin,
-        ooze
-    }
-    
-    public static void InjectTableEnemyBalance(
-        string name,
-        int LVL,
-        string ID,
-        EnemyBalanceType type,
-        EnemyBalanceFaction faction,
-        EnemyBalancePattern pattern,
-        EnemyBalanceSpawnType1 spawn_type1,
-        EnemyBalanceWeapon weapon,
-        EnemyBalanceArmor armor,
-        EnemyBalanceMatter matter,
-        int SU,
-        int? EF = null,
-        int? XP = 0,
-        int HP = 100,
-        int MP = 100,
-        EnemyBalanceSpawnType2 spawn_type2 = EnemyBalanceSpawnType2.None,
-        EnemyBalanceSize size = EnemyBalanceSize.medium,
-        int? Head_DEF = null,
-        int? Body_DEF = null,
-        int? Arms_DEF = null,
-        int? Legs_DEF = null,
-        int Hit_Chance = 70,
-        int? EVS = null,
-        int? PRR = null,
-        int? Block_Power = null,
-        int? Block_Recovery = null,
-        int? CRT = null,
-        int? CRTD = null,
-        int? CTA = null,
-        int? FMB = null,
-        int? Miscast_Chance = null,
-        int? Fortitude = null,
-        int? STL = null,
-        int Health_Restoration = 10,
-        int MP_Restoration = 20,
-        int? Cooldown_Reduction = null,
-        int? Knockback_Resistance = null,
-        int? Stun_Resistance = null,
-        int? Bleeding_Resistance = null,
-        int? Bleeding_Chance = null,
-        int? Stun_Chance = null,
-        int? Daze_Chance = null,
-        int? Knockback_Chance = null,
-        int? Immob_Chance = null,
-        int? Stagger_Chance = null,
-        int STR = 10,
-        int AGL = 10,
-        int Vitality = 10,
-        int PRC = 10,
-        int WIL = 10,
-        int? Damage_Returned = null,
-        int VIS = 10,
-        int? Bonus_Range = null,
-        int? Lifesteal = null,
-        int? Manasteal = null,
-        int? Healing_Received = null,
-        int? Avoiding_Chance = null,
-        int Head = 1,
-        int Torso = 1,
-        int Left_Leg = 1 ,
-        int Right_Leg = 1,
-        int Left_Hand = 1,
-        int Right_Hand = 1,
-        int? IP = null,
-        int? Pain_Resistance = null,
-        int? Morale = 0,
-        int? Threat_Time = null,
-        int? Bodypart_Damage = null,
-        int? Magic_Power = null,
-        int? Armor_Piercing = null,
-        int? Slashing_Damage = null,
-        int? Piercing_Damage = null,
-        int? Blunt_Damage = null,
-        int? Rending_Damage = null,
-        int? Fire_Damage = null,
-        int? Shock_Damage = null,
-        int? Poison_Damage = null,
-        int? Caustic_Damage = null,
-        int? Frost_Damage = null,
-        int? Arcane_Damage = null,
-        int? Unholy_Damage = null,
-        int? Sacred_Damage = null,
-        int? Psionic_Damage = null,
-        int? Physical_Resistance = null,
-        int? Natural_Resistance = null,
-        int? Magical_Resistance = null,
-        int? Slashing_Resistance = null,
-        int? Piercing_Resistance = null,
-        int? Blunt_Resistance = null,
-        int? Rending_Resistance = null,
-        int? Fire_Resistance = null,
-        int? Shock_Resistance = null,
-        int? Poison_Resistance = null,
-        int? Caustic_Resistance = null,
-        int? Frost_Resistance = null,
-        int? Arcane_Resistance = null,
-        int? Unholy_Resistance = null,
-        int? Sacred_Resistance = null,
-        int? Psionic_Resistance = null,
-        bool canBlock = false,
-        bool canDisarm = true,
-        bool canSwim = true,
-        int Swimming_cost = 2
-        )
-    {
-        // Table filename
-        const string tableName = "gml_GlobalScript_table_enemy_balance";
-        
-        // Load table if it exists
-        List<string> table = ThrowIfNull(ModLoader.GetTable(tableName));
-        
-        // Prepare line
-        string newline = $"{name};{LVL};{ID};{GetEnumMemberValue(type)};{GetEnumMemberValue(faction)};{GetEnumMemberValue(pattern)};{GetEnumMemberValue(spawn_type1)};{GetEnumMemberValue(spawn_type2)};{GetEnumMemberValue(weapon)};{GetEnumMemberValue(armor)};{SU};{GetEnumMemberValue(size)};{GetEnumMemberValue(matter)};{EF};;{XP};{HP};{MP};{Head_DEF};{Body_DEF};{Arms_DEF};{Legs_DEF};;{Hit_Chance};{EVS};{PRR};{Block_Power};{Block_Recovery};{CRT};{CRTD};{CTA};{FMB};{Miscast_Chance};{Fortitude};{STL};{Health_Restoration};{MP_Restoration};{Cooldown_Reduction};{Knockback_Resistance};{Stun_Resistance};{Bleeding_Resistance};;{Bleeding_Chance};{Stun_Chance};{Daze_Chance};{Knockback_Chance};{Immob_Chance};{Stagger_Chance};;{STR};{AGL};{Vitality};{PRC};{WIL};;{Damage_Returned};{VIS};{Bonus_Range};{Lifesteal};{Manasteal};{Healing_Received};{Avoiding_Chance};;{Head};{Torso};{Left_Leg};{Right_Leg};{Left_Hand};{Right_Hand};{IP};{Pain_Resistance};{Morale};{Threat_Time};;{Bodypart_Damage};{Magic_Power};{Armor_Piercing};{Slashing_Damage};{Piercing_Damage};{Blunt_Damage};{Rending_Damage};{Fire_Damage};{Shock_Damage};{Poison_Damage};{Caustic_Damage};{Frost_Damage};{Arcane_Damage};{Unholy_Damage};{Sacred_Damage};{Psionic_Damage};;{Physical_Resistance};{Natural_Resistance};{Magical_Resistance};;{Slashing_Resistance};{Piercing_Resistance};{Blunt_Resistance};{Rending_Resistance};{Fire_Resistance};{Shock_Resistance};{Poison_Resistance};{Caustic_Resistance};{Frost_Resistance};{Arcane_Resistance};{Unholy_Resistance};{Sacred_Resistance};{Psionic_Resistance};;{(canBlock ? "1": "")};{(canDisarm ? "1": "")};{(canSwim ? "1": "")};{Swimming_cost};";
-        
-        // Add line to end of table
-        table.Add(newline);
-        ModLoader.SetTable(table, tableName);
-        Log.Information($"Injected {name} into {tableName} table.");
-    }
-}
\ No newline at end of file
diff --git a/ModUtils/TableUtils/ItemStats.cs b/ModUtils/TableUtils/ItemStats.cs
new file mode 100644
index 0000000..95d0027
--- /dev/null
+++ b/ModUtils/TableUtils/ItemStats.cs
@@ -0,0 +1,264 @@
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Runtime.Serialization;
+
+namespace ModShardLauncher;
+
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+[SuppressMessage("ReSharper", "IdentifierTypo")]
+
+public partial class Msl
+{
+    public enum ItemStatsTier
+    {
+        [EnumMember(Value = "")]
+        none,
+        [EnumMember(Value = "1")]
+        Tier1,
+        [EnumMember(Value = "2")]
+        Tier2,
+        [EnumMember(Value = "3")]
+        Tier3,
+        [EnumMember(Value = "4")]
+        Tier4,
+        [EnumMember(Value = "5")]
+        Tier5
+    }
+    
+    public enum ItemStatsCategory
+    {
+        [EnumMember(Value = "")]
+        none,
+        medicine,
+        beverage,
+        junk,
+        tool,
+        drug,
+        alcohol,
+        ammo,
+        valuable,
+        ingredient,
+        food,
+        trophy,
+        commodity,
+        material,
+        additive,
+        resource,
+        upgrade,
+        flag,
+        bag,
+        quest,
+        scroll,
+        book,
+        treasure,
+        recipe,
+        schematic
+    }
+
+    public enum ItemStatsSubcategory
+    {
+        [EnumMember(Value = "")]
+        none,
+        hide,
+        ingredient,
+        alchemy,
+        gem,
+        potion,
+        meat,
+        meat_large,
+        fish,
+        vegetable,
+        fruit,
+        berry,
+        herb,
+        mushroom,
+        dairy,
+        pastry,
+        dish,
+        quest,
+        bird,
+        treatise
+    }
+    
+    public enum ItemStatsMaterial
+    {
+        cloth,
+        glass,
+        organic,
+        metal,
+        wood,
+        leather,
+        gold,
+        pottery,
+        gem,
+        silver,
+        stone,
+        paper
+    }
+    
+    public enum ItemStatsWeight
+    {
+        Light,
+        Medium,
+        [EnumMember(Value = "Very Light")]
+        VeryLight,
+        Heavy,
+        Net
+    }
+
+    public enum ItemStatsTags
+    {
+        [EnumMember(Value = "")]
+        // special
+        none,
+        special,
+        WIP,
+        
+        // rarities
+        common,
+        uncommon,
+        rare,
+        unique,
+        
+        // elven
+        elven,
+        [EnumMember(Value = "elven common")]
+        elvencommon,
+        [EnumMember(Value = "elven uncommon")]
+        elvenuncommon,
+        [EnumMember(Value = "elven rare")]
+        elvenrare,
+        
+        // animals
+        [EnumMember(Value = "common animal")]
+        commonanimal,
+        [EnumMember(Value = "uncommon animal")]
+        uncommonanimal,
+        [EnumMember(Value = "rare animal")]
+        rareanimal,
+        
+        // alchemy
+        alchemy,
+        [EnumMember(Value = "common alchemy")]
+        commonalchemy,
+        [EnumMember(Value = "uncommon alchemy")]
+        uncommonalchemy,
+        
+        // food
+        [EnumMember(Value = "common raw")]
+        commonraw,
+        [EnumMember(Value = "uncommon raw")]
+        uncommonraw,
+        [EnumMember(Value = "rare raw")]
+        rareraw,
+        [EnumMember(Value = "common cooked")]
+        commoncooked,
+        [EnumMember(Value = "uncommon cooked")]
+        uncommoncooked,
+        [EnumMember(Value = "rare cooked")]
+        rarecooked,
+        
+        // dungeons
+        crypt,
+        catacombs,
+        bastion
+    }
+    
+    public static void InjectTableItemStats(
+        string id,
+        ItemStatsMaterial Material,
+        ItemStatsWeight Weight,
+        int? Price = null,
+        int? EffPrice = null,
+        ItemStatsTier tier = ItemStatsTier.none,
+        ItemStatsCategory Cat = ItemStatsCategory.none,
+        ItemStatsSubcategory Subcat = ItemStatsSubcategory.none,
+        ushort? Fresh = null,
+        ushort? Duration = null,
+        ushort? Stacks = null,
+        short? Hunger = null,
+        float? Hunger_Change = null,
+        short? Hunger_Resistance = null,
+        short? Thirsty = null,
+        float? Thirst_Change = null,
+        short? Immunity = null,
+        float? Immunity_Change = null,
+        short? Intoxication = null,
+        float? Toxicity_Change = null,
+        short? Toxicity_Resistance = null, //Could be ushort ?
+        short? Pain = null,
+        float? Pain_Change = null,
+        short? Pain_Resistance = null, // Could be ushort ?
+        short? Pain_Limit = null,
+        short? Morale = null,
+        float? Morale_Change = null,
+        short? Sanity = null,
+        float? Sanity_Change = null,
+        short? Condition = null,
+        short? max_hp = null, // Could be ushort ?
+        short? max_hp_res = null, // Could be ushort ?
+        short? Health_Restoration = null, // Could be float ?
+        short? Healing_Received = null,
+        short? max_mp = null, // Could be ushort ?
+        short? max_mp_res = null, // Could be ushort ?
+        short? MP_Restoration = null,
+        short? MP_turn = null, // Could be ushort ?
+        short? Fatigue = null,
+        float? Fatigue_Change = null,
+        short? Fatigue_Gain = null, // Could be ushort ?
+        short? Received_XP = null,
+        short? Cooldown_Reduction = null,
+        short? Weapon_Damage = null,
+        short? Hit_Chance = null, // type unknown, assuming short
+        short? FMB = null,
+        short? CRTD = null, // Could be ushort ?
+        short? Fortitude = null, // Could be ushort ?
+        short? VSN = null, // type unknown, assuming short
+        short? Bleeding_Resistance = null,
+        short? Knockback_Resistance = null,
+        short? Stun_Resistance = null,
+        short? Physical_Resistance = null, // type unknown, assuming short
+        short? Nature_Resistance = null,
+        short? Magic_Resistance = null,
+        short? Slashing_Resistance = null,
+        short? Piercing_Resistance = null,
+        short? Blunt_Resistance = null,
+        short? Rending_Resistance = null,
+        short? Fire_Resistance = null,
+        short? Shock_Resistance = null,
+        short? Poison_Resistance = null,
+        short? Caustic_Resistance = null,
+        short? Frost_Resistance = null,
+        short? Arcane_Resistance = null,
+        short? Unholy_Resistance = null,
+        short? Sacred_Resistance = null,
+        short? Psionic_Resistance = null,
+        short? Bleeding_Resistance_2 = null,
+        short? Nausea_Chance = null, // Could be ushort ?
+        short? Poisoning_Chance = null, // Could be ushort ?
+        short? Poisoning_Duration = null,
+        bool purse = false,
+        bool bottle = false,
+        string? upgrade = null, // Could be an enum, keeping as a string for custom upgrades I guess
+        short? fodder = null, // Could be ushort ?
+        short? stack = null, // Could be ushort ?
+        bool fireproof = false,
+        bool dropsOnce = false,
+        ItemStatsTags tags = ItemStatsTags.none
+        )
+    {
+        // Table filename
+        const string tableName = "gml_GlobalScript_table_items_stats";
+        
+        // Load table if it exists
+        List<string> table = ThrowIfNull(ModLoader.GetTable(tableName));
+        
+        // Prepare line
+        string newline = $"{id};;{Price};{EffPrice};{GetEnumMemberValue(tier)};{GetEnumMemberValue(Cat)};{GetEnumMemberValue(Subcat)};{Material};{GetEnumMemberValue(Weight)};;{Fresh};{Duration};{Stacks};;{Hunger};{Hunger_Change};{Hunger_Resistance};;{Thirsty};{Thirst_Change};;{Immunity};{Immunity_Change};;{Intoxication};{Toxicity_Change};{Toxicity_Resistance};;{Pain};{Pain_Change};{Pain_Resistance};{Pain_Limit};;{Morale};{Morale_Change};{Sanity};{Sanity_Change};;{Condition};{max_hp};{max_hp_res};{Health_Restoration};{Healing_Received};;{max_mp};{max_mp_res};{MP_Restoration};{MP_turn};;{Fatigue};{Fatigue_Change};{Fatigue_Gain};;{Received_XP};{Cooldown_Reduction};{Weapon_Damage};{Hit_Chance};{FMB};{CRTD};{Fortitude};{VSN};;{Bleeding_Resistance};{Knockback_Resistance};{Stun_Resistance};;{Physical_Resistance};{Nature_Resistance};{Magic_Resistance};{Slashing_Resistance};{Piercing_Resistance};{Blunt_Resistance};{Rending_Resistance};{Fire_Resistance};{Shock_Resistance};{Poison_Resistance};{Caustic_Resistance};{Frost_Resistance};{Arcane_Resistance};{Unholy_Resistance};{Sacred_Resistance};{Psionic_Resistance};{Bleeding_Resistance_2};;{Nausea_Chance};{Poisoning_Chance};{Poisoning_Duration};;{(purse ? "1" : "")};{(bottle ? "1" : "")};{upgrade};{fodder};{stack};{(fireproof ? "1" : "")};{(dropsOnce ? "1" : "")};{GetEnumMemberValue(tags)};";
+        
+        // Add line to table
+        table.Add(newline);
+        ModLoader.SetTable(table, tableName);
+    }
+}
\ No newline at end of file
diff --git a/ModUtils/TableUtils/MobsStats.cs b/ModUtils/TableUtils/MobsStats.cs
new file mode 100644
index 0000000..725a6be
--- /dev/null
+++ b/ModUtils/TableUtils/MobsStats.cs
@@ -0,0 +1,256 @@
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Runtime.Serialization;
+using Serilog;
+
+namespace ModShardLauncher;
+
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+public partial class Msl
+{
+    public enum MobsStatsTier
+    {
+        [EnumMember(Value = "0")]
+        Tier0,
+        [EnumMember(Value = "1")]
+        Tier1,
+        [EnumMember(Value = "2")]
+        Tier2,
+        [EnumMember(Value = "3")]
+        Tier3,
+        [EnumMember(Value = "4")]
+        Tier4,
+        [EnumMember(Value = "5")]
+        Tier5
+    }
+
+    public enum MobsStatsType
+    {
+        undead,
+        human,
+        spectre,
+        spawner,
+        vampire,
+        beast,
+        arachnid,
+        elf,
+        dwarf
+    }
+    
+    public enum MobsStatsFaction
+    {
+        Undead,
+        Vampire,
+        Brigand,
+        omnivore,
+        carnivore,
+        herbivore,
+        GrandMagistrate,
+        RottenWillow,
+        Mercenary,
+        Neutral
+    }
+    
+    public enum MobsStatsPattern
+    {
+        Melee,
+        Ranger,
+        Mage
+    }
+
+    public enum MobsStatsCategory
+    {
+        [EnumMember(Value = "")]
+        none,
+        Expendable,
+        Tech,
+        Fighter,
+        Ranger,
+        Mage,
+        Support,
+        Tank,
+        Assassin,
+        Boss
+    }
+
+    public enum MobsStatsWeapon
+    {
+        claws,
+        axe,
+        dagger,
+        spear,
+        sword,
+        mace,
+        bow,
+        crossbow,
+        [EnumMember(Value = "2hmace")]
+        twohandedmace,
+        [EnumMember(Value = "2haxe")]
+        twohandedaxe,
+        [EnumMember(Value = "2hsword")]
+        twohandedsword,
+        [EnumMember(Value = "2hStaff")]
+        twohandedstaff,
+        fangs,
+        sting,
+        antlers,
+        fists
+    }
+
+    public enum MobsStatsArmor
+    {
+        Light,
+        Medium,
+        Heavy
+    }
+    
+    public enum MobsStatsSize
+    {
+        tiny,
+        small,
+        medium,
+        large,
+        giant
+    }
+
+    public enum MobsStatsMatter
+    {
+        flesh,
+        bones,
+        ectoplasm,
+        ooze,
+        chitin,
+        other
+    }
+    
+    public static void InjectTableMobsStats(
+        string name,
+        MobsStatsTier tier,
+        MobsStatsType type,
+        MobsStatsFaction faction,
+        MobsStatsPattern pattern,
+        MobsStatsWeapon weapon,
+        MobsStatsArmor armor,
+        MobsStatsSize size,
+        short HP,
+        byte Hit_Chance,
+        byte STR,
+        byte AGL,
+        byte Vitality,
+        byte PRC,
+        byte WIL,
+        short XP,
+        MobsStatsMatter matter,
+        MobsStatsCategory category1 = MobsStatsCategory.none,
+        MobsStatsCategory category2 = MobsStatsCategory.none,
+        string? ID = null,
+        short? MP = null,
+        ushort? Morale = null,
+        byte? VIS = null,
+        byte? Head_DEF = null,
+        byte? Body_DEF = null,
+        byte? Arms_DEF = null,
+        byte? Legs_DEF = null,
+        short? EVS = null,
+        byte? PRR = null,
+        byte? Block_Power = null,
+        byte? Block_Recovery = null,
+        byte? Crit_Avoid = null,
+        byte? CRT = null,
+        byte? CRTD = null,
+        short? CTA = null,
+        short? FMB = null,
+        short? Magic_Power = null,
+        short? Miscast_Chance = null,
+        byte? Miracle_Chance = null,
+        byte? Miracle_Power = null,
+        byte? MP_Restoration = null,
+        short? Cooldown_Reduction = null,
+        short? Fortitude = null,
+        short? Health_Restoration = null,
+        byte? Healing_Received = null,
+        byte? Lifesteal = null,
+        byte? Manasteal = null,
+        short? Bleeding_Resistance = null,
+        short? Knockback_Resistance = null,
+        short? Stun_Resistance = null,
+        short? Pain_Resistance = null,
+        short? Bleeding_Chance = null,
+        short? Daze_Chance = null,
+        short? Stun_Chance = null,
+        short? Knockback_Chance = null,
+        short? Immob_Chance = null,
+        short? Stagger_Chance = null,
+        float? STRk = null,
+        float? AGLk = null,
+        float? Vitalityk = null,
+        float? PRCk = null,
+        float? WILk = null,
+        float? Checksum = null,
+        short? Bonus_Range = null,
+        byte? Avoiding_Chance = null,
+        byte? Damage_Returned = null,
+        short? Damage_Received = null, // unknown type, assuming short
+        byte? Head = null,
+        byte? Torso = null,
+        byte? Left_Leg = null,
+        byte? Right_Leg = null,
+        byte? Left_Hand = null,
+        byte? Right_Hand = null,
+        ushort? IP = null,
+        byte? Threat_Time = null,
+        byte? Bodypart_Damage = null,
+        byte? Armor_Piercing = null,
+        byte? DMG_Sum = null,
+        byte? Slashing_Damage = null,
+        byte? Piercing_Damage = null,
+        byte? Blunt_Damage = null,
+        byte? Rending_Damage = null,
+        byte? Fire_Damage = null,
+        byte? Shock_Damage = null,
+        byte? Poison_Damage = null,
+        byte? Caustic_Damage = null,
+        byte? Frost_Damage = null,
+        byte? Arcane_Damage = null,
+        byte? Unholy_Damage = null,
+        byte? Sacred_Damage = null,
+        byte? Psionic_Damage = null,
+        short? Physical_Resistance = null,
+        short? Natural_Resistance = null,
+        short? Magical_Resistance = null,
+        short? Slashing_Resistance = null,
+        short? Piercing_Resistance = null,
+        short? Blunt_Resistance = null,
+        short? Rending_Resistance = null,
+        short? Fire_Resistance = null,
+        short? Shock_Resistance = null,
+        short? Poison_Resistance = null,
+        short? Frost_Resistance = null,
+        short? Caustic_Resistance = null,
+        short? Arcane_Resistance = null,
+        short? Unholy_Resistance = null,
+        short? Sacred_Resistance = null,
+        short? Psionic_Resistance = null,
+        bool canBlock = false,
+        bool canDisarm = false,
+        bool canSwim = false,
+        byte Swimming_Cost = 1,
+        byte? achievement = null
+        )
+    {
+        // Table filename
+        const string tableName = "gml_GlobalScript_table_mobs_stats";
+        
+        // Load table if it exists
+        List<string> table = ThrowIfNull(ModLoader.GetTable(tableName));
+        
+        // Prepare line
+        string newline = $"{name};{GetEnumMemberValue(tier)};{ID};{type};{faction};{pattern};;{GetEnumMemberValue(category1)};{GetEnumMemberValue(category2)};{GetEnumMemberValue(weapon)};{armor};{size};{matter};{VIS};;{XP};{HP};{MP};{Head_DEF};{Body_DEF};{Arms_DEF};{Legs_DEF};;{Hit_Chance};{EVS};{PRR};{Block_Power};{Block_Recovery};{Crit_Avoid};{CRT};{CRTD};{CTA};{FMB};;{Magic_Power};{Miscast_Chance};{Miracle_Chance};{Miracle_Power};;{MP_Restoration};{Cooldown_Reduction};{Fortitude};{Health_Restoration};{Healing_Received};{Lifesteal};{Manasteal};;{Bleeding_Resistance};{Knockback_Resistance};{Stun_Resistance};{Pain_Resistance};;{Bleeding_Chance};{Daze_Chance};{Stun_Chance};{Knockback_Chance};{Immob_Chance};{Stagger_Chance};;{STRk};{AGLk};{Vitalityk};{PRCk};{WILk};{Checksum};;{STR};{AGL};{Vitality};{PRC};{WIL};;{Bonus_Range};{Avoiding_Chance};{Damage_Returned};{Damage_Received};;{Head};{Torso};{Left_Leg};{Right_Leg};{Left_Hand};{Right_Hand};;{IP};{Morale};{Threat_Time};;{Bodypart_Damage};{Armor_Piercing};{DMG_Sum};{Slashing_Damage};{Piercing_Damage};{Blunt_Damage};{Rending_Damage};{Fire_Damage};{Shock_Damage};{Poison_Damage};{Caustic_Damage};{Frost_Damage};{Arcane_Damage};{Unholy_Damage};{Sacred_Damage};{Psionic_Damage};;{Physical_Resistance};{Natural_Resistance};{Magical_Resistance};;{Slashing_Resistance};{Piercing_Resistance};{Blunt_Resistance};{Rending_Resistance};{Fire_Resistance};{Shock_Resistance};{Poison_Resistance};{Frost_Resistance};{Caustic_Resistance};{Arcane_Resistance};{Unholy_Resistance};{Sacred_Resistance};{Psionic_Resistance};;{(canBlock ? "1": "")};{(canDisarm ? "1": "")};{(canSwim ? "1": "")};{Swimming_Cost};{achievement};";
+        
+        // Add line to table
+        table.Add(newline);
+        ModLoader.SetTable(table, tableName);
+        Log.Information($"Injected Mob Stat {name} into table");
+    }
+}
\ No newline at end of file
diff --git a/ModUtils/TableUtils/Potion.cs b/ModUtils/TableUtils/PotionsStats.cs
similarity index 88%
rename from ModUtils/TableUtils/Potion.cs
rename to ModUtils/TableUtils/PotionsStats.cs
index eb4ece8..eb10733 100644
--- a/ModUtils/TableUtils/Potion.cs
+++ b/ModUtils/TableUtils/PotionsStats.cs
@@ -6,7 +6,7 @@ namespace ModShardLauncher;
 
 public partial class Msl
 {
-    public static void InjectTablePotion(string name, string effectScript, params string[] blockedEffects)
+    public static void InjectTablePotionsStats(string name, string effectScript, params string[] blockedEffects)
     {
         // Weird table. It has no header, and seems to work like this:
         // Name of the potion | script with actual effect | any number of incompatible effects that cannot coexist with the actual effect
@@ -17,9 +17,8 @@ public static void InjectTablePotion(string name, string effectScript, params st
         // This seems to be used when rolling potions in the game, to ensure that the potion doesn't have conflicting effects.
         // Needs more investigation to figure out how many blocked effects are allowed, max vanilla potion has 26.
         
-        
         // Table filename
-        const string tableName = "gml_GlobalScript_table_Potion";
+        const string tableName = "gml_GlobalScript_table_potions_stats";
         
         // Load table if it exists
         List<string> table = ThrowIfNull(ModLoader.GetTable(tableName));
diff --git a/ModUtils/TableUtils/RecipesCook.cs b/ModUtils/TableUtils/RecipesCook.cs
new file mode 100644
index 0000000..50761b6
--- /dev/null
+++ b/ModUtils/TableUtils/RecipesCook.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Runtime.Serialization;
+using Serilog;
+
+namespace ModShardLauncher;
+
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+[SuppressMessage("ReSharper", "IdentifierTypo")]
+public partial class Msl
+{
+    public enum RecipesCookHook
+    {
+        [EnumMember(Value = "FRYING & SALTING")]
+        FryingAndSalting,
+        SOUPS,
+        [EnumMember(Value = "MAIN COURSES")]
+        MainCourses,
+        SALADS,
+        DESSERTS
+    }
+    
+    public enum RecipesCookCategory
+    {
+        other,
+        soup,
+        main,
+        side,
+        dessert
+    }
+
+    public enum RecipesCookAdditive
+    {
+        X,
+        V,
+        butter
+    }
+
+    public enum RecipesCookSource
+    {
+        [EnumMember(Value = "Base Recipe")]
+        BaseRecipe,
+        Trade,
+        [EnumMember(Value = "Random Find")]
+        RandomFind,
+        [EnumMember(Value = "Reputation Reward")]
+        ReputationReward
+    }
+    
+    public static void InjectTableRecipesCook(
+        RecipesCookHook hook,
+        string NAME,
+        RecipesCookCategory CAT,
+        string? Recipe1 = null,
+        string? Recipe2 = null,
+        string? Recipe3 = null,
+        string? Recipe4 = null,
+        string? Recipe5 = null,
+        RecipesCookAdditive ADDITIVES = RecipesCookAdditive.X,
+        bool COOKPOT = false,
+        bool PLATE = false,
+        bool DEEP_PLATE = false,
+        bool SATIETY = false,
+        short? MORALE = null,
+        short? SANITY = null,
+        RecipesCookSource SOURCE = RecipesCookSource.BaseRecipe
+        )
+    {
+        // Table filename
+        const string tableName = "gml_GlobalScript_table_recipes_cook";
+        
+        // Load table if it exists
+        List<string> table = ThrowIfNull(ModLoader.GetTable(tableName));
+        
+        // Prepare line
+        string newline = $"{NAME};{CAT};{Recipe1 ?? "-"};{Recipe2 ?? "-"};{Recipe3 ?? "-"};{Recipe4 ?? "-"};{Recipe5 ?? "-"};{GetEnumMemberValue(ADDITIVES)};{(COOKPOT ? "V" : "X")};{(PLATE ? "V" : "X")};{(DEEP_PLATE ? "V" : "X")};{(SATIETY ? "V" : "X")};{MORALE};{SANITY};{GetEnumMemberValue(SOURCE)};";
+        
+        // Find hook
+        string hookStr = "// " + GetEnumMemberValue(hook);
+        (int ind, string? foundLine) = table.Enumerate().FirstOrDefault(x => x.Item2.Contains(hookStr));
+        
+        // Add line to table
+        if (foundLine != null)
+        {
+            table.Insert(ind + 1, newline);
+            ModLoader.SetTable(table, tableName);
+            Log.Information($"Injected Armor {NAME} into table {tableName} under {hook}");
+        }
+        else
+        {
+            Log.Error($"Cannot find hook {hook} in table {tableName}");
+            throw new Exception($"Cannot find hook {hook} in table {tableName}");
+        }
+    }
+}
\ No newline at end of file
diff --git a/ModUtils/TableUtils/RecipesCraft.cs b/ModUtils/TableUtils/RecipesCraft.cs
new file mode 100644
index 0000000..6b6c48c
--- /dev/null
+++ b/ModUtils/TableUtils/RecipesCraft.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Runtime.Serialization;
+using Serilog;
+
+namespace ModShardLauncher;
+
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+public partial class Msl
+{
+    public enum RecipesCraftHook
+    {
+        BASIC,
+        ADVANCED,
+        OTHER
+    }
+    public enum  RecipesCraftCategory
+    {
+        basic,
+        advanced,
+        other
+    }
+
+    public enum RecipesCraftSource
+    {
+        Trade,
+        [EnumMember(Value = "Base Recipe")]
+        BaseRecipe,
+        [EnumMember(Value = "Random Find")]
+        RandomFind,
+        [EnumMember(Value = "Pol Find")]
+        PolFind
+    }
+    
+    public static void InjectTableRecipesCraft(
+        RecipesCraftHook hook,
+        string NAME,
+        RecipesCraftCategory CAT,
+        ushort XP,
+        ushort AMOUNT,
+        RecipesCraftSource SOURCE,
+        string Recipe1,
+        string? Recipe2 = null,
+        string? Recipe3 = null,
+        string? Recipe4 = null,
+        string? Recipe5 = null,
+        string? Recipe6 = null
+        )
+    {
+        // Table filename
+        const string tableName = "gml_GlobalScript_table_recipes_craft";
+        
+        // Load table if it exists
+        List<string> table = ThrowIfNull(ModLoader.GetTable(tableName));
+        
+        // Prepare new line
+        string newline = $"{NAME};{CAT};{Recipe1};{Recipe2 ?? "-"};{Recipe3 ?? "-"};{Recipe4 ?? "-"};{Recipe5 ?? "-"};{Recipe6 ?? "-"};{AMOUNT};{XP};{GetEnumMemberValue(SOURCE)}";
+        
+        // Find hook
+        (int ind, string? foundLine) = table.Enumerate().FirstOrDefault(x => x.Item2.Contains(hook.ToString()));
+        
+        // Add line to table
+        if (foundLine != null)
+        {
+            table.Insert(ind + 1, newline);
+            ModLoader.SetTable(table, tableName);
+            Log.Information($"Injected craft recipe {NAME} into {tableName} under {hook}");
+        }
+        else
+        {
+            Log.Error($"Cannot find hook {hook} in table {tableName}");
+            throw new Exception($"Hook {hook} not found in table {tableName}");
+        }
+    }
+}
\ No newline at end of file
diff --git a/ModUtils/TableUtils/SkillsStat.cs b/ModUtils/TableUtils/SkillsStat.cs
deleted file mode 100644
index 2c463cd..0000000
--- a/ModUtils/TableUtils/SkillsStat.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Runtime.Serialization;
-using Serilog;
-
-namespace ModShardLauncher;
-
-[SuppressMessage("ReSharper", "InconsistentNaming")]
-[SuppressMessage("ReSharper", "IdentifierTypo")]
-public partial class Msl
-{
-    /// <summary>
-    /// <para>Enum used in Skill Stats table. </para>
-    /// Defines the group to insert the skill in.
-    /// </summary>
-    public enum SkillsStatMetaGroup
-    {
-        RANGED,
-        SWORDS,
-        [EnumMember(Value = "2H SWORDS")]
-        TWOHANDEDSWORDS,
-        [EnumMember(Value = "2H MACES")]
-        TWOHANDEDMACES,
-        [EnumMember(Value = "2H AXES")]
-        TWOHANDEDAXES,
-        [EnumMember(Value = "AXES")]
-        AXES,
-        MACES,
-        STAVES,
-        SHIELDS,
-        DAGGERS,
-        [EnumMember(Value = "DUAL WIELDING")]
-        DUALWIELDING,
-        SPEARS,
-        COMBAT,
-        ATHLETIC,
-        SURVIVAL,
-        PYRO,
-        GEO,
-        ELECTRO,
-        ARMOR,
-        [EnumMember(Value = "MAGIC MASTERY")]
-        MAGICMASTERY,
-        UNDEAD,
-        [EnumMember(Value = "PROLOGUE STATUES")]
-        PROLOGUESTATUES,
-        [EnumMember(Value = "PROLOGUE ARCHON")]
-        PROLOGUEARCHON,
-        PROSELYTES,
-        BRIGANDS,
-        [EnumMember(Value = "ANCIENT TROLL")]
-        ANCIENTTROLL,
-        BEASTS,
-        MANTICORE
-    }
-    /// <summary>
-    /// <para>Enum used in Skill Stats table. </para>
-    /// Defines the type of targeting the skill uses.
-    /// </summary>
-    public enum SkillsStatTarget
-    {
-        [EnumMember(Value = "No Target")]
-        NoTarget,
-        [EnumMember(Value = "Target Object")]
-        TargetObject,
-        [EnumMember(Value = "Target Point")]
-        TargetPoint,
-        [EnumMember(Value = "Target Area")]
-        TargetArea,
-        [EnumMember(Value = "Target Ally")]
-        TargetAlly
-    }
-    /// <summary>
-    /// <para>Enum used in Skill Stats table. </para>
-    /// Defines the pattern the skill uses.
-    /// </summary>
-    public enum SkillsStatPattern
-    {
-        normal,
-        five,
-        line,
-        circle,
-        pyramid,
-        pyramid_shift
-    }
-    /// <summary>
-    /// <para>Enum used in Skill Stats table. </para>
-    /// Defines the class of the skill.
-    /// </summary>
-    public enum SkillsStatClass
-    {
-        skill,
-        spell,
-        attack,
-    }
-    /// <summary>
-    /// <para>Enum used in Skill Stats table. </para>
-    /// The skill tree this skill belongs to.
-    /// </summary>
-    public enum SkillsStatBranch
-    {
-        none, // For some reason the string none has to be written, rather than leaving the field empty. Inconsistent but it is what it is.
-        ranged,
-        sword,
-        [EnumMember(Value = "2hsword")]
-        two_handed_sword,
-        [EnumMember(Value = "2hmace")]
-        two_handed_mace,
-        [EnumMember(Value = "2haxe")]
-        two_handed_axe,
-        axe,
-        mace,
-        staff,
-        shield,
-        dagger,
-        dual,
-        spear,
-        combat,
-        athletic,
-        pyromancy,
-        geomancy,
-        electromancy,
-        armor,
-        magic_mastery,
-        necromancy,
-        sanguimancy
-    }
-    /// <summary>
-    /// <para>Enum used in Skill Stats table. </para>
-    /// The metacategory the skill belongs to.
-    /// </summary>
-    public enum SkillsStatMetacategory
-    {
-        [EnumMember(Value = "")]
-        none,
-        weapon,
-        utility
-    }
-    
-    /// <summary>
-    /// Adds a line to the Skills Stat table with the given parameters.
-    /// </summary>
-    /// <param name="metaGroup">The group in which to inject the skill.</param>
-    /// <param name="id">The unique id of the skill.</param>
-    /// <param name="Object">The name of the object this skill is attached to.</param>
-    /// <param name="Target">The targeting mode for this skill.</param>
-    /// <param name="Range">The range of this skill. (Can be a number, `range` or `vis`).</param>
-    /// <param name="KD">The cooldown for this skill.</param>
-    /// <param name="MP">The amount of energy used by this skill.</param>
-    /// <param name="Reserv"></param>
-    /// <param name="Duration">The duration of the buff if the Object is a buff.</param>
-    /// <param name="AOE_Lenght">The length of the area when using Target Area.</param>
-    /// <param name="AOE_Width">The width of the area when using Target Area.</param>
-    /// <param name="is_movement">Whether this skill is a movement skill.</param>
-    /// <param name="Pattern">The pattern this skill uses.</param>
-    /// <param name="Class">The class of the skill.</param>
-    /// <param name="Bonus_Range">Whether this skill receives bonus range.</param>
-    /// <param name="Starcast">The effect to play when using the skill.</param>
-    /// <param name="Branch">The skill tree the skill belongs to.</param>
-    /// <param name="is_knockback">Whether this skill can cause knockback.</param>
-    /// <param name="Crime">Whether using this skill is considered a crime.</param>
-    /// <param name="metacategory">The metacategory this skill belongs to.</param>
-    /// <param name="FMB">The backfire chance when using this skill if it's a spell.</param>
-    /// <param name="AP">The amount of armor piercing the skill has. (Can be `x` for player default or any integer)</param>
-    /// <param name="Attack">Whether this skill is an attack.</param>
-    /// <param name="Stance">Whether this skill is a stance.</param>
-    /// <param name="Charge">Whether this skill is a charge.</param>
-    /// <param name="Maneuver">Whether this skill is a maneuver.</param>
-    /// <param name="Spell">Whether this skill is a spell.</param>
-    public static void InjectTableSkillsStat(
-        SkillsStatMetaGroup metaGroup,
-        string id,
-        string Object,
-        SkillsStatTarget Target = SkillsStatTarget.NoTarget,
-        string Range = "0",
-        int KD = 0,
-        int MP = 0,
-        int Reserv = 0,
-        int Duration = 0,
-        int AOE_Lenght = 0,
-        int AOE_Width = 0,
-        bool is_movement = false,
-        SkillsStatPattern Pattern = SkillsStatPattern.normal,
-        SkillsStatClass Class = SkillsStatClass.skill,
-        bool Bonus_Range = false,
-        string Starcast = "",
-        SkillsStatBranch Branch = SkillsStatBranch.none,
-        bool is_knockback = false,
-        bool Crime = false,
-        SkillsStatMetacategory metacategory = SkillsStatMetacategory.none,
-        int FMB = 0,
-        string AP = "x",
-        bool Attack = false,
-        bool Stance = false,
-        bool Charge = false,
-        bool Maneuver = false,
-        bool Spell = false)
-    {
-        // Table filename
-        const string tableName = "gml_GlobalScript_table_skills_stat";
-        
-        // Load table if it exists
-        List<string> table = ThrowIfNull(ModLoader.GetTable(tableName));
-        
-        // Prepare line
-        string newline = $"{id};{Object};{GetEnumMemberValue(Target)};{Range};{KD};{MP};{Reserv};{Duration};{AOE_Lenght};{AOE_Width};{(is_movement ? "1" : "0")};{Pattern};{Class};{(Bonus_Range ? "1" : "0")};{Starcast};{GetEnumMemberValue(Branch)};{(is_knockback ? "1" : "0")};{(Crime ? "1" : "")};{GetEnumMemberValue(metacategory)};{FMB};{AP};{(Attack ? "1" : "")};{(Stance ? "1" : "")};{(Charge ? "1" : "")};{(Maneuver ? "1" : "")};{(Spell ? "1" : "")};";
-        
-        // Find Meta Category in table
-        string metaGroupStr = "// " + GetEnumMemberValue(metaGroup);
-        (int ind, string? foundLine) = table.Enumerate().FirstOrDefault(x => x.Item2.Contains(metaGroupStr));
-        
-        // Add line to table
-        if (foundLine != null)
-        {
-            table.Insert(ind + 1, newline);
-            ModLoader.SetTable(table, tableName);
-            Log.Information($"Injected Skill Stat {id} into Meta Group {metaGroup}");
-        }
-        else
-        {
-            Log.Error($"Cannot find Meta Group {metaGroup} in Skills Stat table");
-            throw new Exception("Meta Group not found in Skills Stat table");
-        }
-    }
-}
\ No newline at end of file
diff --git a/ModUtils/TableUtils/SkillsStats.cs b/ModUtils/TableUtils/SkillsStats.cs
new file mode 100644
index 0000000..c64e83f
--- /dev/null
+++ b/ModUtils/TableUtils/SkillsStats.cs
@@ -0,0 +1,188 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Runtime.Serialization;
+using Serilog;
+
+namespace ModShardLauncher;
+
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+[SuppressMessage("ReSharper", "IdentifierTypo")]
+public partial class Msl
+{
+    public enum SkillsStatsHook
+    {
+        BASIC,
+        RANGED,
+        SWORDS,
+        [EnumMember(Value = "2H SWORDS")]
+        TWOHANDEDSWORDS,
+        [EnumMember(Value = "2H MACES")]
+        TWOHANDEDMACES,
+        [EnumMember(Value = "2H AXES")]
+        TWOHANDEDAXES,
+        AXES,
+        MACES,
+        STAVES,
+        SHIELDS,
+        DAGGERS,
+        [EnumMember(Value = "DUAL WIELDING")]
+        DUALWIELDING,
+        SPEARS,
+        COMBAT,
+        ATHLETICS,
+        SURVIVAL,
+        PYRO,
+        GEO,
+        ELECTRO,
+        ARMOR,
+        [EnumMember(Value = "MAGIC MASTERY")]
+        MAGICMASTERY,
+        UNDEAD,
+        [EnumMember(Value = "PROLOGUE STATUES")]
+        PROLOGUESTATUES,
+        [EnumMember(Value = "PROLOGUE ARCHON")]
+        PROLOGUEARCHON,
+        PROSELYTES,
+        BRIGANDS,
+        [EnumMember(Value = "ANCIENT TROLL")]
+        ANCIENTTROLL,
+        BEASTS,
+        MANTICORE
+    }
+    
+    public enum SkillsStatsTarget
+    {
+        [EnumMember(Value = "No Target")]
+        NoTarget,
+        [EnumMember(Value = "Target Object")]
+        TargetObject,
+        [EnumMember(Value = "Target Point")]
+        TargetPoint,
+        [EnumMember(Value = "Target Area")]
+        TargetArea,
+        [EnumMember(Value = "Target Ally")]
+        TargetAlly
+    }
+    
+    public enum SkillsStatsPattern
+    {
+        normal,
+        five,
+        line,
+        circle,
+        pyramid,
+        pyramid_shift
+    }
+
+    public enum SkillsStatsValidator
+    {
+        [EnumMember(Value = "")]
+        none,
+        AVOID_TILEMARKS,
+        DASH
+    }
+    
+    public enum SkillsStatsClass
+    {
+        skill,
+        spell,
+        attack,
+    }
+    
+    public enum SkillsStatsBranch
+    {
+        none, // For some reason the string none has to be written, rather than leaving the field empty. Inconsistent but it is what it is.
+        ranged,
+        sword,
+        [EnumMember(Value = "2hsword")]
+        two_handed_sword,
+        [EnumMember(Value = "2hmace")]
+        two_handed_mace,
+        [EnumMember(Value = "2haxe")]
+        two_handed_axe,
+        axe,
+        mace,
+        staff,
+        shield,
+        dagger,
+        dual,
+        spear,
+        combat,
+        athletic,
+        pyromancy,
+        geomancy,
+        electromancy,
+        armor,
+        magic_mastery,
+        necromancy,
+        sanguimancy
+    }
+    
+    public enum SkillsStatsMetacategory
+    {
+        [EnumMember(Value = "")]
+        none,
+        weapon,
+        utility
+    }
+    
+    public static void InjectTableSkillsStats(
+    SkillsStatsHook hook,
+    string id,
+    string? Object = null,
+    SkillsStatsTarget Target = SkillsStatsTarget.NoTarget,
+    string Range = "0",
+    ushort KD = 0,
+    ushort MP = 0,
+    ushort Reserv = 0,
+    ushort Duration = 0,
+    byte AOE_Lenght = 0,
+    byte AOE_Width = 0,
+    bool is_movement = false,
+    SkillsStatsPattern Pattern = SkillsStatsPattern.normal,
+    SkillsStatsValidator Validators = SkillsStatsValidator.none,
+    SkillsStatsClass Class = SkillsStatsClass.skill,
+    bool Bonus_Range = false, // could be byte ? Not sure as only values are 0 and 1
+    string? Starcast = null,
+    SkillsStatsBranch Branch = SkillsStatsBranch.none,
+    bool is_knockback = false,
+    bool Crime = false,
+    SkillsStatsMetacategory metacategory = SkillsStatsMetacategory.none,
+    short FMB = 0,
+    string AP = "x",
+    bool Attack = false,
+    bool Stance = false,
+    bool Charge = false,
+    bool Maneuver = false,
+    bool Spell = false
+        )
+    {
+        // Table filename
+        const string tableName = "gml_GlobalScript_table_skills_stats";
+        
+        // Load table if it exists
+        List<string> table = ThrowIfNull(ModLoader.GetTable(tableName));
+        
+        // Prepare line
+        string newline = $"{id};{Object};{GetEnumMemberValue(Target)};{Range};{KD};{MP};{Reserv};{Duration};{AOE_Lenght};{AOE_Width};{(is_movement ? "1" : "0")};{Pattern};{GetEnumMemberValue(Validators)};{Class};{(Bonus_Range ? "1" : "0")};{Starcast};{GetEnumMemberValue(Branch)};{(is_knockback ? "1" : "0")};{(Crime ? "1" : "")};{GetEnumMemberValue(metacategory)};{FMB};{AP};{(Attack ? "1" : "")};{(Stance ? "1" : "")};{(Charge ? "1" : "")};{(Maneuver ? "1" : "")};{(Spell ? "1" : "")};";
+        
+        // Find Hook
+        string hookStr = "// " + GetEnumMemberValue(hook);
+        (int ind, string? foundLine) = table.Enumerate().FirstOrDefault(x => x.Item2.Contains(hookStr));
+        
+        // Add line to table
+        if (foundLine != null)
+        {
+            table.Insert(ind + 1, newline);
+            ModLoader.SetTable(table, tableName);
+            Log.Information($"Injected Skill Stat {id} into {tableName} under {hook}");
+        }
+        else
+        {
+            Log.Error($"Cannot find Hook {hook} in table {tableName}");
+            throw new Exception($"Hook {hook} not found in table {tableName}");
+        }
+    }
+}
\ No newline at end of file
diff --git a/ModUtils/TableUtils/SurfaceSpawn.cs b/ModUtils/TableUtils/SurfaceSpawn.cs
new file mode 100644
index 0000000..02b4904
--- /dev/null
+++ b/ModUtils/TableUtils/SurfaceSpawn.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Runtime.Serialization;
+using Serilog;
+
+namespace ModShardLauncher;
+
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+[SuppressMessage("ReSharper", "IdentifierTypo")]
+public partial class Msl
+{
+    public enum SurfaceSpawnSlot
+    {
+        Hostile,
+        Neutral
+    }
+    
+    public enum SurfaceSpawnTier
+    {
+        [EnumMember(Value = "1")]
+        Tier1,
+        [EnumMember(Value = "2")]
+        Tier2,
+        [EnumMember(Value = "3")]
+        Tier3,
+        [EnumMember(Value = "4")]
+        Tier4,
+        [EnumMember(Value = "5")]
+        Tier5
+    }
+
+    // Bitmask enum, use like this: `SurfaceSpawnBiome Biome = SurfaceSpawnBiome.Forest | SurfaceSpawnBiome.Steppe` to have multiple choices 
+    [Flags]
+    public enum SurfaceSpawnBiome
+    {
+        Any = 1,
+        Forest = 2,
+        Pineforest = 4,
+        Field = 8,
+        Pinefield = 16,
+        Steppe = 32
+    }
+
+    public enum SurfaceSpawnFaction
+    {
+        Brigand,
+        Beast,       
+        // Anything below is not confirmed, just assuming it would work
+        Undead,
+        Vampire,
+        GrandMagistrate,
+        RottenWillow,
+        Mercenary,
+        Neutral
+    }
+    
+    public static void InjectTableSurfaceSpawn(
+        SurfaceSpawnSlot Slot,
+        // SurfaceSpawnTier Tier,
+        HashSet<SurfaceSpawnTier> Tier,
+        SurfaceSpawnBiome Biome,
+        SurfaceSpawnFaction Faction,
+        byte Spawn_Chance,
+        string Enemy1,
+        string? Enemy2 = null,
+        string? Enemy3 = null,
+        string? Enemy4 = null,
+        string? Enemy5 = null,
+        string? Enemy6 = null
+        )
+    {
+        // Table filename
+        const string tableName = "gml_GlobalScript_table_surface_spawn";
+        
+        // Load table if it exists
+        List<string> table = ThrowIfNull(ModLoader.GetTable(tableName));
+        
+        // Parse tier
+        string tierStr = "";
+        foreach (SurfaceSpawnTier tier in Tier)
+            tierStr += $"{GetEnumMemberValue(tier)}, ";
+        tierStr = tierStr.TrimEnd(',', ' ');
+
+        // Prepare line
+        string newline = $"{Slot};{tierStr};{Biome};{Faction};{Spawn_Chance};{Enemy1};{Enemy2};{Enemy3};{Enemy4};{Enemy5};{Enemy6};";
+        
+        // Add line to table
+        table.Add(newline);
+        ModLoader.SetTable(table, tableName);
+        Log.Information($"Injected a Spawn into table {tableName}");
+    }
+}
\ No newline at end of file
diff --git a/ModUtils/TableUtils/TableArmor.cs b/ModUtils/TableUtils/TableArmor.cs
index 9e45066..c36ab27 100644
--- a/ModUtils/TableUtils/TableArmor.cs
+++ b/ModUtils/TableUtils/TableArmor.cs
@@ -11,7 +11,21 @@ namespace ModShardLauncher;
 [SuppressMessage("ReSharper", "IdentifierTypo")]
 public partial class Msl
 {
-    public enum ArmorMetaGroup
+    public enum ArmorTier
+    {
+        [EnumMember(Value = "1")]
+        Tier1,
+        [EnumMember(Value = "2")]
+        Tier2,
+        [EnumMember(Value = "3")]
+        Tier3,
+        [EnumMember(Value = "4")]
+        Tier4,
+        [EnumMember(Value = "5")]
+        Tier5
+    }
+    
+    public enum ArmorHook
     {
         SHIELDS,
         HELMETS,
@@ -25,7 +39,7 @@ public enum ArmorMetaGroup
     }
     public enum ArmorSlot
     {
-        W,
+        shield,
         Head,
         Chest,
         Arms,
@@ -46,8 +60,8 @@ public enum ArmorClass
     public enum ArmorRarity
     {
         Common,
-        Unique,
-        Legendary
+        Unique
+        // Legendary // seemingly removed with RtR
     }
     
     public enum ArmorMaterial
@@ -55,141 +69,119 @@ public enum ArmorMaterial
         wood,
         leather,
         metal,
-        cloth
+        cloth,
+        silver,
+        gold,
+        gem
     }
     
     public enum ArmorTags
     {
-        [EnumMember(Value = "aldor common")]
-        aldorcommon,
-        [EnumMember(Value = "aldor uncommon")]
-        aldoruncommon,
-        [EnumMember(Value = "aldor rare")]
-        aldorrare,
-        [EnumMember(Value = "aldor magic")]
-        aldormagic,
-        [EnumMember(Value = "fjall common")]
-        fjallcommon,
-        [EnumMember(Value = "fjall uncommon")]
-        fjaluncommon,
-        [EnumMember(Value = "elven common")]
-        elvencommon,
-        [EnumMember(Value = "elven uncommon")]
-        elvenuncommon,
-        [EnumMember(Value = "elven rare")]
-        elvenrare,
-        [EnumMember(Value = "skadia common")]
-        skadiacommon,
-        [EnumMember(Value = "skadia uncommon")]
-        skadiauncommon,
-        [EnumMember(Value = "nistra common")]
-        nistracommon,
-        [EnumMember(Value = "foreign common")]
-        foreigncommon,
-        [EnumMember(Value = "brynn common")]
-        bryncommon,
-        [EnumMember(Value = "norse common")]
-        norsecommon,
-        [EnumMember(Value = "aldwynn uncommon")]
-        aldwynnuncommon,
-        [EnumMember(Value = "maen uncommon")]
-        maenuncommon,
+        aldor,
+        fjall,
+        elven,
         special,
+        unique,
+        skadia,
+        nistra,
+        WIP,
+        magic,
         [EnumMember(Value = "special exc")]
         specialexc
     }
     public static void InjectTableArmor(
-        ArmorMetaGroup metaGroup,
+        ArmorHook hook,
         string name,
-        int LVL,
+        ArmorTier Tier,
         string id,
         ArmorSlot Slot,
         ArmorClass Class,
         ArmorRarity rarity,
         ArmorMaterial Mat,
         ArmorTags tags,
+        ushort MaxDuration,
+        int Price, // could be nullable ? Only shackles have no price 
+        float Markup = 1.0f,
+        byte? DEF = null,
+        byte? PRR = null,
+        byte? Block_Power = null,
+        short? Block_Recovery = null,
+        short? EVS = null,
+        byte? Crit_Avoid = null,
+        short? FMB = null,
+        short? Hit_Chance = null,
+        short? Weapon_Damage = null,
+        short? Armor_Piercing = null,
+        short? Armor_Damage = null,
+        short? CRT = null,
+        short? CRTD = null,
+        short? CTA = null,
+        short? Damage_Received = null,
+        short? Fortitude = null,
+        short? MP = null,
+        short? MP_Restoration = null,
+        short? Skills_Energy_Cost = null,
+        short? Spells_Energy_Cost = null,
+        short? Magic_Power = null,
+        short? Miscast_Chance = null,
+        short? Miracle_Chance = null,
+        short? Miracle_Power = null,
+        short? Cooldown_Reduction = null,
+        short? VSN = null,
+        short? max_hp = null,
+        short? Health_Restoration = null,
+        short? Healing_Received = null,
+        short? Lifesteal = null,
+        short? Manasteal = null,
+        short? Bonus_Range = null,
+        short? Received_XP = null,
+        short? Damage_Returned = null,
+        short? Bleeding_Resistance = null,
+        short? Knockback_Resistance = null,
+        short? Stun_Resistance = null,
+        short? Pain_Resistance = null,
+        short? Fatigue_Gain = null,
+        short? Physical_Resistance = null,
+        short? Nature_Resistance = null,
+        short? Magic_Resistance = null,
+        short? Slashing_Resistance = null,
+        short? Piercing_Resistance = null,
+        short? Blunt_Resistance = null,
+        short? Rending_Resistance = null,
+        short? Fire_Resistance = null,
+        short? Shock_Resistance = null,
+        short? Poison_Resistance = null,
+        short? Caustic_Resistance = null,
+        short? Frost_Resistance = null,
+        short? Arcane_Resistance = null,
+        short? Unholy_Resistance = null,
+        short? Sacred_Resistance = null,
+        short? Psionic_Resistance = null,
+        short? Pyromantic_Power = null,
+        short? Geomantic_Power = null,
+        short? Venomantic_Power = null,
+        short? Electromantic_Power = null,
+        short? Cryomantic_Power = null,
+        short? Arcanistic_Power = null,
+        short? Astromantic_Power = null,
+        short? Psimantic_Power = null,
+        bool fireproof = false,
         bool IsOpen = false,
-        bool NoDrop = false,
-        int? Price = null,
-        int? MaxDuration = null,
-        int? DEF = null,
-        int? PRR = null,
-        int? Block_Power = null,
-        int? Block_Recovery = null,
-        int? EVS = null,
-        int? VSN = null,
-        int? FMB = null,
-        int? MP = null,
-        int? MP_Restoration = null,
-        int? Skills_Energy_Cost = null,
-        int? Spells_Energy_Cost = null,
-        int? Magic_Power = null,
-        int? Backfire_Damage = null,
-        int? Miscast_Chance = null,
-        int? Miracle_Chance = null,
-        int? Miracle_Power = null,
-        int? Damage_Received = null,
-        int? Cooldown_Reduction = null,
-        int? Hit_Chance = null,
-        int? CRT = null,
-        int? CRTD = null,
-        int? CTA = null,
-        int? max_hp = null,
-        int? Health_Restoration = null,
-        int? Healing_Received = null,
-        int? Lifesteal = null,
-        int? Manasteal = null,
-        int? STL = null,
-        int? Noise_Produced = null,
-        int? Fortitude = null,
-        int? Savvy = null,
-        int? Damage_Returned = null,
-        int? Received_XP = null,
-        int? Knockback_Resistance = null,
-        int? Bleeding_Resistance = null,
-        int? Stun_Resistance = null,
-        int? Pain_Resistance = null,
-        int? Fatigue_Gain = null,
-        int? Pyromantic_Power = null,
-        int? Geomantic_Power = null,
-        int? Venomantic_Power = null,
-        int? Electromantic_Power = null,
-        int? Cryomantic_Power = null,
-        int? Arcanistic_Power = null,
-        int? Astromantic_Power = null,
-        int? Psimantic_Power = null,
-        int? Chronomantic_Power = null,
-        int? Physical_Resistance = null,
-        int? Nature_Resistance = null,
-        int? Magic_Resistance = null,
-        int? Slashing_Resistance = null,
-        int? Piercing_Resistance = null,
-        int? Blunt_Resistance = null,
-        int? Rending_Resistance = null,
-        int? Fire_Resistance = null,
-        int? Shock_Resistance = null,
-        int? Poison_Resistance = null,
-        int? Caustic_Resistance = null,
-        int? Frost_Resistance = null,
-        int? Arcane_Resistance = null,
-        int? Unholy_Resistance = null,
-        int? Sacred_Resistance = null,
-        int? Psionic_Resistance = null,
-        int? Received_Experience = null,
-        int? fragment_cloth01 = null,
-        int? fragment_cloth02 = null,
-        int? fragment_cloth03 = null,
-        int? fragment_cloth04 = null,
-        int? fragment_leather01 = null,
-        int? fragment_leather02 = null,
-        int? fragment_leather03 = null,
-        int? fragment_leather04 = null,
-        int? fragment_metal01 = null,
-        int? fragment_metal02 = null,
-        int? fragment_metal03 = null,
-        int? fragment_metal04 = null,
-        int? fragment_gold = null,
-        int? dur_per_frag = null
+        bool NoDrop = false, // type unknown, assuming bool
+        byte? fragment_cloth01 = null,
+        byte? fragment_cloth02 = null,
+        byte? fragment_cloth03 = null,
+        byte? fragment_cloth04 = null,
+        byte? fragment_leather01 = null,
+        byte? fragment_leather02 = null,
+        byte? fragment_leather03 = null,
+        byte? fragment_leather04 = null,
+        byte? fragment_metal01 = null,
+        byte? fragment_metal02 = null,
+        byte? fragment_metal03 = null,
+        byte? fragment_metal04 = null,
+        byte? fragment_gold = null,
+        short? dur_per_frag = null
         )
     {
         // Table filename
@@ -199,24 +191,29 @@ public static void InjectTableArmor(
         List<string> table = ThrowIfNull(ModLoader.GetTable(tableName));
         
         // Prepare line
-        string newline = $"{name};{LVL};{id};{GetEnumMemberValue(Slot)};{GetEnumMemberValue(Class)};{GetEnumMemberValue(rarity)};{GetEnumMemberValue(Mat)};{Price};{MaxDuration};{DEF};;{PRR};{Block_Power};{Block_Recovery};{EVS};{VSN};{FMB};{MP};{MP_Restoration};{Skills_Energy_Cost};{Spells_Energy_Cost};{Magic_Power};{Backfire_Damage};{Miscast_Chance};{Miracle_Chance};{Miracle_Power};{Damage_Received};{Cooldown_Reduction};{Hit_Chance};{CRT};{CRTD};{CTA};{max_hp};{Health_Restoration};{Healing_Received};{Lifesteal};{Manasteal};{STL};{Noise_Produced};{Fortitude};{Savvy};{Damage_Returned};{Received_XP};;{Knockback_Resistance};{Bleeding_Resistance};{Stun_Resistance};{Pain_Resistance};{Fatigue_Gain};;{Pyromantic_Power};{Geomantic_Power};{Venomantic_Power};{Electromantic_Power};{Cryomantic_Power};{Arcanistic_Power};{Astromantic_Power};{Psimantic_Power};{Chronomantic_Power};;{Physical_Resistance};{Nature_Resistance};{Magic_Resistance};{Slashing_Resistance};{Piercing_Resistance};{Blunt_Resistance};{Rending_Resistance};{Fire_Resistance};{Shock_Resistance};{Poison_Resistance};{Caustic_Resistance};{Frost_Resistance};{Arcane_Resistance};{Unholy_Resistance};{Sacred_Resistance};{Psionic_Resistance};{Received_Experience};{GetEnumMemberValue(tags)};{(IsOpen ? "1" : "")};{(NoDrop ? "1" : "")};{fragment_cloth01};{fragment_cloth02};{fragment_cloth03};{fragment_cloth04};{fragment_leather01};{fragment_leather02};{fragment_leather03};{fragment_leather04};{fragment_metal01};{fragment_metal02};{fragment_metal03};{fragment_metal04};{fragment_gold};{dur_per_frag};";
+        string newline = $"{name};{GetEnumMemberValue(Tier)};{id};{Slot};{Class};{rarity};{Mat};{Price};{Markup};{MaxDuration};{DEF};;{PRR};{Block_Power};{Block_Recovery};{EVS};{Crit_Avoid};{FMB};{Hit_Chance};{Weapon_Damage};{Armor_Piercing};{Armor_Damage};{CRT};{CRTD};{CTA};{Damage_Received};{Fortitude};;{MP};{MP_Restoration};{Skills_Energy_Cost};{Spells_Energy_Cost};{Magic_Power};{Miscast_Chance};{Miracle_Chance};{Miracle_Power};{Cooldown_Reduction};;{VSN};{max_hp};{Health_Restoration};{Healing_Received};{Lifesteal};{Manasteal};{Bonus_Range};{Received_XP};{Damage_Returned};;{Bleeding_Resistance};{Knockback_Resistance};{Stun_Resistance};{Pain_Resistance};{Fatigue_Gain};;{Physical_Resistance};{Nature_Resistance};{Magic_Resistance};;{Slashing_Resistance};{Piercing_Resistance};{Blunt_Resistance};{Rending_Resistance};{Fire_Resistance};{Shock_Resistance};{Poison_Resistance};{Caustic_Resistance};{Frost_Resistance};{Arcane_Resistance};{Unholy_Resistance};{Sacred_Resistance};{Psionic_Resistance};;{Pyromantic_Power};{Geomantic_Power};{Venomantic_Power};{Electromantic_Power};{Cryomantic_Power};{Arcanistic_Power};{Astromantic_Power};{Psimantic_Power};;{GetEnumMemberValue(tags)};{(fireproof ? "1" : "")};{(IsOpen ? "1" : "")};{(NoDrop ? "1" : "")};{fragment_cloth01};{fragment_cloth02};{fragment_cloth03};{fragment_cloth04};{fragment_leather01};{fragment_leather02};{fragment_leather03};{fragment_leather04};{fragment_metal01};{fragment_metal02};{fragment_metal03};{fragment_metal04};{fragment_gold};{dur_per_frag};";
         
         // Find Meta Category in table
-        string metaGroupStr = "// " + GetEnumMemberValue(metaGroup);
-        (int ind, string? foundLine) = table.Enumerate().FirstOrDefault(x => x.Item2.Contains(metaGroupStr));
+        string hookStr = "";
+        
+        if (hook == ArmorHook.CHESTPIECES)
+            hookStr = "// " + GetEnumMemberValue(hook); // Necessary workaround for chestpieces as the devs messed up
+        else
+            hookStr = "[ " + GetEnumMemberValue(hook) + " ]";
+        
+        (int ind, string? foundLine) = table.Enumerate().FirstOrDefault(x => x.Item2.Contains(hookStr));
         
         // Add line to table
         if (foundLine != null)
         {
             table.Insert(ind + 1, newline);
             ModLoader.SetTable(table, tableName);
-            Log.Information($"Injected Armor {id} into Meta Group {metaGroup}");
+            Log.Information($"Injected Armor {id} into table {tableName} under {hook}");
         }
         else
         {
-            Log.Error($"Cannot find Meta Group {metaGroup} in {tableName} table");
-            throw new Exception($"Cannot find Meta Group {metaGroup} in {tableName} table");
+            Log.Error($"Cannot find hook {hook} in table {tableName}");
+            throw new Exception($"Cannot find hook {hook} in table {tableName}");
         }
-        
     }
 }
\ No newline at end of file
diff --git a/ModUtils/TableUtils/TableUtils.cs b/ModUtils/TableUtils/TableUtils.cs
index 99b55f5..06059e9 100644
--- a/ModUtils/TableUtils/TableUtils.cs
+++ b/ModUtils/TableUtils/TableUtils.cs
@@ -17,10 +17,9 @@ public partial class Msl
                 .GetCustomAttribute<EnumMemberAttribute>(false)?
                 .Value ?? value.ToString();
         }
-        public static void InjectTableAnimalsAI()
-        {
-            string table = "gml_GlobalScript_table_animals_ai";
-            throw new NotImplementedException();
-        }
+        
+        // Tables left to do :
+        // - ai
+        // - supply / demand if necessary ?
     }
 }
diff --git a/ModUtils/TableUtils/TableWeapons.cs b/ModUtils/TableUtils/TableWeapons.cs
index 5e0ffaf..17eeba7 100644
--- a/ModUtils/TableUtils/TableWeapons.cs
+++ b/ModUtils/TableUtils/TableWeapons.cs
@@ -11,48 +11,18 @@ namespace ModShardLauncher;
 [SuppressMessage("ReSharper", "IdentifierTypo")]
 public partial class Msl
 {
-    /// <summary>
-    /// <para>Enum used in Weapons table. </para>
-    /// Defines the group to insert the skill in.
-    /// </summary>
-    public enum WeaponsMetaGroup
+    public enum WeaponsTier
     {
-        [EnumMember(Value = "SWORDS - BLADES")]
-        BLADES,
-        [EnumMember(Value = "SWORDS - CLEAVERS")]
-        CLEAVERS,
-        [EnumMember(Value = "SWORDS - SABERS")]
-        SABERS,
-        [EnumMember(Value = "SWORDS - ORCISH")]
-        ORCISH,
-        [EnumMember(Value = "SWORDS - LEGENDARY")]
-        SWORDLEGENDARY,
-        HATCHETS,
-        AXES,
-        MACES,
-        HAMMERS,
-        FLAILS,
-        DAGGERS,
-        [EnumMember(Value = "2H SWORDS")]
-        TWOHANDEDSWORDS,
-        [EnumMember(Value = "BASTARDS")]
-        BASTARDSWORDS,
-        SPEARS,
-        HALBERDS,
-        FORKS,
-        POLEAXES,
-        GLAIVES,
-        LONGAXES,
-        POLEMACES,
-        [EnumMember(Value = "HAMMERS & CLUBS")]
-        HAMMERSANDCLUBS,
-        [EnumMember(Value = "2H FLAILS")]
-        TWOHANDEDFLAILS,
-        BOWS,
-        LONGBOWS,
-        CROSSBOWS,
-        STAVES,
-        TOOLS
+        [EnumMember(Value = "1")]
+        Tier1,
+        [EnumMember(Value = "2")]
+        Tier2,
+        [EnumMember(Value = "3")]
+        Tier3,
+        [EnumMember(Value = "4")]
+        Tier4,
+        [EnumMember(Value = "5")]
+        Tier5
     }
     
     /// <summary>
@@ -74,11 +44,11 @@ public enum WeaponsSlot
         twohandedmace,
         bow,
         crossbow,
+        sling,
         [EnumMember(Value = "2hStaff")]
         twohandedstaff,
         chain,
         lute
-        
     }
 
     /// <summary>
@@ -88,8 +58,8 @@ public enum WeaponsSlot
     public enum WeaponsRarity
     {
         Common,
-        Unique,
-        Legendary
+        Unique
+        // Legendary // Doesn't seem to be used post-RtR 
     }
 
     /// <summary>
@@ -99,7 +69,8 @@ public enum WeaponsRarity
     public enum WeaponsMaterial
     {
         wood,
-        metal
+        metal,
+        leather
     }
 
     /// <summary>
@@ -108,119 +79,104 @@ public enum WeaponsMaterial
     /// </summary>
     public enum WeaponsTags
     {
+        // SPECIAL
+        unique,
+        magic,
         special,
         [EnumMember(Value = "special exc")]
         specialexc,
+        WIP,
+        
+        // ALDOR
+        aldor,
         [EnumMember(Value = "aldor common")]
         aldorcommon,
         [EnumMember(Value = "aldor uncommon")]
         aldoruncommon,
         [EnumMember(Value = "aldor rare")]
         aldorrare,
-        [EnumMember(Value = "brynn common")]
-        brynncommon,
-        [EnumMember(Value = "brynn uncommon")]
-        brynnuncommon,
-        [EnumMember(Value = "skadia common")]
-        skadiacommon,
-        [EnumMember(Value = "skadian common")]
-        skadiancommon,
-        [EnumMember(Value = "elven common")]
-        elvencommon,
-        [EnumMember(Value = "woodfolk common")]
-        woodfolkcommon,
-        [EnumMember(Value = "fjall common")]
-        fjallcommon,
-        [EnumMember(Value = "nistra common")]
-        nistracommon,
-        [EnumMember(Value = "orc common")]
-        orccommon,
-        [EnumMember(Value = "aldwynn uncommon")]
-        aldwynnuncommon,
-        [EnumMember(Value = "foreign uncommon")]
-        foreignuncommon,
-        [EnumMember(Value = "maen uncommon")]
-        maenuncommon,
         [EnumMember(Value = "aldor magic")]
-        aldormagic
+        aldormagic,
+        
+        // FOREIGN
+        fjall,
+        elven,
+        skadia,
+        nistra
     }
     
     public static void InjectTableWeapons(
-        WeaponsMetaGroup metaGroup,
+        // Would love to use a hook but devs fucked up the table's categories' names
         string name,
+        WeaponsTier Tier,
         string id,
         WeaponsSlot Slot,
         WeaponsRarity rarity,
         WeaponsMaterial Mat,
         WeaponsTags tags,
-        int MaxDuration,
-        int LVL,
-        int E,
-        int Price,
-        int Rng,
-        int Balance,
-        int? Weapon_Damage = null,
-        int? Armor_Damage = null,
-        int? Armor_Piercing = null,
-        int? Bodypart_Damage = null,
-        int? Slashing_Damage = null,
-        int? Piercing_Damage = null,
-        int? Blunt_Damage = null,
-        int? Rending_Damage = null,
-        int? Fire_Damage = null,
-        int? Shock_Damage = null,
-        int? Poison_Damage = null,
-        int? Caustic_Damage = null,
-        int? Frost_Damage = null,
-        int? Arcane_Damage = null,
-        int? Unholy_Damage = null,
-        int? Sacred_Damage = null,
-        int? Psionic_Damage = null,
-        int? Hit_Chance = null,
-        int? CRT = null,
-        int? CRTD = null,
-        int? PRR = null,
-        int? Block_Power = null,
-        int? CTA = null,
-        int? FMB = null,
-        int? EVS = null,
-        int? Bleeding_Chance = null,
-        int? Daze_Chance = null,
-        int? Stun_Chance = null,
-        int? Knockback_Chance = null,
-        int? Immob_Chance = null,
-        int? Stagger_Chance = null,
-        int? MP = null,
-        int? MP_Restoration = null,
-        int? Cooldown_Reduction = null,
-        int? Skills_Energy_Cost = null,
-        int? Spells_Energy_Cost = null,
-        int? Magic_Power = null,
-        int? Miscast_Chance = null,
-        int? Miracle_Chance = null,
-        int? Miracle_Power = null,
-        int? Backfire_Damage = null,
-        int? Pyromantic_Power = null,
-        int? Geomantic_Power = null,
-        int? Venomantic_Power = null,
-        int? Electroantic_Power = null,
-        int? Cryomantic_Power = null,
-        int? Arcanistic_Power = null,
-        int? Astromantic_Power = null,
-        int? Psimantic_Power = null,
-        int? Chronomantic_Power = null,
-        int? Health_Restoration = null,
-        int? Lifesteal = null,
-        int? Manasteal = null,
-        int? Bonus_Range = null,
-        int? Range_Modifier = null,
-        int? Damage_Received = null,
-        int? Damage_Returned = null,
-        int? Healing_Received = null,
-        int? STL = null,
-        int? Noise_Produced = null,
-        int? Offhand_Efficiency = null,
-        int? Slaying_Chance = null,
+        byte Rng = 1,
+        int? Price = null,
+        byte Markup = 1,
+        short? MaxDuration = null,
+        short? Armor_Piercing = null,
+        short? Armor_Damage = null,
+        short? Bodypart_Damage = null,
+        short? Slashing_Damage = null,
+        short? Piercing_Damage = null,
+        short? Blunt_Damage = null,
+        short? Rending_Damage = null,
+        short? Fire_Damage = null,
+        short? Shock_Damage = null,
+        short? Poison_Damage = null,
+        short? Caustic_Damage = null,
+        short? Frost_Damage = null,
+        short? Arcane_Damage = null,
+        short? Unholy_Damage = null,
+        short? Sacred_Damage = null,
+        short? Psionic_Damage = null,
+        short? FMB = null,
+        short? Hit_Chance = null,
+        short? CRT = null,
+        short? CRTD = null,
+        short? CTA = null,
+        short? PRR = null,
+        short? Block_Power = null,
+        short? Block_Recovery = null,
+        byte? Bleeding_Chance = null,
+        byte? Daze_Chance = null,
+        byte? Stun_Chance = null,
+        byte? Knockback_Chance = null,
+        byte? Immob_Chance = null,
+        byte? Stagger_Chance = null,
+        short? MP = null,
+        short? MP_Restoration = null,
+        short? Cooldown_Reduction = null,
+        short? Skills_Energy_Cost = null,
+        short? Spells_Energy_Cost = null,
+        short? Magic_Power = null,
+        short? Miscast_Chance = null,
+        short? Miracle_Chance = null,
+        short? Miracle_Power = null,
+        short? Bonus_Range = null,
+        short? max_hp = null,
+        short? Health_Restoration = null,
+        short? Healing_Received = null,
+        short? Crit_Avoid = null,
+        short? Fatigue_Gain = null,
+        short? Lifesteal = null,
+        short? Manasteal = null,
+        short? Damage_Received = null,
+        short? Pyromantic_Power = null,
+        short? Geomantic_Power = null,
+        short? Venomantic_Power = null,
+        short? Electroantic_Power = null,
+        short? Cryomantic_Power = null,
+        short? Arcanistic_Power = null,
+        short? Astromantic_Power = null,
+        short? Psimantic_Power = null,
+        short? Balance = null, // Could be byte ?
+        string? upgrade = null,
+        bool fireproof = false,
         bool NoDrop = false
         )
     {
@@ -231,23 +187,11 @@ public static void InjectTableWeapons(
         List<string> table = ThrowIfNull(ModLoader.GetTable(tableName));
         
         // Prepare line
-        string newline = $"{name};{id};{GetEnumMemberValue(Slot)};{GetEnumMemberValue(rarity)};{GetEnumMemberValue(Mat)};{MaxDuration};{LVL};{E};{Price};{Rng};{Weapon_Damage};{Armor_Damage};{Armor_Piercing};{Bodypart_Damage};{Slashing_Damage};{Piercing_Damage};{Blunt_Damage};{Rending_Damage};{Fire_Damage};{Shock_Damage};{Poison_Damage};{Caustic_Damage};{Frost_Damage};{Arcane_Damage};{Unholy_Damage};{Sacred_Damage};{Psionic_Damage};{Hit_Chance};{CRT};{CRTD};{PRR};{Block_Power};{CTA};{FMB};{EVS};{Bleeding_Chance};{Daze_Chance};{Stun_Chance};{Knockback_Chance};{Immob_Chance};{Stagger_Chance};{MP};{MP_Restoration};{Cooldown_Reduction};{Skills_Energy_Cost};{Spells_Energy_Cost};{Magic_Power};{Miscast_Chance};{Miracle_Chance};{Miracle_Power};{Backfire_Damage};{Pyromantic_Power};{Geomantic_Power};{Venomantic_Power};{Electroantic_Power};{Cryomantic_Power};{Arcanistic_Power};{Astromantic_Power};{Psimantic_Power};{Chronomantic_Power};{Health_Restoration};{Lifesteal};{Manasteal};{Bonus_Range};{Range_Modifier};{Damage_Received};{Damage_Returned};{Healing_Received};{STL};{Noise_Produced};{Balance};{Offhand_Efficiency};{Slaying_Chance};{GetEnumMemberValue(tags)};{(NoDrop ? "1" : "")};";
-        
-        // Find Meta Category in table
-        string metaGroupStr = GetEnumMemberValue(metaGroup);
-        (int ind, string? foundLine) = table.Enumerate().FirstOrDefault(x => x.Item2.Contains(metaGroupStr));
+        string newline = $"{name};{GetEnumMemberValue(Tier)};{id};{GetEnumMemberValue(Slot)};{rarity};{Mat};{Price};{Markup};{MaxDuration};{Rng};;{Armor_Piercing};{Armor_Damage};{Bodypart_Damage};;{Slashing_Damage};{Piercing_Damage};{Blunt_Damage};{Rending_Damage};{Fire_Damage};{Shock_Damage};{Poison_Damage};{Caustic_Damage};{Frost_Damage};{Arcane_Damage};{Unholy_Damage};{Sacred_Damage};{Psionic_Damage};;{FMB};{Hit_Chance};{CRT};{CRTD};{CTA};{PRR};{Block_Power};{Block_Recovery};;{Bleeding_Chance};{Daze_Chance};{Stun_Chance};{Knockback_Chance};{Immob_Chance};{Stagger_Chance};;{MP};{MP_Restoration};{Cooldown_Reduction};{Skills_Energy_Cost};{Spells_Energy_Cost};{Magic_Power};{Miscast_Chance};{Miracle_Chance};{Miracle_Power};{Bonus_Range};;{max_hp};{Health_Restoration};{Healing_Received};{Crit_Avoid};{Fatigue_Gain};{Lifesteal};{Manasteal};{Damage_Received};;{Pyromantic_Power};{Geomantic_Power};{Venomantic_Power};{Electroantic_Power};{Cryomantic_Power};{Arcanistic_Power};{Astromantic_Power};{Psimantic_Power};;{Balance};{GetEnumMemberValue(tags)};{upgrade};{(fireproof ? 1 : "")};{(NoDrop ? 1 : "")};";
         
         // Add line to table
-        if (foundLine != null)
-        {
-            table.Insert(ind + 1, newline);
-            ModLoader.SetTable(table, tableName);
-            Log.Information($"Injected Skill Stat {id} into Meta Group {metaGroup}");
-        }
-        else
-        {
-            Log.Error($"Cannot find Meta Group {metaGroup} in Skills Stat table");
-            throw new Exception("Meta Group not found in Skills Stat table");
-        }
+        table.Add(newline);
+        ModLoader.SetTable(table, tableName);
+        Log.Information($"Injected Weapon {id} into table {tableName}");
     }
 }
\ No newline at end of file
diff --git a/Resources/Codes/CodeResources.Designer.cs b/Resources/Codes/CodeResources.Designer.cs
index 8f65b7f..e2c9372 100644
--- a/Resources/Codes/CodeResources.Designer.cs
+++ b/Resources/Codes/CodeResources.Designer.cs
@@ -83,9 +83,9 @@ internal static byte[] give {
         /// <summary>
         ///   查找 System.Byte[] 类型的本地化资源。
         /// </summary>
-        internal static byte[] print {
+        internal static byte[] msl_print {
             get {
-                object obj = ResourceManager.GetObject("print", resourceCulture);
+                object obj = ResourceManager.GetObject("msl_print", resourceCulture);
                 return ((byte[])(obj));
             }
         }
diff --git a/Resources/Codes/CodeResources.resx b/Resources/Codes/CodeResources.resx
index 42f5e75..501e387 100644
--- a/Resources/Codes/CodeResources.resx
+++ b/Resources/Codes/CodeResources.resx
@@ -124,8 +124,8 @@
   <data name="give" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>give.gml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="print" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>print.gml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="msl_print" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>msl_print.gml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="ScriptEngine_create" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>ScriptEngine_create.gml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
diff --git a/Resources/Codes/print.gml b/Resources/Codes/msl_print.gml
similarity index 50%
rename from Resources/Codes/print.gml
rename to Resources/Codes/msl_print.gml
index 92d9200..f06617a 100644
--- a/Resources/Codes/print.gml
+++ b/Resources/Codes/msl_print.gml
@@ -1,4 +1,4 @@
-function print(argument0)
+function msl_print(argument0)
 {
     show_message(argument0)
 }
\ No newline at end of file
diff --git a/Resources/ExportRoom.csx b/Resources/ExportRoom.csx
new file mode 100644
index 0000000..4c97ae3
--- /dev/null
+++ b/Resources/ExportRoom.csx
@@ -0,0 +1,425 @@
+// Written by SolventMercury
+
+// Modified by High Flyer
+// Modified by Pong (for single room)
+
+using System;
+using System.IO;
+using System.Text;
+using System.Text.Json;
+using UndertaleModLib.Models;
+using System.Threading;
+using System.Threading.Tasks;
+using UndertaleModLib.Util;
+
+EnsureDataLoaded();
+
+ScriptMessage("Select the Room output directory");
+string outputPath = PromptChooseDirectory("Export to where");
+if (outputPath == null) throw new ScriptException("The room exporter's output path was not set.");
+
+string InputtedText = "r_taverninside3floor";
+
+string roomToExport =  SimpleTextInput("Menu", "Enter the name of Room", InputtedText, true);
+
+ThreadLocal<GlobalDecompileContext> DECOMPILE_CONTEXT = new ThreadLocal<GlobalDecompileContext>(() => new GlobalDecompileContext(Data, false));
+
+int failed = 0;
+
+JsonWriterOptions writerOptions = new JsonWriterOptions { Indented = true };
+
+foreach (UndertaleRoom room in Data.Rooms)
+{
+    if (room != null && room.Name.Content == roomToExport) // Добавлена проверка на имя комнаты
+    {
+        try
+        {
+            WriteRoomToJson(room);
+            break; // Завершаем цикл после нахождения нужной комнаты
+        }
+        catch (Exception e)
+        {
+            throw e;
+        }
+    }
+}
+
+void WriteString(Utf8JsonWriter writer, string propertyName, UndertaleString stringToWrite)
+{
+    if (stringToWrite?.Content == null)
+        writer.WriteNull(propertyName);
+    else
+        writer.WriteString(propertyName, stringToWrite.Content);
+}
+
+
+// TODO: Use custom enum encoders
+
+void WriteRoomToJson(UndertaleRoom room)
+{
+
+    using MemoryStream stream = new MemoryStream();
+    using Utf8JsonWriter writer = new Utf8JsonWriter(stream, writerOptions);
+    writer.WriteStartObject();
+    // Params
+    WriteString(writer, "name", room.Name);
+    WriteString(writer, "caption", room.Caption);
+    writer.WriteNumber("width", room.Width);
+    writer.WriteNumber("height", room.Height);
+    writer.WriteNumber("speed", room.Speed);
+    writer.WriteBoolean("persistent", room.Persistent);
+    writer.WriteNumber("background_color", room.BackgroundColor ^ 0xFF000000); // remove alpha (BG color doesn't have alpha)
+    writer.WriteBoolean("draw_background_color", room.DrawBackgroundColor);
+
+    // GMS 2 Params
+    WriteString(writer, "creation_code_id", room.CreationCodeId?.Name);
+    writer.WriteNumber("flags", Convert.ToInt32(room.Flags));
+    writer.WriteBoolean("world", room.World);
+    writer.WriteNumber("top", room.Top);
+    writer.WriteNumber("left", room.Left);
+    writer.WriteNumber("right", room.Right);
+    writer.WriteNumber("bottom", room.Bottom);
+    writer.WriteNumber("gravity_x", room.GravityX);
+    writer.WriteNumber("gravity_y", room.GravityY);
+    writer.WriteNumber("meters_per_pixel", room.MetersPerPixel);
+
+    // Now the part that sucks
+
+    // Backgrounds
+    writer.WriteStartArray("backgrounds");
+    if (room.Backgrounds != null)
+    {
+        foreach (UndertaleRoom.Background bg in room.Backgrounds)
+        {
+            writer.WriteStartObject();
+            if (bg != null)
+            {
+                writer.WriteBoolean("enabled", bg.Enabled);
+                writer.WriteBoolean("foreground", bg.Foreground);
+                WriteString(writer, "background_definition", bg.BackgroundDefinition?.Name);
+                writer.WriteNumber("x", bg.X);
+                writer.WriteNumber("y", bg.Y);
+                writer.WriteBoolean("tiled_vertically", bg.TiledVertically);
+                writer.WriteBoolean("tiled_horizontally", bg.TiledHorizontally);
+                writer.WriteNumber("speed_x", bg.SpeedX);
+                writer.WriteNumber("speed_y", bg.SpeedY);
+                writer.WriteBoolean("stretch", bg.Stretch);
+            }
+            writer.WriteEndObject();
+        }
+    }
+    writer.WriteEndArray();
+
+    // Views
+    writer.WriteStartArray("views");
+    if (room.Views != null)
+    {
+        foreach (UndertaleRoom.View view in room.Views)
+        {
+            writer.WriteStartObject();
+            if (view != null)
+            {
+                writer.WriteBoolean("enabled", view.Enabled);
+                writer.WriteNumber("view_x", view.ViewX);
+                writer.WriteNumber("view_y", view.ViewY);
+                writer.WriteNumber("view_width", view.ViewWidth);
+                writer.WriteNumber("view_height", view.ViewHeight);
+                writer.WriteNumber("port_x", view.PortX);
+                writer.WriteNumber("port_y", view.PortY);
+                writer.WriteNumber("port_width", view.PortWidth);
+                writer.WriteNumber("port_height", view.PortHeight);
+                writer.WriteNumber("border_x", view.BorderX);
+                writer.WriteNumber("border_y", view.BorderY);
+                writer.WriteNumber("speed_x", view.SpeedX);
+                writer.WriteNumber("speed_y", view.SpeedY);
+                WriteString(writer, "object_id", view.ObjectId?.Name);
+            }
+            writer.WriteEndObject();
+        }
+    }
+    writer.WriteEndArray();
+
+    // GameObjects
+    writer.WriteStartArray("game_objects");
+    if (room.GameObjects != null)
+    {
+        foreach (UndertaleRoom.GameObject go in room.GameObjects)
+        {
+			
+            writer.WriteStartObject();
+            if (go != null)
+            {
+                writer.WriteNumber("x", go.X);
+                writer.WriteNumber("y", go.Y);
+                WriteString(writer, "object_definition", go.ObjectDefinition?.Name);
+                writer.WriteNumber("instance_id", go.InstanceID);
+                WriteString(writer, "creation_code", go.CreationCode?.Name);
+                writer.WriteNumber("scale_x", go.ScaleX);
+                writer.WriteNumber("scale_y", go.ScaleY);
+                writer.WriteNumber("color", go.Color);
+                writer.WriteNumber("rotation", go.Rotation);
+                WriteString(writer, "pre_create_code", go.PreCreateCode?.Name);
+                writer.WriteNumber("image_speed", go.ImageSpeed);
+                writer.WriteNumber("image_index", go.ImageIndex);
+            }
+            writer.WriteEndObject();
+        }
+    }
+    writer.WriteEndArray();
+
+    // Tiles
+    writer.WriteStartArray("tiles");
+    if (room.Tiles != null)
+    {
+        foreach (UndertaleRoom.Tile tile in room.Tiles)
+        {
+            writer.WriteStartObject();
+            if (tile != null)
+            {
+                writer.WriteBoolean("sprite_mode", tile.spriteMode);
+                writer.WriteNumber("x", tile.X);
+                writer.WriteNumber("y", tile.Y);
+                WriteString(writer, "background_definition", tile.BackgroundDefinition?.Name);
+                WriteString(writer, "sprite_definition", tile.SpriteDefinition?.Name);
+                writer.WriteNumber("source_x", tile.SourceX);
+                writer.WriteNumber("source_y", tile.SourceY);
+                writer.WriteNumber("width", tile.Width);
+                writer.WriteNumber("height", tile.Height);
+                writer.WriteNumber("tile_depth", tile.TileDepth);
+                writer.WriteNumber("instance_id", tile.InstanceID);
+                writer.WriteNumber("scale_x", tile.ScaleX);
+                writer.WriteNumber("scale_y", tile.ScaleY);
+                writer.WriteNumber("color", tile.Color);
+            }
+            writer.WriteEndObject();
+        }
+    }
+    writer.WriteEndArray();
+
+    // Layers
+    // This is the part that super sucks
+
+    writer.WriteStartArray("layers");
+    if (room.Layers != null)
+    {
+        foreach (UndertaleRoom.Layer layer in room.Layers)
+        {
+            writer.WriteStartObject();
+            if (layer != null)
+            {
+                //layer params
+                WriteString(writer, "layer_name", layer.LayerName);
+                writer.WriteNumber("layer_id", layer.LayerId);
+                writer.WriteNumber("layer_type", Convert.ToInt32(layer.LayerType));
+                writer.WriteNumber("layer_depth", layer.LayerDepth);
+                writer.WriteNumber("x_offset", layer.XOffset);
+                writer.WriteNumber("y_offset", layer.YOffset);
+                writer.WriteNumber("h_speed", layer.HSpeed);
+                writer.WriteNumber("v_speed", layer.VSpeed);
+                writer.WriteBoolean("is_visible", layer.IsVisible);
+
+                writer.WriteStartObject("layer_data");
+                if (layer.Data != null)
+                {
+                    switch (layer.LayerType)
+                    {
+                        case UndertaleRoom.LayerType.Background:
+                        {
+                            UndertaleRoom.Layer.LayerBackgroundData layerData = (UndertaleRoom.Layer.LayerBackgroundData) layer.Data;
+
+                            writer.WriteBoolean("visible", layerData.Visible);
+                            writer.WriteBoolean("foreground", layerData.Foreground);
+                            WriteString(writer, "sprite", layerData.Sprite?.Name);
+                            writer.WriteBoolean("tiled_horizontally", layerData.TiledHorizontally);
+                            writer.WriteBoolean("tiled_vertically", layerData.TiledVertically);
+                            writer.WriteBoolean("stretch", layerData.Stretch);
+                            writer.WriteNumber("color", layerData.Color);
+                            writer.WriteNumber("first_frame", layerData.FirstFrame);
+                            writer.WriteNumber("animation_speed", layerData.AnimationSpeed);
+                            writer.WriteNumber("animation_speed_type", Convert.ToInt32(layerData.AnimationSpeedType));
+                            break;
+                        }
+                        case UndertaleRoom.LayerType.Instances:
+                        {
+                            UndertaleRoom.Layer.LayerInstancesData layerData = (UndertaleRoom.Layer.LayerInstancesData) layer.Data;
+
+                            writer.WriteStartArray("instances");
+                            if (layerData.Instances != null)
+                            {
+                                foreach (UndertaleRoom.GameObject instance in layerData.Instances)
+                                {
+                                    writer.WriteStartObject();
+                                    if (instance != null)
+                                    {
+                                        writer.WriteNumber("x", instance.X);
+                                        writer.WriteNumber("y", instance.Y);
+                                        WriteString(writer, "object_definition", instance.ObjectDefinition?.Name);
+                                        writer.WriteNumber("instance_id", instance.InstanceID);
+                                        WriteString(writer, "creation_code", instance.CreationCode?.Name);
+                                        writer.WriteNumber("scale_x", instance.ScaleX);
+                                        writer.WriteNumber("scale_y", instance.ScaleY);
+                                        writer.WriteNumber("color", instance.Color);
+                                        writer.WriteNumber("rotation", instance.Rotation);
+                                        WriteString(writer, "pre_create_code", instance.PreCreateCode?.Name);
+                                        writer.WriteNumber("image_speed", instance.ImageSpeed);
+                                        writer.WriteNumber("image_index", instance.ImageIndex);
+                                    }
+                                    writer.WriteEndObject();
+                                }
+                            }
+                            writer.WriteEndArray();
+                            break;
+                        }
+                        // Awful^3
+                        case UndertaleRoom.LayerType.Assets:
+                        {
+                            UndertaleRoom.Layer.LayerAssetsData layerData = (UndertaleRoom.Layer.LayerAssetsData) layer.Data;
+                            // Tiles
+                            writer.WriteStartArray("legacy_tiles");
+                            if (layerData.LegacyTiles != null)
+                            {
+                                foreach (UndertaleRoom.Tile tile in layerData.LegacyTiles)
+                                {
+                                    writer.WriteStartObject();
+                                    if (tile != null)
+                                    {
+                                        writer.WriteBoolean("sprite_mode", tile.spriteMode);
+                                        writer.WriteNumber("x", tile.X);
+                                        writer.WriteNumber("y", tile.Y);
+                                        WriteString(writer, "background_definition", tile.BackgroundDefinition?.Name);
+                                        WriteString(writer, "sprite_definition", tile.SpriteDefinition?.Name);
+                                        writer.WriteNumber("source_x", tile.SourceX);
+                                        writer.WriteNumber("source_y", tile.SourceY);
+                                        writer.WriteNumber("width", tile.Width);
+                                        writer.WriteNumber("height", tile.Height);
+                                        writer.WriteNumber("tile_depth", tile.TileDepth);
+                                        writer.WriteNumber("instance_id", tile.InstanceID);
+                                        writer.WriteNumber("scale_x", tile.ScaleX);
+                                        writer.WriteNumber("scale_y", tile.ScaleY);
+                                        writer.WriteNumber("color", tile.Color);
+                                    }
+                                    writer.WriteEndObject();
+                                }
+                            }
+                            writer.WriteEndArray();
+
+                            // Sprites
+                            writer.WriteStartArray("sprites");
+                            if (layerData.Sprites != null)
+                            {
+                                foreach (UndertaleRoom.SpriteInstance sprite in layerData.Sprites)
+                                {
+                                    writer.WriteStartObject();
+                                    if (sprite != null)
+                                    {
+                                        WriteString(writer, "name", sprite.Name);
+                                        WriteString(writer, "sprite", sprite.Sprite?.Name);
+                                        writer.WriteNumber("x", sprite.X);
+                                        writer.WriteNumber("y", sprite.Y);
+                                        writer.WriteNumber("scale_x", sprite.ScaleX);
+                                        writer.WriteNumber("scale_y", sprite.ScaleY);
+                                        writer.WriteNumber("color", sprite.Color);
+                                        writer.WriteNumber("animation_speed", sprite.AnimationSpeed);
+                                        writer.WriteNumber("animation_speed_type", Convert.ToInt32(sprite.AnimationSpeedType));
+                                        writer.WriteNumber("frame_index", sprite.FrameIndex);
+                                        writer.WriteNumber("rotation", sprite.Rotation);
+                                    }
+                                    writer.WriteEndObject();
+                                }
+                            }
+                            writer.WriteEndArray();
+
+                            // Sequences
+                            writer.WriteStartArray("sequences");
+                            if (layerData.Sequences != null)
+                            {
+                                foreach (UndertaleRoom.SequenceInstance sequence in layerData.Sequences)
+                                {
+                                    writer.WriteStartObject();
+                                    if (sequence != null)
+                                    {
+                                        WriteString(writer, "name", sequence.Name);
+                                        WriteString(writer, "sequence", sequence.Sequence?.Name);
+                                        writer.WriteNumber("x", sequence.X);
+                                        writer.WriteNumber("y", sequence.Y);
+                                        writer.WriteNumber("scale_x", sequence.ScaleX);
+                                        writer.WriteNumber("scale_y", sequence.ScaleY);
+                                        writer.WriteNumber("color", sequence.Color);
+                                        writer.WriteNumber("animation_speed", sequence.AnimationSpeed);
+                                        writer.WriteNumber("animation_speed_type", Convert.ToInt32(sequence.AnimationSpeedType));
+                                        writer.WriteNumber("frame_index", sequence.FrameIndex);
+                                        writer.WriteNumber("rotation", sequence.Rotation);
+                                    }
+                                    writer.WriteEndObject();
+                                }
+                            }
+                            writer.WriteEndArray();
+
+                            // NineSlices
+                            writer.WriteStartArray("nine_slices");
+                            if (layerData.NineSlices != null)
+                            {
+                                foreach (UndertaleRoom.SpriteInstance nineSlice in layerData.NineSlices)
+                                {
+                                    writer.WriteStartObject();
+                                    if (nineSlice != null)
+                                    {
+                                        WriteString(writer, "name", nineSlice.Name);
+                                        WriteString(writer, "sprite", nineSlice.Sprite?.Name);
+                                        writer.WriteNumber("x", nineSlice.X);
+                                        writer.WriteNumber("y", nineSlice.Y);
+                                        writer.WriteNumber("scale_x", nineSlice.ScaleX);
+                                        writer.WriteNumber("scale_y", nineSlice.ScaleY);
+                                        writer.WriteNumber("color", nineSlice.Color);
+                                        writer.WriteNumber("animation_speed", nineSlice.AnimationSpeed);
+                                        writer.WriteNumber("animation_speed_type", Convert.ToInt32(nineSlice.AnimationSpeedType));
+                                        writer.WriteNumber("frame_index", nineSlice.FrameIndex);
+                                        writer.WriteNumber("rotation", nineSlice.Rotation);
+                                    }
+                                    writer.WriteEndObject();
+                                }
+                            }
+                            writer.WriteEndArray();
+                            break;
+                        }
+                        case UndertaleRoom.LayerType.Tiles:
+                        {
+                            UndertaleRoom.Layer.LayerTilesData layerData = (UndertaleRoom.Layer.LayerTilesData) layer.Data;
+
+                            WriteString(writer, "background", layerData.Background?.Name);
+
+                            writer.WriteNumber("tiles_x", layerData.TilesX);
+                            writer.WriteNumber("tiles_y", layerData.TilesY);
+
+                            writer.WriteStartArray("tile_data");
+                            if (layerData.TileData != null)
+                            {
+                                foreach (uint[] tile in layerData.TileData)
+                                {
+                                    writer.WriteStartArray();
+                                    foreach (uint tileId in tile)
+                                    {
+                                        writer.WriteStartObject();
+                                        writer.WriteNumber("id", tileId);
+                                        writer.WriteEndObject();
+                                    }
+                                    writer.WriteEndArray();
+                                }
+                            }
+                            writer.WriteEndArray();
+                            break;
+                        }
+                    }
+                }
+                writer.WriteEndObject();
+            }
+            writer.WriteEndObject();
+        }
+    }
+    writer.WriteEndArray();
+
+    writer.WriteEndObject();
+    writer.Flush();
+
+    File.WriteAllBytes(Path.Join(outputPath, room.Name.Content) + ".json", stream.ToArray());
+}
diff --git a/docs/guides/api.en.md b/docs/guides/api.en.md
index 1616ea4..62be89f 100644
--- a/docs/guides/api.en.md
+++ b/docs/guides/api.en.md
@@ -899,6 +899,21 @@
     | :--- | :--- |
     | `UndertaleGameObject` | The gameobject found. |
 
+
+??? example "AddRoomJson `method`"
+    <h3>Summary</h3>
+    Loads a room from a JSON file generated by the `ExportRoom.csx` custom UTMTCE script.
+    <h3>Example</h3>
+    ```c#
+    // Example : Adds a room from a JSON file named 'r_myRoom.json'
+    Msl.AddRoomJson("your_room_as_JSON_string_here")
+    ```
+    <h3>Arguments</h3>
+
+    | **Type** | **Name** | **Description**|
+    | :---: | :---: | :--- |
+    | `String` | `jsonString` | The JSON string to load the room from. |
+
 ---
 
 ## Patching
diff --git a/docs/guides/how-to-play-mod.en.md b/docs/guides/how-to-play-mod.en.md
index f32cf11..66b8a00 100644
--- a/docs/guides/how-to-play-mod.en.md
+++ b/docs/guides/how-to-play-mod.en.md
@@ -37,7 +37,7 @@ Let's take a quick tour of the UI to better know MSL. </br></br>
 The button on the top left of the window shows the button's name. </br></br>
 The `Anvil` button below that leads to the `Mods` menu. (***^^This is the only menu you will need^^***.) </br></br>
 The `C#` button leads to the `Mod Sources` menu. (*It's used by modders to create their mods*.) </br></br>
-The `Cog` button leads to the `Settings` menu. (*At some point you will be able to configure mod settings there*.) </br></br>
+The `Cog` button leads to the `Settings` menu. (*It's used for some settings you probably won't need*.) </br></br>
 </center>
 
 ---
@@ -46,6 +46,7 @@ The `Cog` button leads to the `Settings` menu. (*At some point you will be able
 
 Now that we've got MSL running, let's install some mods. </br>
 Here's an [example video showing the installation](https://www.youtube.com/watch?v=_J0oJYGi38E&t=13s) of [NeoConsole](https://github.com/Nylux/Stoneshard-NeoConsole/releases). (*enable the subtitles !*) </br> </br>
+Note: It's a bit outdated, but the process is pretty much the same, a new video will be made at some point.
 
 - Close MSL.
 - Download your mod's `.sml` file.
diff --git a/docs/guides/start-modding.en.md b/docs/guides/start-modding.en.md
index c95d2d5..7b4baf3 100644
--- a/docs/guides/start-modding.en.md
+++ b/docs/guides/start-modding.en.md
@@ -104,7 +104,7 @@ namespace MyMod
 ```
 
 1. The `using` directives allow us to use code from ModShardLauncher to write our mod.
-2. This is the base class for your mod. </br> All of your code should be contained withing it.
+2. This is the base class for your mod. </br> All of your code should be contained within it.
 3. This variable contains the name of the author of this mod. </br> Feel free to replace it with yours ! </br> It's visible in MSL's Mod list.
 4. This variable contains your mod's name. </br> Feel free to change it ! </br> It's visible in MSL's Mod list.
 5. This variable contains your mod's description. </br> Feel free to change it ! </br> It's visible in MSL's Mod list.
@@ -262,7 +262,7 @@ Here's an example of that :
 ``` c# title="Chained Methods"
 Msl.LoadGML("gml_GlobalScript_scr_sessionDataInit") // Loading a script from the game's files
 .MatchFrom("global.HP = -1") // Finding the line containing `global.HP = -1`
-.ReplaceBy("global.HP = 50") // Replacing it with `gobal.HP = 50`
+.ReplaceBy("global.HP = 50") // Replacing it with `global.HP = 50`
 .Save() // Saving the file
 ```
 
diff --git a/future_workflow.md b/future_workflow.md
index f1dc72c..0daa65a 100644
--- a/future_workflow.md
+++ b/future_workflow.md
@@ -4,6 +4,5 @@
 - Move required dlls (everything in ModReference + Reference folders) in the folder
 - Archive to msl.zip
 - Test in sandbox environment (no need to install .NET, use latest Stoneshard + a mod you KNOW works)
-- Add to release
-- Add ModShard.dll to release (take yours / find in previous releases of MSL)
+- Add archive to release
 - Publish release
\ No newline at end of file