diff --git a/src/client/component/loot.cpp b/src/client/component/loot.cpp
index d2afb1c2..25df9f64 100644
--- a/src/client/component/loot.cpp
+++ b/src/client/component/loot.cpp
@@ -5,6 +5,7 @@
 
 #include "scheduler.hpp"
 #include "game/game.hpp"
+#include "game/utils.hpp"
 
 namespace loot
 {
@@ -95,14 +96,10 @@ namespace loot
 	{
 		void post_unpack() override
 		{
-			dvar_cg_unlockall_loot = game::Dvar_RegisterBool(game::Dvar_GenerateHash("cg_unlockall_loot"), "cg_unlockall_loot", false, (game::dvarFlags_e)0x0, "Unlocks blackmarket loot");
-			dvar_cg_unlockall_loot->debugName = "cg_unlockall_loot";
-			dvar_cg_unlockall_purchases = game::Dvar_RegisterBool(game::Dvar_GenerateHash("cg_unlockall_purchases"), "cg_unlockall_purchases", false, (game::dvarFlags_e)0x0, "Unlock all purchases with tokens");
-			dvar_cg_unlockall_purchases->debugName = "cg_unlockall_purchases";
-			dvar_cg_unlockall_attachments = game::Dvar_RegisterBool(game::Dvar_GenerateHash("cg_unlockall_attachments"), "cg_unlockall_attachments", false, (game::dvarFlags_e)0x0, "Unlocks all attachments");
-			dvar_cg_unlockall_attachments->debugName = "cg_unlockall_attachments";
-			dvar_cg_cg_unlockall_camos = game::Dvar_RegisterBool(game::Dvar_GenerateHash("cg_unlockall_camos"), "cg_unlockall_camos", false, (game::dvarFlags_e)0x0, "Unlocks all camos");
-			dvar_cg_cg_unlockall_camos->debugName = "cg_unlockall_camos";
+			dvar_cg_unlockall_loot = game::register_dvar_bool("cg_unlockall_loot", false, game::DVAR_ARCHIVE, "Unlocks blackmarket loot");
+			dvar_cg_unlockall_purchases = game::register_dvar_bool("cg_unlockall_purchases", false, game::DVAR_ARCHIVE, "Unlock all purchases with tokens");
+			dvar_cg_unlockall_attachments = game::register_dvar_bool("cg_unlockall_attachments", false, game::DVAR_ARCHIVE, "Unlocks all attachments");
+			dvar_cg_cg_unlockall_camos = game::register_dvar_bool("cg_unlockall_camos", false, game::DVAR_ARCHIVE, "Unlocks all camos");
 
 			loot_getitemquantity_hook.create(0x141E82C00_g, loot_getitemquantity_stub);
 			liveinventory_getitemquantity_hook.create(0x141E09030_g, liveinventory_getitemquantity_stub);
diff --git a/src/client/component/party.cpp b/src/client/component/party.cpp
index 793cc8a9..53ecc3bd 100644
--- a/src/client/component/party.cpp
+++ b/src/client/component/party.cpp
@@ -1,7 +1,6 @@
 #include <std_include.hpp>
 #include "loader/component_loader.hpp"
 #include "game/game.hpp"
-#include "game/utils.hpp"
 
 #include "party.hpp"
 #include "network.hpp"
@@ -14,7 +13,6 @@
 #include <utils/cryptography.hpp>
 #include <utils/concurrency.hpp>
 
-
 namespace party
 {
 	namespace