diff --git a/config.json b/config.json
index d96a4f3..14450aa 100644
--- a/config.json
+++ b/config.json
@@ -35,7 +35,7 @@
     {
       "name": "dwForceAttack",
       "module": "client.dll",
-      "pattern": "48 8D 0D ? ? ? ? E9 94 4B B4 FF",
+      "pattern": "48 8D 0D ? ? ? ? E9 64 4B B4 FF",
       "operations": [
         {
           "type": "ripRelative"
@@ -49,7 +49,7 @@
     {
       "name": "dwForceAttack2",
       "module": "client.dll",
-      "pattern": "48 8D 0D ? ? ? ? E9 A4 4B B4 FF",
+      "pattern": "48 8D 0D ? ? ? ? E9 74 4B B4 FF",
       "operations": [
         {
           "type": "ripRelative"
@@ -144,6 +144,16 @@
         }
       ]
     },
+    {
+      "name": "dwGameEntitySystem",
+      "module": "client.dll",
+      "pattern": "48 8B 1D ? ? ? ? 48 89 1D",
+      "operations": [
+        {
+          "type": "ripRelative"
+        }
+      ]
+    },
     {
       "name": "dwGameEntitySystem_getBaseEntity",
       "module": "client.dll",
diff --git a/generated/animationsystem.dll.cs b/generated/animationsystem.dll.cs
index bf520bf..8beb457 100644
--- a/generated/animationsystem.dll.cs
+++ b/generated/animationsystem.dll.cs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.314527500 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 public static class AimMatrixOpFixedSettings_t {
diff --git a/generated/animationsystem.dll.hpp b/generated/animationsystem.dll.hpp
index c571a3f..d149c70 100644
--- a/generated/animationsystem.dll.hpp
+++ b/generated/animationsystem.dll.hpp
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.290426500 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #pragma once
diff --git a/generated/animationsystem.dll.py b/generated/animationsystem.dll.py
index 61e31f3..e8c0652 100644
--- a/generated/animationsystem.dll.py
+++ b/generated/animationsystem.dll.py
@@ -1,6 +1,6 @@
 '''
 Created using https://github.com/a2x/cs2-dumper
-2023-10-20 23:01:49.339664900 UTC
+Thu, 26 Oct 2023 06:38:23 +0000
 '''
 
 class AimMatrixOpFixedSettings_t:
diff --git a/generated/animationsystem.dll.rs b/generated/animationsystem.dll.rs
index 837230e..9fa68dc 100644
--- a/generated/animationsystem.dll.rs
+++ b/generated/animationsystem.dll.rs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.362783300 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #![allow(non_snake_case, non_upper_case_globals)]
diff --git a/generated/client.dll.cs b/generated/client.dll.cs
index 1a8aea3..d1dd445 100644
--- a/generated/client.dll.cs
+++ b/generated/client.dll.cs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:50.727502800 UTC
+ * Thu, 26 Oct 2023 06:38:24 +0000
  */
 
 public static class ActiveModelConfig_t {
diff --git a/generated/client.dll.hpp b/generated/client.dll.hpp
index d82daa7..e86fc86 100644
--- a/generated/client.dll.hpp
+++ b/generated/client.dll.hpp
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:50.685740700 UTC
+ * Thu, 26 Oct 2023 06:38:24 +0000
  */
 
 #pragma once
diff --git a/generated/client.dll.py b/generated/client.dll.py
index 19b86c9..777b274 100644
--- a/generated/client.dll.py
+++ b/generated/client.dll.py
@@ -1,6 +1,6 @@
 '''
 Created using https://github.com/a2x/cs2-dumper
-2023-10-20 23:01:50.770998900 UTC
+Thu, 26 Oct 2023 06:38:24 +0000
 '''
 
 class ActiveModelConfig_t:
diff --git a/generated/client.dll.rs b/generated/client.dll.rs
index 748eed1..abe57d9 100644
--- a/generated/client.dll.rs
+++ b/generated/client.dll.rs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:50.812595400 UTC
+ * Thu, 26 Oct 2023 06:38:24 +0000
  */
 
 #![allow(non_snake_case, non_upper_case_globals)]
diff --git a/generated/engine2.dll.cs b/generated/engine2.dll.cs
index 528fa50..1ed8fea 100644
--- a/generated/engine2.dll.cs
+++ b/generated/engine2.dll.cs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.161341200 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 public static class CEmptyEntityInstance {
diff --git a/generated/engine2.dll.hpp b/generated/engine2.dll.hpp
index 34b8824..78aeb0a 100644
--- a/generated/engine2.dll.hpp
+++ b/generated/engine2.dll.hpp
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.159615800 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #pragma once
diff --git a/generated/engine2.dll.py b/generated/engine2.dll.py
index d6ed3b7..29e03e3 100644
--- a/generated/engine2.dll.py
+++ b/generated/engine2.dll.py
@@ -1,6 +1,6 @@
 '''
 Created using https://github.com/a2x/cs2-dumper
-2023-10-20 23:01:49.163267700 UTC
+Thu, 26 Oct 2023 06:38:23 +0000
 '''
 
 class CEmptyEntityInstance:
diff --git a/generated/engine2.dll.rs b/generated/engine2.dll.rs
index 1a7bcb4..15efba2 100644
--- a/generated/engine2.dll.rs
+++ b/generated/engine2.dll.rs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.164979 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #![allow(non_snake_case, non_upper_case_globals)]
diff --git a/generated/host.dll.cs b/generated/host.dll.cs
index 4f18d87..60cde07 100644
--- a/generated/host.dll.cs
+++ b/generated/host.dll.cs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:50.856722800 UTC
+ * Thu, 26 Oct 2023 06:38:24 +0000
  */
 
 public static class CAnimScriptBase {
diff --git a/generated/host.dll.hpp b/generated/host.dll.hpp
index 7088d4f..b00be03 100644
--- a/generated/host.dll.hpp
+++ b/generated/host.dll.hpp
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:50.856379 UTC
+ * Thu, 26 Oct 2023 06:38:24 +0000
  */
 
 #pragma once
diff --git a/generated/host.dll.py b/generated/host.dll.py
index 77de252..4149f3d 100644
--- a/generated/host.dll.py
+++ b/generated/host.dll.py
@@ -1,6 +1,6 @@
 '''
 Created using https://github.com/a2x/cs2-dumper
-2023-10-20 23:01:50.857215800 UTC
+Thu, 26 Oct 2023 06:38:24 +0000
 '''
 
 class CAnimScriptBase:
diff --git a/generated/host.dll.rs b/generated/host.dll.rs
index b08d99b..7260eaa 100644
--- a/generated/host.dll.rs
+++ b/generated/host.dll.rs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:50.857574 UTC
+ * Thu, 26 Oct 2023 06:38:24 +0000
  */
 
 #![allow(non_snake_case, non_upper_case_globals)]
diff --git a/generated/interfaces.cs b/generated/interfaces.cs
index adf78a7..43ba917 100644
--- a/generated/interfaces.cs
+++ b/generated/interfaces.cs
@@ -1,25 +1,25 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:51.115098700 UTC
+ * Thu, 26 Oct 2023 06:38:24 +0000
  */
 
-public static class AnimationsystemDll { // animationsystem.dll
+public static class animationsystem_dll { // animationsystem.dll
     public const nint AnimationSystemUtils_001 = 0x64670;
     public const nint AnimationSystem_001 = 0x5F1D0;
 }
 
-public static class ClientDll { // client.dll
-    public const nint LegacyGameUI001 = 0x8914A0;
-    public const nint Source2ClientUI001 = 0x8801C0;
-    public const nint Source2ClientPrediction001 = 0x79DB20;
-    public const nint ClientToolsInfo_001 = 0x729A30;
-    public const nint Source2Client002 = 0x729A50;
-    public const nint GameClientExports001 = 0x729A40;
-    public const nint EmptyWorldService001_Client = 0x48C210;
-    public const nint Source2ClientConfig001 = 0x473220;
+public static class client_dll { // client.dll
+    public const nint LegacyGameUI001 = 0x892500;
+    public const nint Source2ClientUI001 = 0x881220;
+    public const nint Source2ClientPrediction001 = 0x79EB10;
+    public const nint ClientToolsInfo_001 = 0x72AA20;
+    public const nint Source2Client002 = 0x72AA40;
+    public const nint GameClientExports001 = 0x72AA30;
+    public const nint EmptyWorldService001_Client = 0x48C470;
+    public const nint Source2ClientConfig001 = 0x473480;
 }
 
-public static class Engine2Dll { // engine2.dll
+public static class engine2_dll { // engine2.dll
     public const nint SimpleEngineLoopService_001 = 0x1E2480;
     public const nint ClientServerEngineLoopService_001 = 0x1D8150;
     public const nint KeyValueCache001 = 0x1D4790;
@@ -54,12 +54,12 @@ public static class Engine2Dll { // engine2.dll
     public const nint Source2EngineToClient001 = 0x5A620;
 }
 
-public static class FilesystemStdioDll { // filesystem_stdio.dll
+public static class filesystem_stdio_dll { // filesystem_stdio.dll
     public const nint VAsyncFileSystem2_001 = 0x66D30;
     public const nint VFileSystem017 = 0x66D20;
 }
 
-public static class HostDll { // host.dll
+public static class host_dll { // host.dll
     public const nint Source2Host001 = 0x18E10;
     public const nint SinglePlayerSharedMemory001 = 0x18A90;
     public const nint SaveRestoreDataVersion001 = 0x18A80;
@@ -70,25 +70,25 @@ public static class HostDll { // host.dll
     public const nint DebugDrawQueueManager001 = 0x11710;
 }
 
-public static class ImemanagerDll { // imemanager.dll
+public static class imemanager_dll { // imemanager.dll
     public const nint IMEManager001 = 0xC470;
 }
 
-public static class InputsystemDll { // inputsystem.dll
+public static class inputsystem_dll { // inputsystem.dll
     public const nint InputSystemVersion001 = 0x28D0;
     public const nint InputStackSystemVersion001 = 0x16F0;
 }
 
-public static class LocalizeDll { // localize.dll
+public static class localize_dll { // localize.dll
     public const nint Localize_001 = 0x3830;
 }
 
-public static class MatchmakingDll { // matchmaking.dll
+public static class matchmaking_dll { // matchmaking.dll
     public const nint GameTypes001 = 0x50270;
     public const nint MATCHFRAMEWORK_001 = 0x101030;
 }
 
-public static class Materialsystem2Dll { // materialsystem2.dll
+public static class materialsystem2_dll { // materialsystem2.dll
     public const nint MaterialUtils_001 = 0x4DB90;
     public const nint TextLayout_001 = 0x4A2E0;
     public const nint PostProcessingSystem_001 = 0x42A60;
@@ -96,91 +96,91 @@ public static class Materialsystem2Dll { // materialsystem2.dll
     public const nint VMaterialSystem2_001 = 0x25EC0;
 }
 
-public static class MeshsystemDll { // meshsystem.dll
+public static class meshsystem_dll { // meshsystem.dll
     public const nint MeshSystem001 = 0x7270;
 }
 
-public static class NavsystemDll { // navsystem.dll
+public static class navsystem_dll { // navsystem.dll
     public const nint NavSystem001 = 0x76F0;
 }
 
-public static class NetworksystemDll { // networksystem.dll
+public static class networksystem_dll { // networksystem.dll
     public const nint SerializedEntitiesVersion001 = 0xD1AE0;
     public const nint NetworkSystemVersion001 = 0xBBFA0;
     public const nint NetworkMessagesVersion001 = 0x9C040;
     public const nint FlattenedSerializersVersion001 = 0x7B8A0;
 }
 
-public static class PanoramaDll { // panorama.dll
+public static class panorama_dll { // panorama.dll
     public const nint PanoramaUIEngine001 = 0x57EE0;
 }
 
-public static class PanoramaTextPangoDll { // panorama_text_pango.dll
+public static class panorama_text_pango_dll { // panorama_text_pango.dll
     public const nint PanoramaTextServices001 = 0x4CBD0;
 }
 
-public static class PanoramauiclientDll { // panoramauiclient.dll
+public static class panoramauiclient_dll { // panoramauiclient.dll
     public const nint PanoramaUIClient001 = 0x12780;
 }
 
-public static class ParticlesDll { // particles.dll
+public static class particles_dll { // particles.dll
     public const nint ParticleSystemMgr003 = 0x52D20;
 }
 
-public static class PulseSystemDll { // pulse_system.dll
+public static class pulse_system_dll { // pulse_system.dll
     public const nint IPulseSystem_001 = 0x5B80;
 }
 
-public static class Rendersystemdx11Dll { // rendersystemdx11.dll
+public static class rendersystemdx11_dll { // rendersystemdx11.dll
     public const nint RenderUtils_001 = 0x52FD0;
     public const nint VRenderDeviceMgrBackdoor001 = 0x4A4F0;
     public const nint RenderDeviceMgr001 = 0x4A4E0;
 }
 
-public static class ResourcesystemDll { // resourcesystem.dll
+public static class resourcesystem_dll { // resourcesystem.dll
     public const nint ResourceSystem013 = 0x10650;
 }
 
-public static class ScenefilecacheDll { // scenefilecache.dll
+public static class scenefilecache_dll { // scenefilecache.dll
     public const nint SceneFileCache002 = 0x68E0;
     public const nint ResponseRulesCache001 = 0x3190;
 }
 
-public static class ScenesystemDll { // scenesystem.dll
+public static class scenesystem_dll { // scenesystem.dll
     public const nint SceneUtils_001 = 0x13D030;
     public const nint SceneSystem_002 = 0xCAE10;
     public const nint RenderingPipelines_001 = 0x8EED0;
 }
 
-public static class SchemasystemDll { // schemasystem.dll
+public static class schemasystem_dll { // schemasystem.dll
     public const nint SchemaSystem_001 = 0xA930;
 }
 
-public static class ServerDll { // server.dll
-    public const nint NavGameTest001 = 0xA2CCE0;
-    public const nint ServerToolsInfo_001 = 0x831620;
-    public const nint Source2GameClients001 = 0x831630;
-    public const nint Source2GameEntities001 = 0x831640;
-    public const nint Source2Server001 = 0x831650;
-    public const nint EmptyWorldService001_Server = 0x588470;
-    public const nint Source2ServerConfig001 = 0x568470;
-    public const nint EntitySubclassUtilsV001 = 0x2C8690;
-    public const nint customnavsystem001 = 0x245070;
-    public const nint Source2GameDirector001 = 0x13EFF0;
+public static class server_dll { // server.dll
+    public const nint NavGameTest001 = 0xA2D610;
+    public const nint ServerToolsInfo_001 = 0x831EE0;
+    public const nint Source2GameClients001 = 0x831EF0;
+    public const nint Source2GameEntities001 = 0x831F00;
+    public const nint Source2Server001 = 0x831F10;
+    public const nint EmptyWorldService001_Server = 0x588530;
+    public const nint Source2ServerConfig001 = 0x568530;
+    public const nint EntitySubclassUtilsV001 = 0x2C87D0;
+    public const nint customnavsystem001 = 0x2451B0;
+    public const nint Source2GameDirector001 = 0x13F130;
 }
 
-public static class SoundsystemDll { // soundsystem.dll
+public static class soundsystem_dll { // soundsystem.dll
     public const nint SoundOpSystem001 = 0x1567E0;
     public const nint SoundOpSystemEdit001 = 0x8BBC0;
     public const nint VMixEditTool001 = 0x71740;
     public const nint SoundSystem001 = 0x46540;
 }
 
-public static class SteamaudioDll { // steamaudio.dll
+public static class steamaudio_dll { // steamaudio.dll
     public const nint SteamAudio001 = 0x12EE0;
 }
 
-public static class Steamclient64Dll { // steamclient64.dll
+public static class steamclient64_dll { // steamclient64.dll
     public const nint IVALIDATE001 = 0x833640;
     public const nint CLIENTENGINE_INTERFACE_VERSION005 = 0x82F4C0;
     public const nint SteamClient020 = 0x62CAF0;
@@ -202,39 +202,39 @@ public static class Steamclient64Dll { // steamclient64.dll
     public const nint p2pvoicesingleton002 = 0xD5840;
 }
 
-public static class Tier0Dll { // tier0.dll
+public static class tier0_dll { // tier0.dll
     public const nint VStringTokenSystem001 = 0x18C060;
     public const nint TestScriptMgr001 = 0x13F3C0;
     public const nint VProcessUtils002 = 0x12F540;
     public const nint VEngineCvar007 = 0x61920;
 }
 
-public static class V8SystemDll { // v8system.dll
+public static class v8system_dll { // v8system.dll
     public const nint Source2V8System001 = 0x1670;
 }
 
-public static class ValveAviDll { // valve_avi.dll
+public static class valve_avi_dll { // valve_avi.dll
     public const nint VAvi001 = 0x2F90;
 }
 
-public static class ValveWmfDll { // valve_wmf.dll
+public static class valve_wmf_dll { // valve_wmf.dll
     public const nint VMediaFoundation001 = 0x12D0;
 }
 
-public static class Vphysics2Dll { // vphysics2.dll
-    public const nint VPhysics2_Handle_Interface_001 = 0x5FA60;
-    public const nint VPhysics2_Interface_001 = 0x5B7F0;
+public static class vphysics2_dll { // vphysics2.dll
+    public const nint VPhysics2_Handle_Interface_001 = 0x61120;
+    public const nint VPhysics2_Interface_001 = 0x5C740;
 }
 
-public static class VscriptDll { // vscript.dll
+public static class vscript_dll { // vscript.dll
     public const nint VScriptManager010 = 0x31DA0;
 }
 
-public static class VstdlibS64Dll { // vstdlib_s64.dll
+public static class vstdlib_s64_dll { // vstdlib_s64.dll
     public const nint IVALIDATE001 = 0x24FF0;
     public const nint VEngineCvar002 = 0x5750;
 }
 
-public static class WorldrendererDll { // worldrenderer.dll
+public static class worldrenderer_dll { // worldrenderer.dll
     public const nint WorldRendererMgr001 = 0x21530;
 }
\ No newline at end of file
diff --git a/generated/interfaces.hpp b/generated/interfaces.hpp
index 38f440b..dde8edf 100644
--- a/generated/interfaces.hpp
+++ b/generated/interfaces.hpp
@@ -1,29 +1,29 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:51.113204800 UTC
+ * Thu, 26 Oct 2023 06:38:24 +0000
  */
 
 #pragma once
 
 #include <cstddef>
 
-namespace AnimationsystemDll { // animationsystem.dll
+namespace animationsystem_dll { // animationsystem.dll
     constexpr std::ptrdiff_t AnimationSystemUtils_001 = 0x64670;
     constexpr std::ptrdiff_t AnimationSystem_001 = 0x5F1D0;
 }
 
-namespace ClientDll { // client.dll
-    constexpr std::ptrdiff_t LegacyGameUI001 = 0x8914A0;
-    constexpr std::ptrdiff_t Source2ClientUI001 = 0x8801C0;
-    constexpr std::ptrdiff_t Source2ClientPrediction001 = 0x79DB20;
-    constexpr std::ptrdiff_t ClientToolsInfo_001 = 0x729A30;
-    constexpr std::ptrdiff_t Source2Client002 = 0x729A50;
-    constexpr std::ptrdiff_t GameClientExports001 = 0x729A40;
-    constexpr std::ptrdiff_t EmptyWorldService001_Client = 0x48C210;
-    constexpr std::ptrdiff_t Source2ClientConfig001 = 0x473220;
+namespace client_dll { // client.dll
+    constexpr std::ptrdiff_t LegacyGameUI001 = 0x892500;
+    constexpr std::ptrdiff_t Source2ClientUI001 = 0x881220;
+    constexpr std::ptrdiff_t Source2ClientPrediction001 = 0x79EB10;
+    constexpr std::ptrdiff_t ClientToolsInfo_001 = 0x72AA20;
+    constexpr std::ptrdiff_t Source2Client002 = 0x72AA40;
+    constexpr std::ptrdiff_t GameClientExports001 = 0x72AA30;
+    constexpr std::ptrdiff_t EmptyWorldService001_Client = 0x48C470;
+    constexpr std::ptrdiff_t Source2ClientConfig001 = 0x473480;
 }
 
-namespace Engine2Dll { // engine2.dll
+namespace engine2_dll { // engine2.dll
     constexpr std::ptrdiff_t SimpleEngineLoopService_001 = 0x1E2480;
     constexpr std::ptrdiff_t ClientServerEngineLoopService_001 = 0x1D8150;
     constexpr std::ptrdiff_t KeyValueCache001 = 0x1D4790;
@@ -58,12 +58,12 @@ namespace Engine2Dll { // engine2.dll
     constexpr std::ptrdiff_t Source2EngineToClient001 = 0x5A620;
 }
 
-namespace FilesystemStdioDll { // filesystem_stdio.dll
+namespace filesystem_stdio_dll { // filesystem_stdio.dll
     constexpr std::ptrdiff_t VAsyncFileSystem2_001 = 0x66D30;
     constexpr std::ptrdiff_t VFileSystem017 = 0x66D20;
 }
 
-namespace HostDll { // host.dll
+namespace host_dll { // host.dll
     constexpr std::ptrdiff_t Source2Host001 = 0x18E10;
     constexpr std::ptrdiff_t SinglePlayerSharedMemory001 = 0x18A90;
     constexpr std::ptrdiff_t SaveRestoreDataVersion001 = 0x18A80;
@@ -74,25 +74,25 @@ namespace HostDll { // host.dll
     constexpr std::ptrdiff_t DebugDrawQueueManager001 = 0x11710;
 }
 
-namespace ImemanagerDll { // imemanager.dll
+namespace imemanager_dll { // imemanager.dll
     constexpr std::ptrdiff_t IMEManager001 = 0xC470;
 }
 
-namespace InputsystemDll { // inputsystem.dll
+namespace inputsystem_dll { // inputsystem.dll
     constexpr std::ptrdiff_t InputSystemVersion001 = 0x28D0;
     constexpr std::ptrdiff_t InputStackSystemVersion001 = 0x16F0;
 }
 
-namespace LocalizeDll { // localize.dll
+namespace localize_dll { // localize.dll
     constexpr std::ptrdiff_t Localize_001 = 0x3830;
 }
 
-namespace MatchmakingDll { // matchmaking.dll
+namespace matchmaking_dll { // matchmaking.dll
     constexpr std::ptrdiff_t GameTypes001 = 0x50270;
     constexpr std::ptrdiff_t MATCHFRAMEWORK_001 = 0x101030;
 }
 
-namespace Materialsystem2Dll { // materialsystem2.dll
+namespace materialsystem2_dll { // materialsystem2.dll
     constexpr std::ptrdiff_t MaterialUtils_001 = 0x4DB90;
     constexpr std::ptrdiff_t TextLayout_001 = 0x4A2E0;
     constexpr std::ptrdiff_t PostProcessingSystem_001 = 0x42A60;
@@ -100,91 +100,91 @@ namespace Materialsystem2Dll { // materialsystem2.dll
     constexpr std::ptrdiff_t VMaterialSystem2_001 = 0x25EC0;
 }
 
-namespace MeshsystemDll { // meshsystem.dll
+namespace meshsystem_dll { // meshsystem.dll
     constexpr std::ptrdiff_t MeshSystem001 = 0x7270;
 }
 
-namespace NavsystemDll { // navsystem.dll
+namespace navsystem_dll { // navsystem.dll
     constexpr std::ptrdiff_t NavSystem001 = 0x76F0;
 }
 
-namespace NetworksystemDll { // networksystem.dll
+namespace networksystem_dll { // networksystem.dll
     constexpr std::ptrdiff_t SerializedEntitiesVersion001 = 0xD1AE0;
     constexpr std::ptrdiff_t NetworkSystemVersion001 = 0xBBFA0;
     constexpr std::ptrdiff_t NetworkMessagesVersion001 = 0x9C040;
     constexpr std::ptrdiff_t FlattenedSerializersVersion001 = 0x7B8A0;
 }
 
-namespace PanoramaDll { // panorama.dll
+namespace panorama_dll { // panorama.dll
     constexpr std::ptrdiff_t PanoramaUIEngine001 = 0x57EE0;
 }
 
-namespace PanoramaTextPangoDll { // panorama_text_pango.dll
+namespace panorama_text_pango_dll { // panorama_text_pango.dll
     constexpr std::ptrdiff_t PanoramaTextServices001 = 0x4CBD0;
 }
 
-namespace PanoramauiclientDll { // panoramauiclient.dll
+namespace panoramauiclient_dll { // panoramauiclient.dll
     constexpr std::ptrdiff_t PanoramaUIClient001 = 0x12780;
 }
 
-namespace ParticlesDll { // particles.dll
+namespace particles_dll { // particles.dll
     constexpr std::ptrdiff_t ParticleSystemMgr003 = 0x52D20;
 }
 
-namespace PulseSystemDll { // pulse_system.dll
+namespace pulse_system_dll { // pulse_system.dll
     constexpr std::ptrdiff_t IPulseSystem_001 = 0x5B80;
 }
 
-namespace Rendersystemdx11Dll { // rendersystemdx11.dll
+namespace rendersystemdx11_dll { // rendersystemdx11.dll
     constexpr std::ptrdiff_t RenderUtils_001 = 0x52FD0;
     constexpr std::ptrdiff_t VRenderDeviceMgrBackdoor001 = 0x4A4F0;
     constexpr std::ptrdiff_t RenderDeviceMgr001 = 0x4A4E0;
 }
 
-namespace ResourcesystemDll { // resourcesystem.dll
+namespace resourcesystem_dll { // resourcesystem.dll
     constexpr std::ptrdiff_t ResourceSystem013 = 0x10650;
 }
 
-namespace ScenefilecacheDll { // scenefilecache.dll
+namespace scenefilecache_dll { // scenefilecache.dll
     constexpr std::ptrdiff_t SceneFileCache002 = 0x68E0;
     constexpr std::ptrdiff_t ResponseRulesCache001 = 0x3190;
 }
 
-namespace ScenesystemDll { // scenesystem.dll
+namespace scenesystem_dll { // scenesystem.dll
     constexpr std::ptrdiff_t SceneUtils_001 = 0x13D030;
     constexpr std::ptrdiff_t SceneSystem_002 = 0xCAE10;
     constexpr std::ptrdiff_t RenderingPipelines_001 = 0x8EED0;
 }
 
-namespace SchemasystemDll { // schemasystem.dll
+namespace schemasystem_dll { // schemasystem.dll
     constexpr std::ptrdiff_t SchemaSystem_001 = 0xA930;
 }
 
-namespace ServerDll { // server.dll
-    constexpr std::ptrdiff_t NavGameTest001 = 0xA2CCE0;
-    constexpr std::ptrdiff_t ServerToolsInfo_001 = 0x831620;
-    constexpr std::ptrdiff_t Source2GameClients001 = 0x831630;
-    constexpr std::ptrdiff_t Source2GameEntities001 = 0x831640;
-    constexpr std::ptrdiff_t Source2Server001 = 0x831650;
-    constexpr std::ptrdiff_t EmptyWorldService001_Server = 0x588470;
-    constexpr std::ptrdiff_t Source2ServerConfig001 = 0x568470;
-    constexpr std::ptrdiff_t EntitySubclassUtilsV001 = 0x2C8690;
-    constexpr std::ptrdiff_t customnavsystem001 = 0x245070;
-    constexpr std::ptrdiff_t Source2GameDirector001 = 0x13EFF0;
+namespace server_dll { // server.dll
+    constexpr std::ptrdiff_t NavGameTest001 = 0xA2D610;
+    constexpr std::ptrdiff_t ServerToolsInfo_001 = 0x831EE0;
+    constexpr std::ptrdiff_t Source2GameClients001 = 0x831EF0;
+    constexpr std::ptrdiff_t Source2GameEntities001 = 0x831F00;
+    constexpr std::ptrdiff_t Source2Server001 = 0x831F10;
+    constexpr std::ptrdiff_t EmptyWorldService001_Server = 0x588530;
+    constexpr std::ptrdiff_t Source2ServerConfig001 = 0x568530;
+    constexpr std::ptrdiff_t EntitySubclassUtilsV001 = 0x2C87D0;
+    constexpr std::ptrdiff_t customnavsystem001 = 0x2451B0;
+    constexpr std::ptrdiff_t Source2GameDirector001 = 0x13F130;
 }
 
-namespace SoundsystemDll { // soundsystem.dll
+namespace soundsystem_dll { // soundsystem.dll
     constexpr std::ptrdiff_t SoundOpSystem001 = 0x1567E0;
     constexpr std::ptrdiff_t SoundOpSystemEdit001 = 0x8BBC0;
     constexpr std::ptrdiff_t VMixEditTool001 = 0x71740;
     constexpr std::ptrdiff_t SoundSystem001 = 0x46540;
 }
 
-namespace SteamaudioDll { // steamaudio.dll
+namespace steamaudio_dll { // steamaudio.dll
     constexpr std::ptrdiff_t SteamAudio001 = 0x12EE0;
 }
 
-namespace Steamclient64Dll { // steamclient64.dll
+namespace steamclient64_dll { // steamclient64.dll
     constexpr std::ptrdiff_t IVALIDATE001 = 0x833640;
     constexpr std::ptrdiff_t CLIENTENGINE_INTERFACE_VERSION005 = 0x82F4C0;
     constexpr std::ptrdiff_t SteamClient020 = 0x62CAF0;
@@ -206,39 +206,39 @@ namespace Steamclient64Dll { // steamclient64.dll
     constexpr std::ptrdiff_t p2pvoicesingleton002 = 0xD5840;
 }
 
-namespace Tier0Dll { // tier0.dll
+namespace tier0_dll { // tier0.dll
     constexpr std::ptrdiff_t VStringTokenSystem001 = 0x18C060;
     constexpr std::ptrdiff_t TestScriptMgr001 = 0x13F3C0;
     constexpr std::ptrdiff_t VProcessUtils002 = 0x12F540;
     constexpr std::ptrdiff_t VEngineCvar007 = 0x61920;
 }
 
-namespace V8SystemDll { // v8system.dll
+namespace v8system_dll { // v8system.dll
     constexpr std::ptrdiff_t Source2V8System001 = 0x1670;
 }
 
-namespace ValveAviDll { // valve_avi.dll
+namespace valve_avi_dll { // valve_avi.dll
     constexpr std::ptrdiff_t VAvi001 = 0x2F90;
 }
 
-namespace ValveWmfDll { // valve_wmf.dll
+namespace valve_wmf_dll { // valve_wmf.dll
     constexpr std::ptrdiff_t VMediaFoundation001 = 0x12D0;
 }
 
-namespace Vphysics2Dll { // vphysics2.dll
-    constexpr std::ptrdiff_t VPhysics2_Handle_Interface_001 = 0x5FA60;
-    constexpr std::ptrdiff_t VPhysics2_Interface_001 = 0x5B7F0;
+namespace vphysics2_dll { // vphysics2.dll
+    constexpr std::ptrdiff_t VPhysics2_Handle_Interface_001 = 0x61120;
+    constexpr std::ptrdiff_t VPhysics2_Interface_001 = 0x5C740;
 }
 
-namespace VscriptDll { // vscript.dll
+namespace vscript_dll { // vscript.dll
     constexpr std::ptrdiff_t VScriptManager010 = 0x31DA0;
 }
 
-namespace VstdlibS64Dll { // vstdlib_s64.dll
+namespace vstdlib_s64_dll { // vstdlib_s64.dll
     constexpr std::ptrdiff_t IVALIDATE001 = 0x24FF0;
     constexpr std::ptrdiff_t VEngineCvar002 = 0x5750;
 }
 
-namespace WorldrendererDll { // worldrenderer.dll
+namespace worldrenderer_dll { // worldrenderer.dll
     constexpr std::ptrdiff_t WorldRendererMgr001 = 0x21530;
 }
\ No newline at end of file
diff --git a/generated/interfaces.json b/generated/interfaces.json
index babe934..cc94e13 100644
--- a/generated/interfaces.json
+++ b/generated/interfaces.json
@@ -1,5 +1,5 @@
 {
-  "AnimationsystemDll": {
+  "animationsystem_dll": {
     "data": {
       "AnimationSystemUtils_001": {
         "value": 411248,
@@ -12,44 +12,44 @@
     },
     "comment": "animationsystem.dll"
   },
-  "ClientDll": {
+  "client_dll": {
     "data": {
       "ClientToolsInfo_001": {
-        "value": 7510576,
+        "value": 7514656,
         "comment": null
       },
       "EmptyWorldService001_Client": {
-        "value": 4768272,
+        "value": 4768880,
         "comment": null
       },
       "GameClientExports001": {
-        "value": 7510592,
+        "value": 7514672,
         "comment": null
       },
       "LegacyGameUI001": {
-        "value": 8983712,
+        "value": 8987904,
         "comment": null
       },
       "Source2Client002": {
-        "value": 7510608,
+        "value": 7514688,
         "comment": null
       },
       "Source2ClientConfig001": {
-        "value": 4665888,
+        "value": 4666496,
         "comment": null
       },
       "Source2ClientPrediction001": {
-        "value": 7985952,
+        "value": 7990032,
         "comment": null
       },
       "Source2ClientUI001": {
-        "value": 8913344,
+        "value": 8917536,
         "comment": null
       }
     },
     "comment": "client.dll"
   },
-  "Engine2Dll": {
+  "engine2_dll": {
     "data": {
       "BenchmarkService001": {
         "value": 1477952,
@@ -182,7 +182,7 @@
     },
     "comment": "engine2.dll"
   },
-  "FilesystemStdioDll": {
+  "filesystem_stdio_dll": {
     "data": {
       "VAsyncFileSystem2_001": {
         "value": 421168,
@@ -195,7 +195,7 @@
     },
     "comment": "filesystem_stdio.dll"
   },
-  "HostDll": {
+  "host_dll": {
     "data": {
       "DebugDrawQueueManager001": {
         "value": 71440,
@@ -232,7 +232,7 @@
     },
     "comment": "host.dll"
   },
-  "ImemanagerDll": {
+  "imemanager_dll": {
     "data": {
       "IMEManager001": {
         "value": 50288,
@@ -241,7 +241,7 @@
     },
     "comment": "imemanager.dll"
   },
-  "InputsystemDll": {
+  "inputsystem_dll": {
     "data": {
       "InputStackSystemVersion001": {
         "value": 5872,
@@ -254,7 +254,7 @@
     },
     "comment": "inputsystem.dll"
   },
-  "LocalizeDll": {
+  "localize_dll": {
     "data": {
       "Localize_001": {
         "value": 14384,
@@ -263,7 +263,7 @@
     },
     "comment": "localize.dll"
   },
-  "MatchmakingDll": {
+  "matchmaking_dll": {
     "data": {
       "GameTypes001": {
         "value": 328304,
@@ -276,7 +276,7 @@
     },
     "comment": "matchmaking.dll"
   },
-  "Materialsystem2Dll": {
+  "materialsystem2_dll": {
     "data": {
       "FontManager_001": {
         "value": 227584,
@@ -301,7 +301,7 @@
     },
     "comment": "materialsystem2.dll"
   },
-  "MeshsystemDll": {
+  "meshsystem_dll": {
     "data": {
       "MeshSystem001": {
         "value": 29296,
@@ -310,7 +310,7 @@
     },
     "comment": "meshsystem.dll"
   },
-  "NavsystemDll": {
+  "navsystem_dll": {
     "data": {
       "NavSystem001": {
         "value": 30448,
@@ -319,7 +319,7 @@
     },
     "comment": "navsystem.dll"
   },
-  "NetworksystemDll": {
+  "networksystem_dll": {
     "data": {
       "FlattenedSerializersVersion001": {
         "value": 506016,
@@ -340,7 +340,7 @@
     },
     "comment": "networksystem.dll"
   },
-  "PanoramaDll": {
+  "panorama_dll": {
     "data": {
       "PanoramaUIEngine001": {
         "value": 360160,
@@ -349,7 +349,7 @@
     },
     "comment": "panorama.dll"
   },
-  "PanoramaTextPangoDll": {
+  "panorama_text_pango_dll": {
     "data": {
       "PanoramaTextServices001": {
         "value": 314320,
@@ -358,7 +358,7 @@
     },
     "comment": "panorama_text_pango.dll"
   },
-  "PanoramauiclientDll": {
+  "panoramauiclient_dll": {
     "data": {
       "PanoramaUIClient001": {
         "value": 75648,
@@ -367,7 +367,7 @@
     },
     "comment": "panoramauiclient.dll"
   },
-  "ParticlesDll": {
+  "particles_dll": {
     "data": {
       "ParticleSystemMgr003": {
         "value": 339232,
@@ -376,7 +376,7 @@
     },
     "comment": "particles.dll"
   },
-  "PulseSystemDll": {
+  "pulse_system_dll": {
     "data": {
       "IPulseSystem_001": {
         "value": 23424,
@@ -385,7 +385,7 @@
     },
     "comment": "pulse_system.dll"
   },
-  "Rendersystemdx11Dll": {
+  "rendersystemdx11_dll": {
     "data": {
       "RenderDeviceMgr001": {
         "value": 304352,
@@ -402,7 +402,7 @@
     },
     "comment": "rendersystemdx11.dll"
   },
-  "ResourcesystemDll": {
+  "resourcesystem_dll": {
     "data": {
       "ResourceSystem013": {
         "value": 67152,
@@ -411,7 +411,7 @@
     },
     "comment": "resourcesystem.dll"
   },
-  "ScenefilecacheDll": {
+  "scenefilecache_dll": {
     "data": {
       "ResponseRulesCache001": {
         "value": 12688,
@@ -424,7 +424,7 @@
     },
     "comment": "scenefilecache.dll"
   },
-  "ScenesystemDll": {
+  "scenesystem_dll": {
     "data": {
       "RenderingPipelines_001": {
         "value": 585424,
@@ -441,7 +441,7 @@
     },
     "comment": "scenesystem.dll"
   },
-  "SchemasystemDll": {
+  "schemasystem_dll": {
     "data": {
       "SchemaSystem_001": {
         "value": 43312,
@@ -450,52 +450,52 @@
     },
     "comment": "schemasystem.dll"
   },
-  "ServerDll": {
+  "server_dll": {
     "data": {
       "EmptyWorldService001_Server": {
-        "value": 5801072,
+        "value": 5801264,
         "comment": null
       },
       "EntitySubclassUtilsV001": {
-        "value": 2918032,
+        "value": 2918352,
         "comment": null
       },
       "NavGameTest001": {
-        "value": 10669280,
+        "value": 10671632,
         "comment": null
       },
       "ServerToolsInfo_001": {
-        "value": 8590880,
+        "value": 8593120,
         "comment": null
       },
       "Source2GameClients001": {
-        "value": 8590896,
+        "value": 8593136,
         "comment": null
       },
       "Source2GameDirector001": {
-        "value": 1306608,
+        "value": 1306928,
         "comment": null
       },
       "Source2GameEntities001": {
-        "value": 8590912,
+        "value": 8593152,
         "comment": null
       },
       "Source2Server001": {
-        "value": 8590928,
+        "value": 8593168,
         "comment": null
       },
       "Source2ServerConfig001": {
-        "value": 5670000,
+        "value": 5670192,
         "comment": null
       },
       "customnavsystem001": {
-        "value": 2379888,
+        "value": 2380208,
         "comment": null
       }
     },
     "comment": "server.dll"
   },
-  "SoundsystemDll": {
+  "soundsystem_dll": {
     "data": {
       "SoundOpSystem001": {
         "value": 1402848,
@@ -516,7 +516,7 @@
     },
     "comment": "soundsystem.dll"
   },
-  "SteamaudioDll": {
+  "steamaudio_dll": {
     "data": {
       "SteamAudio001": {
         "value": 77536,
@@ -525,7 +525,7 @@
     },
     "comment": "steamaudio.dll"
   },
-  "Steamclient64Dll": {
+  "steamclient64_dll": {
     "data": {
       "CLIENTENGINE_INTERFACE_VERSION005": {
         "value": 8582336,
@@ -606,7 +606,7 @@
     },
     "comment": "steamclient64.dll"
   },
-  "Tier0Dll": {
+  "tier0_dll": {
     "data": {
       "TestScriptMgr001": {
         "value": 1307584,
@@ -627,7 +627,7 @@
     },
     "comment": "tier0.dll"
   },
-  "V8SystemDll": {
+  "v8system_dll": {
     "data": {
       "Source2V8System001": {
         "value": 5744,
@@ -636,7 +636,7 @@
     },
     "comment": "v8system.dll"
   },
-  "ValveAviDll": {
+  "valve_avi_dll": {
     "data": {
       "VAvi001": {
         "value": 12176,
@@ -645,7 +645,7 @@
     },
     "comment": "valve_avi.dll"
   },
-  "ValveWmfDll": {
+  "valve_wmf_dll": {
     "data": {
       "VMediaFoundation001": {
         "value": 4816,
@@ -654,20 +654,20 @@
     },
     "comment": "valve_wmf.dll"
   },
-  "Vphysics2Dll": {
+  "vphysics2_dll": {
     "data": {
       "VPhysics2_Handle_Interface_001": {
-        "value": 391776,
+        "value": 397600,
         "comment": null
       },
       "VPhysics2_Interface_001": {
-        "value": 374768,
+        "value": 378688,
         "comment": null
       }
     },
     "comment": "vphysics2.dll"
   },
-  "VscriptDll": {
+  "vscript_dll": {
     "data": {
       "VScriptManager010": {
         "value": 204192,
@@ -676,7 +676,7 @@
     },
     "comment": "vscript.dll"
   },
-  "VstdlibS64Dll": {
+  "vstdlib_s64_dll": {
     "data": {
       "IVALIDATE001": {
         "value": 151536,
@@ -689,7 +689,7 @@
     },
     "comment": "vstdlib_s64.dll"
   },
-  "WorldrendererDll": {
+  "worldrenderer_dll": {
     "data": {
       "WorldRendererMgr001": {
         "value": 136496,
diff --git a/generated/interfaces.py b/generated/interfaces.py
index e1881d5..29e77a6 100644
--- a/generated/interfaces.py
+++ b/generated/interfaces.py
@@ -1,23 +1,23 @@
 '''
 Created using https://github.com/a2x/cs2-dumper
-2023-10-20 23:01:51.117215500 UTC
+Thu, 26 Oct 2023 06:38:24 +0000
 '''
 
-class AnimationsystemDll: # animationsystem.dll
+class animationsystem_dll: # animationsystem.dll
     AnimationSystemUtils_001 = 0x64670
     AnimationSystem_001 = 0x5F1D0
 
-class ClientDll: # client.dll
-    LegacyGameUI001 = 0x8914A0
-    Source2ClientUI001 = 0x8801C0
-    Source2ClientPrediction001 = 0x79DB20
-    ClientToolsInfo_001 = 0x729A30
-    Source2Client002 = 0x729A50
-    GameClientExports001 = 0x729A40
-    EmptyWorldService001_Client = 0x48C210
-    Source2ClientConfig001 = 0x473220
+class client_dll: # client.dll
+    LegacyGameUI001 = 0x892500
+    Source2ClientUI001 = 0x881220
+    Source2ClientPrediction001 = 0x79EB10
+    ClientToolsInfo_001 = 0x72AA20
+    Source2Client002 = 0x72AA40
+    GameClientExports001 = 0x72AA30
+    EmptyWorldService001_Client = 0x48C470
+    Source2ClientConfig001 = 0x473480
 
-class Engine2Dll: # engine2.dll
+class engine2_dll: # engine2.dll
     SimpleEngineLoopService_001 = 0x1E2480
     ClientServerEngineLoopService_001 = 0x1D8150
     KeyValueCache001 = 0x1D4790
@@ -51,11 +51,11 @@ class Engine2Dll: # engine2.dll
     Source2EngineToClientStringTable001 = 0x83BE0
     Source2EngineToClient001 = 0x5A620
 
-class FilesystemStdioDll: # filesystem_stdio.dll
+class filesystem_stdio_dll: # filesystem_stdio.dll
     VAsyncFileSystem2_001 = 0x66D30
     VFileSystem017 = 0x66D20
 
-class HostDll: # host.dll
+class host_dll: # host.dll
     Source2Host001 = 0x18E10
     SinglePlayerSharedMemory001 = 0x18A90
     SaveRestoreDataVersion001 = 0x18A80
@@ -65,96 +65,96 @@ class HostDll: # host.dll
     GameModelInfo001 = 0x11CC0
     DebugDrawQueueManager001 = 0x11710
 
-class ImemanagerDll: # imemanager.dll
+class imemanager_dll: # imemanager.dll
     IMEManager001 = 0xC470
 
-class InputsystemDll: # inputsystem.dll
+class inputsystem_dll: # inputsystem.dll
     InputSystemVersion001 = 0x28D0
     InputStackSystemVersion001 = 0x16F0
 
-class LocalizeDll: # localize.dll
+class localize_dll: # localize.dll
     Localize_001 = 0x3830
 
-class MatchmakingDll: # matchmaking.dll
+class matchmaking_dll: # matchmaking.dll
     GameTypes001 = 0x50270
     MATCHFRAMEWORK_001 = 0x101030
 
-class Materialsystem2Dll: # materialsystem2.dll
+class materialsystem2_dll: # materialsystem2.dll
     MaterialUtils_001 = 0x4DB90
     TextLayout_001 = 0x4A2E0
     PostProcessingSystem_001 = 0x42A60
     FontManager_001 = 0x37900
     VMaterialSystem2_001 = 0x25EC0
 
-class MeshsystemDll: # meshsystem.dll
+class meshsystem_dll: # meshsystem.dll
     MeshSystem001 = 0x7270
 
-class NavsystemDll: # navsystem.dll
+class navsystem_dll: # navsystem.dll
     NavSystem001 = 0x76F0
 
-class NetworksystemDll: # networksystem.dll
+class networksystem_dll: # networksystem.dll
     SerializedEntitiesVersion001 = 0xD1AE0
     NetworkSystemVersion001 = 0xBBFA0
     NetworkMessagesVersion001 = 0x9C040
     FlattenedSerializersVersion001 = 0x7B8A0
 
-class PanoramaDll: # panorama.dll
+class panorama_dll: # panorama.dll
     PanoramaUIEngine001 = 0x57EE0
 
-class PanoramaTextPangoDll: # panorama_text_pango.dll
+class panorama_text_pango_dll: # panorama_text_pango.dll
     PanoramaTextServices001 = 0x4CBD0
 
-class PanoramauiclientDll: # panoramauiclient.dll
+class panoramauiclient_dll: # panoramauiclient.dll
     PanoramaUIClient001 = 0x12780
 
-class ParticlesDll: # particles.dll
+class particles_dll: # particles.dll
     ParticleSystemMgr003 = 0x52D20
 
-class PulseSystemDll: # pulse_system.dll
+class pulse_system_dll: # pulse_system.dll
     IPulseSystem_001 = 0x5B80
 
-class Rendersystemdx11Dll: # rendersystemdx11.dll
+class rendersystemdx11_dll: # rendersystemdx11.dll
     RenderUtils_001 = 0x52FD0
     VRenderDeviceMgrBackdoor001 = 0x4A4F0
     RenderDeviceMgr001 = 0x4A4E0
 
-class ResourcesystemDll: # resourcesystem.dll
+class resourcesystem_dll: # resourcesystem.dll
     ResourceSystem013 = 0x10650
 
-class ScenefilecacheDll: # scenefilecache.dll
+class scenefilecache_dll: # scenefilecache.dll
     SceneFileCache002 = 0x68E0
     ResponseRulesCache001 = 0x3190
 
-class ScenesystemDll: # scenesystem.dll
+class scenesystem_dll: # scenesystem.dll
     SceneUtils_001 = 0x13D030
     SceneSystem_002 = 0xCAE10
     RenderingPipelines_001 = 0x8EED0
 
-class SchemasystemDll: # schemasystem.dll
+class schemasystem_dll: # schemasystem.dll
     SchemaSystem_001 = 0xA930
 
-class ServerDll: # server.dll
-    NavGameTest001 = 0xA2CCE0
-    ServerToolsInfo_001 = 0x831620
-    Source2GameClients001 = 0x831630
-    Source2GameEntities001 = 0x831640
-    Source2Server001 = 0x831650
-    EmptyWorldService001_Server = 0x588470
-    Source2ServerConfig001 = 0x568470
-    EntitySubclassUtilsV001 = 0x2C8690
-    customnavsystem001 = 0x245070
-    Source2GameDirector001 = 0x13EFF0
+class server_dll: # server.dll
+    NavGameTest001 = 0xA2D610
+    ServerToolsInfo_001 = 0x831EE0
+    Source2GameClients001 = 0x831EF0
+    Source2GameEntities001 = 0x831F00
+    Source2Server001 = 0x831F10
+    EmptyWorldService001_Server = 0x588530
+    Source2ServerConfig001 = 0x568530
+    EntitySubclassUtilsV001 = 0x2C87D0
+    customnavsystem001 = 0x2451B0
+    Source2GameDirector001 = 0x13F130
 
-class SoundsystemDll: # soundsystem.dll
+class soundsystem_dll: # soundsystem.dll
     SoundOpSystem001 = 0x1567E0
     SoundOpSystemEdit001 = 0x8BBC0
     VMixEditTool001 = 0x71740
     SoundSystem001 = 0x46540
 
-class SteamaudioDll: # steamaudio.dll
+class steamaudio_dll: # steamaudio.dll
     SteamAudio001 = 0x12EE0
 
-class Steamclient64Dll: # steamclient64.dll
+class steamclient64_dll: # steamclient64.dll
     IVALIDATE001 = 0x833640
     CLIENTENGINE_INTERFACE_VERSION005 = 0x82F4C0
     SteamClient020 = 0x62CAF0
@@ -175,31 +175,31 @@ class Steamclient64Dll: # steamclient64.dll
     p2pvoice002 = 0xD8EA0
     p2pvoicesingleton002 = 0xD5840
 
-class Tier0Dll: # tier0.dll
+class tier0_dll: # tier0.dll
     VStringTokenSystem001 = 0x18C060
     TestScriptMgr001 = 0x13F3C0
     VProcessUtils002 = 0x12F540
     VEngineCvar007 = 0x61920
 
-class V8SystemDll: # v8system.dll
+class v8system_dll: # v8system.dll
     Source2V8System001 = 0x1670
 
-class ValveAviDll: # valve_avi.dll
+class valve_avi_dll: # valve_avi.dll
     VAvi001 = 0x2F90
 
-class ValveWmfDll: # valve_wmf.dll
+class valve_wmf_dll: # valve_wmf.dll
     VMediaFoundation001 = 0x12D0
 
-class Vphysics2Dll: # vphysics2.dll
-    VPhysics2_Handle_Interface_001 = 0x5FA60
-    VPhysics2_Interface_001 = 0x5B7F0
+class vphysics2_dll: # vphysics2.dll
+    VPhysics2_Handle_Interface_001 = 0x61120
+    VPhysics2_Interface_001 = 0x5C740
 
-class VscriptDll: # vscript.dll
+class vscript_dll: # vscript.dll
     VScriptManager010 = 0x31DA0
 
-class VstdlibS64Dll: # vstdlib_s64.dll
+class vstdlib_s64_dll: # vstdlib_s64.dll
     IVALIDATE001 = 0x24FF0
     VEngineCvar002 = 0x5750
 
-class WorldrendererDll: # worldrenderer.dll
+class worldrenderer_dll: # worldrenderer.dll
     WorldRendererMgr001 = 0x21530
diff --git a/generated/interfaces.rs b/generated/interfaces.rs
index e10990d..3782924 100644
--- a/generated/interfaces.rs
+++ b/generated/interfaces.rs
@@ -1,27 +1,27 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:51.119179600 UTC
+ * Thu, 26 Oct 2023 06:38:24 +0000
  */
 
 #![allow(non_snake_case, non_upper_case_globals)]
 
-pub mod AnimationsystemDll { // animationsystem.dll
+pub mod animationsystem_dll { // animationsystem.dll
     pub const AnimationSystemUtils_001: usize = 0x64670;
     pub const AnimationSystem_001: usize = 0x5F1D0;
 }
 
-pub mod ClientDll { // client.dll
-    pub const LegacyGameUI001: usize = 0x8914A0;
-    pub const Source2ClientUI001: usize = 0x8801C0;
-    pub const Source2ClientPrediction001: usize = 0x79DB20;
-    pub const ClientToolsInfo_001: usize = 0x729A30;
-    pub const Source2Client002: usize = 0x729A50;
-    pub const GameClientExports001: usize = 0x729A40;
-    pub const EmptyWorldService001_Client: usize = 0x48C210;
-    pub const Source2ClientConfig001: usize = 0x473220;
+pub mod client_dll { // client.dll
+    pub const LegacyGameUI001: usize = 0x892500;
+    pub const Source2ClientUI001: usize = 0x881220;
+    pub const Source2ClientPrediction001: usize = 0x79EB10;
+    pub const ClientToolsInfo_001: usize = 0x72AA20;
+    pub const Source2Client002: usize = 0x72AA40;
+    pub const GameClientExports001: usize = 0x72AA30;
+    pub const EmptyWorldService001_Client: usize = 0x48C470;
+    pub const Source2ClientConfig001: usize = 0x473480;
 }
 
-pub mod Engine2Dll { // engine2.dll
+pub mod engine2_dll { // engine2.dll
     pub const SimpleEngineLoopService_001: usize = 0x1E2480;
     pub const ClientServerEngineLoopService_001: usize = 0x1D8150;
     pub const KeyValueCache001: usize = 0x1D4790;
@@ -56,12 +56,12 @@ pub mod Engine2Dll { // engine2.dll
     pub const Source2EngineToClient001: usize = 0x5A620;
 }
 
-pub mod FilesystemStdioDll { // filesystem_stdio.dll
+pub mod filesystem_stdio_dll { // filesystem_stdio.dll
     pub const VAsyncFileSystem2_001: usize = 0x66D30;
     pub const VFileSystem017: usize = 0x66D20;
 }
 
-pub mod HostDll { // host.dll
+pub mod host_dll { // host.dll
     pub const Source2Host001: usize = 0x18E10;
     pub const SinglePlayerSharedMemory001: usize = 0x18A90;
     pub const SaveRestoreDataVersion001: usize = 0x18A80;
@@ -72,25 +72,25 @@ pub mod HostDll { // host.dll
     pub const DebugDrawQueueManager001: usize = 0x11710;
 }
 
-pub mod ImemanagerDll { // imemanager.dll
+pub mod imemanager_dll { // imemanager.dll
     pub const IMEManager001: usize = 0xC470;
 }
 
-pub mod InputsystemDll { // inputsystem.dll
+pub mod inputsystem_dll { // inputsystem.dll
     pub const InputSystemVersion001: usize = 0x28D0;
     pub const InputStackSystemVersion001: usize = 0x16F0;
 }
 
-pub mod LocalizeDll { // localize.dll
+pub mod localize_dll { // localize.dll
     pub const Localize_001: usize = 0x3830;
 }
 
-pub mod MatchmakingDll { // matchmaking.dll
+pub mod matchmaking_dll { // matchmaking.dll
     pub const GameTypes001: usize = 0x50270;
     pub const MATCHFRAMEWORK_001: usize = 0x101030;
 }
 
-pub mod Materialsystem2Dll { // materialsystem2.dll
+pub mod materialsystem2_dll { // materialsystem2.dll
     pub const MaterialUtils_001: usize = 0x4DB90;
     pub const TextLayout_001: usize = 0x4A2E0;
     pub const PostProcessingSystem_001: usize = 0x42A60;
@@ -98,91 +98,91 @@ pub mod Materialsystem2Dll { // materialsystem2.dll
     pub const VMaterialSystem2_001: usize = 0x25EC0;
 }
 
-pub mod MeshsystemDll { // meshsystem.dll
+pub mod meshsystem_dll { // meshsystem.dll
     pub const MeshSystem001: usize = 0x7270;
 }
 
-pub mod NavsystemDll { // navsystem.dll
+pub mod navsystem_dll { // navsystem.dll
     pub const NavSystem001: usize = 0x76F0;
 }
 
-pub mod NetworksystemDll { // networksystem.dll
+pub mod networksystem_dll { // networksystem.dll
     pub const SerializedEntitiesVersion001: usize = 0xD1AE0;
     pub const NetworkSystemVersion001: usize = 0xBBFA0;
     pub const NetworkMessagesVersion001: usize = 0x9C040;
     pub const FlattenedSerializersVersion001: usize = 0x7B8A0;
 }
 
-pub mod PanoramaDll { // panorama.dll
+pub mod panorama_dll { // panorama.dll
     pub const PanoramaUIEngine001: usize = 0x57EE0;
 }
 
-pub mod PanoramaTextPangoDll { // panorama_text_pango.dll
+pub mod panorama_text_pango_dll { // panorama_text_pango.dll
     pub const PanoramaTextServices001: usize = 0x4CBD0;
 }
 
-pub mod PanoramauiclientDll { // panoramauiclient.dll
+pub mod panoramauiclient_dll { // panoramauiclient.dll
     pub const PanoramaUIClient001: usize = 0x12780;
 }
 
-pub mod ParticlesDll { // particles.dll
+pub mod particles_dll { // particles.dll
     pub const ParticleSystemMgr003: usize = 0x52D20;
 }
 
-pub mod PulseSystemDll { // pulse_system.dll
+pub mod pulse_system_dll { // pulse_system.dll
     pub const IPulseSystem_001: usize = 0x5B80;
 }
 
-pub mod Rendersystemdx11Dll { // rendersystemdx11.dll
+pub mod rendersystemdx11_dll { // rendersystemdx11.dll
     pub const RenderUtils_001: usize = 0x52FD0;
     pub const VRenderDeviceMgrBackdoor001: usize = 0x4A4F0;
     pub const RenderDeviceMgr001: usize = 0x4A4E0;
 }
 
-pub mod ResourcesystemDll { // resourcesystem.dll
+pub mod resourcesystem_dll { // resourcesystem.dll
     pub const ResourceSystem013: usize = 0x10650;
 }
 
-pub mod ScenefilecacheDll { // scenefilecache.dll
+pub mod scenefilecache_dll { // scenefilecache.dll
     pub const SceneFileCache002: usize = 0x68E0;
     pub const ResponseRulesCache001: usize = 0x3190;
 }
 
-pub mod ScenesystemDll { // scenesystem.dll
+pub mod scenesystem_dll { // scenesystem.dll
     pub const SceneUtils_001: usize = 0x13D030;
     pub const SceneSystem_002: usize = 0xCAE10;
     pub const RenderingPipelines_001: usize = 0x8EED0;
 }
 
-pub mod SchemasystemDll { // schemasystem.dll
+pub mod schemasystem_dll { // schemasystem.dll
     pub const SchemaSystem_001: usize = 0xA930;
 }
 
-pub mod ServerDll { // server.dll
-    pub const NavGameTest001: usize = 0xA2CCE0;
-    pub const ServerToolsInfo_001: usize = 0x831620;
-    pub const Source2GameClients001: usize = 0x831630;
-    pub const Source2GameEntities001: usize = 0x831640;
-    pub const Source2Server001: usize = 0x831650;
-    pub const EmptyWorldService001_Server: usize = 0x588470;
-    pub const Source2ServerConfig001: usize = 0x568470;
-    pub const EntitySubclassUtilsV001: usize = 0x2C8690;
-    pub const customnavsystem001: usize = 0x245070;
-    pub const Source2GameDirector001: usize = 0x13EFF0;
+pub mod server_dll { // server.dll
+    pub const NavGameTest001: usize = 0xA2D610;
+    pub const ServerToolsInfo_001: usize = 0x831EE0;
+    pub const Source2GameClients001: usize = 0x831EF0;
+    pub const Source2GameEntities001: usize = 0x831F00;
+    pub const Source2Server001: usize = 0x831F10;
+    pub const EmptyWorldService001_Server: usize = 0x588530;
+    pub const Source2ServerConfig001: usize = 0x568530;
+    pub const EntitySubclassUtilsV001: usize = 0x2C87D0;
+    pub const customnavsystem001: usize = 0x2451B0;
+    pub const Source2GameDirector001: usize = 0x13F130;
 }
 
-pub mod SoundsystemDll { // soundsystem.dll
+pub mod soundsystem_dll { // soundsystem.dll
     pub const SoundOpSystem001: usize = 0x1567E0;
     pub const SoundOpSystemEdit001: usize = 0x8BBC0;
     pub const VMixEditTool001: usize = 0x71740;
     pub const SoundSystem001: usize = 0x46540;
 }
 
-pub mod SteamaudioDll { // steamaudio.dll
+pub mod steamaudio_dll { // steamaudio.dll
     pub const SteamAudio001: usize = 0x12EE0;
 }
 
-pub mod Steamclient64Dll { // steamclient64.dll
+pub mod steamclient64_dll { // steamclient64.dll
     pub const IVALIDATE001: usize = 0x833640;
     pub const CLIENTENGINE_INTERFACE_VERSION005: usize = 0x82F4C0;
     pub const SteamClient020: usize = 0x62CAF0;
@@ -204,39 +204,39 @@ pub mod Steamclient64Dll { // steamclient64.dll
     pub const p2pvoicesingleton002: usize = 0xD5840;
 }
 
-pub mod Tier0Dll { // tier0.dll
+pub mod tier0_dll { // tier0.dll
     pub const VStringTokenSystem001: usize = 0x18C060;
     pub const TestScriptMgr001: usize = 0x13F3C0;
     pub const VProcessUtils002: usize = 0x12F540;
     pub const VEngineCvar007: usize = 0x61920;
 }
 
-pub mod V8SystemDll { // v8system.dll
+pub mod v8system_dll { // v8system.dll
     pub const Source2V8System001: usize = 0x1670;
 }
 
-pub mod ValveAviDll { // valve_avi.dll
+pub mod valve_avi_dll { // valve_avi.dll
     pub const VAvi001: usize = 0x2F90;
 }
 
-pub mod ValveWmfDll { // valve_wmf.dll
+pub mod valve_wmf_dll { // valve_wmf.dll
     pub const VMediaFoundation001: usize = 0x12D0;
 }
 
-pub mod Vphysics2Dll { // vphysics2.dll
-    pub const VPhysics2_Handle_Interface_001: usize = 0x5FA60;
-    pub const VPhysics2_Interface_001: usize = 0x5B7F0;
+pub mod vphysics2_dll { // vphysics2.dll
+    pub const VPhysics2_Handle_Interface_001: usize = 0x61120;
+    pub const VPhysics2_Interface_001: usize = 0x5C740;
 }
 
-pub mod VscriptDll { // vscript.dll
+pub mod vscript_dll { // vscript.dll
     pub const VScriptManager010: usize = 0x31DA0;
 }
 
-pub mod VstdlibS64Dll { // vstdlib_s64.dll
+pub mod vstdlib_s64_dll { // vstdlib_s64.dll
     pub const IVALIDATE001: usize = 0x24FF0;
     pub const VEngineCvar002: usize = 0x5750;
 }
 
-pub mod WorldrendererDll { // worldrenderer.dll
+pub mod worldrenderer_dll { // worldrenderer.dll
     pub const WorldRendererMgr001: usize = 0x21530;
 }
\ No newline at end of file
diff --git a/generated/materialsystem2.dll.cs b/generated/materialsystem2.dll.cs
index c69c2ec..56873d8 100644
--- a/generated/materialsystem2.dll.cs
+++ b/generated/materialsystem2.dll.cs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.173945100 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 public static class MaterialParamBuffer_t { // MaterialParam_t
diff --git a/generated/materialsystem2.dll.hpp b/generated/materialsystem2.dll.hpp
index 1ac7b15..db2bfd1 100644
--- a/generated/materialsystem2.dll.hpp
+++ b/generated/materialsystem2.dll.hpp
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.172626100 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #pragma once
diff --git a/generated/materialsystem2.dll.py b/generated/materialsystem2.dll.py
index b71a558..c34de4b 100644
--- a/generated/materialsystem2.dll.py
+++ b/generated/materialsystem2.dll.py
@@ -1,6 +1,6 @@
 '''
 Created using https://github.com/a2x/cs2-dumper
-2023-10-20 23:01:49.175562300 UTC
+Thu, 26 Oct 2023 06:38:23 +0000
 '''
 
 class MaterialParamBuffer_t: # MaterialParam_t
diff --git a/generated/materialsystem2.dll.rs b/generated/materialsystem2.dll.rs
index 1928ca4..f72387d 100644
--- a/generated/materialsystem2.dll.rs
+++ b/generated/materialsystem2.dll.rs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.176721400 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #![allow(non_snake_case, non_upper_case_globals)]
diff --git a/generated/networksystem.dll.cs b/generated/networksystem.dll.cs
index 57296e2..98dd677 100644
--- a/generated/networksystem.dll.cs
+++ b/generated/networksystem.dll.cs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.178381900 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 public static class ChangeAccessorFieldPathIndex_t {
diff --git a/generated/networksystem.dll.hpp b/generated/networksystem.dll.hpp
index 795f2eb..cd3add4 100644
--- a/generated/networksystem.dll.hpp
+++ b/generated/networksystem.dll.hpp
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.178118300 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #pragma once
diff --git a/generated/networksystem.dll.py b/generated/networksystem.dll.py
index 632a398..a961af0 100644
--- a/generated/networksystem.dll.py
+++ b/generated/networksystem.dll.py
@@ -1,6 +1,6 @@
 '''
 Created using https://github.com/a2x/cs2-dumper
-2023-10-20 23:01:49.178756700 UTC
+Thu, 26 Oct 2023 06:38:23 +0000
 '''
 
 class ChangeAccessorFieldPathIndex_t:
diff --git a/generated/networksystem.dll.rs b/generated/networksystem.dll.rs
index f036d0a..8f265c9 100644
--- a/generated/networksystem.dll.rs
+++ b/generated/networksystem.dll.rs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.178986100 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #![allow(non_snake_case, non_upper_case_globals)]
diff --git a/generated/offsets.cs b/generated/offsets.cs
index 0edf452..04fbb7b 100644
--- a/generated/offsets.cs
+++ b/generated/offsets.cs
@@ -1,39 +1,40 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:51.629984100 UTC
+ * Thu, 26 Oct 2023 06:38:41 +0000
  */
 
-public static class ClientDll { // client.dll
-    public const nint dwBaseEntityModel_setModel = 0x57DA70;
-    public const nint dwEntityList = 0x1798738;
-    public const nint dwForceAttack = 0x169DE50;
-    public const nint dwForceAttack2 = 0x169DEE0;
-    public const nint dwForceBackward = 0x169E120;
-    public const nint dwForceCrouch = 0x169E3F0;
-    public const nint dwForceForward = 0x169E090;
-    public const nint dwForceJump = 0x169E360;
-    public const nint dwForceLeft = 0x169E1B0;
-    public const nint dwForceRight = 0x169E240;
-    public const nint dwGameEntitySystem_getBaseEntity = 0x601070;
-    public const nint dwGameEntitySystem_getHighestEntityIndex = 0x5F2D60;
-    public const nint dwGameRules = 0x17F4478;
-    public const nint dwGlobalVars = 0x1699F40;
-    public const nint dwGlowManager = 0x17F3BF8;
-    public const nint dwInterfaceLinkList = 0x197F2B8;
-    public const nint dwLocalPlayerController = 0x17E7158;
-    public const nint dwLocalPlayerPawn = 0x1885C28;
-    public const nint dwPlantedC4 = 0x188CAD0;
-    public const nint dwViewAngles = 0x18E5740;
-    public const nint dwViewMatrix = 0x1886710;
-    public const nint dwViewRender = 0x1887108;
+public static class client_dll { // client.dll
+    public const nint dwBaseEntityModel_setModel = 0x57EA50;
+    public const nint dwEntityList = 0x17995C0;
+    public const nint dwForceAttack = 0x169EE60;
+    public const nint dwForceAttack2 = 0x169EEF0;
+    public const nint dwForceBackward = 0x169F130;
+    public const nint dwForceCrouch = 0x169F400;
+    public const nint dwForceForward = 0x169F0A0;
+    public const nint dwForceJump = 0x169F370;
+    public const nint dwForceLeft = 0x169F1C0;
+    public const nint dwForceRight = 0x169F250;
+    public const nint dwGameEntitySystem = 0x1952588;
+    public const nint dwGameEntitySystem_getBaseEntity = 0x602050;
+    public const nint dwGameEntitySystem_getHighestEntityIndex = 0x5F3D40;
+    public const nint dwGameRules = 0x17F5488;
+    public const nint dwGlobalVars = 0x169AFE0;
+    public const nint dwGlowManager = 0x17F4C10;
+    public const nint dwInterfaceLinkList = 0x1980298;
+    public const nint dwLocalPlayerController = 0x17E8158;
+    public const nint dwLocalPlayerPawn = 0x1886C48;
+    public const nint dwPlantedC4 = 0x188BFE0;
+    public const nint dwViewAngles = 0x18E6770;
+    public const nint dwViewMatrix = 0x1887730;
+    public const nint dwViewRender = 0x1888128;
 }
 
-public static class Engine2Dll { // engine2.dll
+public static class engine2_dll { // engine2.dll
     public const nint dwBuildNumber = 0x487514;
     public const nint dwNetworkGameClient = 0x486AB0;
     public const nint dwNetworkGameClient_getLocalPlayer = 0xF0;
     public const nint dwNetworkGameClient_maxClients = 0x250;
     public const nint dwNetworkGameClient_signOnState = 0x240;
-    public const nint dwWindowHeight = 0x53867C;
-    public const nint dwWindowWidth = 0x538678;
+    public const nint dwWindowHeight = 0x5386AC;
+    public const nint dwWindowWidth = 0x5386A8;
 }
\ No newline at end of file
diff --git a/generated/offsets.hpp b/generated/offsets.hpp
index 4379201..fc36d8b 100644
--- a/generated/offsets.hpp
+++ b/generated/offsets.hpp
@@ -1,43 +1,44 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:51.629418100 UTC
+ * Thu, 26 Oct 2023 06:38:41 +0000
  */
 
 #pragma once
 
 #include <cstddef>
 
-namespace ClientDll { // client.dll
-    constexpr std::ptrdiff_t dwBaseEntityModel_setModel = 0x57DA70;
-    constexpr std::ptrdiff_t dwEntityList = 0x1798738;
-    constexpr std::ptrdiff_t dwForceAttack = 0x169DE50;
-    constexpr std::ptrdiff_t dwForceAttack2 = 0x169DEE0;
-    constexpr std::ptrdiff_t dwForceBackward = 0x169E120;
-    constexpr std::ptrdiff_t dwForceCrouch = 0x169E3F0;
-    constexpr std::ptrdiff_t dwForceForward = 0x169E090;
-    constexpr std::ptrdiff_t dwForceJump = 0x169E360;
-    constexpr std::ptrdiff_t dwForceLeft = 0x169E1B0;
-    constexpr std::ptrdiff_t dwForceRight = 0x169E240;
-    constexpr std::ptrdiff_t dwGameEntitySystem_getBaseEntity = 0x601070;
-    constexpr std::ptrdiff_t dwGameEntitySystem_getHighestEntityIndex = 0x5F2D60;
-    constexpr std::ptrdiff_t dwGameRules = 0x17F4478;
-    constexpr std::ptrdiff_t dwGlobalVars = 0x1699F40;
-    constexpr std::ptrdiff_t dwGlowManager = 0x17F3BF8;
-    constexpr std::ptrdiff_t dwInterfaceLinkList = 0x197F2B8;
-    constexpr std::ptrdiff_t dwLocalPlayerController = 0x17E7158;
-    constexpr std::ptrdiff_t dwLocalPlayerPawn = 0x1885C28;
-    constexpr std::ptrdiff_t dwPlantedC4 = 0x188CAD0;
-    constexpr std::ptrdiff_t dwViewAngles = 0x18E5740;
-    constexpr std::ptrdiff_t dwViewMatrix = 0x1886710;
-    constexpr std::ptrdiff_t dwViewRender = 0x1887108;
+namespace client_dll { // client.dll
+    constexpr std::ptrdiff_t dwBaseEntityModel_setModel = 0x57EA50;
+    constexpr std::ptrdiff_t dwEntityList = 0x17995C0;
+    constexpr std::ptrdiff_t dwForceAttack = 0x169EE60;
+    constexpr std::ptrdiff_t dwForceAttack2 = 0x169EEF0;
+    constexpr std::ptrdiff_t dwForceBackward = 0x169F130;
+    constexpr std::ptrdiff_t dwForceCrouch = 0x169F400;
+    constexpr std::ptrdiff_t dwForceForward = 0x169F0A0;
+    constexpr std::ptrdiff_t dwForceJump = 0x169F370;
+    constexpr std::ptrdiff_t dwForceLeft = 0x169F1C0;
+    constexpr std::ptrdiff_t dwForceRight = 0x169F250;
+    constexpr std::ptrdiff_t dwGameEntitySystem = 0x1952588;
+    constexpr std::ptrdiff_t dwGameEntitySystem_getBaseEntity = 0x602050;
+    constexpr std::ptrdiff_t dwGameEntitySystem_getHighestEntityIndex = 0x5F3D40;
+    constexpr std::ptrdiff_t dwGameRules = 0x17F5488;
+    constexpr std::ptrdiff_t dwGlobalVars = 0x169AFE0;
+    constexpr std::ptrdiff_t dwGlowManager = 0x17F4C10;
+    constexpr std::ptrdiff_t dwInterfaceLinkList = 0x1980298;
+    constexpr std::ptrdiff_t dwLocalPlayerController = 0x17E8158;
+    constexpr std::ptrdiff_t dwLocalPlayerPawn = 0x1886C48;
+    constexpr std::ptrdiff_t dwPlantedC4 = 0x188BFE0;
+    constexpr std::ptrdiff_t dwViewAngles = 0x18E6770;
+    constexpr std::ptrdiff_t dwViewMatrix = 0x1887730;
+    constexpr std::ptrdiff_t dwViewRender = 0x1888128;
 }
 
-namespace Engine2Dll { // engine2.dll
+namespace engine2_dll { // engine2.dll
     constexpr std::ptrdiff_t dwBuildNumber = 0x487514;
     constexpr std::ptrdiff_t dwNetworkGameClient = 0x486AB0;
     constexpr std::ptrdiff_t dwNetworkGameClient_getLocalPlayer = 0xF0;
     constexpr std::ptrdiff_t dwNetworkGameClient_maxClients = 0x250;
     constexpr std::ptrdiff_t dwNetworkGameClient_signOnState = 0x240;
-    constexpr std::ptrdiff_t dwWindowHeight = 0x53867C;
-    constexpr std::ptrdiff_t dwWindowWidth = 0x538678;
+    constexpr std::ptrdiff_t dwWindowHeight = 0x5386AC;
+    constexpr std::ptrdiff_t dwWindowWidth = 0x5386A8;
 }
\ No newline at end of file
diff --git a/generated/offsets.json b/generated/offsets.json
index e9403a1..22cbe59 100644
--- a/generated/offsets.json
+++ b/generated/offsets.json
@@ -1,98 +1,102 @@
 {
-  "ClientDll": {
+  "client_dll": {
     "data": {
       "dwBaseEntityModel_setModel": {
-        "value": 5757552,
+        "value": 5761616,
         "comment": null
       },
       "dwEntityList": {
-        "value": 24741688,
+        "value": 24745408,
         "comment": null
       },
       "dwForceAttack": {
-        "value": 23715408,
+        "value": 23719520,
         "comment": null
       },
       "dwForceAttack2": {
-        "value": 23715552,
+        "value": 23719664,
         "comment": null
       },
       "dwForceBackward": {
-        "value": 23716128,
+        "value": 23720240,
         "comment": null
       },
       "dwForceCrouch": {
-        "value": 23716848,
+        "value": 23720960,
         "comment": null
       },
       "dwForceForward": {
-        "value": 23715984,
+        "value": 23720096,
         "comment": null
       },
       "dwForceJump": {
-        "value": 23716704,
+        "value": 23720816,
         "comment": null
       },
       "dwForceLeft": {
-        "value": 23716272,
+        "value": 23720384,
         "comment": null
       },
       "dwForceRight": {
-        "value": 23716416,
+        "value": 23720528,
+        "comment": null
+      },
+      "dwGameEntitySystem": {
+        "value": 26551688,
         "comment": null
       },
       "dwGameEntitySystem_getBaseEntity": {
-        "value": 6295664,
+        "value": 6299728,
         "comment": null
       },
       "dwGameEntitySystem_getHighestEntityIndex": {
-        "value": 6237536,
+        "value": 6241600,
         "comment": null
       },
       "dwGameRules": {
-        "value": 25117816,
+        "value": 25121928,
         "comment": null
       },
       "dwGlobalVars": {
-        "value": 23699264,
+        "value": 23703520,
         "comment": null
       },
       "dwGlowManager": {
-        "value": 25115640,
+        "value": 25119760,
         "comment": null
       },
       "dwInterfaceLinkList": {
-        "value": 26735288,
+        "value": 26739352,
         "comment": null
       },
       "dwLocalPlayerController": {
-        "value": 25063768,
+        "value": 25067864,
         "comment": null
       },
       "dwLocalPlayerPawn": {
-        "value": 25713704,
+        "value": 25717832,
         "comment": null
       },
       "dwPlantedC4": {
-        "value": 25742032,
+        "value": 25739232,
         "comment": null
       },
       "dwViewAngles": {
-        "value": 26105664,
+        "value": 26109808,
         "comment": null
       },
       "dwViewMatrix": {
-        "value": 25716496,
+        "value": 25720624,
         "comment": null
       },
       "dwViewRender": {
-        "value": 25719048,
+        "value": 25723176,
         "comment": null
       }
     },
     "comment": "client.dll"
   },
-  "Engine2Dll": {
+  "engine2_dll": {
     "data": {
       "dwBuildNumber": {
         "value": 4748564,
@@ -115,11 +119,11 @@
         "comment": null
       },
       "dwWindowHeight": {
-        "value": 5473916,
+        "value": 5473964,
         "comment": null
       },
       "dwWindowWidth": {
-        "value": 5473912,
+        "value": 5473960,
         "comment": null
       }
     },
diff --git a/generated/offsets.py b/generated/offsets.py
index d661451..6e5d9bc 100644
--- a/generated/offsets.py
+++ b/generated/offsets.py
@@ -1,37 +1,38 @@
 '''
 Created using https://github.com/a2x/cs2-dumper
-2023-10-20 23:01:51.630645500 UTC
+Thu, 26 Oct 2023 06:38:41 +0000
 '''
 
-class ClientDll: # client.dll
-    dwBaseEntityModel_setModel = 0x57DA70
-    dwEntityList = 0x1798738
-    dwForceAttack = 0x169DE50
-    dwForceAttack2 = 0x169DEE0
-    dwForceBackward = 0x169E120
-    dwForceCrouch = 0x169E3F0
-    dwForceForward = 0x169E090
-    dwForceJump = 0x169E360
-    dwForceLeft = 0x169E1B0
-    dwForceRight = 0x169E240
-    dwGameEntitySystem_getBaseEntity = 0x601070
-    dwGameEntitySystem_getHighestEntityIndex = 0x5F2D60
-    dwGameRules = 0x17F4478
-    dwGlobalVars = 0x1699F40
-    dwGlowManager = 0x17F3BF8
-    dwInterfaceLinkList = 0x197F2B8
-    dwLocalPlayerController = 0x17E7158
-    dwLocalPlayerPawn = 0x1885C28
-    dwPlantedC4 = 0x188CAD0
-    dwViewAngles = 0x18E5740
-    dwViewMatrix = 0x1886710
-    dwViewRender = 0x1887108
+class client_dll: # client.dll
+    dwBaseEntityModel_setModel = 0x57EA50
+    dwEntityList = 0x17995C0
+    dwForceAttack = 0x169EE60
+    dwForceAttack2 = 0x169EEF0
+    dwForceBackward = 0x169F130
+    dwForceCrouch = 0x169F400
+    dwForceForward = 0x169F0A0
+    dwForceJump = 0x169F370
+    dwForceLeft = 0x169F1C0
+    dwForceRight = 0x169F250
+    dwGameEntitySystem = 0x1952588
+    dwGameEntitySystem_getBaseEntity = 0x602050
+    dwGameEntitySystem_getHighestEntityIndex = 0x5F3D40
+    dwGameRules = 0x17F5488
+    dwGlobalVars = 0x169AFE0
+    dwGlowManager = 0x17F4C10
+    dwInterfaceLinkList = 0x1980298
+    dwLocalPlayerController = 0x17E8158
+    dwLocalPlayerPawn = 0x1886C48
+    dwPlantedC4 = 0x188BFE0
+    dwViewAngles = 0x18E6770
+    dwViewMatrix = 0x1887730
+    dwViewRender = 0x1888128
 
-class Engine2Dll: # engine2.dll
+class engine2_dll: # engine2.dll
     dwBuildNumber = 0x487514
     dwNetworkGameClient = 0x486AB0
     dwNetworkGameClient_getLocalPlayer = 0xF0
     dwNetworkGameClient_maxClients = 0x250
     dwNetworkGameClient_signOnState = 0x240
-    dwWindowHeight = 0x53867C
-    dwWindowWidth = 0x538678
+    dwWindowHeight = 0x5386AC
+    dwWindowWidth = 0x5386A8
diff --git a/generated/offsets.rs b/generated/offsets.rs
index 25610f2..5d971ea 100644
--- a/generated/offsets.rs
+++ b/generated/offsets.rs
@@ -1,41 +1,42 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:51.631119800 UTC
+ * Thu, 26 Oct 2023 06:38:41 +0000
  */
 
 #![allow(non_snake_case, non_upper_case_globals)]
 
-pub mod ClientDll { // client.dll
-    pub const dwBaseEntityModel_setModel: usize = 0x57DA70;
-    pub const dwEntityList: usize = 0x1798738;
-    pub const dwForceAttack: usize = 0x169DE50;
-    pub const dwForceAttack2: usize = 0x169DEE0;
-    pub const dwForceBackward: usize = 0x169E120;
-    pub const dwForceCrouch: usize = 0x169E3F0;
-    pub const dwForceForward: usize = 0x169E090;
-    pub const dwForceJump: usize = 0x169E360;
-    pub const dwForceLeft: usize = 0x169E1B0;
-    pub const dwForceRight: usize = 0x169E240;
-    pub const dwGameEntitySystem_getBaseEntity: usize = 0x601070;
-    pub const dwGameEntitySystem_getHighestEntityIndex: usize = 0x5F2D60;
-    pub const dwGameRules: usize = 0x17F4478;
-    pub const dwGlobalVars: usize = 0x1699F40;
-    pub const dwGlowManager: usize = 0x17F3BF8;
-    pub const dwInterfaceLinkList: usize = 0x197F2B8;
-    pub const dwLocalPlayerController: usize = 0x17E7158;
-    pub const dwLocalPlayerPawn: usize = 0x1885C28;
-    pub const dwPlantedC4: usize = 0x188CAD0;
-    pub const dwViewAngles: usize = 0x18E5740;
-    pub const dwViewMatrix: usize = 0x1886710;
-    pub const dwViewRender: usize = 0x1887108;
+pub mod client_dll { // client.dll
+    pub const dwBaseEntityModel_setModel: usize = 0x57EA50;
+    pub const dwEntityList: usize = 0x17995C0;
+    pub const dwForceAttack: usize = 0x169EE60;
+    pub const dwForceAttack2: usize = 0x169EEF0;
+    pub const dwForceBackward: usize = 0x169F130;
+    pub const dwForceCrouch: usize = 0x169F400;
+    pub const dwForceForward: usize = 0x169F0A0;
+    pub const dwForceJump: usize = 0x169F370;
+    pub const dwForceLeft: usize = 0x169F1C0;
+    pub const dwForceRight: usize = 0x169F250;
+    pub const dwGameEntitySystem: usize = 0x1952588;
+    pub const dwGameEntitySystem_getBaseEntity: usize = 0x602050;
+    pub const dwGameEntitySystem_getHighestEntityIndex: usize = 0x5F3D40;
+    pub const dwGameRules: usize = 0x17F5488;
+    pub const dwGlobalVars: usize = 0x169AFE0;
+    pub const dwGlowManager: usize = 0x17F4C10;
+    pub const dwInterfaceLinkList: usize = 0x1980298;
+    pub const dwLocalPlayerController: usize = 0x17E8158;
+    pub const dwLocalPlayerPawn: usize = 0x1886C48;
+    pub const dwPlantedC4: usize = 0x188BFE0;
+    pub const dwViewAngles: usize = 0x18E6770;
+    pub const dwViewMatrix: usize = 0x1887730;
+    pub const dwViewRender: usize = 0x1888128;
 }
 
-pub mod Engine2Dll { // engine2.dll
+pub mod engine2_dll { // engine2.dll
     pub const dwBuildNumber: usize = 0x487514;
     pub const dwNetworkGameClient: usize = 0x486AB0;
     pub const dwNetworkGameClient_getLocalPlayer: usize = 0xF0;
     pub const dwNetworkGameClient_maxClients: usize = 0x250;
     pub const dwNetworkGameClient_signOnState: usize = 0x240;
-    pub const dwWindowHeight: usize = 0x53867C;
-    pub const dwWindowWidth: usize = 0x538678;
+    pub const dwWindowHeight: usize = 0x5386AC;
+    pub const dwWindowWidth: usize = 0x5386A8;
 }
\ No newline at end of file
diff --git a/generated/particles.dll.cs b/generated/particles.dll.cs
index 8b7478f..b61ced4 100644
--- a/generated/particles.dll.cs
+++ b/generated/particles.dll.cs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.756719400 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 public static class CBaseRendererSource2 { // CParticleFunctionRenderer
diff --git a/generated/particles.dll.hpp b/generated/particles.dll.hpp
index f1b2907..979c507 100644
--- a/generated/particles.dll.hpp
+++ b/generated/particles.dll.hpp
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.715215200 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #pragma once
diff --git a/generated/particles.dll.py b/generated/particles.dll.py
index 9169eb0..0e96049 100644
--- a/generated/particles.dll.py
+++ b/generated/particles.dll.py
@@ -1,6 +1,6 @@
 '''
 Created using https://github.com/a2x/cs2-dumper
-2023-10-20 23:01:49.798506800 UTC
+Thu, 26 Oct 2023 06:38:23 +0000
 '''
 
 class CBaseRendererSource2: # CParticleFunctionRenderer
diff --git a/generated/particles.dll.rs b/generated/particles.dll.rs
index a06620f..ac50283 100644
--- a/generated/particles.dll.rs
+++ b/generated/particles.dll.rs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.837496900 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #![allow(non_snake_case, non_upper_case_globals)]
diff --git a/generated/pulse_system.dll.cs b/generated/pulse_system.dll.cs
index f7345e5..0f93a4a 100644
--- a/generated/pulse_system.dll.cs
+++ b/generated/pulse_system.dll.cs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.516145500 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 public static class CBasePulseGraphInstance {
diff --git a/generated/pulse_system.dll.hpp b/generated/pulse_system.dll.hpp
index e9a9423..56cd7f6 100644
--- a/generated/pulse_system.dll.hpp
+++ b/generated/pulse_system.dll.hpp
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.513570900 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #pragma once
diff --git a/generated/pulse_system.dll.py b/generated/pulse_system.dll.py
index 216bb4e..497e79f 100644
--- a/generated/pulse_system.dll.py
+++ b/generated/pulse_system.dll.py
@@ -1,6 +1,6 @@
 '''
 Created using https://github.com/a2x/cs2-dumper
-2023-10-20 23:01:49.518945300 UTC
+Thu, 26 Oct 2023 06:38:23 +0000
 '''
 
 class CBasePulseGraphInstance:
diff --git a/generated/pulse_system.dll.rs b/generated/pulse_system.dll.rs
index b1db56e..5d68936 100644
--- a/generated/pulse_system.dll.rs
+++ b/generated/pulse_system.dll.rs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.521408200 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #![allow(non_snake_case, non_upper_case_globals)]
diff --git a/generated/rendersystemdx11.dll.cs b/generated/rendersystemdx11.dll.cs
index cdce119..a25d188 100644
--- a/generated/rendersystemdx11.dll.cs
+++ b/generated/rendersystemdx11.dll.cs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.150323200 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 public static class RenderInputLayoutField_t {
diff --git a/generated/rendersystemdx11.dll.hpp b/generated/rendersystemdx11.dll.hpp
index 63ad6aa..7782cf1 100644
--- a/generated/rendersystemdx11.dll.hpp
+++ b/generated/rendersystemdx11.dll.hpp
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.149959300 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #pragma once
diff --git a/generated/rendersystemdx11.dll.py b/generated/rendersystemdx11.dll.py
index d802831..c259d22 100644
--- a/generated/rendersystemdx11.dll.py
+++ b/generated/rendersystemdx11.dll.py
@@ -1,6 +1,6 @@
 '''
 Created using https://github.com/a2x/cs2-dumper
-2023-10-20 23:01:49.150834300 UTC
+Thu, 26 Oct 2023 06:38:23 +0000
 '''
 
 class RenderInputLayoutField_t:
diff --git a/generated/rendersystemdx11.dll.rs b/generated/rendersystemdx11.dll.rs
index 111ec0c..ace3162 100644
--- a/generated/rendersystemdx11.dll.rs
+++ b/generated/rendersystemdx11.dll.rs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.151180800 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #![allow(non_snake_case, non_upper_case_globals)]
diff --git a/generated/resourcesystem.dll.cs b/generated/resourcesystem.dll.cs
index d5c71b7..97e451e 100644
--- a/generated/resourcesystem.dll.cs
+++ b/generated/resourcesystem.dll.cs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.145456400 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 public static class AABB_t {
diff --git a/generated/resourcesystem.dll.hpp b/generated/resourcesystem.dll.hpp
index 1401fc9..de7f08d 100644
--- a/generated/resourcesystem.dll.hpp
+++ b/generated/resourcesystem.dll.hpp
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.144421100 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #pragma once
diff --git a/generated/resourcesystem.dll.py b/generated/resourcesystem.dll.py
index 42516a4..a94c6f0 100644
--- a/generated/resourcesystem.dll.py
+++ b/generated/resourcesystem.dll.py
@@ -1,6 +1,6 @@
 '''
 Created using https://github.com/a2x/cs2-dumper
-2023-10-20 23:01:49.146685700 UTC
+Thu, 26 Oct 2023 06:38:23 +0000
 '''
 
 class AABB_t:
diff --git a/generated/resourcesystem.dll.rs b/generated/resourcesystem.dll.rs
index de9924f..67ee16c 100644
--- a/generated/resourcesystem.dll.rs
+++ b/generated/resourcesystem.dll.rs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.147681100 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #![allow(non_snake_case, non_upper_case_globals)]
diff --git a/generated/scenesystem.dll.cs b/generated/scenesystem.dll.cs
index 1ca071b..8609454 100644
--- a/generated/scenesystem.dll.cs
+++ b/generated/scenesystem.dll.cs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.477311 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 public static class CSSDSEndFrameViewInfo {
diff --git a/generated/scenesystem.dll.hpp b/generated/scenesystem.dll.hpp
index fe96b8b..37e8abb 100644
--- a/generated/scenesystem.dll.hpp
+++ b/generated/scenesystem.dll.hpp
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.476745600 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #pragma once
diff --git a/generated/scenesystem.dll.py b/generated/scenesystem.dll.py
index c931cb2..717efb8 100644
--- a/generated/scenesystem.dll.py
+++ b/generated/scenesystem.dll.py
@@ -1,6 +1,6 @@
 '''
 Created using https://github.com/a2x/cs2-dumper
-2023-10-20 23:01:49.478047400 UTC
+Thu, 26 Oct 2023 06:38:23 +0000
 '''
 
 class CSSDSEndFrameViewInfo:
diff --git a/generated/scenesystem.dll.rs b/generated/scenesystem.dll.rs
index 7fa89be..e77653f 100644
--- a/generated/scenesystem.dll.rs
+++ b/generated/scenesystem.dll.rs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.478601800 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #![allow(non_snake_case, non_upper_case_globals)]
diff --git a/generated/schemasystem.dll.cs b/generated/schemasystem.dll.cs
index 94400e1..9469abb 100644
--- a/generated/schemasystem.dll.cs
+++ b/generated/schemasystem.dll.cs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.136044500 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 public static class CExampleSchemaVData_Monomorphic {
diff --git a/generated/schemasystem.dll.hpp b/generated/schemasystem.dll.hpp
index 1e9e58c..295f9c0 100644
--- a/generated/schemasystem.dll.hpp
+++ b/generated/schemasystem.dll.hpp
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.135429600 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #pragma once
diff --git a/generated/schemasystem.dll.py b/generated/schemasystem.dll.py
index 0b8c74e..8b5a70f 100644
--- a/generated/schemasystem.dll.py
+++ b/generated/schemasystem.dll.py
@@ -1,6 +1,6 @@
 '''
 Created using https://github.com/a2x/cs2-dumper
-2023-10-20 23:01:49.136826100 UTC
+Thu, 26 Oct 2023 06:38:23 +0000
 '''
 
 class CExampleSchemaVData_Monomorphic:
diff --git a/generated/schemasystem.dll.rs b/generated/schemasystem.dll.rs
index 51214d9..b2232d8 100644
--- a/generated/schemasystem.dll.rs
+++ b/generated/schemasystem.dll.rs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.137415600 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #![allow(non_snake_case, non_upper_case_globals)]
diff --git a/generated/server.dll.cs b/generated/server.dll.cs
index e5727b2..c365a86 100644
--- a/generated/server.dll.cs
+++ b/generated/server.dll.cs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:50.278482700 UTC
+ * Thu, 26 Oct 2023 06:38:24 +0000
  */
 
 public static class ActiveModelConfig_t {
diff --git a/generated/server.dll.hpp b/generated/server.dll.hpp
index 7482a79..d46781e 100644
--- a/generated/server.dll.hpp
+++ b/generated/server.dll.hpp
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:50.208143800 UTC
+ * Thu, 26 Oct 2023 06:38:24 +0000
  */
 
 #pragma once
diff --git a/generated/server.dll.py b/generated/server.dll.py
index bf8205c..c4a413e 100644
--- a/generated/server.dll.py
+++ b/generated/server.dll.py
@@ -1,6 +1,6 @@
 '''
 Created using https://github.com/a2x/cs2-dumper
-2023-10-20 23:01:50.351699500 UTC
+Thu, 26 Oct 2023 06:38:24 +0000
 '''
 
 class ActiveModelConfig_t:
diff --git a/generated/server.dll.rs b/generated/server.dll.rs
index 6ee9137..65c7308 100644
--- a/generated/server.dll.rs
+++ b/generated/server.dll.rs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:50.420995400 UTC
+ * Thu, 26 Oct 2023 06:38:24 +0000
  */
 
 #![allow(non_snake_case, non_upper_case_globals)]
diff --git a/generated/soundsystem.dll.cs b/generated/soundsystem.dll.cs
index 1629918..5aaae25 100644
--- a/generated/soundsystem.dll.cs
+++ b/generated/soundsystem.dll.cs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.465649400 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 public static class CDSPMixgroupModifier {
diff --git a/generated/soundsystem.dll.hpp b/generated/soundsystem.dll.hpp
index 5a5a394..2e70786 100644
--- a/generated/soundsystem.dll.hpp
+++ b/generated/soundsystem.dll.hpp
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.462614600 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #pragma once
diff --git a/generated/soundsystem.dll.py b/generated/soundsystem.dll.py
index b47f012..23484bc 100644
--- a/generated/soundsystem.dll.py
+++ b/generated/soundsystem.dll.py
@@ -1,6 +1,6 @@
 '''
 Created using https://github.com/a2x/cs2-dumper
-2023-10-20 23:01:49.468861500 UTC
+Thu, 26 Oct 2023 06:38:23 +0000
 '''
 
 class CDSPMixgroupModifier:
diff --git a/generated/soundsystem.dll.rs b/generated/soundsystem.dll.rs
index b933de7..1b7907d 100644
--- a/generated/soundsystem.dll.rs
+++ b/generated/soundsystem.dll.rs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.471774200 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #![allow(non_snake_case, non_upper_case_globals)]
diff --git a/generated/vphysics2.dll.cs b/generated/vphysics2.dll.cs
index cc15657..49129b6 100644
--- a/generated/vphysics2.dll.cs
+++ b/generated/vphysics2.dll.cs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.427257500 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 public static class CFeIndexedJiggleBone {
@@ -635,12 +635,13 @@ public static class RnHull_t {
     public const nint m_vOrthographicAreas = 0x28; // Vector
     public const nint m_MassProperties = 0x34; // matrix3x4_t
     public const nint m_flVolume = 0x64; // float
-    public const nint m_Vertices = 0x68; // CUtlVector<Vector>
-    public const nint m_Edges = 0x80; // CUtlVector<RnHalfEdge_t>
-    public const nint m_Faces = 0x98; // CUtlVector<RnFace_t>
-    public const nint m_Planes = 0xB0; // CUtlVector<RnPlane_t>
-    public const nint m_nFlags = 0xC8; // uint32_t
-    public const nint m_pRegionSVM = 0xD0; // CRegionSVM*
+    public const nint m_Vertices = 0x68; // CUtlVector<RnVertex_t>
+    public const nint m_VertexPositions = 0x80; // CUtlVector<Vector>
+    public const nint m_Edges = 0x98; // CUtlVector<RnHalfEdge_t>
+    public const nint m_Faces = 0xB0; // CUtlVector<RnFace_t>
+    public const nint m_FacePlanes = 0xC8; // CUtlVector<RnPlane_t>
+    public const nint m_nFlags = 0xE0; // uint32_t
+    public const nint m_pRegionSVM = 0xE8; // CRegionSVM*
 }
 
 public static class RnMeshDesc_t { // RnShapeDesc_t
@@ -706,6 +707,10 @@ public static class RnTriangle_t {
     public const nint m_nIndex = 0x0; // int32_t[3]
 }
 
+public static class RnVertex_t {
+    public const nint m_nEdge = 0x0; // uint8_t
+}
+
 public static class RnWing_t {
     public const nint m_nIndex = 0x0; // int32_t[3]
 }
diff --git a/generated/vphysics2.dll.hpp b/generated/vphysics2.dll.hpp
index 1e225af..ddbc718 100644
--- a/generated/vphysics2.dll.hpp
+++ b/generated/vphysics2.dll.hpp
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.420147400 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #pragma once
@@ -639,12 +639,13 @@ namespace RnHull_t {
     constexpr std::ptrdiff_t m_vOrthographicAreas = 0x28; // Vector
     constexpr std::ptrdiff_t m_MassProperties = 0x34; // matrix3x4_t
     constexpr std::ptrdiff_t m_flVolume = 0x64; // float
-    constexpr std::ptrdiff_t m_Vertices = 0x68; // CUtlVector<Vector>
-    constexpr std::ptrdiff_t m_Edges = 0x80; // CUtlVector<RnHalfEdge_t>
-    constexpr std::ptrdiff_t m_Faces = 0x98; // CUtlVector<RnFace_t>
-    constexpr std::ptrdiff_t m_Planes = 0xB0; // CUtlVector<RnPlane_t>
-    constexpr std::ptrdiff_t m_nFlags = 0xC8; // uint32_t
-    constexpr std::ptrdiff_t m_pRegionSVM = 0xD0; // CRegionSVM*
+    constexpr std::ptrdiff_t m_Vertices = 0x68; // CUtlVector<RnVertex_t>
+    constexpr std::ptrdiff_t m_VertexPositions = 0x80; // CUtlVector<Vector>
+    constexpr std::ptrdiff_t m_Edges = 0x98; // CUtlVector<RnHalfEdge_t>
+    constexpr std::ptrdiff_t m_Faces = 0xB0; // CUtlVector<RnFace_t>
+    constexpr std::ptrdiff_t m_FacePlanes = 0xC8; // CUtlVector<RnPlane_t>
+    constexpr std::ptrdiff_t m_nFlags = 0xE0; // uint32_t
+    constexpr std::ptrdiff_t m_pRegionSVM = 0xE8; // CRegionSVM*
 }
 
 namespace RnMeshDesc_t { // RnShapeDesc_t
@@ -710,6 +711,10 @@ namespace RnTriangle_t {
     constexpr std::ptrdiff_t m_nIndex = 0x0; // int32_t[3]
 }
 
+namespace RnVertex_t {
+    constexpr std::ptrdiff_t m_nEdge = 0x0; // uint8_t
+}
+
 namespace RnWing_t {
     constexpr std::ptrdiff_t m_nIndex = 0x0; // int32_t[3]
 }
diff --git a/generated/vphysics2.dll.json b/generated/vphysics2.dll.json
index a14b885..b12a36c 100644
--- a/generated/vphysics2.dll.json
+++ b/generated/vphysics2.dll.json
@@ -2029,24 +2029,28 @@
         "comment": "AABB_t"
       },
       "m_Edges": {
-        "value": 128,
+        "value": 152,
         "comment": "CUtlVector<RnHalfEdge_t>"
       },
+      "m_FacePlanes": {
+        "value": 200,
+        "comment": "CUtlVector<RnPlane_t>"
+      },
       "m_Faces": {
-        "value": 152,
+        "value": 176,
         "comment": "CUtlVector<RnFace_t>"
       },
       "m_MassProperties": {
         "value": 52,
         "comment": "matrix3x4_t"
       },
-      "m_Planes": {
-        "value": 176,
-        "comment": "CUtlVector<RnPlane_t>"
+      "m_VertexPositions": {
+        "value": 128,
+        "comment": "CUtlVector<Vector>"
       },
       "m_Vertices": {
         "value": 104,
-        "comment": "CUtlVector<Vector>"
+        "comment": "CUtlVector<RnVertex_t>"
       },
       "m_flMaxAngularRadius": {
         "value": 12,
@@ -2057,11 +2061,11 @@
         "comment": "float"
       },
       "m_nFlags": {
-        "value": 200,
+        "value": 224,
         "comment": "uint32_t"
       },
       "m_pRegionSVM": {
-        "value": 208,
+        "value": 232,
         "comment": "CRegionSVM*"
       },
       "m_vCentroid": {
@@ -2250,6 +2254,15 @@
     },
     "comment": null
   },
+  "RnVertex_t": {
+    "data": {
+      "m_nEdge": {
+        "value": 0,
+        "comment": "uint8_t"
+      }
+    },
+    "comment": null
+  },
   "RnWing_t": {
     "data": {
       "m_nIndex": {
diff --git a/generated/vphysics2.dll.py b/generated/vphysics2.dll.py
index 8ffb0ef..a96c1a5 100644
--- a/generated/vphysics2.dll.py
+++ b/generated/vphysics2.dll.py
@@ -1,6 +1,6 @@
 '''
 Created using https://github.com/a2x/cs2-dumper
-2023-10-20 23:01:49.434752900 UTC
+Thu, 26 Oct 2023 06:38:23 +0000
 '''
 
 class CFeIndexedJiggleBone:
@@ -567,12 +567,13 @@ class RnHull_t:
     m_vOrthographicAreas = 0x28 # Vector
     m_MassProperties = 0x34 # matrix3x4_t
     m_flVolume = 0x64 # float
-    m_Vertices = 0x68 # CUtlVector<Vector>
-    m_Edges = 0x80 # CUtlVector<RnHalfEdge_t>
-    m_Faces = 0x98 # CUtlVector<RnFace_t>
-    m_Planes = 0xB0 # CUtlVector<RnPlane_t>
-    m_nFlags = 0xC8 # uint32_t
-    m_pRegionSVM = 0xD0 # CRegionSVM*
+    m_Vertices = 0x68 # CUtlVector<RnVertex_t>
+    m_VertexPositions = 0x80 # CUtlVector<Vector>
+    m_Edges = 0x98 # CUtlVector<RnHalfEdge_t>
+    m_Faces = 0xB0 # CUtlVector<RnFace_t>
+    m_FacePlanes = 0xC8 # CUtlVector<RnPlane_t>
+    m_nFlags = 0xE0 # uint32_t
+    m_pRegionSVM = 0xE8 # CRegionSVM*
 
 class RnMeshDesc_t: # RnShapeDesc_t
     m_Mesh = 0x10 # RnMesh_t
@@ -626,6 +627,9 @@ class RnSphere_t:
 class RnTriangle_t:
     m_nIndex = 0x0 # int32_t[3]
 
+class RnVertex_t:
+    m_nEdge = 0x0 # uint8_t
+
 class RnWing_t:
     m_nIndex = 0x0 # int32_t[3]
 
diff --git a/generated/vphysics2.dll.rs b/generated/vphysics2.dll.rs
index c11e72a..68fbf3b 100644
--- a/generated/vphysics2.dll.rs
+++ b/generated/vphysics2.dll.rs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.441693400 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #![allow(non_snake_case, non_upper_case_globals)]
@@ -637,12 +637,13 @@ pub mod RnHull_t {
     pub const m_vOrthographicAreas: usize = 0x28; // Vector
     pub const m_MassProperties: usize = 0x34; // matrix3x4_t
     pub const m_flVolume: usize = 0x64; // float
-    pub const m_Vertices: usize = 0x68; // CUtlVector<Vector>
-    pub const m_Edges: usize = 0x80; // CUtlVector<RnHalfEdge_t>
-    pub const m_Faces: usize = 0x98; // CUtlVector<RnFace_t>
-    pub const m_Planes: usize = 0xB0; // CUtlVector<RnPlane_t>
-    pub const m_nFlags: usize = 0xC8; // uint32_t
-    pub const m_pRegionSVM: usize = 0xD0; // CRegionSVM*
+    pub const m_Vertices: usize = 0x68; // CUtlVector<RnVertex_t>
+    pub const m_VertexPositions: usize = 0x80; // CUtlVector<Vector>
+    pub const m_Edges: usize = 0x98; // CUtlVector<RnHalfEdge_t>
+    pub const m_Faces: usize = 0xB0; // CUtlVector<RnFace_t>
+    pub const m_FacePlanes: usize = 0xC8; // CUtlVector<RnPlane_t>
+    pub const m_nFlags: usize = 0xE0; // uint32_t
+    pub const m_pRegionSVM: usize = 0xE8; // CRegionSVM*
 }
 
 pub mod RnMeshDesc_t { // RnShapeDesc_t
@@ -708,6 +709,10 @@ pub mod RnTriangle_t {
     pub const m_nIndex: usize = 0x0; // int32_t[3]
 }
 
+pub mod RnVertex_t {
+    pub const m_nEdge: usize = 0x0; // uint8_t
+}
+
 pub mod RnWing_t {
     pub const m_nIndex: usize = 0x0; // int32_t[3]
 }
diff --git a/generated/worldrenderer.dll.cs b/generated/worldrenderer.dll.cs
index 46c1508..ef85ae4 100644
--- a/generated/worldrenderer.dll.cs
+++ b/generated/worldrenderer.dll.cs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.493396 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 public static class AggregateLODSetup_t {
diff --git a/generated/worldrenderer.dll.hpp b/generated/worldrenderer.dll.hpp
index fca02f6..0279062 100644
--- a/generated/worldrenderer.dll.hpp
+++ b/generated/worldrenderer.dll.hpp
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.491127200 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #pragma once
diff --git a/generated/worldrenderer.dll.py b/generated/worldrenderer.dll.py
index 05a26fd..e9580fe 100644
--- a/generated/worldrenderer.dll.py
+++ b/generated/worldrenderer.dll.py
@@ -1,6 +1,6 @@
 '''
 Created using https://github.com/a2x/cs2-dumper
-2023-10-20 23:01:49.495889300 UTC
+Thu, 26 Oct 2023 06:38:23 +0000
 '''
 
 class AggregateLODSetup_t:
diff --git a/generated/worldrenderer.dll.rs b/generated/worldrenderer.dll.rs
index d1a5781..a34b08a 100644
--- a/generated/worldrenderer.dll.rs
+++ b/generated/worldrenderer.dll.rs
@@ -1,6 +1,6 @@
 /*
  * Created using https://github.com/a2x/cs2-dumper
- * 2023-10-20 23:01:49.498236100 UTC
+ * Thu, 26 Oct 2023 06:38:23 +0000
  */
 
 #![allow(non_snake_case, non_upper_case_globals)]
diff --git a/src/builder/cpp_file_builder.rs b/src/builder/cpp_file_builder.rs
index 8efd846..ec73167 100644
--- a/src/builder/cpp_file_builder.rs
+++ b/src/builder/cpp_file_builder.rs
@@ -22,9 +22,9 @@ impl FileBuilder for CppFileBuilder {
         name: &str,
         comment: Option<&str>,
     ) -> Result<()> {
-        let comment = comment.map_or(String::new(), |c| format!("// {}", c));
+        let comment = comment.map_or(String::new(), |c| format!(" // {}", c));
 
-        write!(output, "namespace {} {{ {}\n", name, comment)
+        write!(output, "namespace {} {{{}\n", name, comment)
     }
 
     fn write_variable(
@@ -37,11 +37,11 @@ impl FileBuilder for CppFileBuilder {
     ) -> Result<()> {
         let indentation = " ".repeat(indentation.unwrap_or(4));
 
-        let comment = comment.map_or(String::new(), |c| format!("// {}", c));
+        let comment = comment.map_or(String::new(), |c| format!(" // {}", c));
 
         write!(
             output,
-            "{}constexpr std::ptrdiff_t {} = {:#X}; {}\n",
+            "{}constexpr std::ptrdiff_t {} = {:#X};{}\n",
             indentation, name, value, comment
         )
     }
diff --git a/src/builder/csharp_file_builder.rs b/src/builder/csharp_file_builder.rs
index db8e0e0..cb66dc3 100644
--- a/src/builder/csharp_file_builder.rs
+++ b/src/builder/csharp_file_builder.rs
@@ -22,9 +22,9 @@ impl FileBuilder for CSharpFileBuilder {
         name: &str,
         comment: Option<&str>,
     ) -> Result<()> {
-        let comment = comment.map_or(String::new(), |c| format!("// {}", c));
+        let comment = comment.map_or(String::new(), |c| format!(" // {}", c));
 
-        write!(output, "public static class {} {{ {}\n", name, comment)
+        write!(output, "public static class {} {{{}\n", name, comment)
     }
 
     fn write_variable(
@@ -37,11 +37,11 @@ impl FileBuilder for CSharpFileBuilder {
     ) -> Result<()> {
         let indentation = " ".repeat(indentation.unwrap_or(4));
 
-        let comment = comment.map_or(String::new(), |c| format!("// {}", c));
+        let comment = comment.map_or(String::new(), |c| format!(" // {}", c));
 
         write!(
             output,
-            "{}public const nint {} = {:#X}; {}\n",
+            "{}public const nint {} = {:#X};{}\n",
             indentation, name, value, comment
         )
     }
diff --git a/src/builder/python_file_builder.rs b/src/builder/python_file_builder.rs
index b10e7ce..32e6b2a 100644
--- a/src/builder/python_file_builder.rs
+++ b/src/builder/python_file_builder.rs
@@ -22,9 +22,9 @@ impl FileBuilder for PythonFileBuilder {
         name: &str,
         comment: Option<&str>,
     ) -> Result<()> {
-        let comment = comment.map_or(String::new(), |c| format!("# {}", c));
+        let comment = comment.map_or(String::new(), |c| format!(" # {}", c));
 
-        write!(output, "class {}: {}\n", name, comment)
+        write!(output, "class {}:{}\n", name, comment)
     }
 
     fn write_variable(
@@ -37,11 +37,11 @@ impl FileBuilder for PythonFileBuilder {
     ) -> Result<()> {
         let indentation = " ".repeat(indentation.unwrap_or(4));
 
-        let comment = comment.map_or(String::new(), |c| format!("# {}", c));
+        let comment = comment.map_or(String::new(), |c| format!(" # {}", c));
 
         write!(
             output,
-            "{}{} = {:#X} {}\n",
+            "{}{} = {:#X}{}\n",
             indentation, name, value, comment
         )
     }
diff --git a/src/builder/rust_file_builder.rs b/src/builder/rust_file_builder.rs
index ece519c..669539f 100644
--- a/src/builder/rust_file_builder.rs
+++ b/src/builder/rust_file_builder.rs
@@ -25,9 +25,9 @@ impl FileBuilder for RustFileBuilder {
         name: &str,
         comment: Option<&str>,
     ) -> Result<()> {
-        let comment = comment.map_or(String::new(), |c| format!("// {}", c));
+        let comment = comment.map_or(String::new(), |c| format!(" // {}", c));
 
-        write!(output, "pub mod {} {{ {}\n", name, comment)
+        write!(output, "pub mod {} {{{}\n", name, comment)
     }
 
     fn write_variable(
@@ -40,11 +40,11 @@ impl FileBuilder for RustFileBuilder {
     ) -> Result<()> {
         let indentation = " ".repeat(indentation.unwrap_or(4));
 
-        let comment = comment.map_or(String::new(), |c| format!("// {}", c));
+        let comment = comment.map_or(String::new(), |c| format!(" // {}", c));
 
         write!(
             output,
-            "{}pub const {}: usize = {:#X}; {}\n",
+            "{}pub const {}: usize = {:#X};{}\n",
             indentation, name, value, comment
         )
     }
diff --git a/src/dumper/offsets.rs b/src/dumper/offsets.rs
index 7051bfe..07a85df 100644
--- a/src/dumper/offsets.rs
+++ b/src/dumper/offsets.rs
@@ -11,7 +11,7 @@ use simplelog::{debug, error, info};
 
 use std::fs::File;
 
-// Dumps all offsets specified in the `config.json` file and writes the results to a file.
+/// Dumps all offsets specified in the `config.json` file and writes the results to a file.
 ///
 /// # Arguments
 ///
@@ -144,9 +144,17 @@ mod tests {
 
     use super::*;
 
+    fn setup() -> Result<Process> {
+        let mut process = Process::new("cs2.exe")?;
+
+        process.initialize()?;
+
+        Ok(process)
+    }
+
     #[test]
     fn build_number() -> Result<()> {
-        let process = Process::new("cs2.exe")?;
+        let process = setup()?;
 
         let engine_base = process
             .get_module_by_name("engine2.dll")
@@ -199,14 +207,14 @@ mod tests {
             }
         }
 
-        let process = Process::new("cs2.exe")?;
+        let process = setup()?;
 
         let client_base = process
             .get_module_by_name("client.dll")
             .expect("Failed to find client.dll")
             .base();
 
-        let global_vars = process.read_memory::<*const GlobalVarsBase>(client_base + 0x1696F40)?;
+        let global_vars = process.read_memory::<*const GlobalVarsBase>(client_base + 0x169AFE0)?;
 
         let current_map_name = unsafe {
             (*global_vars)
@@ -221,14 +229,14 @@ mod tests {
 
     #[test]
     fn local_player() -> Result<()> {
-        let process = Process::new("cs2.exe")?;
+        let process = setup()?;
 
         let client_base = process
             .get_module_by_name("client.dll")
             .expect("Failed to find client.dll")
             .base();
 
-        let local_player_controller = process.read_memory::<usize>(client_base + 0x17E27C8)?;
+        let local_player_controller = process.read_memory::<usize>(client_base + 0x17E8158)?;
 
         let player_name = process.read_string((local_player_controller + 0x610).into())?;
 
@@ -239,15 +247,15 @@ mod tests {
 
     #[test]
     fn window_size() -> Result<()> {
-        let process = Process::new("cs2.exe")?;
+        let process = setup()?;
 
         let engine_base = process
             .get_module_by_name("engine2.dll")
             .expect("Failed to find engine2.dll")
             .base();
 
-        let window_width = process.read_memory::<u32>(engine_base + 0x5386D0)?;
-        let window_height = process.read_memory::<u32>(engine_base + 0x5386D4)?;
+        let window_width = process.read_memory::<u32>(engine_base + 0x5386A8)?;
+        let window_height = process.read_memory::<u32>(engine_base + 0x5386AC)?;
 
         println!("Window size: {}x{}", window_width, window_height);
 
diff --git a/src/dumper/schemas.rs b/src/dumper/schemas.rs
index 35dff80..ad6b219 100644
--- a/src/dumper/schemas.rs
+++ b/src/dumper/schemas.rs
@@ -8,7 +8,7 @@ use anyhow::Result;
 
 use simplelog::{debug, info};
 
-// Dumps all schema system defined classes and writes the results to a file.
+/// Dumps all schema system classes and writes the results to a file.
 ///
 /// # Arguments
 ///
@@ -36,20 +36,17 @@ pub fn dump_schemas(
         let mut entries = Entries::new();
 
         for class in type_scope.classes()? {
-            let parent_name = match class.parent()?.map(|p| p.name().to_string()) {
-                Some(name) => name,
-                None => continue,
-            };
+            let parent_name = class.parent()?.map(|p| p.name().to_string());
 
             debug!(
                 "<i><u><bright-yellow>{}</></></> : <i><u><yellow>{}</></></>",
                 class.name(),
-                parent_name
+                parent_name.clone().unwrap_or_default()
             );
 
             let container = entries.entry(class.name().replace("::", "_")).or_default();
 
-            container.comment = Some(parent_name);
+            container.comment = parent_name;
 
             for field in class.fields()? {
                 let name = field.name()?;
diff --git a/src/main.rs b/src/main.rs
index c433e49..c5a45b4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -38,7 +38,7 @@ struct Args {
     #[arg(short, long)]
     offsets: bool,
 
-    /// Dump schemas.
+    /// Dump schema system classes.
     #[arg(short, long)]
     schemas: bool,
 
@@ -47,7 +47,7 @@ struct Args {
     verbose: bool,
 
     /// Output folder.
-    #[arg(short, long, default_value = "generated")]
+    #[arg(long, default_value = "generated")]
     output: String,
 
     /// Indentation level.