diff --git a/game_payload/blob/core.o b/game_payload/blob/core.o
index f2621c7..01d27a8 100644
Binary files a/game_payload/blob/core.o and b/game_payload/blob/core.o differ
diff --git a/game_payload/meson.build b/game_payload/meson.build
index 83c5dfc..af18434 100644
--- a/game_payload/meson.build
+++ b/game_payload/meson.build
@@ -15,13 +15,10 @@ sources = [
     'src/msg.c'
 ]
 resources = [
-    'res/hi3/glb/allocations.dat',
-    'res/hi3/glb/entries.dat',
+    'res/hi3/glb.dat',
 
-    'res/hsr/os/allocations.dat',
-    'res/hsr/os/entries.dat',
-    'res/hsr/cn/allocations.dat',
-    'res/hsr/cn/entries.dat'
+    'res/hsr/os.dat',
+    'res/hsr/cn.dat'
 ]
 
 # Generate resource files for ./res
diff --git a/game_payload/res/hi3/glb.dat b/game_payload/res/hi3/glb.dat
new file mode 100644
index 0000000..f7c99be
Binary files /dev/null and b/game_payload/res/hi3/glb.dat differ
diff --git a/game_payload/res/hi3/glb/allocations.dat b/game_payload/res/hi3/glb/allocations.dat
deleted file mode 100644
index b034b8b..0000000
Binary files a/game_payload/res/hi3/glb/allocations.dat and /dev/null differ
diff --git a/game_payload/res/hi3/glb/entries.dat b/game_payload/res/hi3/glb/entries.dat
deleted file mode 100644
index 20d1069..0000000
Binary files a/game_payload/res/hi3/glb/entries.dat and /dev/null differ
diff --git a/game_payload/res/hsr/cn.dat b/game_payload/res/hsr/cn.dat
new file mode 100644
index 0000000..2e46929
Binary files /dev/null and b/game_payload/res/hsr/cn.dat differ
diff --git a/game_payload/res/hsr/cn/allocations.dat b/game_payload/res/hsr/cn/allocations.dat
deleted file mode 100644
index 629676a..0000000
Binary files a/game_payload/res/hsr/cn/allocations.dat and /dev/null differ
diff --git a/game_payload/res/hsr/cn/entries.dat b/game_payload/res/hsr/cn/entries.dat
deleted file mode 100644
index e3b9756..0000000
Binary files a/game_payload/res/hsr/cn/entries.dat and /dev/null differ
diff --git a/game_payload/res/hsr/os.dat b/game_payload/res/hsr/os.dat
new file mode 100644
index 0000000..9d7f667
Binary files /dev/null and b/game_payload/res/hsr/os.dat differ
diff --git a/game_payload/res/hsr/os/allocations.dat b/game_payload/res/hsr/os/allocations.dat
deleted file mode 100644
index aa66635..0000000
Binary files a/game_payload/res/hsr/os/allocations.dat and /dev/null differ
diff --git a/game_payload/res/hsr/os/entries.dat b/game_payload/res/hsr/os/entries.dat
deleted file mode 100644
index aded3a3..0000000
Binary files a/game_payload/res/hsr/os/entries.dat and /dev/null differ
diff --git a/game_payload/src/core.md b/game_payload/src/core.md
index f179977..36a26b5 100644
--- a/game_payload/src/core.md
+++ b/game_payload/src/core.md
@@ -12,3 +12,6 @@
 
 ### 1.1.11
 - Fixed an additional issue introduced in 1.1.9
+
+### branch/native-tables
+- Almost a full rewrite, functionality unchanged