diff --git a/src/object/client/CGContainer.cpp b/src/object/client/CGContainer.cpp
index 423af69..07eb44e 100644
--- a/src/object/client/CGContainer.cpp
+++ b/src/object/client/CGContainer.cpp
@@ -1,6 +1,10 @@
 #include "object/client/CGContainer.hpp"
 #include "object/client/CGItem.hpp"
 
+uint32_t CGContainer::TotalFields() {
+    return CGItem::TotalFields() + 74;
+}
+
 uint32_t CGContainer::TotalFieldsSaved() {
     return CGItem::TotalFieldsSaved() + 72;
 }
diff --git a/src/object/client/CGContainer.hpp b/src/object/client/CGContainer.hpp
index 0dd5506..a9797c8 100644
--- a/src/object/client/CGContainer.hpp
+++ b/src/object/client/CGContainer.hpp
@@ -10,6 +10,7 @@ struct CGContainerData {
 class CGContainer {
     public:
         // Public static functions
+        static uint32_t TotalFields();
         static uint32_t TotalFieldsSaved();
 };
 
diff --git a/src/object/client/CGCorpse.cpp b/src/object/client/CGCorpse.cpp
index 5ec8e10..5ccb069 100644
--- a/src/object/client/CGCorpse.cpp
+++ b/src/object/client/CGCorpse.cpp
@@ -1,6 +1,10 @@
 #include "object/client/CGCorpse.hpp"
 #include "object/client/CGObject.hpp"
 
+uint32_t CGCorpse::TotalFields() {
+    return CGObject::TotalFields() + 30;
+}
+
 uint32_t CGCorpse::TotalFieldsSaved() {
     return CGObject::TotalFieldsSaved() + 3;
 }
diff --git a/src/object/client/CGCorpse.hpp b/src/object/client/CGCorpse.hpp
index 99dfba8..902e48e 100644
--- a/src/object/client/CGCorpse.hpp
+++ b/src/object/client/CGCorpse.hpp
@@ -10,6 +10,7 @@ struct CGCorpseData {
 class CGCorpse {
     public:
         // Public static functions
+        static uint32_t TotalFields();
         static uint32_t TotalFieldsSaved();
 };
 
diff --git a/src/object/client/CGDynamicObject.cpp b/src/object/client/CGDynamicObject.cpp
index 6fd1a88..7a4e840 100644
--- a/src/object/client/CGDynamicObject.cpp
+++ b/src/object/client/CGDynamicObject.cpp
@@ -1,6 +1,10 @@
 #include "object/client/CGDynamicObject.hpp"
 #include "object/client/CGObject.hpp"
 
+uint32_t CGDynamicObject::TotalFields() {
+    return CGObject::TotalFields() + 6;
+}
+
 uint32_t CGDynamicObject::TotalFieldsSaved() {
     return CGObject::TotalFieldsSaved();
 }
diff --git a/src/object/client/CGDynamicObject.hpp b/src/object/client/CGDynamicObject.hpp
index 9c1d74d..2c32a10 100644
--- a/src/object/client/CGDynamicObject.hpp
+++ b/src/object/client/CGDynamicObject.hpp
@@ -10,6 +10,7 @@ struct CGDynamicObjectData {
 class CGDynamicObject {
     public:
         // Public static functions
+        static uint32_t TotalFields();
         static uint32_t TotalFieldsSaved();
 };
 
diff --git a/src/object/client/CGGameObject.cpp b/src/object/client/CGGameObject.cpp
index 25377a5..7f9b0d4 100644
--- a/src/object/client/CGGameObject.cpp
+++ b/src/object/client/CGGameObject.cpp
@@ -1,6 +1,10 @@
 #include "object/client/CGGameObject.hpp"
 #include "object/client/CGObject.hpp"
 
+uint32_t CGGameObject::TotalFields() {
+    return CGObject::TotalFields() + 12;
+}
+
 uint32_t CGGameObject::TotalFieldsSaved() {
     return CGObject::TotalFieldsSaved() + 4;
 }
diff --git a/src/object/client/CGGameObject.hpp b/src/object/client/CGGameObject.hpp
index 6f78e6b..ac573d0 100644
--- a/src/object/client/CGGameObject.hpp
+++ b/src/object/client/CGGameObject.hpp
@@ -10,6 +10,7 @@ struct CGGameObjectData {
 class CGGameObject {
     public:
         // Public static functions
+        static uint32_t TotalFields();
         static uint32_t TotalFieldsSaved();
 };
 
diff --git a/src/object/client/CGItem.cpp b/src/object/client/CGItem.cpp
index 1f847e1..f540e0f 100644
--- a/src/object/client/CGItem.cpp
+++ b/src/object/client/CGItem.cpp
@@ -1,6 +1,10 @@
 #include "object/client/CGItem.hpp"
 #include "object/client/CGObject.hpp"
 
+uint32_t CGItem::TotalFields() {
+    return CGObject::TotalFields() + 58;
+}
+
 uint32_t CGItem::TotalFieldsSaved() {
     return CGObject::TotalFieldsSaved() + 47;
 }
diff --git a/src/object/client/CGItem.hpp b/src/object/client/CGItem.hpp
index 53ec968..2efe3dc 100644
--- a/src/object/client/CGItem.hpp
+++ b/src/object/client/CGItem.hpp
@@ -10,6 +10,7 @@ struct CGItemData {
 class CGItem {
     public:
         // Public static functions
+        static uint32_t TotalFields();
         static uint32_t TotalFieldsSaved();
 };
 
diff --git a/src/object/client/CGObject.cpp b/src/object/client/CGObject.cpp
index da41804..fd6d02d 100644
--- a/src/object/client/CGObject.cpp
+++ b/src/object/client/CGObject.cpp
@@ -1,5 +1,9 @@
 #include "object/client/CGObject.hpp"
 
+uint32_t CGObject::TotalFields() {
+    return 6;
+}
+
 uint32_t CGObject::TotalFieldsSaved() {
     return 3;
 }
diff --git a/src/object/client/CGObject.hpp b/src/object/client/CGObject.hpp
index 8563f7a..1ceee2b 100644
--- a/src/object/client/CGObject.hpp
+++ b/src/object/client/CGObject.hpp
@@ -15,6 +15,7 @@ struct CGObjectData {
 class CGObject {
     public:
         // Public static functions
+        static uint32_t TotalFields();
         static uint32_t TotalFieldsSaved();
 
         // Public member variables
diff --git a/src/object/client/CGPlayer.cpp b/src/object/client/CGPlayer.cpp
index ed177d6..e9567e0 100644
--- a/src/object/client/CGPlayer.cpp
+++ b/src/object/client/CGPlayer.cpp
@@ -1,6 +1,14 @@
 #include "object/client/CGPlayer.hpp"
 #include "object/client/CGUnit.hpp"
 
+uint32_t CGPlayer::TotalFields() {
+    return CGUnit::TotalFields() + 1178;
+}
+
+uint32_t CGPlayer::TotalRemoteFields() {
+    return CGUnit::TotalFields() + 176;
+}
+
 uint32_t CGPlayer::TotalFieldsSaved() {
     return CGUnit::TotalFieldsSaved() + 1043;
 }
diff --git a/src/object/client/CGPlayer.hpp b/src/object/client/CGPlayer.hpp
index 0405bdc..0b3d6da 100644
--- a/src/object/client/CGPlayer.hpp
+++ b/src/object/client/CGPlayer.hpp
@@ -10,6 +10,8 @@ struct CGPlayerData {
 class CGPlayer {
     public:
         // Public static functions
+        static uint32_t TotalFields();
+        static uint32_t TotalRemoteFields();
         static uint32_t TotalFieldsSaved();
         static uint32_t TotalRemoteFieldsSaved();
 };
diff --git a/src/object/client/CGUnit.cpp b/src/object/client/CGUnit.cpp
index bcbdd86..051d6c9 100644
--- a/src/object/client/CGUnit.cpp
+++ b/src/object/client/CGUnit.cpp
@@ -1,6 +1,10 @@
 #include "object/client/CGUnit.hpp"
 #include "object/client/CGObject.hpp"
 
+uint32_t CGUnit::TotalFields() {
+    return CGObject::TotalFields() + 142;
+}
+
 uint32_t CGUnit::TotalFieldsSaved() {
     return CGObject::TotalFieldsSaved() + 123;
 }
diff --git a/src/object/client/CGUnit.hpp b/src/object/client/CGUnit.hpp
index fe5a5e3..fa345ae 100644
--- a/src/object/client/CGUnit.hpp
+++ b/src/object/client/CGUnit.hpp
@@ -10,6 +10,7 @@ struct CGUnitData {
 class CGUnit {
     public:
         // Public static functions
+        static uint32_t TotalFields();
         static uint32_t TotalFieldsSaved();
 };