diff --git a/output/animationsystem.dll.cs b/output/animationsystem.dll.cs
index 6aecaf1d..21171e8a 100644
--- a/output/animationsystem.dll.cs
+++ b/output/animationsystem.dll.cs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 namespace CS2Dumper.Schemas {
     // Module: animationsystem.dll
diff --git a/output/animationsystem.dll.hpp b/output/animationsystem.dll.hpp
index d33be88b..7e35b046 100644
--- a/output/animationsystem.dll.hpp
+++ b/output/animationsystem.dll.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #pragma once
 
diff --git a/output/animationsystem.dll.rs b/output/animationsystem.dll.rs
index dff92795..0d2e4732 100644
--- a/output/animationsystem.dll.rs
+++ b/output/animationsystem.dll.rs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #![allow(non_upper_case_globals, non_camel_case_types, non_snake_case, unused)]
 
diff --git a/output/buttons.cs b/output/buttons.cs
index c3479ab5..69c38cbd 100644
--- a/output/buttons.cs
+++ b/output/buttons.cs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 namespace CS2Dumper {
     // Module: client.dll
diff --git a/output/buttons.hpp b/output/buttons.hpp
index 6f629ce3..f2f28038 100644
--- a/output/buttons.hpp
+++ b/output/buttons.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #pragma once
 
diff --git a/output/buttons.rs b/output/buttons.rs
index f9d8d4d6..76d83798 100644
--- a/output/buttons.rs
+++ b/output/buttons.rs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #![allow(non_upper_case_globals, non_camel_case_types, unused)]
 
diff --git a/output/client.dll.cs b/output/client.dll.cs
index 0df7018d..cbb513f9 100644
--- a/output/client.dll.cs
+++ b/output/client.dll.cs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 namespace CS2Dumper.Schemas {
     // Module: client.dll
@@ -732,7 +732,7 @@ namespace CS2Dumper.Schemas {
             public const nint m_flOldPlayerZ = 0x138; // float32
             public const nint m_flOldPlayerViewOffsetZ = 0x13C; // float32
             public const nint m_CurrentFog = 0x140; // fogparams_t
-            public const nint m_hOldFogController = 0x1A8; // CHandle<C_FogController>
+            public const nint m_hOldFogController = 0x1A8; // 
             public const nint m_bOverrideFogColor = 0x1AC; // bool[5]
             public const nint m_OverrideFogColor = 0x1B1; // Color[5]
             public const nint m_bOverrideFogStartEnd = 0x1C5; // bool[5]
@@ -910,8 +910,8 @@ namespace CS2Dumper.Schemas {
         // NetworkVarNames: m_hostageRescueZ (int)
         // NetworkVarNames: m_bEndMatchNextMapAllVoted (bool)
         public static class C_CSPlayerResource {
-            public const nint m_bHostageAlive = 0x550; // bool[12]
-            public const nint m_isHostageFollowingSomeone = 0x55C; // bool[12]
+            public const nint m_bHostageAlive = 0x550; // 
+            public const nint m_isHostageFollowingSomeone = 0x55C; // 
             public const nint m_iHostageEntityIDs = 0x568; // CEntityIndex[12]
             public const nint m_bombsiteCenterA = 0x598; // 
             public const nint m_bombsiteCenterB = 0x5A4; // 
@@ -1936,7 +1936,7 @@ namespace CS2Dumper.Schemas {
         // Metadata:
         // NetworkVarNames: m_hCtrl (CHandle<CFogController>)
         public static class C_fogplayerparams_t {
-            public const nint m_hCtrl = 0x8; // CHandle<C_FogController>
+            public const nint m_hCtrl = 0x8; // 
             public const nint m_flTransitionTime = 0xC; // float32
             public const nint m_OldColor = 0x10; // Color
             public const nint m_flOldStart = 0x14; // float32
@@ -4245,8 +4245,8 @@ namespace CS2Dumper.Schemas {
         // NetworkVarNames: m_iAmmo (uint16)
         public static class CPlayer_WeaponServices {
             public const nint m_hMyWeapons = 0x40; // C_NetworkUtlVectorBase<CHandle<C_BasePlayerWeapon>>
-            public const nint m_hActiveWeapon = 0x58; // 
-            public const nint m_hLastWeapon = 0x5C; // 
+            public const nint m_hActiveWeapon = 0x58; // CHandle<C_BasePlayerWeapon>
+            public const nint m_hLastWeapon = 0x5C; // CHandle<C_BasePlayerWeapon>
             public const nint m_iAmmo = 0x60; // uint16[32]
         }
         // Parent: None
@@ -4526,7 +4526,7 @@ namespace CS2Dumper.Schemas {
         // NetworkVarNames: m_weaponPurchasesThisMatch (WeaponPurchaseTracker_t)
         // NetworkVarNames: m_weaponPurchasesThisRound (WeaponPurchaseTracker_t)
         public static class CCSPlayer_ActionTrackingServices {
-            public const nint m_hLastWeaponBeforeC4AutoSwitch = 0x40; // 
+            public const nint m_hLastWeaponBeforeC4AutoSwitch = 0x40; // CHandle<C_BasePlayerWeapon>
             public const nint m_bIsRescuing = 0x44; // bool
             public const nint m_weaponPurchasesThisMatch = 0x48; // WeaponPurchaseTracker_t
             public const nint m_weaponPurchasesThisRound = 0xA0; // WeaponPurchaseTracker_t
@@ -6302,7 +6302,7 @@ namespace CS2Dumper.Schemas {
             public const nint m_nViewModelIndex = 0xEEC; // uint32
             public const nint m_nAnimationParity = 0xEF0; // uint32
             public const nint m_flAnimationStartTime = 0xEF4; // float32
-            public const nint m_hWeapon = 0xEF8; // 
+            public const nint m_hWeapon = 0xEF8; // CHandle<C_BasePlayerWeapon>
             public const nint m_sVMName = 0xF00; // CUtlSymbolLarge
             public const nint m_sAnimationPrefix = 0xF08; // CUtlSymbolLarge
             public const nint m_hWeaponModel = 0xF10; // CHandle<C_ViewmodelWeapon>
diff --git a/output/client.dll.hpp b/output/client.dll.hpp
index ed8bb7e1..18b9b874 100644
--- a/output/client.dll.hpp
+++ b/output/client.dll.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #pragma once
 
@@ -737,7 +737,7 @@ namespace cs2_dumper {
                 constexpr std::ptrdiff_t m_flOldPlayerZ = 0x138; // float32
                 constexpr std::ptrdiff_t m_flOldPlayerViewOffsetZ = 0x13C; // float32
                 constexpr std::ptrdiff_t m_CurrentFog = 0x140; // fogparams_t
-                constexpr std::ptrdiff_t m_hOldFogController = 0x1A8; // CHandle<C_FogController>
+                constexpr std::ptrdiff_t m_hOldFogController = 0x1A8; // 
                 constexpr std::ptrdiff_t m_bOverrideFogColor = 0x1AC; // bool[5]
                 constexpr std::ptrdiff_t m_OverrideFogColor = 0x1B1; // Color[5]
                 constexpr std::ptrdiff_t m_bOverrideFogStartEnd = 0x1C5; // bool[5]
@@ -915,8 +915,8 @@ namespace cs2_dumper {
             // NetworkVarNames: m_hostageRescueZ (int)
             // NetworkVarNames: m_bEndMatchNextMapAllVoted (bool)
             namespace C_CSPlayerResource {
-                constexpr std::ptrdiff_t m_bHostageAlive = 0x550; // bool[12]
-                constexpr std::ptrdiff_t m_isHostageFollowingSomeone = 0x55C; // bool[12]
+                constexpr std::ptrdiff_t m_bHostageAlive = 0x550; // 
+                constexpr std::ptrdiff_t m_isHostageFollowingSomeone = 0x55C; // 
                 constexpr std::ptrdiff_t m_iHostageEntityIDs = 0x568; // CEntityIndex[12]
                 constexpr std::ptrdiff_t m_bombsiteCenterA = 0x598; // 
                 constexpr std::ptrdiff_t m_bombsiteCenterB = 0x5A4; // 
@@ -1941,7 +1941,7 @@ namespace cs2_dumper {
             // Metadata:
             // NetworkVarNames: m_hCtrl (CHandle<CFogController>)
             namespace C_fogplayerparams_t {
-                constexpr std::ptrdiff_t m_hCtrl = 0x8; // CHandle<C_FogController>
+                constexpr std::ptrdiff_t m_hCtrl = 0x8; // 
                 constexpr std::ptrdiff_t m_flTransitionTime = 0xC; // float32
                 constexpr std::ptrdiff_t m_OldColor = 0x10; // Color
                 constexpr std::ptrdiff_t m_flOldStart = 0x14; // float32
@@ -4250,8 +4250,8 @@ namespace cs2_dumper {
             // NetworkVarNames: m_iAmmo (uint16)
             namespace CPlayer_WeaponServices {
                 constexpr std::ptrdiff_t m_hMyWeapons = 0x40; // C_NetworkUtlVectorBase<CHandle<C_BasePlayerWeapon>>
-                constexpr std::ptrdiff_t m_hActiveWeapon = 0x58; // 
-                constexpr std::ptrdiff_t m_hLastWeapon = 0x5C; // 
+                constexpr std::ptrdiff_t m_hActiveWeapon = 0x58; // CHandle<C_BasePlayerWeapon>
+                constexpr std::ptrdiff_t m_hLastWeapon = 0x5C; // CHandle<C_BasePlayerWeapon>
                 constexpr std::ptrdiff_t m_iAmmo = 0x60; // uint16[32]
             }
             // Parent: None
@@ -4531,7 +4531,7 @@ namespace cs2_dumper {
             // NetworkVarNames: m_weaponPurchasesThisMatch (WeaponPurchaseTracker_t)
             // NetworkVarNames: m_weaponPurchasesThisRound (WeaponPurchaseTracker_t)
             namespace CCSPlayer_ActionTrackingServices {
-                constexpr std::ptrdiff_t m_hLastWeaponBeforeC4AutoSwitch = 0x40; // 
+                constexpr std::ptrdiff_t m_hLastWeaponBeforeC4AutoSwitch = 0x40; // CHandle<C_BasePlayerWeapon>
                 constexpr std::ptrdiff_t m_bIsRescuing = 0x44; // bool
                 constexpr std::ptrdiff_t m_weaponPurchasesThisMatch = 0x48; // WeaponPurchaseTracker_t
                 constexpr std::ptrdiff_t m_weaponPurchasesThisRound = 0xA0; // WeaponPurchaseTracker_t
@@ -6307,7 +6307,7 @@ namespace cs2_dumper {
                 constexpr std::ptrdiff_t m_nViewModelIndex = 0xEEC; // uint32
                 constexpr std::ptrdiff_t m_nAnimationParity = 0xEF0; // uint32
                 constexpr std::ptrdiff_t m_flAnimationStartTime = 0xEF4; // float32
-                constexpr std::ptrdiff_t m_hWeapon = 0xEF8; // 
+                constexpr std::ptrdiff_t m_hWeapon = 0xEF8; // CHandle<C_BasePlayerWeapon>
                 constexpr std::ptrdiff_t m_sVMName = 0xF00; // CUtlSymbolLarge
                 constexpr std::ptrdiff_t m_sAnimationPrefix = 0xF08; // CUtlSymbolLarge
                 constexpr std::ptrdiff_t m_hWeaponModel = 0xF10; // CHandle<C_ViewmodelWeapon>
diff --git a/output/client.dll.rs b/output/client.dll.rs
index 4b88208b..64aee93d 100644
--- a/output/client.dll.rs
+++ b/output/client.dll.rs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #![allow(non_upper_case_globals, non_camel_case_types, non_snake_case, unused)]
 
@@ -742,7 +742,7 @@ pub mod cs2_dumper {
                 pub const m_flOldPlayerZ: usize = 0x138; // float32
                 pub const m_flOldPlayerViewOffsetZ: usize = 0x13C; // float32
                 pub const m_CurrentFog: usize = 0x140; // fogparams_t
-                pub const m_hOldFogController: usize = 0x1A8; // CHandle<C_FogController>
+                pub const m_hOldFogController: usize = 0x1A8; // 
                 pub const m_bOverrideFogColor: usize = 0x1AC; // bool[5]
                 pub const m_OverrideFogColor: usize = 0x1B1; // Color[5]
                 pub const m_bOverrideFogStartEnd: usize = 0x1C5; // bool[5]
@@ -920,8 +920,8 @@ pub mod cs2_dumper {
             // NetworkVarNames: m_hostageRescueZ (int)
             // NetworkVarNames: m_bEndMatchNextMapAllVoted (bool)
             pub mod C_CSPlayerResource {
-                pub const m_bHostageAlive: usize = 0x550; // bool[12]
-                pub const m_isHostageFollowingSomeone: usize = 0x55C; // bool[12]
+                pub const m_bHostageAlive: usize = 0x550; // 
+                pub const m_isHostageFollowingSomeone: usize = 0x55C; // 
                 pub const m_iHostageEntityIDs: usize = 0x568; // CEntityIndex[12]
                 pub const m_bombsiteCenterA: usize = 0x598; // 
                 pub const m_bombsiteCenterB: usize = 0x5A4; // 
@@ -1946,7 +1946,7 @@ pub mod cs2_dumper {
             // Metadata:
             // NetworkVarNames: m_hCtrl (CHandle<CFogController>)
             pub mod C_fogplayerparams_t {
-                pub const m_hCtrl: usize = 0x8; // CHandle<C_FogController>
+                pub const m_hCtrl: usize = 0x8; // 
                 pub const m_flTransitionTime: usize = 0xC; // float32
                 pub const m_OldColor: usize = 0x10; // Color
                 pub const m_flOldStart: usize = 0x14; // float32
@@ -4255,8 +4255,8 @@ pub mod cs2_dumper {
             // NetworkVarNames: m_iAmmo (uint16)
             pub mod CPlayer_WeaponServices {
                 pub const m_hMyWeapons: usize = 0x40; // C_NetworkUtlVectorBase<CHandle<C_BasePlayerWeapon>>
-                pub const m_hActiveWeapon: usize = 0x58; // 
-                pub const m_hLastWeapon: usize = 0x5C; // 
+                pub const m_hActiveWeapon: usize = 0x58; // CHandle<C_BasePlayerWeapon>
+                pub const m_hLastWeapon: usize = 0x5C; // CHandle<C_BasePlayerWeapon>
                 pub const m_iAmmo: usize = 0x60; // uint16[32]
             }
             // Parent: None
@@ -4536,7 +4536,7 @@ pub mod cs2_dumper {
             // NetworkVarNames: m_weaponPurchasesThisMatch (WeaponPurchaseTracker_t)
             // NetworkVarNames: m_weaponPurchasesThisRound (WeaponPurchaseTracker_t)
             pub mod CCSPlayer_ActionTrackingServices {
-                pub const m_hLastWeaponBeforeC4AutoSwitch: usize = 0x40; // 
+                pub const m_hLastWeaponBeforeC4AutoSwitch: usize = 0x40; // CHandle<C_BasePlayerWeapon>
                 pub const m_bIsRescuing: usize = 0x44; // bool
                 pub const m_weaponPurchasesThisMatch: usize = 0x48; // WeaponPurchaseTracker_t
                 pub const m_weaponPurchasesThisRound: usize = 0xA0; // WeaponPurchaseTracker_t
@@ -6312,7 +6312,7 @@ pub mod cs2_dumper {
                 pub const m_nViewModelIndex: usize = 0xEEC; // uint32
                 pub const m_nAnimationParity: usize = 0xEF0; // uint32
                 pub const m_flAnimationStartTime: usize = 0xEF4; // float32
-                pub const m_hWeapon: usize = 0xEF8; // 
+                pub const m_hWeapon: usize = 0xEF8; // CHandle<C_BasePlayerWeapon>
                 pub const m_sVMName: usize = 0xF00; // CUtlSymbolLarge
                 pub const m_sAnimationPrefix: usize = 0xF08; // CUtlSymbolLarge
                 pub const m_hWeaponModel: usize = 0xF10; // CHandle<C_ViewmodelWeapon>
diff --git a/output/engine2.dll.cs b/output/engine2.dll.cs
index d3e3b268..2ff521db 100644
--- a/output/engine2.dll.cs
+++ b/output/engine2.dll.cs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 namespace CS2Dumper.Schemas {
     // Module: engine2.dll
diff --git a/output/engine2.dll.hpp b/output/engine2.dll.hpp
index e5df50d2..4354b070 100644
--- a/output/engine2.dll.hpp
+++ b/output/engine2.dll.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #pragma once
 
diff --git a/output/engine2.dll.rs b/output/engine2.dll.rs
index 98e54cca..4a0aa06a 100644
--- a/output/engine2.dll.rs
+++ b/output/engine2.dll.rs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #![allow(non_upper_case_globals, non_camel_case_types, non_snake_case, unused)]
 
diff --git a/output/host.dll.cs b/output/host.dll.cs
index bfdc6a04..92726e73 100644
--- a/output/host.dll.cs
+++ b/output/host.dll.cs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 namespace CS2Dumper.Schemas {
     // Module: host.dll
diff --git a/output/host.dll.hpp b/output/host.dll.hpp
index 7ac1482c..26855589 100644
--- a/output/host.dll.hpp
+++ b/output/host.dll.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #pragma once
 
diff --git a/output/host.dll.rs b/output/host.dll.rs
index d8f55691..895dfef5 100644
--- a/output/host.dll.rs
+++ b/output/host.dll.rs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #![allow(non_upper_case_globals, non_camel_case_types, non_snake_case, unused)]
 
diff --git a/output/info.json b/output/info.json
index 0d9e3c33..79bc95eb 100644
--- a/output/info.json
+++ b/output/info.json
@@ -1,4 +1,4 @@
 {
   "build_number": 14001,
-  "timestamp": "2024-04-07T05:30:39.851724900+00:00"
+  "timestamp": "2024-04-07T08:19:03.265339800+00:00"
 }
\ No newline at end of file
diff --git a/output/interfaces.cs b/output/interfaces.cs
index 80661a79..7049dddd 100644
--- a/output/interfaces.cs
+++ b/output/interfaces.cs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 namespace CS2Dumper.Interfaces {
     // Module: animationsystem.dll
diff --git a/output/interfaces.hpp b/output/interfaces.hpp
index 98b96965..801d868f 100644
--- a/output/interfaces.hpp
+++ b/output/interfaces.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #pragma once
 
diff --git a/output/interfaces.rs b/output/interfaces.rs
index 71c23a77..4a5c206a 100644
--- a/output/interfaces.rs
+++ b/output/interfaces.rs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #![allow(non_upper_case_globals, non_camel_case_types, unused)]
 
diff --git a/output/materialsystem2.dll.cs b/output/materialsystem2.dll.cs
index 487e40d7..b739d4a3 100644
--- a/output/materialsystem2.dll.cs
+++ b/output/materialsystem2.dll.cs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 namespace CS2Dumper.Schemas {
     // Module: materialsystem2.dll
diff --git a/output/materialsystem2.dll.hpp b/output/materialsystem2.dll.hpp
index 3d8814d5..6bb694ef 100644
--- a/output/materialsystem2.dll.hpp
+++ b/output/materialsystem2.dll.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #pragma once
 
diff --git a/output/materialsystem2.dll.rs b/output/materialsystem2.dll.rs
index 54fa5ea5..4da82b09 100644
--- a/output/materialsystem2.dll.rs
+++ b/output/materialsystem2.dll.rs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #![allow(non_upper_case_globals, non_camel_case_types, non_snake_case, unused)]
 
diff --git a/output/meshsystem.dll.cs b/output/meshsystem.dll.cs
deleted file mode 100644
index 1e6a33ee..00000000
--- a/output/meshsystem.dll.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-// Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
-
-namespace CS2Dumper.Schemas {
-}
diff --git a/output/meshsystem.dll.hpp b/output/meshsystem.dll.hpp
deleted file mode 100644
index a7083fa2..00000000
--- a/output/meshsystem.dll.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-// Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
-
-#pragma once
-
-#include <cstddef>
-
-namespace cs2_dumper {
-    namespace schemas {
-    }
-}
diff --git a/output/meshsystem.dll.json b/output/meshsystem.dll.json
deleted file mode 100644
index a8849f72..00000000
--- a/output/meshsystem.dll.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "meshsystem.dll": {
-    "classes": {},
-    "enums": {}
-  }
-}
\ No newline at end of file
diff --git a/output/meshsystem.dll.rs b/output/meshsystem.dll.rs
deleted file mode 100644
index 06466e00..00000000
--- a/output/meshsystem.dll.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
-
-#![allow(non_upper_case_globals, non_camel_case_types, non_snake_case, unused)]
-
-pub mod cs2_dumper {
-    pub mod schemas {
-    }
-}
diff --git a/output/networksystem.dll.cs b/output/networksystem.dll.cs
index dfeda85f..64f45d85 100644
--- a/output/networksystem.dll.cs
+++ b/output/networksystem.dll.cs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 namespace CS2Dumper.Schemas {
     // Module: networksystem.dll
diff --git a/output/networksystem.dll.hpp b/output/networksystem.dll.hpp
index 1f750545..76db71bf 100644
--- a/output/networksystem.dll.hpp
+++ b/output/networksystem.dll.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #pragma once
 
diff --git a/output/networksystem.dll.rs b/output/networksystem.dll.rs
index 52a220bd..7c33d23c 100644
--- a/output/networksystem.dll.rs
+++ b/output/networksystem.dll.rs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #![allow(non_upper_case_globals, non_camel_case_types, non_snake_case, unused)]
 
diff --git a/output/offsets.cs b/output/offsets.cs
index 714be578..b1e65338 100644
--- a/output/offsets.cs
+++ b/output/offsets.cs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 namespace CS2Dumper.Offsets {
     // Module: client.dll
diff --git a/output/offsets.hpp b/output/offsets.hpp
index b915529f..c7dd1595 100644
--- a/output/offsets.hpp
+++ b/output/offsets.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #pragma once
 
diff --git a/output/offsets.rs b/output/offsets.rs
index 3ab06513..4611eeda 100644
--- a/output/offsets.rs
+++ b/output/offsets.rs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #![allow(non_upper_case_globals, non_camel_case_types, unused)]
 
diff --git a/output/panorama.dll.cs b/output/panorama.dll.cs
index 6471a3be..4e8f4059 100644
--- a/output/panorama.dll.cs
+++ b/output/panorama.dll.cs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 namespace CS2Dumper.Schemas {
     // Module: panorama.dll
diff --git a/output/panorama.dll.hpp b/output/panorama.dll.hpp
index 34d82307..abe1206b 100644
--- a/output/panorama.dll.hpp
+++ b/output/panorama.dll.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #pragma once
 
diff --git a/output/panorama.dll.rs b/output/panorama.dll.rs
index 11aa0c08..776f01ee 100644
--- a/output/panorama.dll.rs
+++ b/output/panorama.dll.rs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #![allow(non_upper_case_globals, non_camel_case_types, non_snake_case, unused)]
 
diff --git a/output/particles.dll.cs b/output/particles.dll.cs
index b976573e..d8fbdd8f 100644
--- a/output/particles.dll.cs
+++ b/output/particles.dll.cs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 namespace CS2Dumper.Schemas {
     // Module: particles.dll
diff --git a/output/particles.dll.hpp b/output/particles.dll.hpp
index b90b8f2c..828865bd 100644
--- a/output/particles.dll.hpp
+++ b/output/particles.dll.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #pragma once
 
diff --git a/output/particles.dll.rs b/output/particles.dll.rs
index 56ffb3b1..6c5306cf 100644
--- a/output/particles.dll.rs
+++ b/output/particles.dll.rs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #![allow(non_upper_case_globals, non_camel_case_types, non_snake_case, unused)]
 
diff --git a/output/pulse_system.dll.cs b/output/pulse_system.dll.cs
index c52096c8..efd58e6e 100644
--- a/output/pulse_system.dll.cs
+++ b/output/pulse_system.dll.cs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 namespace CS2Dumper.Schemas {
     // Module: pulse_system.dll
diff --git a/output/pulse_system.dll.hpp b/output/pulse_system.dll.hpp
index d6d29789..d2eac856 100644
--- a/output/pulse_system.dll.hpp
+++ b/output/pulse_system.dll.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #pragma once
 
diff --git a/output/pulse_system.dll.rs b/output/pulse_system.dll.rs
index e60f5519..587c2b07 100644
--- a/output/pulse_system.dll.rs
+++ b/output/pulse_system.dll.rs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #![allow(non_upper_case_globals, non_camel_case_types, non_snake_case, unused)]
 
diff --git a/output/rendersystemdx11.dll.cs b/output/rendersystemdx11.dll.cs
index b374a331..d312ebe8 100644
--- a/output/rendersystemdx11.dll.cs
+++ b/output/rendersystemdx11.dll.cs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 namespace CS2Dumper.Schemas {
     // Module: rendersystemdx11.dll
diff --git a/output/rendersystemdx11.dll.hpp b/output/rendersystemdx11.dll.hpp
index 46818a9f..0618682e 100644
--- a/output/rendersystemdx11.dll.hpp
+++ b/output/rendersystemdx11.dll.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #pragma once
 
diff --git a/output/rendersystemdx11.dll.rs b/output/rendersystemdx11.dll.rs
index bd734863..79ec660f 100644
--- a/output/rendersystemdx11.dll.rs
+++ b/output/rendersystemdx11.dll.rs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #![allow(non_upper_case_globals, non_camel_case_types, non_snake_case, unused)]
 
diff --git a/output/resourcesystem.dll.cs b/output/resourcesystem.dll.cs
index db6663e6..ad84a1af 100644
--- a/output/resourcesystem.dll.cs
+++ b/output/resourcesystem.dll.cs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 namespace CS2Dumper.Schemas {
     // Module: resourcesystem.dll
diff --git a/output/resourcesystem.dll.hpp b/output/resourcesystem.dll.hpp
index 38f8e830..9ac5dc04 100644
--- a/output/resourcesystem.dll.hpp
+++ b/output/resourcesystem.dll.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #pragma once
 
diff --git a/output/resourcesystem.dll.rs b/output/resourcesystem.dll.rs
index 8123516c..a543b26a 100644
--- a/output/resourcesystem.dll.rs
+++ b/output/resourcesystem.dll.rs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #![allow(non_upper_case_globals, non_camel_case_types, non_snake_case, unused)]
 
diff --git a/output/scenefilecache.dll.cs b/output/scenefilecache.dll.cs
deleted file mode 100644
index 1e6a33ee..00000000
--- a/output/scenefilecache.dll.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-// Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
-
-namespace CS2Dumper.Schemas {
-}
diff --git a/output/scenefilecache.dll.hpp b/output/scenefilecache.dll.hpp
deleted file mode 100644
index a7083fa2..00000000
--- a/output/scenefilecache.dll.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-// Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
-
-#pragma once
-
-#include <cstddef>
-
-namespace cs2_dumper {
-    namespace schemas {
-    }
-}
diff --git a/output/scenefilecache.dll.json b/output/scenefilecache.dll.json
deleted file mode 100644
index 637f1ef2..00000000
--- a/output/scenefilecache.dll.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "scenefilecache.dll": {
-    "classes": {},
-    "enums": {}
-  }
-}
\ No newline at end of file
diff --git a/output/scenefilecache.dll.rs b/output/scenefilecache.dll.rs
deleted file mode 100644
index 06466e00..00000000
--- a/output/scenefilecache.dll.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
-
-#![allow(non_upper_case_globals, non_camel_case_types, non_snake_case, unused)]
-
-pub mod cs2_dumper {
-    pub mod schemas {
-    }
-}
diff --git a/output/scenesystem.dll.cs b/output/scenesystem.dll.cs
index 7aafa1d8..e61c5641 100644
--- a/output/scenesystem.dll.cs
+++ b/output/scenesystem.dll.cs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 namespace CS2Dumper.Schemas {
     // Module: scenesystem.dll
diff --git a/output/scenesystem.dll.hpp b/output/scenesystem.dll.hpp
index 9d75bf87..e8580bb6 100644
--- a/output/scenesystem.dll.hpp
+++ b/output/scenesystem.dll.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #pragma once
 
diff --git a/output/scenesystem.dll.rs b/output/scenesystem.dll.rs
index ce251ba7..ea8e6aae 100644
--- a/output/scenesystem.dll.rs
+++ b/output/scenesystem.dll.rs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #![allow(non_upper_case_globals, non_camel_case_types, non_snake_case, unused)]
 
diff --git a/output/schemasystem.dll.cs b/output/schemasystem.dll.cs
index aedb8dd2..b374b84c 100644
--- a/output/schemasystem.dll.cs
+++ b/output/schemasystem.dll.cs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 namespace CS2Dumper.Schemas {
     // Module: schemasystem.dll
diff --git a/output/schemasystem.dll.hpp b/output/schemasystem.dll.hpp
index 23bb997b..5b70c5d3 100644
--- a/output/schemasystem.dll.hpp
+++ b/output/schemasystem.dll.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #pragma once
 
diff --git a/output/schemasystem.dll.rs b/output/schemasystem.dll.rs
index 5d219634..c9e762eb 100644
--- a/output/schemasystem.dll.rs
+++ b/output/schemasystem.dll.rs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #![allow(non_upper_case_globals, non_camel_case_types, non_snake_case, unused)]
 
diff --git a/output/server.dll.cs b/output/server.dll.cs
index 53c37bf9..dc8b6346 100644
--- a/output/server.dll.cs
+++ b/output/server.dll.cs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 namespace CS2Dumper.Schemas {
     // Module: server.dll
@@ -2588,7 +2588,7 @@ namespace CS2Dumper.Schemas {
             public const nint m_vecBackBoundsMin = 0xE64; // 
             public const nint m_vecBackBoundsMax = 0xE70; // 
             public const nint m_bAjarDoorShouldntAlwaysOpen = 0xE7C; // bool
-            public const nint m_hEntityBlocker = 0xE80; // CHandle<CEntityBlocker>
+            public const nint m_hEntityBlocker = 0xE80; // 
         }
         // Parent: CBaseModelEntity
         // Fields count: 21
@@ -3005,7 +3005,7 @@ namespace CS2Dumper.Schemas {
             public const nint m_numCloseAttempts = 0xC48; // int32
             public const nint m_nPhysicsMaterial = 0xC4C; // CUtlStringToken
             public const nint m_SlaveName = 0xC50; // CUtlSymbolLarge
-            public const nint m_hMaster = 0xC58; // 
+            public const nint m_hMaster = 0xC58; // CHandle<CBasePropDoor>
             public const nint m_OnBlockedClosing = 0xC60; // CEntityIOOutput
             public const nint m_OnBlockedOpening = 0xC88; // CEntityIOOutput
             public const nint m_OnUnblockedClosing = 0xCB0; // CEntityIOOutput
@@ -6769,8 +6769,8 @@ namespace CS2Dumper.Schemas {
         // NetworkVarNames: m_hostageRescueZ (int)
         // NetworkVarNames: m_bEndMatchNextMapAllVoted (bool)
         public static class CCSPlayerResource {
-            public const nint m_bHostageAlive = 0x4C0; // bool[12]
-            public const nint m_isHostageFollowingSomeone = 0x4CC; // bool[12]
+            public const nint m_bHostageAlive = 0x4C0; // 
+            public const nint m_isHostageFollowingSomeone = 0x4CC; // 
             public const nint m_iHostageEntityIDs = 0x4D8; // CEntityIndex[12]
             public const nint m_bombsiteCenterA = 0x508; // 
             public const nint m_bombsiteCenterB = 0x514; // 
diff --git a/output/server.dll.hpp b/output/server.dll.hpp
index accf2373..90bef436 100644
--- a/output/server.dll.hpp
+++ b/output/server.dll.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #pragma once
 
@@ -2593,7 +2593,7 @@ namespace cs2_dumper {
                 constexpr std::ptrdiff_t m_vecBackBoundsMin = 0xE64; // 
                 constexpr std::ptrdiff_t m_vecBackBoundsMax = 0xE70; // 
                 constexpr std::ptrdiff_t m_bAjarDoorShouldntAlwaysOpen = 0xE7C; // bool
-                constexpr std::ptrdiff_t m_hEntityBlocker = 0xE80; // CHandle<CEntityBlocker>
+                constexpr std::ptrdiff_t m_hEntityBlocker = 0xE80; // 
             }
             // Parent: CBaseModelEntity
             // Fields count: 21
@@ -3010,7 +3010,7 @@ namespace cs2_dumper {
                 constexpr std::ptrdiff_t m_numCloseAttempts = 0xC48; // int32
                 constexpr std::ptrdiff_t m_nPhysicsMaterial = 0xC4C; // CUtlStringToken
                 constexpr std::ptrdiff_t m_SlaveName = 0xC50; // CUtlSymbolLarge
-                constexpr std::ptrdiff_t m_hMaster = 0xC58; // 
+                constexpr std::ptrdiff_t m_hMaster = 0xC58; // CHandle<CBasePropDoor>
                 constexpr std::ptrdiff_t m_OnBlockedClosing = 0xC60; // CEntityIOOutput
                 constexpr std::ptrdiff_t m_OnBlockedOpening = 0xC88; // CEntityIOOutput
                 constexpr std::ptrdiff_t m_OnUnblockedClosing = 0xCB0; // CEntityIOOutput
@@ -6774,8 +6774,8 @@ namespace cs2_dumper {
             // NetworkVarNames: m_hostageRescueZ (int)
             // NetworkVarNames: m_bEndMatchNextMapAllVoted (bool)
             namespace CCSPlayerResource {
-                constexpr std::ptrdiff_t m_bHostageAlive = 0x4C0; // bool[12]
-                constexpr std::ptrdiff_t m_isHostageFollowingSomeone = 0x4CC; // bool[12]
+                constexpr std::ptrdiff_t m_bHostageAlive = 0x4C0; // 
+                constexpr std::ptrdiff_t m_isHostageFollowingSomeone = 0x4CC; // 
                 constexpr std::ptrdiff_t m_iHostageEntityIDs = 0x4D8; // CEntityIndex[12]
                 constexpr std::ptrdiff_t m_bombsiteCenterA = 0x508; // 
                 constexpr std::ptrdiff_t m_bombsiteCenterB = 0x514; // 
diff --git a/output/server.dll.rs b/output/server.dll.rs
index 9036de9e..8ae8431d 100644
--- a/output/server.dll.rs
+++ b/output/server.dll.rs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #![allow(non_upper_case_globals, non_camel_case_types, non_snake_case, unused)]
 
@@ -2717,7 +2717,7 @@ pub mod cs2_dumper {
                 pub const m_vecBackBoundsMin: usize = 0xE64; // 
                 pub const m_vecBackBoundsMax: usize = 0xE70; // 
                 pub const m_bAjarDoorShouldntAlwaysOpen: usize = 0xE7C; // bool
-                pub const m_hEntityBlocker: usize = 0xE80; // CHandle<CEntityBlocker>
+                pub const m_hEntityBlocker: usize = 0xE80; // 
             }
             // Parent: CBaseModelEntity
             // Fields count: 21
@@ -3134,7 +3134,7 @@ pub mod cs2_dumper {
                 pub const m_numCloseAttempts: usize = 0xC48; // int32
                 pub const m_nPhysicsMaterial: usize = 0xC4C; // CUtlStringToken
                 pub const m_SlaveName: usize = 0xC50; // CUtlSymbolLarge
-                pub const m_hMaster: usize = 0xC58; // 
+                pub const m_hMaster: usize = 0xC58; // CHandle<CBasePropDoor>
                 pub const m_OnBlockedClosing: usize = 0xC60; // CEntityIOOutput
                 pub const m_OnBlockedOpening: usize = 0xC88; // CEntityIOOutput
                 pub const m_OnUnblockedClosing: usize = 0xCB0; // CEntityIOOutput
@@ -6898,8 +6898,8 @@ pub mod cs2_dumper {
             // NetworkVarNames: m_hostageRescueZ (int)
             // NetworkVarNames: m_bEndMatchNextMapAllVoted (bool)
             pub mod CCSPlayerResource {
-                pub const m_bHostageAlive: usize = 0x4C0; // bool[12]
-                pub const m_isHostageFollowingSomeone: usize = 0x4CC; // bool[12]
+                pub const m_bHostageAlive: usize = 0x4C0; // 
+                pub const m_isHostageFollowingSomeone: usize = 0x4CC; // 
                 pub const m_iHostageEntityIDs: usize = 0x4D8; // CEntityIndex[12]
                 pub const m_bombsiteCenterA: usize = 0x508; // 
                 pub const m_bombsiteCenterB: usize = 0x514; // 
diff --git a/output/soundsystem.dll.cs b/output/soundsystem.dll.cs
index 46c52c06..eada683e 100644
--- a/output/soundsystem.dll.cs
+++ b/output/soundsystem.dll.cs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 namespace CS2Dumper.Schemas {
     // Module: soundsystem.dll
diff --git a/output/soundsystem.dll.hpp b/output/soundsystem.dll.hpp
index a5e58698..197502ab 100644
--- a/output/soundsystem.dll.hpp
+++ b/output/soundsystem.dll.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #pragma once
 
diff --git a/output/soundsystem.dll.rs b/output/soundsystem.dll.rs
index 44b3a2f5..4048c52a 100644
--- a/output/soundsystem.dll.rs
+++ b/output/soundsystem.dll.rs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #![allow(non_upper_case_globals, non_camel_case_types, non_snake_case, unused)]
 
diff --git a/output/vphysics2.dll.cs b/output/vphysics2.dll.cs
index ad4a5027..123ac6cd 100644
--- a/output/vphysics2.dll.cs
+++ b/output/vphysics2.dll.cs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 namespace CS2Dumper.Schemas {
     // Module: vphysics2.dll
diff --git a/output/vphysics2.dll.hpp b/output/vphysics2.dll.hpp
index 55880860..429cf625 100644
--- a/output/vphysics2.dll.hpp
+++ b/output/vphysics2.dll.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #pragma once
 
diff --git a/output/vphysics2.dll.rs b/output/vphysics2.dll.rs
index 26663c4d..b256b300 100644
--- a/output/vphysics2.dll.rs
+++ b/output/vphysics2.dll.rs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #![allow(non_upper_case_globals, non_camel_case_types, non_snake_case, unused)]
 
diff --git a/output/worldrenderer.dll.cs b/output/worldrenderer.dll.cs
index c31141b5..93189885 100644
--- a/output/worldrenderer.dll.cs
+++ b/output/worldrenderer.dll.cs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 namespace CS2Dumper.Schemas {
     // Module: worldrenderer.dll
diff --git a/output/worldrenderer.dll.hpp b/output/worldrenderer.dll.hpp
index 804fd5e1..94af4e99 100644
--- a/output/worldrenderer.dll.hpp
+++ b/output/worldrenderer.dll.hpp
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #pragma once
 
diff --git a/output/worldrenderer.dll.rs b/output/worldrenderer.dll.rs
index 306a3549..8eae803a 100644
--- a/output/worldrenderer.dll.rs
+++ b/output/worldrenderer.dll.rs
@@ -1,5 +1,5 @@
 // Generated using https://github.com/a2x/cs2-dumper
-// 2024-04-07 05:30:39.851724900 UTC
+// 2024-04-07 08:19:03.265339800 UTC
 
 #![allow(non_upper_case_globals, non_camel_case_types, non_snake_case, unused)]
 
diff --git a/src/analysis/schemas.rs b/src/analysis/schemas.rs
index e6c7ebe7..33a2ef2f 100644
--- a/src/analysis/schemas.rs
+++ b/src/analysis/schemas.rs
@@ -266,42 +266,46 @@ fn read_type_scopes(
 ) -> Result<Vec<TypeScope>> {
     let type_scopes = &schema_system.type_scopes;
 
-    (0..type_scopes.size)
-        .map(|i| {
-            let type_scope_ptr = type_scopes.element(process, i as _)?;
-            let type_scope = type_scope_ptr.read(process)?;
+    (0..type_scopes.size).try_fold(Vec::new(), |mut acc, i| {
+        let type_scope_ptr = type_scopes.element(process, i as _)?;
+        let type_scope = type_scope_ptr.read(process)?;
 
-            let module_name = unsafe { CStr::from_ptr(type_scope.name.as_ptr()) }
-                .to_string_lossy()
-                .to_string();
+        let module_name = unsafe { CStr::from_ptr(type_scope.name.as_ptr()) }
+            .to_string_lossy()
+            .to_string();
 
-            let classes: Vec<_> = type_scope
-                .class_bindings
-                .elements(process)?
-                .iter()
-                .filter_map(|ptr| read_class_binding(process, *ptr).ok())
-                .collect();
+        let classes: Vec<_> = type_scope
+            .class_bindings
+            .elements(process)?
+            .iter()
+            .filter_map(|ptr| read_class_binding(process, *ptr).ok())
+            .collect();
 
-            let enums: Vec<_> = type_scope
-                .enum_bindings
-                .elements(process)?
-                .iter()
-                .filter_map(|ptr| read_enum_binding(process, *ptr).ok())
-                .collect();
+        let enums: Vec<_> = type_scope
+            .enum_bindings
+            .elements(process)?
+            .iter()
+            .filter_map(|ptr| read_enum_binding(process, *ptr).ok())
+            .collect();
 
-            debug!(
-                "found type scope: {} at {:#X} (classes count: {}) (enums count: {})",
-                module_name,
-                type_scope_ptr.to_umem(),
-                classes.len(),
-                enums.len()
-            );
+        if classes.is_empty() && enums.is_empty() {
+            return Ok(acc);
+        }
 
-            Ok(TypeScope {
-                module_name,
-                classes,
-                enums,
-            })
-        })
-        .collect()
+        debug!(
+            "found type scope: {} at {:#X} (classes count: {}) (enums count: {})",
+            module_name,
+            type_scope_ptr.to_umem(),
+            classes.len(),
+            enums.len(),
+        );
+
+        acc.push(TypeScope {
+            module_name,
+            classes,
+            enums,
+        });
+
+        Ok(acc)
+    })
 }
diff --git a/src/output/mod.rs b/src/output/mod.rs
index 4331e4e3..6d210498 100644
--- a/src/output/mod.rs
+++ b/src/output/mod.rs
@@ -234,10 +234,10 @@ impl Results {
         self.offsets
             .iter()
             .find_map(|(module_name, offsets)| {
-                let (_name, value) = offsets.iter().find(|(name, _)| *name == "dwBuildNumber")?;
                 let module = process.module_by_name(module_name).ok()?;
+                let offset = offsets.iter().find(|(name, _)| *name == "dwBuildNumber")?;
 
-                process.read(module.base + value).ok()
+                process.read(module.base + offset.1).ok()
             })
             .ok_or(Error::Other("unable to read build number"))
     }
diff --git a/src/output/schemas.rs b/src/output/schemas.rs
index 1f7c6aba..50612683 100644
--- a/src/output/schemas.rs
+++ b/src/output/schemas.rs
@@ -15,11 +15,6 @@ impl CodeGen for SchemaMap {
         self.write_content(results, indent_size, |fmt| {
             fmt.block("namespace CS2Dumper.Schemas", false, |fmt| {
                 for (module_name, (classes, enums)) in self {
-                    // Skip empty modules.
-                    if classes.is_empty() && enums.is_empty() {
-                        continue;
-                    }
-
                     writeln!(fmt, "// Module: {}", module_name)?;
                     writeln!(fmt, "// Classes count: {}", classes.len())?;
                     writeln!(fmt, "// Enums count: {}", enums.len())?;
@@ -116,11 +111,6 @@ impl CodeGen for SchemaMap {
             fmt.block("namespace cs2_dumper", false, |fmt| {
                 fmt.block("namespace schemas", false, |fmt| {
                     for (module_name, (classes, enums)) in self {
-                        // Skip empty modules.
-                        if classes.is_empty() && enums.is_empty() {
-                            continue;
-                        }
-
                         writeln!(fmt, "// Module: {}", module_name)?;
                         writeln!(fmt, "// Classes count: {}", classes.len())?;
                         writeln!(fmt, "// Enums count: {}", enums.len())?;
@@ -302,11 +292,6 @@ impl CodeGen for SchemaMap {
             fmt.block("pub mod cs2_dumper", false, |fmt| {
                 fmt.block("pub mod schemas", false, |fmt| {
                     for (module_name, (classes, enums)) in self {
-                        // Skip empty modules.
-                        if classes.is_empty() && enums.is_empty() {
-                            continue;
-                        }
-
                         writeln!(fmt, "// Module: {}", module_name)?;
                         writeln!(fmt, "// Classes count: {}", classes.len())?;
                         writeln!(fmt, "// Enums count: {}", enums.len())?;