diff --git a/common/repositories/base/base_aa_ability_repository.h b/common/repositories/base/base_aa_ability_repository.h
index fbf16f0ba..a6079b617 100644
--- a/common/repositories/base/base_aa_ability_repository.h
+++ b/common/repositories/base/base_aa_ability_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_aa_rank_effects_repository.h b/common/repositories/base/base_aa_rank_effects_repository.h
index fa0eebcd1..3fca2393c 100644
--- a/common/repositories/base/base_aa_rank_effects_repository.h
+++ b/common/repositories/base/base_aa_rank_effects_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_aa_rank_prereqs_repository.h b/common/repositories/base/base_aa_rank_prereqs_repository.h
index 04b1a0a38..a2d0f584a 100644
--- a/common/repositories/base/base_aa_rank_prereqs_repository.h
+++ b/common/repositories/base/base_aa_rank_prereqs_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_aa_ranks_repository.h b/common/repositories/base/base_aa_ranks_repository.h
index 8145e3e96..57bf035d2 100644
--- a/common/repositories/base/base_aa_ranks_repository.h
+++ b/common/repositories/base/base_aa_ranks_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_account_flags_repository.h b/common/repositories/base/base_account_flags_repository.h
index af9c9b223..68929ef37 100644
--- a/common/repositories/base/base_account_flags_repository.h
+++ b/common/repositories/base/base_account_flags_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_account_ip_repository.h b/common/repositories/base/base_account_ip_repository.h
index 1384c4ef2..2a3a93e62 100644
--- a/common/repositories/base/base_account_ip_repository.h
+++ b/common/repositories/base/base_account_ip_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -74,7 +74,7 @@ public:
 		entry.accid    = 0;
 		entry.ip       = "";
 		entry.count    = 1;
-		entry.lastused = current_timestamp();
+		entry.lastused = "";
 
 		return entry;
 	}
diff --git a/common/repositories/base/base_account_repository.h b/common/repositories/base/base_account_repository.h
index 6283caf13..681b2c1e5 100644
--- a/common/repositories/base/base_account_repository.h
+++ b/common/repositories/base/base_account_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_account_rewards_repository.h b/common/repositories/base/base_account_rewards_repository.h
index ee6213e16..4fd0ecb63 100644
--- a/common/repositories/base/base_account_rewards_repository.h
+++ b/common/repositories/base/base_account_rewards_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_adventure_details_repository.h b/common/repositories/base/base_adventure_details_repository.h
index 656ba8908..cf6b27197 100644
--- a/common/repositories/base/base_adventure_details_repository.h
+++ b/common/repositories/base/base_adventure_details_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_adventure_members_repository.h b/common/repositories/base/base_adventure_members_repository.h
index 4cdc357fd..80f824175 100644
--- a/common/repositories/base/base_adventure_members_repository.h
+++ b/common/repositories/base/base_adventure_members_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_adventure_stats_repository.h b/common/repositories/base/base_adventure_stats_repository.h
index b1634c080..bd21e2fef 100644
--- a/common/repositories/base/base_adventure_stats_repository.h
+++ b/common/repositories/base/base_adventure_stats_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_adventure_template_entry_flavor_repository.h b/common/repositories/base/base_adventure_template_entry_flavor_repository.h
index 8b4bfa7b6..fc586a252 100644
--- a/common/repositories/base/base_adventure_template_entry_flavor_repository.h
+++ b/common/repositories/base/base_adventure_template_entry_flavor_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_adventure_template_entry_repository.h b/common/repositories/base/base_adventure_template_entry_repository.h
index 5e4b9ca7c..6a348b350 100644
--- a/common/repositories/base/base_adventure_template_entry_repository.h
+++ b/common/repositories/base/base_adventure_template_entry_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_adventure_template_repository.h b/common/repositories/base/base_adventure_template_repository.h
index 076b8abc5..4509268ad 100644
--- a/common/repositories/base/base_adventure_template_repository.h
+++ b/common/repositories/base/base_adventure_template_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_alternate_currency_repository.h b/common/repositories/base/base_alternate_currency_repository.h
index 832da0f84..1687d66c3 100644
--- a/common/repositories/base/base_alternate_currency_repository.h
+++ b/common/repositories/base/base_alternate_currency_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_auras_repository.h b/common/repositories/base/base_auras_repository.h
index e884fc50b..478413ffa 100644
--- a/common/repositories/base/base_auras_repository.h
+++ b/common/repositories/base/base_auras_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_base_data_repository.h b/common/repositories/base/base_base_data_repository.h
index 3574f254a..ea152964b 100644
--- a/common/repositories/base/base_base_data_repository.h
+++ b/common/repositories/base/base_base_data_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -19,7 +19,7 @@ class BaseBaseDataRepository {
 public:
 	struct BaseData {
 		int   level;
-		int   class;
+		int   class_;
 		float hp;
 		float mana;
 		float end;
@@ -39,7 +39,7 @@ public:
 	{
 		return {
 			"level",
-			"class",
+			"`class`",
 			"hp",
 			"mana",
 			"end",
@@ -84,7 +84,7 @@ public:
 		BaseData entry{};
 
 		entry.level    = 0;
-		entry.class    = 0;
+		entry.class_   = 0;
 		entry.hp       = 0;
 		entry.mana     = 0;
 		entry.end      = 0;
@@ -129,7 +129,7 @@ public:
 			BaseData entry{};
 
 			entry.level    = atoi(row[0]);
-			entry.class    = atoi(row[1]);
+			entry.class_   = atoi(row[1]);
 			entry.hp       = static_cast<float>(atof(row[2]));
 			entry.mana     = static_cast<float>(atof(row[3]));
 			entry.end      = static_cast<float>(atof(row[4]));
@@ -172,7 +172,7 @@ public:
 		auto columns = Columns();
 
 		update_values.push_back(columns[0] + " = " + std::to_string(base_data_entry.level));
-		update_values.push_back(columns[1] + " = " + std::to_string(base_data_entry.class));
+		update_values.push_back(columns[1] + " = " + std::to_string(base_data_entry.class_));
 		update_values.push_back(columns[2] + " = " + std::to_string(base_data_entry.hp));
 		update_values.push_back(columns[3] + " = " + std::to_string(base_data_entry.mana));
 		update_values.push_back(columns[4] + " = " + std::to_string(base_data_entry.end));
@@ -203,7 +203,7 @@ public:
 		std::vector<std::string> insert_values;
 
 		insert_values.push_back(std::to_string(base_data_entry.level));
-		insert_values.push_back(std::to_string(base_data_entry.class));
+		insert_values.push_back(std::to_string(base_data_entry.class_));
 		insert_values.push_back(std::to_string(base_data_entry.hp));
 		insert_values.push_back(std::to_string(base_data_entry.mana));
 		insert_values.push_back(std::to_string(base_data_entry.end));
@@ -242,7 +242,7 @@ public:
 			std::vector<std::string> insert_values;
 
 			insert_values.push_back(std::to_string(base_data_entry.level));
-			insert_values.push_back(std::to_string(base_data_entry.class));
+			insert_values.push_back(std::to_string(base_data_entry.class_));
 			insert_values.push_back(std::to_string(base_data_entry.hp));
 			insert_values.push_back(std::to_string(base_data_entry.mana));
 			insert_values.push_back(std::to_string(base_data_entry.end));
@@ -285,7 +285,7 @@ public:
 			BaseData entry{};
 
 			entry.level    = atoi(row[0]);
-			entry.class    = atoi(row[1]);
+			entry.class_   = atoi(row[1]);
 			entry.hp       = static_cast<float>(atof(row[2]));
 			entry.mana     = static_cast<float>(atof(row[3]));
 			entry.end      = static_cast<float>(atof(row[4]));
@@ -319,7 +319,7 @@ public:
 			BaseData entry{};
 
 			entry.level    = atoi(row[0]);
-			entry.class    = atoi(row[1]);
+			entry.class_   = atoi(row[1]);
 			entry.hp       = static_cast<float>(atof(row[2]));
 			entry.mana     = static_cast<float>(atof(row[3]));
 			entry.end      = static_cast<float>(atof(row[4]));
diff --git a/common/repositories/base/base_blocked_spells_repository.h b/common/repositories/base/base_blocked_spells_repository.h
index d17524a2c..3905a30d6 100644
--- a/common/repositories/base/base_blocked_spells_repository.h
+++ b/common/repositories/base/base_blocked_spells_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_bug_reports_repository.h b/common/repositories/base/base_bug_reports_repository.h
index ecd1335ef..1f5385994 100644
--- a/common/repositories/base/base_bug_reports_repository.h
+++ b/common/repositories/base/base_bug_reports_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -154,9 +154,9 @@ public:
 		entry._unknown_value      = 0;
 		entry.bug_report          = "";
 		entry.system_info         = "";
-		entry.report_datetime     = current_timestamp();
+		entry.report_datetime     = "";
 		entry.bug_status          = 0;
-		entry.last_review         = current_timestamp();
+		entry.last_review         = "";
 		entry.last_reviewer       = "None";
 		entry.reviewer_notes      = "";
 
diff --git a/common/repositories/base/base_bugs_repository.h b/common/repositories/base/base_bugs_repository.h
index 9ac9b9330..da35828c1 100644
--- a/common/repositories/base/base_bugs_repository.h
+++ b/common/repositories/base/base_bugs_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_buyer_repository.h b/common/repositories/base/base_buyer_repository.h
index 1b1cb9800..292792ddb 100644
--- a/common/repositories/base/base_buyer_repository.h
+++ b/common/repositories/base/base_buyer_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_char_create_combinations_repository.h b/common/repositories/base/base_char_create_combinations_repository.h
index ed806d6bd..8423f9751 100644
--- a/common/repositories/base/base_char_create_combinations_repository.h
+++ b/common/repositories/base/base_char_create_combinations_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -20,7 +20,7 @@ public:
 	struct CharCreateCombinations {
 		int allocation_id;
 		int race;
-		int class;
+		int class_;
 		int deity;
 		int start_zone;
 		int expansions_req;
@@ -36,7 +36,7 @@ public:
 		return {
 			"allocation_id",
 			"race",
-			"class",
+			"`class`",
 			"deity",
 			"start_zone",
 			"expansions_req",
@@ -77,7 +77,7 @@ public:
 
 		entry.allocation_id  = 0;
 		entry.race           = 0;
-		entry.class          = 0;
+		entry.class_         = 0;
 		entry.deity          = 0;
 		entry.start_zone     = 0;
 		entry.expansions_req = 0;
@@ -118,7 +118,7 @@ public:
 
 			entry.allocation_id  = atoi(row[0]);
 			entry.race           = atoi(row[1]);
-			entry.class          = atoi(row[2]);
+			entry.class_         = atoi(row[2]);
 			entry.deity          = atoi(row[3]);
 			entry.start_zone     = atoi(row[4]);
 			entry.expansions_req = atoi(row[5]);
@@ -157,7 +157,7 @@ public:
 
 		update_values.push_back(columns[0] + " = " + std::to_string(char_create_combinations_entry.allocation_id));
 		update_values.push_back(columns[1] + " = " + std::to_string(char_create_combinations_entry.race));
-		update_values.push_back(columns[2] + " = " + std::to_string(char_create_combinations_entry.class));
+		update_values.push_back(columns[2] + " = " + std::to_string(char_create_combinations_entry.class_));
 		update_values.push_back(columns[3] + " = " + std::to_string(char_create_combinations_entry.deity));
 		update_values.push_back(columns[4] + " = " + std::to_string(char_create_combinations_entry.start_zone));
 		update_values.push_back(columns[5] + " = " + std::to_string(char_create_combinations_entry.expansions_req));
@@ -184,7 +184,7 @@ public:
 
 		insert_values.push_back(std::to_string(char_create_combinations_entry.allocation_id));
 		insert_values.push_back(std::to_string(char_create_combinations_entry.race));
-		insert_values.push_back(std::to_string(char_create_combinations_entry.class));
+		insert_values.push_back(std::to_string(char_create_combinations_entry.class_));
 		insert_values.push_back(std::to_string(char_create_combinations_entry.deity));
 		insert_values.push_back(std::to_string(char_create_combinations_entry.start_zone));
 		insert_values.push_back(std::to_string(char_create_combinations_entry.expansions_req));
@@ -219,7 +219,7 @@ public:
 
 			insert_values.push_back(std::to_string(char_create_combinations_entry.allocation_id));
 			insert_values.push_back(std::to_string(char_create_combinations_entry.race));
-			insert_values.push_back(std::to_string(char_create_combinations_entry.class));
+			insert_values.push_back(std::to_string(char_create_combinations_entry.class_));
 			insert_values.push_back(std::to_string(char_create_combinations_entry.deity));
 			insert_values.push_back(std::to_string(char_create_combinations_entry.start_zone));
 			insert_values.push_back(std::to_string(char_create_combinations_entry.expansions_req));
@@ -258,7 +258,7 @@ public:
 
 			entry.allocation_id  = atoi(row[0]);
 			entry.race           = atoi(row[1]);
-			entry.class          = atoi(row[2]);
+			entry.class_         = atoi(row[2]);
 			entry.deity          = atoi(row[3]);
 			entry.start_zone     = atoi(row[4]);
 			entry.expansions_req = atoi(row[5]);
@@ -288,7 +288,7 @@ public:
 
 			entry.allocation_id  = atoi(row[0]);
 			entry.race           = atoi(row[1]);
-			entry.class          = atoi(row[2]);
+			entry.class_         = atoi(row[2]);
 			entry.deity          = atoi(row[3]);
 			entry.start_zone     = atoi(row[4]);
 			entry.expansions_req = atoi(row[5]);
diff --git a/common/repositories/base/base_char_create_point_allocations_repository.h b/common/repositories/base/base_char_create_point_allocations_repository.h
index 7b3f4a2d6..668fc5062 100644
--- a/common/repositories/base/base_char_create_point_allocations_repository.h
+++ b/common/repositories/base/base_char_create_point_allocations_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_char_recipe_list_repository.h b/common/repositories/base/base_char_recipe_list_repository.h
index cb3e33707..541859f49 100644
--- a/common/repositories/base/base_char_recipe_list_repository.h
+++ b/common/repositories/base/base_char_recipe_list_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_activities_repository.h b/common/repositories/base/base_character_activities_repository.h
index 9c4a7b144..e4014c0a4 100644
--- a/common/repositories/base/base_character_activities_repository.h
+++ b/common/repositories/base/base_character_activities_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_alt_currency_repository.h b/common/repositories/base/base_character_alt_currency_repository.h
index 9e2ebc695..31228ba3b 100644
--- a/common/repositories/base/base_character_alt_currency_repository.h
+++ b/common/repositories/base/base_character_alt_currency_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_alternate_abilities_repository.h b/common/repositories/base/base_character_alternate_abilities_repository.h
index de4ef1cb4..a3616643d 100644
--- a/common/repositories/base/base_character_alternate_abilities_repository.h
+++ b/common/repositories/base/base_character_alternate_abilities_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_auras_repository.h b/common/repositories/base/base_character_auras_repository.h
index 8ac89e458..10f9d3ac4 100644
--- a/common/repositories/base/base_character_auras_repository.h
+++ b/common/repositories/base/base_character_auras_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_bandolier_repository.h b/common/repositories/base/base_character_bandolier_repository.h
index a208ac9da..f4c725fb7 100644
--- a/common/repositories/base/base_character_bandolier_repository.h
+++ b/common/repositories/base/base_character_bandolier_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_bind_repository.h b/common/repositories/base/base_character_bind_repository.h
index 6ae2aee1d..c31979a8d 100644
--- a/common/repositories/base/base_character_bind_repository.h
+++ b/common/repositories/base/base_character_bind_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_buffs_repository.h b/common/repositories/base/base_character_buffs_repository.h
index 6e577e154..51d179c86 100644
--- a/common/repositories/base/base_character_buffs_repository.h
+++ b/common/repositories/base/base_character_buffs_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_corpse_items_repository.h b/common/repositories/base/base_character_corpse_items_repository.h
index a1d50d125..37343835f 100644
--- a/common/repositories/base/base_character_corpse_items_repository.h
+++ b/common/repositories/base/base_character_corpse_items_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_corpses_repository.h b/common/repositories/base/base_character_corpses_repository.h
index bb7df4e0d..f215a351f 100644
--- a/common/repositories/base/base_character_corpses_repository.h
+++ b/common/repositories/base/base_character_corpses_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -38,7 +38,7 @@ public:
 		int         level;
 		int         race;
 		int         gender;
-		int         class;
+		int         class_;
 		int         deity;
 		int         texture;
 		int         helm_texture;
@@ -95,7 +95,7 @@ public:
 			"level",
 			"race",
 			"gender",
-			"class",
+			"`class`",
 			"deity",
 			"texture",
 			"helm_texture",
@@ -177,7 +177,7 @@ public:
 		entry.level            = 0;
 		entry.race             = 0;
 		entry.gender           = 0;
-		entry.class            = 0;
+		entry.class_           = 0;
 		entry.deity            = 0;
 		entry.texture          = 0;
 		entry.helm_texture     = 0;
@@ -259,7 +259,7 @@ public:
 			entry.level            = atoi(row[17]);
 			entry.race             = atoi(row[18]);
 			entry.gender           = atoi(row[19]);
-			entry.class            = atoi(row[20]);
+			entry.class_           = atoi(row[20]);
 			entry.deity            = atoi(row[21]);
 			entry.texture          = atoi(row[22]);
 			entry.helm_texture     = atoi(row[23]);
@@ -338,7 +338,7 @@ public:
 		update_values.push_back(columns[17] + " = " + std::to_string(character_corpses_entry.level));
 		update_values.push_back(columns[18] + " = " + std::to_string(character_corpses_entry.race));
 		update_values.push_back(columns[19] + " = " + std::to_string(character_corpses_entry.gender));
-		update_values.push_back(columns[20] + " = " + std::to_string(character_corpses_entry.class));
+		update_values.push_back(columns[20] + " = " + std::to_string(character_corpses_entry.class_));
 		update_values.push_back(columns[21] + " = " + std::to_string(character_corpses_entry.deity));
 		update_values.push_back(columns[22] + " = " + std::to_string(character_corpses_entry.texture));
 		update_values.push_back(columns[23] + " = " + std::to_string(character_corpses_entry.helm_texture));
@@ -406,7 +406,7 @@ public:
 		insert_values.push_back(std::to_string(character_corpses_entry.level));
 		insert_values.push_back(std::to_string(character_corpses_entry.race));
 		insert_values.push_back(std::to_string(character_corpses_entry.gender));
-		insert_values.push_back(std::to_string(character_corpses_entry.class));
+		insert_values.push_back(std::to_string(character_corpses_entry.class_));
 		insert_values.push_back(std::to_string(character_corpses_entry.deity));
 		insert_values.push_back(std::to_string(character_corpses_entry.texture));
 		insert_values.push_back(std::to_string(character_corpses_entry.helm_texture));
@@ -482,7 +482,7 @@ public:
 			insert_values.push_back(std::to_string(character_corpses_entry.level));
 			insert_values.push_back(std::to_string(character_corpses_entry.race));
 			insert_values.push_back(std::to_string(character_corpses_entry.gender));
-			insert_values.push_back(std::to_string(character_corpses_entry.class));
+			insert_values.push_back(std::to_string(character_corpses_entry.class_));
 			insert_values.push_back(std::to_string(character_corpses_entry.deity));
 			insert_values.push_back(std::to_string(character_corpses_entry.texture));
 			insert_values.push_back(std::to_string(character_corpses_entry.helm_texture));
@@ -562,7 +562,7 @@ public:
 			entry.level            = atoi(row[17]);
 			entry.race             = atoi(row[18]);
 			entry.gender           = atoi(row[19]);
-			entry.class            = atoi(row[20]);
+			entry.class_           = atoi(row[20]);
 			entry.deity            = atoi(row[21]);
 			entry.texture          = atoi(row[22]);
 			entry.helm_texture     = atoi(row[23]);
@@ -633,7 +633,7 @@ public:
 			entry.level            = atoi(row[17]);
 			entry.race             = atoi(row[18]);
 			entry.gender           = atoi(row[19]);
-			entry.class            = atoi(row[20]);
+			entry.class_           = atoi(row[20]);
 			entry.deity            = atoi(row[21]);
 			entry.texture          = atoi(row[22]);
 			entry.helm_texture     = atoi(row[23]);
diff --git a/common/repositories/base/base_character_currency_repository.h b/common/repositories/base/base_character_currency_repository.h
index 17134a15d..a50a4cd7b 100644
--- a/common/repositories/base/base_character_currency_repository.h
+++ b/common/repositories/base/base_character_currency_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_data_repository.h b/common/repositories/base/base_character_data_repository.h
index 623a5a875..b95d42447 100644
--- a/common/repositories/base/base_character_data_repository.h
+++ b/common/repositories/base/base_character_data_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -32,7 +32,7 @@ public:
 		float       heading;
 		int         gender;
 		int         race;
-		int         class;
+		int         class_;
 		int         level;
 		int         deity;
 		int         birthday;
@@ -72,7 +72,7 @@ public:
 		int         sta;
 		int         cha;
 		int         dex;
-		int         int;
+		int         int_;
 		int         agi;
 		int         wis;
 		int         zone_change_count;
@@ -144,7 +144,7 @@ public:
 			"heading",
 			"gender",
 			"race",
-			"class",
+			"`class`",
 			"level",
 			"deity",
 			"birthday",
@@ -184,7 +184,7 @@ public:
 			"sta",
 			"cha",
 			"dex",
-			"int",
+			"`int`",
 			"agi",
 			"wis",
 			"zone_change_count",
@@ -281,7 +281,7 @@ public:
 		entry.heading                 = 0;
 		entry.gender                  = 0;
 		entry.race                    = 0;
-		entry.class                   = 0;
+		entry.class_                  = 0;
 		entry.level                   = 0;
 		entry.deity                   = 0;
 		entry.birthday                = 0;
@@ -321,7 +321,7 @@ public:
 		entry.sta                     = 0;
 		entry.cha                     = 0;
 		entry.dex                     = 0;
-		entry.int                     = 0;
+		entry.int_                    = 0;
 		entry.agi                     = 0;
 		entry.wis                     = 0;
 		entry.zone_change_count       = 0;
@@ -368,7 +368,7 @@ public:
 		entry.aa_points_spent_old     = 0;
 		entry.aa_points_old           = 0;
 		entry.e_last_invsnapshot      = 0;
-		entry.deleted_at              = 0;
+		entry.deleted_at              = "";
 
 		return entry;
 	}
@@ -418,7 +418,7 @@ public:
 			entry.heading                 = static_cast<float>(atof(row[11]));
 			entry.gender                  = atoi(row[12]);
 			entry.race                    = atoi(row[13]);
-			entry.class                   = atoi(row[14]);
+			entry.class_                  = atoi(row[14]);
 			entry.level                   = atoi(row[15]);
 			entry.deity                   = atoi(row[16]);
 			entry.birthday                = atoi(row[17]);
@@ -458,7 +458,7 @@ public:
 			entry.sta                     = atoi(row[51]);
 			entry.cha                     = atoi(row[52]);
 			entry.dex                     = atoi(row[53]);
-			entry.int                     = atoi(row[54]);
+			entry.int_                    = atoi(row[54]);
 			entry.agi                     = atoi(row[55]);
 			entry.wis                     = atoi(row[56]);
 			entry.zone_change_count       = atoi(row[57]);
@@ -552,7 +552,7 @@ public:
 		update_values.push_back(columns[11] + " = " + std::to_string(character_data_entry.heading));
 		update_values.push_back(columns[12] + " = " + std::to_string(character_data_entry.gender));
 		update_values.push_back(columns[13] + " = " + std::to_string(character_data_entry.race));
-		update_values.push_back(columns[14] + " = " + std::to_string(character_data_entry.class));
+		update_values.push_back(columns[14] + " = " + std::to_string(character_data_entry.class_));
 		update_values.push_back(columns[15] + " = " + std::to_string(character_data_entry.level));
 		update_values.push_back(columns[16] + " = " + std::to_string(character_data_entry.deity));
 		update_values.push_back(columns[17] + " = " + std::to_string(character_data_entry.birthday));
@@ -592,7 +592,7 @@ public:
 		update_values.push_back(columns[51] + " = " + std::to_string(character_data_entry.sta));
 		update_values.push_back(columns[52] + " = " + std::to_string(character_data_entry.cha));
 		update_values.push_back(columns[53] + " = " + std::to_string(character_data_entry.dex));
-		update_values.push_back(columns[54] + " = " + std::to_string(character_data_entry.int));
+		update_values.push_back(columns[54] + " = " + std::to_string(character_data_entry.int_));
 		update_values.push_back(columns[55] + " = " + std::to_string(character_data_entry.agi));
 		update_values.push_back(columns[56] + " = " + std::to_string(character_data_entry.wis));
 		update_values.push_back(columns[57] + " = " + std::to_string(character_data_entry.zone_change_count));
@@ -675,7 +675,7 @@ public:
 		insert_values.push_back(std::to_string(character_data_entry.heading));
 		insert_values.push_back(std::to_string(character_data_entry.gender));
 		insert_values.push_back(std::to_string(character_data_entry.race));
-		insert_values.push_back(std::to_string(character_data_entry.class));
+		insert_values.push_back(std::to_string(character_data_entry.class_));
 		insert_values.push_back(std::to_string(character_data_entry.level));
 		insert_values.push_back(std::to_string(character_data_entry.deity));
 		insert_values.push_back(std::to_string(character_data_entry.birthday));
@@ -715,7 +715,7 @@ public:
 		insert_values.push_back(std::to_string(character_data_entry.sta));
 		insert_values.push_back(std::to_string(character_data_entry.cha));
 		insert_values.push_back(std::to_string(character_data_entry.dex));
-		insert_values.push_back(std::to_string(character_data_entry.int));
+		insert_values.push_back(std::to_string(character_data_entry.int_));
 		insert_values.push_back(std::to_string(character_data_entry.agi));
 		insert_values.push_back(std::to_string(character_data_entry.wis));
 		insert_values.push_back(std::to_string(character_data_entry.zone_change_count));
@@ -806,7 +806,7 @@ public:
 			insert_values.push_back(std::to_string(character_data_entry.heading));
 			insert_values.push_back(std::to_string(character_data_entry.gender));
 			insert_values.push_back(std::to_string(character_data_entry.race));
-			insert_values.push_back(std::to_string(character_data_entry.class));
+			insert_values.push_back(std::to_string(character_data_entry.class_));
 			insert_values.push_back(std::to_string(character_data_entry.level));
 			insert_values.push_back(std::to_string(character_data_entry.deity));
 			insert_values.push_back(std::to_string(character_data_entry.birthday));
@@ -846,7 +846,7 @@ public:
 			insert_values.push_back(std::to_string(character_data_entry.sta));
 			insert_values.push_back(std::to_string(character_data_entry.cha));
 			insert_values.push_back(std::to_string(character_data_entry.dex));
-			insert_values.push_back(std::to_string(character_data_entry.int));
+			insert_values.push_back(std::to_string(character_data_entry.int_));
 			insert_values.push_back(std::to_string(character_data_entry.agi));
 			insert_values.push_back(std::to_string(character_data_entry.wis));
 			insert_values.push_back(std::to_string(character_data_entry.zone_change_count));
@@ -941,7 +941,7 @@ public:
 			entry.heading                 = static_cast<float>(atof(row[11]));
 			entry.gender                  = atoi(row[12]);
 			entry.race                    = atoi(row[13]);
-			entry.class                   = atoi(row[14]);
+			entry.class_                  = atoi(row[14]);
 			entry.level                   = atoi(row[15]);
 			entry.deity                   = atoi(row[16]);
 			entry.birthday                = atoi(row[17]);
@@ -981,7 +981,7 @@ public:
 			entry.sta                     = atoi(row[51]);
 			entry.cha                     = atoi(row[52]);
 			entry.dex                     = atoi(row[53]);
-			entry.int                     = atoi(row[54]);
+			entry.int_                    = atoi(row[54]);
 			entry.agi                     = atoi(row[55]);
 			entry.wis                     = atoi(row[56]);
 			entry.zone_change_count       = atoi(row[57]);
@@ -1067,7 +1067,7 @@ public:
 			entry.heading                 = static_cast<float>(atof(row[11]));
 			entry.gender                  = atoi(row[12]);
 			entry.race                    = atoi(row[13]);
-			entry.class                   = atoi(row[14]);
+			entry.class_                  = atoi(row[14]);
 			entry.level                   = atoi(row[15]);
 			entry.deity                   = atoi(row[16]);
 			entry.birthday                = atoi(row[17]);
@@ -1107,7 +1107,7 @@ public:
 			entry.sta                     = atoi(row[51]);
 			entry.cha                     = atoi(row[52]);
 			entry.dex                     = atoi(row[53]);
-			entry.int                     = atoi(row[54]);
+			entry.int_                    = atoi(row[54]);
 			entry.agi                     = atoi(row[55]);
 			entry.wis                     = atoi(row[56]);
 			entry.zone_change_count       = atoi(row[57]);
diff --git a/common/repositories/base/base_character_disciplines_repository.h b/common/repositories/base/base_character_disciplines_repository.h
index 941e36056..a1870e5a0 100644
--- a/common/repositories/base/base_character_disciplines_repository.h
+++ b/common/repositories/base/base_character_disciplines_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_expedition_lockouts_repository.h b/common/repositories/base/base_character_expedition_lockouts_repository.h
index d50dd1f9e..cfdc17a3b 100644
--- a/common/repositories/base/base_character_expedition_lockouts_repository.h
+++ b/common/repositories/base/base_character_expedition_lockouts_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_inspect_messages_repository.h b/common/repositories/base/base_character_inspect_messages_repository.h
index 0a8cbc3e6..d7158e9a4 100644
--- a/common/repositories/base/base_character_inspect_messages_repository.h
+++ b/common/repositories/base/base_character_inspect_messages_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_item_recast_repository.h b/common/repositories/base/base_character_item_recast_repository.h
index 433d0f0f0..fbf105e3d 100644
--- a/common/repositories/base/base_character_item_recast_repository.h
+++ b/common/repositories/base/base_character_item_recast_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_languages_repository.h b/common/repositories/base/base_character_languages_repository.h
index 64217e8d7..96bb48e8f 100644
--- a/common/repositories/base/base_character_languages_repository.h
+++ b/common/repositories/base/base_character_languages_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_leadership_abilities_repository.h b/common/repositories/base/base_character_leadership_abilities_repository.h
index ac872d88b..63ee5a0dd 100644
--- a/common/repositories/base/base_character_leadership_abilities_repository.h
+++ b/common/repositories/base/base_character_leadership_abilities_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_material_repository.h b/common/repositories/base/base_character_material_repository.h
index 1b434cf2c..723828fcc 100644
--- a/common/repositories/base/base_character_material_repository.h
+++ b/common/repositories/base/base_character_material_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_memmed_spells_repository.h b/common/repositories/base/base_character_memmed_spells_repository.h
index b47750533..846d852d5 100644
--- a/common/repositories/base/base_character_memmed_spells_repository.h
+++ b/common/repositories/base/base_character_memmed_spells_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_pet_buffs_repository.h b/common/repositories/base/base_character_pet_buffs_repository.h
index 3dc6eb689..b4ef96b0a 100644
--- a/common/repositories/base/base_character_pet_buffs_repository.h
+++ b/common/repositories/base/base_character_pet_buffs_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_pet_info_repository.h b/common/repositories/base/base_character_pet_info_repository.h
index 91f65d216..b93b2a1e5 100644
--- a/common/repositories/base/base_character_pet_info_repository.h
+++ b/common/repositories/base/base_character_pet_info_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_pet_inventory_repository.h b/common/repositories/base/base_character_pet_inventory_repository.h
index 4e7e26456..b12549dd1 100644
--- a/common/repositories/base/base_character_pet_inventory_repository.h
+++ b/common/repositories/base/base_character_pet_inventory_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_potionbelt_repository.h b/common/repositories/base/base_character_potionbelt_repository.h
index 16d1cbfcd..7606449ce 100644
--- a/common/repositories/base/base_character_potionbelt_repository.h
+++ b/common/repositories/base/base_character_potionbelt_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_skills_repository.h b/common/repositories/base/base_character_skills_repository.h
index d654fd448..16454fa21 100644
--- a/common/repositories/base/base_character_skills_repository.h
+++ b/common/repositories/base/base_character_skills_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_spells_repository.h b/common/repositories/base/base_character_spells_repository.h
index eb34b0d43..29291cf65 100644
--- a/common/repositories/base/base_character_spells_repository.h
+++ b/common/repositories/base/base_character_spells_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_character_tasks_repository.h b/common/repositories/base/base_character_tasks_repository.h
index 9d8371f34..58ba04194 100644
--- a/common/repositories/base/base_character_tasks_repository.h
+++ b/common/repositories/base/base_character_tasks_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_completed_tasks_repository.h b/common/repositories/base/base_completed_tasks_repository.h
index bee95bf79..61ec15cf2 100644
--- a/common/repositories/base/base_completed_tasks_repository.h
+++ b/common/repositories/base/base_completed_tasks_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_content_flags_repository.h b/common/repositories/base/base_content_flags_repository.h
index f59ad8663..3b57905ee 100644
--- a/common/repositories/base/base_content_flags_repository.h
+++ b/common/repositories/base/base_content_flags_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_damageshieldtypes_repository.h b/common/repositories/base/base_damageshieldtypes_repository.h
index b2c6be57e..9e08f4ed9 100644
--- a/common/repositories/base/base_damageshieldtypes_repository.h
+++ b/common/repositories/base/base_damageshieldtypes_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_data_buckets_repository.h b/common/repositories/base/base_data_buckets_repository.h
index cef173a69..f50e21592 100644
--- a/common/repositories/base/base_data_buckets_repository.h
+++ b/common/repositories/base/base_data_buckets_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -18,7 +18,7 @@
 class BaseDataBucketsRepository {
 public:
 	struct DataBuckets {
-		int         id;
+		int64       id;
 		std::string key;
 		std::string value;
 		int         expires;
@@ -110,7 +110,7 @@ public:
 		if (results.RowCount() == 1) {
 			DataBuckets entry{};
 
-			entry.id      = atoi(row[0]);
+			entry.id      = strtoll(row[0], NULL, 10);
 			entry.key     = row[1] ? row[1] : "";
 			entry.value   = row[2] ? row[2] : "";
 			entry.expires = atoi(row[3]);
@@ -241,7 +241,7 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			DataBuckets entry{};
 
-			entry.id      = atoi(row[0]);
+			entry.id      = strtoll(row[0], NULL, 10);
 			entry.key     = row[1] ? row[1] : "";
 			entry.value   = row[2] ? row[2] : "";
 			entry.expires = atoi(row[3]);
@@ -269,7 +269,7 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			DataBuckets entry{};
 
-			entry.id      = atoi(row[0]);
+			entry.id      = strtoll(row[0], NULL, 10);
 			entry.key     = row[1] ? row[1] : "";
 			entry.value   = row[2] ? row[2] : "";
 			entry.expires = atoi(row[3]);
diff --git a/common/repositories/base/base_db_str_repository.h b/common/repositories/base/base_db_str_repository.h
index f9a827d95..e94b29772 100644
--- a/common/repositories/base/base_db_str_repository.h
+++ b/common/repositories/base/base_db_str_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_discovered_items_repository.h b/common/repositories/base/base_discovered_items_repository.h
index 555566f9d..03affdd09 100644
--- a/common/repositories/base/base_discovered_items_repository.h
+++ b/common/repositories/base/base_discovered_items_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_doors_repository.h b/common/repositories/base/base_doors_repository.h
index 75d740742..bcb0d5f49 100644
--- a/common/repositories/base/base_doors_repository.h
+++ b/common/repositories/base/base_doors_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -53,7 +53,6 @@ public:
 		int         max_expansion;
 		std::string content_flags;
 		std::string content_flags_disabled;
-		int         is_instance_door;
 	};
 
 	static std::string PrimaryKey()
@@ -99,7 +98,6 @@ public:
 			"max_expansion",
 			"content_flags",
 			"content_flags_disabled",
-			"is_instance_door",
 		};
 	}
 
@@ -170,7 +168,6 @@ public:
 		entry.max_expansion          = 0;
 		entry.content_flags          = "";
 		entry.content_flags_disabled = "";
-		entry.is_instance_door       = 0;
 
 		return entry;
 	}
@@ -241,7 +238,6 @@ public:
 			entry.max_expansion          = atoi(row[32]);
 			entry.content_flags          = row[33] ? row[33] : "";
 			entry.content_flags_disabled = row[34] ? row[34] : "";
-			entry.is_instance_door       = atoi(row[35]);
 
 			return entry;
 		}
@@ -309,7 +305,6 @@ public:
 		update_values.push_back(columns[32] + " = " + std::to_string(doors_entry.max_expansion));
 		update_values.push_back(columns[33] + " = '" + EscapeString(doors_entry.content_flags) + "'");
 		update_values.push_back(columns[34] + " = '" + EscapeString(doors_entry.content_flags_disabled) + "'");
-		update_values.push_back(columns[35] + " = " + std::to_string(doors_entry.is_instance_door));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -366,7 +361,6 @@ public:
 		insert_values.push_back(std::to_string(doors_entry.max_expansion));
 		insert_values.push_back("'" + EscapeString(doors_entry.content_flags) + "'");
 		insert_values.push_back("'" + EscapeString(doors_entry.content_flags_disabled) + "'");
-		insert_values.push_back(std::to_string(doors_entry.is_instance_door));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -431,7 +425,6 @@ public:
 			insert_values.push_back(std::to_string(doors_entry.max_expansion));
 			insert_values.push_back("'" + EscapeString(doors_entry.content_flags) + "'");
 			insert_values.push_back("'" + EscapeString(doors_entry.content_flags_disabled) + "'");
-			insert_values.push_back(std::to_string(doors_entry.is_instance_door));
 
 			insert_chunks.push_back("(" + implode(",", insert_values) + ")");
 		}
@@ -500,7 +493,6 @@ public:
 			entry.max_expansion          = atoi(row[32]);
 			entry.content_flags          = row[33] ? row[33] : "";
 			entry.content_flags_disabled = row[34] ? row[34] : "";
-			entry.is_instance_door       = atoi(row[35]);
 
 			all_entries.push_back(entry);
 		}
@@ -560,7 +552,6 @@ public:
 			entry.max_expansion          = atoi(row[32]);
 			entry.content_flags          = row[33] ? row[33] : "";
 			entry.content_flags_disabled = row[34] ? row[34] : "";
-			entry.is_instance_door       = atoi(row[35]);
 
 			all_entries.push_back(entry);
 		}
diff --git a/common/repositories/base/base_dynamic_zones_repository.h b/common/repositories/base/base_dynamic_zones_repository.h
index 13aabb07b..283ecd754 100644
--- a/common/repositories/base/base_dynamic_zones_repository.h
+++ b/common/repositories/base/base_dynamic_zones_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_eventlog_repository.h b/common/repositories/base/base_eventlog_repository.h
index 999fb455b..25b6ea1cc 100644
--- a/common/repositories/base/base_eventlog_repository.h
+++ b/common/repositories/base/base_eventlog_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -89,7 +89,7 @@ public:
 		entry.status          = 0;
 		entry.charname        = "";
 		entry.target          = "None";
-		entry.time            = current_timestamp();
+		entry.time            = "";
 		entry.descriptiontype = "";
 		entry.description     = "";
 		entry.event_nid       = 0;
diff --git a/common/repositories/base/base_expedition_lockouts_repository.h b/common/repositories/base/base_expedition_lockouts_repository.h
index e9c5ceda2..68a606923 100644
--- a/common/repositories/base/base_expedition_lockouts_repository.h
+++ b/common/repositories/base/base_expedition_lockouts_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_expeditions_repository.h b/common/repositories/base/base_expeditions_repository.h
index 8fea9a698..fb8007339 100644
--- a/common/repositories/base/base_expeditions_repository.h
+++ b/common/repositories/base/base_expeditions_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_faction_base_data_repository.h b/common/repositories/base/base_faction_base_data_repository.h
index c5bfc8c43..9357d4ce8 100644
--- a/common/repositories/base/base_faction_base_data_repository.h
+++ b/common/repositories/base/base_faction_base_data_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_faction_list_mod_repository.h b/common/repositories/base/base_faction_list_mod_repository.h
index 673c6ac96..0181f5ba3 100644
--- a/common/repositories/base/base_faction_list_mod_repository.h
+++ b/common/repositories/base/base_faction_list_mod_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_faction_list_repository.h b/common/repositories/base/base_faction_list_repository.h
index 32e20bb6c..f985d7aad 100644
--- a/common/repositories/base/base_faction_list_repository.h
+++ b/common/repositories/base/base_faction_list_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_faction_values_repository.h b/common/repositories/base/base_faction_values_repository.h
index 181779da3..2176d287b 100644
--- a/common/repositories/base/base_faction_values_repository.h
+++ b/common/repositories/base/base_faction_values_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_fishing_repository.h b/common/repositories/base/base_fishing_repository.h
index 6ee2bf098..2c6ad7b43 100644
--- a/common/repositories/base/base_fishing_repository.h
+++ b/common/repositories/base/base_fishing_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_forage_repository.h b/common/repositories/base/base_forage_repository.h
index 0aa684b1b..4f80658cc 100644
--- a/common/repositories/base/base_forage_repository.h
+++ b/common/repositories/base/base_forage_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_friends_repository.h b/common/repositories/base/base_friends_repository.h
index 187994a85..a01746174 100644
--- a/common/repositories/base/base_friends_repository.h
+++ b/common/repositories/base/base_friends_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_global_loot_repository.h b/common/repositories/base/base_global_loot_repository.h
index 98170acf5..81ee74549 100644
--- a/common/repositories/base/base_global_loot_repository.h
+++ b/common/repositories/base/base_global_loot_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -27,7 +27,7 @@ public:
 		int         rare;
 		int         raid;
 		std::string race;
-		std::string class;
+		std::string class_;
 		std::string bodytype;
 		std::string zone;
 		int         hot_zone;
@@ -54,7 +54,7 @@ public:
 			"rare",
 			"raid",
 			"race",
-			"class",
+			"`class`",
 			"bodytype",
 			"zone",
 			"hot_zone",
@@ -106,7 +106,7 @@ public:
 		entry.rare                   = 0;
 		entry.raid                   = 0;
 		entry.race                   = "";
-		entry.class                  = "";
+		entry.class_                 = "";
 		entry.bodytype               = "";
 		entry.zone                   = "";
 		entry.hot_zone               = 0;
@@ -158,7 +158,7 @@ public:
 			entry.rare                   = atoi(row[6]);
 			entry.raid                   = atoi(row[7]);
 			entry.race                   = row[8] ? row[8] : "";
-			entry.class                  = row[9] ? row[9] : "";
+			entry.class_                 = row[9] ? row[9] : "";
 			entry.bodytype               = row[10] ? row[10] : "";
 			entry.zone                   = row[11] ? row[11] : "";
 			entry.hot_zone               = atoi(row[12]);
@@ -207,7 +207,7 @@ public:
 		update_values.push_back(columns[6] + " = " + std::to_string(global_loot_entry.rare));
 		update_values.push_back(columns[7] + " = " + std::to_string(global_loot_entry.raid));
 		update_values.push_back(columns[8] + " = '" + EscapeString(global_loot_entry.race) + "'");
-		update_values.push_back(columns[9] + " = '" + EscapeString(global_loot_entry.class) + "'");
+		update_values.push_back(columns[9] + " = '" + EscapeString(global_loot_entry.class_) + "'");
 		update_values.push_back(columns[10] + " = '" + EscapeString(global_loot_entry.bodytype) + "'");
 		update_values.push_back(columns[11] + " = '" + EscapeString(global_loot_entry.zone) + "'");
 		update_values.push_back(columns[12] + " = " + std::to_string(global_loot_entry.hot_zone));
@@ -245,7 +245,7 @@ public:
 		insert_values.push_back(std::to_string(global_loot_entry.rare));
 		insert_values.push_back(std::to_string(global_loot_entry.raid));
 		insert_values.push_back("'" + EscapeString(global_loot_entry.race) + "'");
-		insert_values.push_back("'" + EscapeString(global_loot_entry.class) + "'");
+		insert_values.push_back("'" + EscapeString(global_loot_entry.class_) + "'");
 		insert_values.push_back("'" + EscapeString(global_loot_entry.bodytype) + "'");
 		insert_values.push_back("'" + EscapeString(global_loot_entry.zone) + "'");
 		insert_values.push_back(std::to_string(global_loot_entry.hot_zone));
@@ -291,7 +291,7 @@ public:
 			insert_values.push_back(std::to_string(global_loot_entry.rare));
 			insert_values.push_back(std::to_string(global_loot_entry.raid));
 			insert_values.push_back("'" + EscapeString(global_loot_entry.race) + "'");
-			insert_values.push_back("'" + EscapeString(global_loot_entry.class) + "'");
+			insert_values.push_back("'" + EscapeString(global_loot_entry.class_) + "'");
 			insert_values.push_back("'" + EscapeString(global_loot_entry.bodytype) + "'");
 			insert_values.push_back("'" + EscapeString(global_loot_entry.zone) + "'");
 			insert_values.push_back(std::to_string(global_loot_entry.hot_zone));
@@ -341,7 +341,7 @@ public:
 			entry.rare                   = atoi(row[6]);
 			entry.raid                   = atoi(row[7]);
 			entry.race                   = row[8] ? row[8] : "";
-			entry.class                  = row[9] ? row[9] : "";
+			entry.class_                 = row[9] ? row[9] : "";
 			entry.bodytype               = row[10] ? row[10] : "";
 			entry.zone                   = row[11] ? row[11] : "";
 			entry.hot_zone               = atoi(row[12]);
@@ -382,7 +382,7 @@ public:
 			entry.rare                   = atoi(row[6]);
 			entry.raid                   = atoi(row[7]);
 			entry.race                   = row[8] ? row[8] : "";
-			entry.class                  = row[9] ? row[9] : "";
+			entry.class_                 = row[9] ? row[9] : "";
 			entry.bodytype               = row[10] ? row[10] : "";
 			entry.zone                   = row[11] ? row[11] : "";
 			entry.hot_zone               = atoi(row[12]);
diff --git a/common/repositories/base/base_gm_ips_repository.h b/common/repositories/base/base_gm_ips_repository.h
index 56027c7a2..5fa6b1f54 100644
--- a/common/repositories/base/base_gm_ips_repository.h
+++ b/common/repositories/base/base_gm_ips_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_goallists_repository.h b/common/repositories/base/base_goallists_repository.h
index c736d9e01..ff937c169 100644
--- a/common/repositories/base/base_goallists_repository.h
+++ b/common/repositories/base/base_goallists_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_graveyard_repository.h b/common/repositories/base/base_graveyard_repository.h
index 500775a94..f104e2236 100644
--- a/common/repositories/base/base_graveyard_repository.h
+++ b/common/repositories/base/base_graveyard_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_ground_spawns_repository.h b/common/repositories/base/base_ground_spawns_repository.h
index 6b2a0d5cc..4d8b9168d 100644
--- a/common/repositories/base/base_ground_spawns_repository.h
+++ b/common/repositories/base/base_ground_spawns_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_group_id_repository.h b/common/repositories/base/base_group_id_repository.h
index 8005f003e..313bfffbe 100644
--- a/common/repositories/base/base_group_id_repository.h
+++ b/common/repositories/base/base_group_id_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_group_leaders_repository.h b/common/repositories/base/base_group_leaders_repository.h
index 97e7028cd..d549adaaf 100644
--- a/common/repositories/base/base_group_leaders_repository.h
+++ b/common/repositories/base/base_group_leaders_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_guild_members_repository.h b/common/repositories/base/base_guild_members_repository.h
index 931d0bdf6..577817241 100644
--- a/common/repositories/base/base_guild_members_repository.h
+++ b/common/repositories/base/base_guild_members_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_guild_ranks_repository.h b/common/repositories/base/base_guild_ranks_repository.h
index b608cfaa5..cbf7763f7 100644
--- a/common/repositories/base/base_guild_ranks_repository.h
+++ b/common/repositories/base/base_guild_ranks_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_guild_relations_repository.h b/common/repositories/base/base_guild_relations_repository.h
index 2ddcd854f..5afe63413 100644
--- a/common/repositories/base/base_guild_relations_repository.h
+++ b/common/repositories/base/base_guild_relations_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_guilds_repository.h b/common/repositories/base/base_guilds_repository.h
index e1cd14f14..b38f223fc 100644
--- a/common/repositories/base/base_guilds_repository.h
+++ b/common/repositories/base/base_guilds_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_hackers_repository.h b/common/repositories/base/base_hackers_repository.h
index 4a492deac..3d25dc90a 100644
--- a/common/repositories/base/base_hackers_repository.h
+++ b/common/repositories/base/base_hackers_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -80,7 +80,7 @@ public:
 		entry.name    = "";
 		entry.hacked  = "";
 		entry.zone    = "";
-		entry.date    = current_timestamp();
+		entry.date    = "";
 
 		return entry;
 	}
diff --git a/common/repositories/base/base_instance_list_player_repository.h b/common/repositories/base/base_instance_list_player_repository.h
index 4b8aed4ee..92e4687b1 100644
--- a/common/repositories/base/base_instance_list_player_repository.h
+++ b/common/repositories/base/base_instance_list_player_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_instance_list_repository.h b/common/repositories/base/base_instance_list_repository.h
index 55b31703f..bdf7abfa6 100644
--- a/common/repositories/base/base_instance_list_repository.h
+++ b/common/repositories/base/base_instance_list_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_inventory_repository.h b/common/repositories/base/base_inventory_repository.h
index 62308ebdf..d17c7ff62 100644
--- a/common/repositories/base/base_inventory_repository.h
+++ b/common/repositories/base/base_inventory_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_inventory_snapshots_repository.h b/common/repositories/base/base_inventory_snapshots_repository.h
index 4d34062f3..ec91303b1 100644
--- a/common/repositories/base/base_inventory_snapshots_repository.h
+++ b/common/repositories/base/base_inventory_snapshots_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_ip_exemptions_repository.h b/common/repositories/base/base_ip_exemptions_repository.h
index dadd49b8e..6952c4dab 100644
--- a/common/repositories/base/base_ip_exemptions_repository.h
+++ b/common/repositories/base/base_ip_exemptions_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_item_tick_repository.h b/common/repositories/base/base_item_tick_repository.h
index 77b0ec71e..2579c3c40 100644
--- a/common/repositories/base/base_item_tick_repository.h
+++ b/common/repositories/base/base_item_tick_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_items_repository.h b/common/repositories/base/base_items_repository.h
index da124eca0..06a7797b8 100644
--- a/common/repositories/base/base_items_repository.h
+++ b/common/repositories/base/base_items_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -797,8 +797,8 @@ public:
 		entry.scrolllevel2        = 0;
 		entry.scrolllevel         = 0;
 		entry.UNK157              = 0;
-		entry.serialized          = 0;
-		entry.verified            = 0;
+		entry.serialized          = "";
+		entry.verified            = "";
 		entry.serialization       = "";
 		entry.source              = "";
 		entry.UNK033              = 0;
diff --git a/common/repositories/base/base_ldon_trap_entries_repository.h b/common/repositories/base/base_ldon_trap_entries_repository.h
index 05fc73bf5..a9e8b9052 100644
--- a/common/repositories/base/base_ldon_trap_entries_repository.h
+++ b/common/repositories/base/base_ldon_trap_entries_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_ldon_trap_templates_repository.h b/common/repositories/base/base_ldon_trap_templates_repository.h
index 27def1890..022482232 100644
--- a/common/repositories/base/base_ldon_trap_templates_repository.h
+++ b/common/repositories/base/base_ldon_trap_templates_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_level_exp_mods_repository.h b/common/repositories/base/base_level_exp_mods_repository.h
index eaa4a5f4a..410d4d25c 100644
--- a/common/repositories/base/base_level_exp_mods_repository.h
+++ b/common/repositories/base/base_level_exp_mods_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_lfguild_repository.h b/common/repositories/base/base_lfguild_repository.h
index 10e2f0682..be7337579 100644
--- a/common/repositories/base/base_lfguild_repository.h
+++ b/common/repositories/base/base_lfguild_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_login_accounts_repository.h b/common/repositories/base/base_login_accounts_repository.h
index 25dc167d1..7b2e68f11 100644
--- a/common/repositories/base/base_login_accounts_repository.h
+++ b/common/repositories/base/base_login_accounts_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -87,9 +87,9 @@ public:
 		entry.account_email      = "";
 		entry.source_loginserver = "";
 		entry.last_ip_address    = "";
-		entry.last_login_date    = 0;
-		entry.created_at         = 0;
-		entry.updated_at         = current_timestamp();
+		entry.last_login_date    = "";
+		entry.created_at         = "";
+		entry.updated_at         = "";
 
 		return entry;
 	}
diff --git a/common/repositories/base/base_login_api_tokens_repository.h b/common/repositories/base/base_login_api_tokens_repository.h
index 88ed5c74a..7d5f7f98f 100644
--- a/common/repositories/base/base_login_api_tokens_repository.h
+++ b/common/repositories/base/base_login_api_tokens_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -79,8 +79,8 @@ public:
 		entry.token      = "";
 		entry.can_write  = 0;
 		entry.can_read   = 0;
-		entry.created_at = 0;
-		entry.updated_at = current_timestamp();
+		entry.created_at = "";
+		entry.updated_at = "";
 
 		return entry;
 	}
diff --git a/common/repositories/base/base_login_server_admins_repository.h b/common/repositories/base/base_login_server_admins_repository.h
index 771eb014f..be6b3bcf7 100644
--- a/common/repositories/base/base_login_server_admins_repository.h
+++ b/common/repositories/base/base_login_server_admins_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -85,7 +85,7 @@ public:
 		entry.first_name              = "";
 		entry.last_name               = "";
 		entry.email                   = "";
-		entry.registration_date       = 0;
+		entry.registration_date       = "";
 		entry.registration_ip_address = "";
 
 		return entry;
diff --git a/common/repositories/base/base_login_server_list_types_repository.h b/common/repositories/base/base_login_server_list_types_repository.h
index 16b47381c..443182c05 100644
--- a/common/repositories/base/base_login_server_list_types_repository.h
+++ b/common/repositories/base/base_login_server_list_types_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_login_world_servers_repository.h b/common/repositories/base/base_login_world_servers_repository.h
index 96dc1f8ae..cce6a0bff 100644
--- a/common/repositories/base/base_login_world_servers_repository.h
+++ b/common/repositories/base/base_login_world_servers_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -88,7 +88,7 @@ public:
 		entry.short_name                = "";
 		entry.tag_description           = "";
 		entry.login_server_list_type_id = 0;
-		entry.last_login_date           = 0;
+		entry.last_login_date           = "";
 		entry.last_ip_address           = "";
 		entry.login_server_admin_id     = 0;
 		entry.is_server_trusted         = 0;
diff --git a/common/repositories/base/base_lootdrop_entries_repository.h b/common/repositories/base/base_lootdrop_entries_repository.h
index 524b00588..4be4630a3 100644
--- a/common/repositories/base/base_lootdrop_entries_repository.h
+++ b/common/repositories/base/base_lootdrop_entries_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_lootdrop_repository.h b/common/repositories/base/base_lootdrop_repository.h
index abacd5f8b..d70c3201c 100644
--- a/common/repositories/base/base_lootdrop_repository.h
+++ b/common/repositories/base/base_lootdrop_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_loottable_entries_repository.h b/common/repositories/base/base_loottable_entries_repository.h
index e8143e7e3..67e073be7 100644
--- a/common/repositories/base/base_loottable_entries_repository.h
+++ b/common/repositories/base/base_loottable_entries_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_loottable_repository.h b/common/repositories/base/base_loottable_repository.h
index 88ff30ec9..a41229069 100644
--- a/common/repositories/base/base_loottable_repository.h
+++ b/common/repositories/base/base_loottable_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_mail_repository.h b/common/repositories/base/base_mail_repository.h
index 674881b64..2123e6396 100644
--- a/common/repositories/base/base_mail_repository.h
+++ b/common/repositories/base/base_mail_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_merchantlist_repository.h b/common/repositories/base/base_merchantlist_repository.h
index 437b419cd..f7dc02df6 100644
--- a/common/repositories/base/base_merchantlist_repository.h
+++ b/common/repositories/base/base_merchantlist_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_merchantlist_temp_repository.h b/common/repositories/base/base_merchantlist_temp_repository.h
index 1db32b796..21626aa3d 100644
--- a/common/repositories/base/base_merchantlist_temp_repository.h
+++ b/common/repositories/base/base_merchantlist_temp_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_name_filter_repository.h b/common/repositories/base/base_name_filter_repository.h
index 5f9c19a8b..984f2b142 100644
--- a/common/repositories/base/base_name_filter_repository.h
+++ b/common/repositories/base/base_name_filter_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_npc_emotes_repository.h b/common/repositories/base/base_npc_emotes_repository.h
index cc0503d16..6660ed59e 100644
--- a/common/repositories/base/base_npc_emotes_repository.h
+++ b/common/repositories/base/base_npc_emotes_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_npc_faction_entries_repository.h b/common/repositories/base/base_npc_faction_entries_repository.h
index a25a9a258..1084b9a5e 100644
--- a/common/repositories/base/base_npc_faction_entries_repository.h
+++ b/common/repositories/base/base_npc_faction_entries_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_npc_faction_repository.h b/common/repositories/base/base_npc_faction_repository.h
index 5cb58fafa..87bff25d1 100644
--- a/common/repositories/base/base_npc_faction_repository.h
+++ b/common/repositories/base/base_npc_faction_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_npc_scale_global_base_repository.h b/common/repositories/base/base_npc_scale_global_base_repository.h
index e701c7686..b7eafe57a 100644
--- a/common/repositories/base/base_npc_scale_global_base_repository.h
+++ b/common/repositories/base/base_npc_scale_global_base_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_npc_spells_effects_entries_repository.h b/common/repositories/base/base_npc_spells_effects_entries_repository.h
index 563176079..f6ca532ee 100644
--- a/common/repositories/base/base_npc_spells_effects_entries_repository.h
+++ b/common/repositories/base/base_npc_spells_effects_entries_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_npc_spells_effects_repository.h b/common/repositories/base/base_npc_spells_effects_repository.h
index a6b5e52bd..6983a002e 100644
--- a/common/repositories/base/base_npc_spells_effects_repository.h
+++ b/common/repositories/base/base_npc_spells_effects_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_npc_spells_entries_repository.h b/common/repositories/base/base_npc_spells_entries_repository.h
index 97139ab2b..a165d6965 100644
--- a/common/repositories/base/base_npc_spells_entries_repository.h
+++ b/common/repositories/base/base_npc_spells_entries_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_npc_spells_repository.h b/common/repositories/base/base_npc_spells_repository.h
index 448683064..e7f9d784e 100644
--- a/common/repositories/base/base_npc_spells_repository.h
+++ b/common/repositories/base/base_npc_spells_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_npc_types_repository.h b/common/repositories/base/base_npc_types_repository.h
index b127988fa..25020d8a8 100644
--- a/common/repositories/base/base_npc_types_repository.h
+++ b/common/repositories/base/base_npc_types_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -23,7 +23,7 @@ public:
 		std::string lastname;
 		int         level;
 		int         race;
-		int         class;
+		int         class_;
 		int         bodytype;
 		int         hp;
 		int         mana;
@@ -140,6 +140,7 @@ public:
 		int         model;
 		int         flymode;
 		int         always_aggro;
+		int         exp_mod;
 	};
 
 	static std::string PrimaryKey()
@@ -155,7 +156,7 @@ public:
 			"lastname",
 			"level",
 			"race",
-			"class",
+			"`class`",
 			"bodytype",
 			"hp",
 			"mana",
@@ -272,6 +273,7 @@ public:
 			"model",
 			"flymode",
 			"always_aggro",
+			"exp_mod",
 		};
 	}
 
@@ -312,7 +314,7 @@ public:
 		entry.lastname               = "";
 		entry.level                  = 0;
 		entry.race                   = 0;
-		entry.class                  = 0;
+		entry.class_                 = 0;
 		entry.bodytype               = 1;
 		entry.hp                     = 0;
 		entry.mana                   = 0;
@@ -429,6 +431,7 @@ public:
 		entry.model                  = 0;
 		entry.flymode                = -1;
 		entry.always_aggro           = 0;
+		entry.exp_mod                = 100;
 
 		return entry;
 	}
@@ -469,7 +472,7 @@ public:
 			entry.lastname               = row[2] ? row[2] : "";
 			entry.level                  = atoi(row[3]);
 			entry.race                   = atoi(row[4]);
-			entry.class                  = atoi(row[5]);
+			entry.class_                 = atoi(row[5]);
 			entry.bodytype               = atoi(row[6]);
 			entry.hp                     = atoi(row[7]);
 			entry.mana                   = atoi(row[8]);
@@ -586,6 +589,7 @@ public:
 			entry.model                  = atoi(row[119]);
 			entry.flymode                = atoi(row[120]);
 			entry.always_aggro           = atoi(row[121]);
+			entry.exp_mod                = atoi(row[122]);
 
 			return entry;
 		}
@@ -623,7 +627,7 @@ public:
 		update_values.push_back(columns[2] + " = '" + EscapeString(npc_types_entry.lastname) + "'");
 		update_values.push_back(columns[3] + " = " + std::to_string(npc_types_entry.level));
 		update_values.push_back(columns[4] + " = " + std::to_string(npc_types_entry.race));
-		update_values.push_back(columns[5] + " = " + std::to_string(npc_types_entry.class));
+		update_values.push_back(columns[5] + " = " + std::to_string(npc_types_entry.class_));
 		update_values.push_back(columns[6] + " = " + std::to_string(npc_types_entry.bodytype));
 		update_values.push_back(columns[7] + " = " + std::to_string(npc_types_entry.hp));
 		update_values.push_back(columns[8] + " = " + std::to_string(npc_types_entry.mana));
@@ -740,6 +744,7 @@ public:
 		update_values.push_back(columns[119] + " = " + std::to_string(npc_types_entry.model));
 		update_values.push_back(columns[120] + " = " + std::to_string(npc_types_entry.flymode));
 		update_values.push_back(columns[121] + " = " + std::to_string(npc_types_entry.always_aggro));
+		update_values.push_back(columns[122] + " = " + std::to_string(npc_types_entry.exp_mod));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -766,7 +771,7 @@ public:
 		insert_values.push_back("'" + EscapeString(npc_types_entry.lastname) + "'");
 		insert_values.push_back(std::to_string(npc_types_entry.level));
 		insert_values.push_back(std::to_string(npc_types_entry.race));
-		insert_values.push_back(std::to_string(npc_types_entry.class));
+		insert_values.push_back(std::to_string(npc_types_entry.class_));
 		insert_values.push_back(std::to_string(npc_types_entry.bodytype));
 		insert_values.push_back(std::to_string(npc_types_entry.hp));
 		insert_values.push_back(std::to_string(npc_types_entry.mana));
@@ -883,6 +888,7 @@ public:
 		insert_values.push_back(std::to_string(npc_types_entry.model));
 		insert_values.push_back(std::to_string(npc_types_entry.flymode));
 		insert_values.push_back(std::to_string(npc_types_entry.always_aggro));
+		insert_values.push_back(std::to_string(npc_types_entry.exp_mod));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -917,7 +923,7 @@ public:
 			insert_values.push_back("'" + EscapeString(npc_types_entry.lastname) + "'");
 			insert_values.push_back(std::to_string(npc_types_entry.level));
 			insert_values.push_back(std::to_string(npc_types_entry.race));
-			insert_values.push_back(std::to_string(npc_types_entry.class));
+			insert_values.push_back(std::to_string(npc_types_entry.class_));
 			insert_values.push_back(std::to_string(npc_types_entry.bodytype));
 			insert_values.push_back(std::to_string(npc_types_entry.hp));
 			insert_values.push_back(std::to_string(npc_types_entry.mana));
@@ -1034,6 +1040,7 @@ public:
 			insert_values.push_back(std::to_string(npc_types_entry.model));
 			insert_values.push_back(std::to_string(npc_types_entry.flymode));
 			insert_values.push_back(std::to_string(npc_types_entry.always_aggro));
+			insert_values.push_back(std::to_string(npc_types_entry.exp_mod));
 
 			insert_chunks.push_back("(" + implode(",", insert_values) + ")");
 		}
@@ -1072,7 +1079,7 @@ public:
 			entry.lastname               = row[2] ? row[2] : "";
 			entry.level                  = atoi(row[3]);
 			entry.race                   = atoi(row[4]);
-			entry.class                  = atoi(row[5]);
+			entry.class_                 = atoi(row[5]);
 			entry.bodytype               = atoi(row[6]);
 			entry.hp                     = atoi(row[7]);
 			entry.mana                   = atoi(row[8]);
@@ -1189,6 +1196,7 @@ public:
 			entry.model                  = atoi(row[119]);
 			entry.flymode                = atoi(row[120]);
 			entry.always_aggro           = atoi(row[121]);
+			entry.exp_mod                = atoi(row[122]);
 
 			all_entries.push_back(entry);
 		}
@@ -1218,7 +1226,7 @@ public:
 			entry.lastname               = row[2] ? row[2] : "";
 			entry.level                  = atoi(row[3]);
 			entry.race                   = atoi(row[4]);
-			entry.class                  = atoi(row[5]);
+			entry.class_                 = atoi(row[5]);
 			entry.bodytype               = atoi(row[6]);
 			entry.hp                     = atoi(row[7]);
 			entry.mana                   = atoi(row[8]);
@@ -1335,6 +1343,7 @@ public:
 			entry.model                  = atoi(row[119]);
 			entry.flymode                = atoi(row[120]);
 			entry.always_aggro           = atoi(row[121]);
+			entry.exp_mod                = atoi(row[122]);
 
 			all_entries.push_back(entry);
 		}
diff --git a/common/repositories/base/base_npc_types_tint_repository.h b/common/repositories/base/base_npc_types_tint_repository.h
index 3ba577f36..ea01c8d01 100644
--- a/common/repositories/base/base_npc_types_tint_repository.h
+++ b/common/repositories/base/base_npc_types_tint_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_object_contents_repository.h b/common/repositories/base/base_object_contents_repository.h
index 576429ba0..3ab7c70b8 100644
--- a/common/repositories/base/base_object_contents_repository.h
+++ b/common/repositories/base/base_object_contents_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_object_repository.h b/common/repositories/base/base_object_repository.h
index a572ed712..dc098db06 100644
--- a/common/repositories/base/base_object_repository.h
+++ b/common/repositories/base/base_object_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_perl_event_export_settings_repository.h b/common/repositories/base/base_perl_event_export_settings_repository.h
index d58084463..50c0a63f6 100644
--- a/common/repositories/base/base_perl_event_export_settings_repository.h
+++ b/common/repositories/base/base_perl_event_export_settings_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_petitions_repository.h b/common/repositories/base/base_petitions_repository.h
index 30dd9feaa..36a781ab0 100644
--- a/common/repositories/base/base_petitions_repository.h
+++ b/common/repositories/base/base_petitions_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -33,7 +33,7 @@ public:
 		int         checkouts;
 		int         unavailables;
 		int         ischeckedout;
-		int         senttime;
+		int64       senttime;
 	};
 
 	static std::string PrimaryKey()
@@ -161,7 +161,7 @@ public:
 			entry.checkouts    = atoi(row[12]);
 			entry.unavailables = atoi(row[13]);
 			entry.ischeckedout = atoi(row[14]);
-			entry.senttime     = atoi(row[15]);
+			entry.senttime     = strtoll(row[15], NULL, 10);
 
 			return entry;
 		}
@@ -340,7 +340,7 @@ public:
 			entry.checkouts    = atoi(row[12]);
 			entry.unavailables = atoi(row[13]);
 			entry.ischeckedout = atoi(row[14]);
-			entry.senttime     = atoi(row[15]);
+			entry.senttime     = strtoll(row[15], NULL, 10);
 
 			all_entries.push_back(entry);
 		}
@@ -380,7 +380,7 @@ public:
 			entry.checkouts    = atoi(row[12]);
 			entry.unavailables = atoi(row[13]);
 			entry.ischeckedout = atoi(row[14]);
-			entry.senttime     = atoi(row[15]);
+			entry.senttime     = strtoll(row[15], NULL, 10);
 
 			all_entries.push_back(entry);
 		}
diff --git a/common/repositories/base/base_pets_beastlord_data_repository.h b/common/repositories/base/base_pets_beastlord_data_repository.h
new file mode 100644
index 000000000..61c7d75ba
--- /dev/null
+++ b/common/repositories/base/base_pets_beastlord_data_repository.h
@@ -0,0 +1,338 @@
+/**
+ * DO NOT MODIFY THIS FILE
+ *
+ * This repository was automatically generated and is NOT to be modified directly.
+ * Any repository modifications are meant to be made to the repository extending the base.
+ * Any modifications to base repositories are to be made by the generator only
+ *
+ * @generator ./utils/scripts/generators/repository-generator.pl
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ */
+
+#ifndef EQEMU_BASE_PETS_BEASTLORD_DATA_REPOSITORY_H
+#define EQEMU_BASE_PETS_BEASTLORD_DATA_REPOSITORY_H
+
+#include "../../database.h"
+#include "../../string_util.h"
+
+class BasePetsBeastlordDataRepository {
+public:
+	struct PetsBeastlordData {
+		int   player_race;
+		int   pet_race;
+		int   texture;
+		int   helm_texture;
+		int   gender;
+		float size_modifier;
+		int   face;
+	};
+
+	static std::string PrimaryKey()
+	{
+		return std::string("player_race");
+	}
+
+	static std::vector<std::string> Columns()
+	{
+		return {
+			"player_race",
+			"pet_race",
+			"texture",
+			"helm_texture",
+			"gender",
+			"size_modifier",
+			"face",
+		};
+	}
+
+	static std::string ColumnsRaw()
+	{
+		return std::string(implode(", ", Columns()));
+	}
+
+	static std::string TableName()
+	{
+		return std::string("pets_beastlord_data");
+	}
+
+	static std::string BaseSelect()
+	{
+		return fmt::format(
+			"SELECT {} FROM {}",
+			ColumnsRaw(),
+			TableName()
+		);
+	}
+
+	static std::string BaseInsert()
+	{
+		return fmt::format(
+			"INSERT INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static PetsBeastlordData NewEntity()
+	{
+		PetsBeastlordData entry{};
+
+		entry.player_race   = 1;
+		entry.pet_race      = 42;
+		entry.texture       = 0;
+		entry.helm_texture  = 0;
+		entry.gender        = 2;
+		entry.size_modifier = 1;
+		entry.face          = 0;
+
+		return entry;
+	}
+
+	static PetsBeastlordData GetPetsBeastlordDataEntry(
+		const std::vector<PetsBeastlordData> &pets_beastlord_datas,
+		int pets_beastlord_data_id
+	)
+	{
+		for (auto &pets_beastlord_data : pets_beastlord_datas) {
+			if (pets_beastlord_data.player_race == pets_beastlord_data_id) {
+				return pets_beastlord_data;
+			}
+		}
+
+		return NewEntity();
+	}
+
+	static PetsBeastlordData FindOne(
+		Database& db,
+		int pets_beastlord_data_id
+	)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} WHERE id = {} LIMIT 1",
+				BaseSelect(),
+				pets_beastlord_data_id
+			)
+		);
+
+		auto row = results.begin();
+		if (results.RowCount() == 1) {
+			PetsBeastlordData entry{};
+
+			entry.player_race   = atoi(row[0]);
+			entry.pet_race      = atoi(row[1]);
+			entry.texture       = atoi(row[2]);
+			entry.helm_texture  = atoi(row[3]);
+			entry.gender        = atoi(row[4]);
+			entry.size_modifier = static_cast<float>(atof(row[5]));
+			entry.face          = atoi(row[6]);
+
+			return entry;
+		}
+
+		return NewEntity();
+	}
+
+	static int DeleteOne(
+		Database& db,
+		int pets_beastlord_data_id
+	)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"DELETE FROM {} WHERE {} = {}",
+				TableName(),
+				PrimaryKey(),
+				pets_beastlord_data_id
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int UpdateOne(
+		Database& db,
+		PetsBeastlordData pets_beastlord_data_entry
+	)
+	{
+		std::vector<std::string> update_values;
+
+		auto columns = Columns();
+
+		update_values.push_back(columns[0] + " = " + std::to_string(pets_beastlord_data_entry.player_race));
+		update_values.push_back(columns[1] + " = " + std::to_string(pets_beastlord_data_entry.pet_race));
+		update_values.push_back(columns[2] + " = " + std::to_string(pets_beastlord_data_entry.texture));
+		update_values.push_back(columns[3] + " = " + std::to_string(pets_beastlord_data_entry.helm_texture));
+		update_values.push_back(columns[4] + " = " + std::to_string(pets_beastlord_data_entry.gender));
+		update_values.push_back(columns[5] + " = " + std::to_string(pets_beastlord_data_entry.size_modifier));
+		update_values.push_back(columns[6] + " = " + std::to_string(pets_beastlord_data_entry.face));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"UPDATE {} SET {} WHERE {} = {}",
+				TableName(),
+				implode(", ", update_values),
+				PrimaryKey(),
+				pets_beastlord_data_entry.player_race
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static PetsBeastlordData InsertOne(
+		Database& db,
+		PetsBeastlordData pets_beastlord_data_entry
+	)
+	{
+		std::vector<std::string> insert_values;
+
+		insert_values.push_back(std::to_string(pets_beastlord_data_entry.player_race));
+		insert_values.push_back(std::to_string(pets_beastlord_data_entry.pet_race));
+		insert_values.push_back(std::to_string(pets_beastlord_data_entry.texture));
+		insert_values.push_back(std::to_string(pets_beastlord_data_entry.helm_texture));
+		insert_values.push_back(std::to_string(pets_beastlord_data_entry.gender));
+		insert_values.push_back(std::to_string(pets_beastlord_data_entry.size_modifier));
+		insert_values.push_back(std::to_string(pets_beastlord_data_entry.face));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseInsert(),
+				implode(",", insert_values)
+			)
+		);
+
+		if (results.Success()) {
+			pets_beastlord_data_entry.player_race = results.LastInsertedID();
+			return pets_beastlord_data_entry;
+		}
+
+		pets_beastlord_data_entry = NewEntity();
+
+		return pets_beastlord_data_entry;
+	}
+
+	static int InsertMany(
+		Database& db,
+		std::vector<PetsBeastlordData> pets_beastlord_data_entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &pets_beastlord_data_entry: pets_beastlord_data_entries) {
+			std::vector<std::string> insert_values;
+
+			insert_values.push_back(std::to_string(pets_beastlord_data_entry.player_race));
+			insert_values.push_back(std::to_string(pets_beastlord_data_entry.pet_race));
+			insert_values.push_back(std::to_string(pets_beastlord_data_entry.texture));
+			insert_values.push_back(std::to_string(pets_beastlord_data_entry.helm_texture));
+			insert_values.push_back(std::to_string(pets_beastlord_data_entry.gender));
+			insert_values.push_back(std::to_string(pets_beastlord_data_entry.size_modifier));
+			insert_values.push_back(std::to_string(pets_beastlord_data_entry.face));
+
+			insert_chunks.push_back("(" + implode(",", insert_values) + ")");
+		}
+
+		std::vector<std::string> insert_values;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseInsert(),
+				implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static std::vector<PetsBeastlordData> All(Database& db)
+	{
+		std::vector<PetsBeastlordData> all_entries;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{}",
+				BaseSelect()
+			)
+		);
+
+		all_entries.reserve(results.RowCount());
+
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			PetsBeastlordData entry{};
+
+			entry.player_race   = atoi(row[0]);
+			entry.pet_race      = atoi(row[1]);
+			entry.texture       = atoi(row[2]);
+			entry.helm_texture  = atoi(row[3]);
+			entry.gender        = atoi(row[4]);
+			entry.size_modifier = static_cast<float>(atof(row[5]));
+			entry.face          = atoi(row[6]);
+
+			all_entries.push_back(entry);
+		}
+
+		return all_entries;
+	}
+
+	static std::vector<PetsBeastlordData> GetWhere(Database& db, std::string where_filter)
+	{
+		std::vector<PetsBeastlordData> all_entries;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} WHERE {}",
+				BaseSelect(),
+				where_filter
+			)
+		);
+
+		all_entries.reserve(results.RowCount());
+
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			PetsBeastlordData entry{};
+
+			entry.player_race   = atoi(row[0]);
+			entry.pet_race      = atoi(row[1]);
+			entry.texture       = atoi(row[2]);
+			entry.helm_texture  = atoi(row[3]);
+			entry.gender        = atoi(row[4]);
+			entry.size_modifier = static_cast<float>(atof(row[5]));
+			entry.face          = atoi(row[6]);
+
+			all_entries.push_back(entry);
+		}
+
+		return all_entries;
+	}
+
+	static int DeleteWhere(Database& db, std::string where_filter)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"DELETE FROM {} WHERE {}",
+				TableName(),
+				where_filter
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int Truncate(Database& db)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"TRUNCATE TABLE {}",
+				TableName()
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+};
+
+#endif //EQEMU_BASE_PETS_BEASTLORD_DATA_REPOSITORY_H
diff --git a/common/repositories/base/base_pets_equipmentset_entries_repository.h b/common/repositories/base/base_pets_equipmentset_entries_repository.h
index ecd9b2643..1999b35b7 100644
--- a/common/repositories/base/base_pets_equipmentset_entries_repository.h
+++ b/common/repositories/base/base_pets_equipmentset_entries_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_pets_equipmentset_repository.h b/common/repositories/base/base_pets_equipmentset_repository.h
index 0f27a879f..ebb04c02c 100644
--- a/common/repositories/base/base_pets_equipmentset_repository.h
+++ b/common/repositories/base/base_pets_equipmentset_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_pets_repository.h b/common/repositories/base/base_pets_repository.h
index 75681e6c4..1dc25f333 100644
--- a/common/repositories/base/base_pets_repository.h
+++ b/common/repositories/base/base_pets_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_player_titlesets_repository.h b/common/repositories/base/base_player_titlesets_repository.h
index 12c800953..dad10ca0d 100644
--- a/common/repositories/base/base_player_titlesets_repository.h
+++ b/common/repositories/base/base_player_titlesets_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_proximities_repository.h b/common/repositories/base/base_proximities_repository.h
index 6b1f697b0..8dfff3279 100644
--- a/common/repositories/base/base_proximities_repository.h
+++ b/common/repositories/base/base_proximities_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_quest_globals_repository.h b/common/repositories/base/base_quest_globals_repository.h
index 0870938fd..7324e7c29 100644
--- a/common/repositories/base/base_quest_globals_repository.h
+++ b/common/repositories/base/base_quest_globals_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_raid_details_repository.h b/common/repositories/base/base_raid_details_repository.h
index a0f717bc6..a53949908 100644
--- a/common/repositories/base/base_raid_details_repository.h
+++ b/common/repositories/base/base_raid_details_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_raid_members_repository.h b/common/repositories/base/base_raid_members_repository.h
index b4c9ef94f..2dc350ae1 100644
--- a/common/repositories/base/base_raid_members_repository.h
+++ b/common/repositories/base/base_raid_members_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_reports_repository.h b/common/repositories/base/base_reports_repository.h
index caebd4107..89aa474b7 100644
--- a/common/repositories/base/base_reports_repository.h
+++ b/common/repositories/base/base_reports_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_respawn_times_repository.h b/common/repositories/base/base_respawn_times_repository.h
index df69f2be9..0ca8d525f 100644
--- a/common/repositories/base/base_respawn_times_repository.h
+++ b/common/repositories/base/base_respawn_times_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_rule_sets_repository.h b/common/repositories/base/base_rule_sets_repository.h
index 31dab96d9..181e064a8 100644
--- a/common/repositories/base/base_rule_sets_repository.h
+++ b/common/repositories/base/base_rule_sets_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_rule_values_repository.h b/common/repositories/base/base_rule_values_repository.h
index 6bd6fe2d6..821ccfdc2 100644
--- a/common/repositories/base/base_rule_values_repository.h
+++ b/common/repositories/base/base_rule_values_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_saylink_repository.h b/common/repositories/base/base_saylink_repository.h
index e02b1954c..d9206a137 100644
--- a/common/repositories/base/base_saylink_repository.h
+++ b/common/repositories/base/base_saylink_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_skill_caps_repository.h b/common/repositories/base/base_skill_caps_repository.h
index b17753782..dee1ede92 100644
--- a/common/repositories/base/base_skill_caps_repository.h
+++ b/common/repositories/base/base_skill_caps_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -19,7 +19,7 @@ class BaseSkillCapsRepository {
 public:
 	struct SkillCaps {
 		int skillID;
-		int class;
+		int class_;
 		int level;
 		int cap;
 		int class_;
@@ -34,7 +34,7 @@ public:
 	{
 		return {
 			"skillID",
-			"class",
+			"`class`",
 			"level",
 			"cap",
 			"class_",
@@ -74,7 +74,7 @@ public:
 		SkillCaps entry{};
 
 		entry.skillID = 0;
-		entry.class   = 0;
+		entry.class_  = 0;
 		entry.level   = 0;
 		entry.cap     = 0;
 		entry.class_  = 0;
@@ -114,7 +114,7 @@ public:
 			SkillCaps entry{};
 
 			entry.skillID = atoi(row[0]);
-			entry.class   = atoi(row[1]);
+			entry.class_  = atoi(row[1]);
 			entry.level   = atoi(row[2]);
 			entry.cap     = atoi(row[3]);
 			entry.class_  = atoi(row[4]);
@@ -152,7 +152,7 @@ public:
 		auto columns = Columns();
 
 		update_values.push_back(columns[0] + " = " + std::to_string(skill_caps_entry.skillID));
-		update_values.push_back(columns[1] + " = " + std::to_string(skill_caps_entry.class));
+		update_values.push_back(columns[1] + " = " + std::to_string(skill_caps_entry.class_));
 		update_values.push_back(columns[2] + " = " + std::to_string(skill_caps_entry.level));
 		update_values.push_back(columns[3] + " = " + std::to_string(skill_caps_entry.cap));
 		update_values.push_back(columns[4] + " = " + std::to_string(skill_caps_entry.class_));
@@ -178,7 +178,7 @@ public:
 		std::vector<std::string> insert_values;
 
 		insert_values.push_back(std::to_string(skill_caps_entry.skillID));
-		insert_values.push_back(std::to_string(skill_caps_entry.class));
+		insert_values.push_back(std::to_string(skill_caps_entry.class_));
 		insert_values.push_back(std::to_string(skill_caps_entry.level));
 		insert_values.push_back(std::to_string(skill_caps_entry.cap));
 		insert_values.push_back(std::to_string(skill_caps_entry.class_));
@@ -212,7 +212,7 @@ public:
 			std::vector<std::string> insert_values;
 
 			insert_values.push_back(std::to_string(skill_caps_entry.skillID));
-			insert_values.push_back(std::to_string(skill_caps_entry.class));
+			insert_values.push_back(std::to_string(skill_caps_entry.class_));
 			insert_values.push_back(std::to_string(skill_caps_entry.level));
 			insert_values.push_back(std::to_string(skill_caps_entry.cap));
 			insert_values.push_back(std::to_string(skill_caps_entry.class_));
@@ -250,7 +250,7 @@ public:
 			SkillCaps entry{};
 
 			entry.skillID = atoi(row[0]);
-			entry.class   = atoi(row[1]);
+			entry.class_  = atoi(row[1]);
 			entry.level   = atoi(row[2]);
 			entry.cap     = atoi(row[3]);
 			entry.class_  = atoi(row[4]);
@@ -279,7 +279,7 @@ public:
 			SkillCaps entry{};
 
 			entry.skillID = atoi(row[0]);
-			entry.class   = atoi(row[1]);
+			entry.class_  = atoi(row[1]);
 			entry.level   = atoi(row[2]);
 			entry.cap     = atoi(row[3]);
 			entry.class_  = atoi(row[4]);
diff --git a/common/repositories/base/base_spawn2_repository.h b/common/repositories/base/base_spawn2_repository.h
index 921c9262d..6ff7146ee 100644
--- a/common/repositories/base/base_spawn2_repository.h
+++ b/common/repositories/base/base_spawn2_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -29,6 +29,7 @@ public:
 		int         respawntime;
 		int         variance;
 		int         pathgrid;
+		int         path_when_zone_idle;
 		int         _condition;
 		int         cond_value;
 		int         enabled;
@@ -58,6 +59,7 @@ public:
 			"respawntime",
 			"variance",
 			"pathgrid",
+			"path_when_zone_idle",
 			"_condition",
 			"cond_value",
 			"enabled",
@@ -112,6 +114,7 @@ public:
 		entry.respawntime            = 0;
 		entry.variance               = 0;
 		entry.pathgrid               = 0;
+		entry.path_when_zone_idle    = 0;
 		entry._condition             = 0;
 		entry.cond_value             = 1;
 		entry.enabled                = 1;
@@ -166,14 +169,15 @@ public:
 			entry.respawntime            = atoi(row[8]);
 			entry.variance               = atoi(row[9]);
 			entry.pathgrid               = atoi(row[10]);
-			entry._condition             = atoi(row[11]);
-			entry.cond_value             = atoi(row[12]);
-			entry.enabled                = atoi(row[13]);
-			entry.animation              = atoi(row[14]);
-			entry.min_expansion          = atoi(row[15]);
-			entry.max_expansion          = atoi(row[16]);
-			entry.content_flags          = row[17] ? row[17] : "";
-			entry.content_flags_disabled = row[18] ? row[18] : "";
+			entry.path_when_zone_idle    = atoi(row[11]);
+			entry._condition             = atoi(row[12]);
+			entry.cond_value             = atoi(row[13]);
+			entry.enabled                = atoi(row[14]);
+			entry.animation              = atoi(row[15]);
+			entry.min_expansion          = atoi(row[16]);
+			entry.max_expansion          = atoi(row[17]);
+			entry.content_flags          = row[18] ? row[18] : "";
+			entry.content_flags_disabled = row[19] ? row[19] : "";
 
 			return entry;
 		}
@@ -217,14 +221,15 @@ public:
 		update_values.push_back(columns[8] + " = " + std::to_string(spawn2_entry.respawntime));
 		update_values.push_back(columns[9] + " = " + std::to_string(spawn2_entry.variance));
 		update_values.push_back(columns[10] + " = " + std::to_string(spawn2_entry.pathgrid));
-		update_values.push_back(columns[11] + " = " + std::to_string(spawn2_entry._condition));
-		update_values.push_back(columns[12] + " = " + std::to_string(spawn2_entry.cond_value));
-		update_values.push_back(columns[13] + " = " + std::to_string(spawn2_entry.enabled));
-		update_values.push_back(columns[14] + " = " + std::to_string(spawn2_entry.animation));
-		update_values.push_back(columns[15] + " = " + std::to_string(spawn2_entry.min_expansion));
-		update_values.push_back(columns[16] + " = " + std::to_string(spawn2_entry.max_expansion));
-		update_values.push_back(columns[17] + " = '" + EscapeString(spawn2_entry.content_flags) + "'");
-		update_values.push_back(columns[18] + " = '" + EscapeString(spawn2_entry.content_flags_disabled) + "'");
+		update_values.push_back(columns[11] + " = " + std::to_string(spawn2_entry.path_when_zone_idle));
+		update_values.push_back(columns[12] + " = " + std::to_string(spawn2_entry._condition));
+		update_values.push_back(columns[13] + " = " + std::to_string(spawn2_entry.cond_value));
+		update_values.push_back(columns[14] + " = " + std::to_string(spawn2_entry.enabled));
+		update_values.push_back(columns[15] + " = " + std::to_string(spawn2_entry.animation));
+		update_values.push_back(columns[16] + " = " + std::to_string(spawn2_entry.min_expansion));
+		update_values.push_back(columns[17] + " = " + std::to_string(spawn2_entry.max_expansion));
+		update_values.push_back(columns[18] + " = '" + EscapeString(spawn2_entry.content_flags) + "'");
+		update_values.push_back(columns[19] + " = '" + EscapeString(spawn2_entry.content_flags_disabled) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -257,6 +262,7 @@ public:
 		insert_values.push_back(std::to_string(spawn2_entry.respawntime));
 		insert_values.push_back(std::to_string(spawn2_entry.variance));
 		insert_values.push_back(std::to_string(spawn2_entry.pathgrid));
+		insert_values.push_back(std::to_string(spawn2_entry.path_when_zone_idle));
 		insert_values.push_back(std::to_string(spawn2_entry._condition));
 		insert_values.push_back(std::to_string(spawn2_entry.cond_value));
 		insert_values.push_back(std::to_string(spawn2_entry.enabled));
@@ -305,6 +311,7 @@ public:
 			insert_values.push_back(std::to_string(spawn2_entry.respawntime));
 			insert_values.push_back(std::to_string(spawn2_entry.variance));
 			insert_values.push_back(std::to_string(spawn2_entry.pathgrid));
+			insert_values.push_back(std::to_string(spawn2_entry.path_when_zone_idle));
 			insert_values.push_back(std::to_string(spawn2_entry._condition));
 			insert_values.push_back(std::to_string(spawn2_entry.cond_value));
 			insert_values.push_back(std::to_string(spawn2_entry.enabled));
@@ -357,14 +364,15 @@ public:
 			entry.respawntime            = atoi(row[8]);
 			entry.variance               = atoi(row[9]);
 			entry.pathgrid               = atoi(row[10]);
-			entry._condition             = atoi(row[11]);
-			entry.cond_value             = atoi(row[12]);
-			entry.enabled                = atoi(row[13]);
-			entry.animation              = atoi(row[14]);
-			entry.min_expansion          = atoi(row[15]);
-			entry.max_expansion          = atoi(row[16]);
-			entry.content_flags          = row[17] ? row[17] : "";
-			entry.content_flags_disabled = row[18] ? row[18] : "";
+			entry.path_when_zone_idle    = atoi(row[11]);
+			entry._condition             = atoi(row[12]);
+			entry.cond_value             = atoi(row[13]);
+			entry.enabled                = atoi(row[14]);
+			entry.animation              = atoi(row[15]);
+			entry.min_expansion          = atoi(row[16]);
+			entry.max_expansion          = atoi(row[17]);
+			entry.content_flags          = row[18] ? row[18] : "";
+			entry.content_flags_disabled = row[19] ? row[19] : "";
 
 			all_entries.push_back(entry);
 		}
@@ -400,14 +408,15 @@ public:
 			entry.respawntime            = atoi(row[8]);
 			entry.variance               = atoi(row[9]);
 			entry.pathgrid               = atoi(row[10]);
-			entry._condition             = atoi(row[11]);
-			entry.cond_value             = atoi(row[12]);
-			entry.enabled                = atoi(row[13]);
-			entry.animation              = atoi(row[14]);
-			entry.min_expansion          = atoi(row[15]);
-			entry.max_expansion          = atoi(row[16]);
-			entry.content_flags          = row[17] ? row[17] : "";
-			entry.content_flags_disabled = row[18] ? row[18] : "";
+			entry.path_when_zone_idle    = atoi(row[11]);
+			entry._condition             = atoi(row[12]);
+			entry.cond_value             = atoi(row[13]);
+			entry.enabled                = atoi(row[14]);
+			entry.animation              = atoi(row[15]);
+			entry.min_expansion          = atoi(row[16]);
+			entry.max_expansion          = atoi(row[17]);
+			entry.content_flags          = row[18] ? row[18] : "";
+			entry.content_flags_disabled = row[19] ? row[19] : "";
 
 			all_entries.push_back(entry);
 		}
diff --git a/common/repositories/base/base_spawn_condition_values_repository.h b/common/repositories/base/base_spawn_condition_values_repository.h
index c54eee597..ca796270f 100644
--- a/common/repositories/base/base_spawn_condition_values_repository.h
+++ b/common/repositories/base/base_spawn_condition_values_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_spawn_conditions_repository.h b/common/repositories/base/base_spawn_conditions_repository.h
index e0e7fa0ab..4a3435fd7 100644
--- a/common/repositories/base/base_spawn_conditions_repository.h
+++ b/common/repositories/base/base_spawn_conditions_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_spawn_events_repository.h b/common/repositories/base/base_spawn_events_repository.h
index da52bbb8a..66490d2ca 100644
--- a/common/repositories/base/base_spawn_events_repository.h
+++ b/common/repositories/base/base_spawn_events_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_spawnentry_repository.h b/common/repositories/base/base_spawnentry_repository.h
index 4a04bf7d6..3bfb7b5e0 100644
--- a/common/repositories/base/base_spawnentry_repository.h
+++ b/common/repositories/base/base_spawnentry_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_spawngroup_repository.h b/common/repositories/base/base_spawngroup_repository.h
index 0baba76aa..a9ab5e3e6 100644
--- a/common/repositories/base/base_spawngroup_repository.h
+++ b/common/repositories/base/base_spawngroup_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_spell_buckets_repository.h b/common/repositories/base/base_spell_buckets_repository.h
index 39ce3ff42..7e6d5e46d 100644
--- a/common/repositories/base/base_spell_buckets_repository.h
+++ b/common/repositories/base/base_spell_buckets_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -18,7 +18,7 @@
 class BaseSpellBucketsRepository {
 public:
 	struct SpellBuckets {
-		int         spellid;
+		int64       spellid;
 		std::string key;
 		std::string value;
 	};
@@ -107,7 +107,7 @@ public:
 		if (results.RowCount() == 1) {
 			SpellBuckets entry{};
 
-			entry.spellid = atoi(row[0]);
+			entry.spellid = strtoll(row[0], NULL, 10);
 			entry.key     = row[1] ? row[1] : "";
 			entry.value   = row[2] ? row[2] : "";
 
@@ -235,7 +235,7 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			SpellBuckets entry{};
 
-			entry.spellid = atoi(row[0]);
+			entry.spellid = strtoll(row[0], NULL, 10);
 			entry.key     = row[1] ? row[1] : "";
 			entry.value   = row[2] ? row[2] : "";
 
@@ -262,7 +262,7 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			SpellBuckets entry{};
 
-			entry.spellid = atoi(row[0]);
+			entry.spellid = strtoll(row[0], NULL, 10);
 			entry.key     = row[1] ? row[1] : "";
 			entry.value   = row[2] ? row[2] : "";
 
diff --git a/common/repositories/base/base_spell_globals_repository.h b/common/repositories/base/base_spell_globals_repository.h
index 40ce563ce..26e836597 100644
--- a/common/repositories/base/base_spell_globals_repository.h
+++ b/common/repositories/base/base_spell_globals_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_spells_new_repository.h b/common/repositories/base/base_spells_new_repository.h
index e59ce3b28..e273667ad 100644
--- a/common/repositories/base/base_spells_new_repository.h
+++ b/common/repositories/base/base_spells_new_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_start_zones_repository.h b/common/repositories/base/base_start_zones_repository.h
index 75a8595ca..9a627de40 100644
--- a/common/repositories/base/base_start_zones_repository.h
+++ b/common/repositories/base/base_start_zones_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_starting_items_repository.h b/common/repositories/base/base_starting_items_repository.h
index edb2cafa9..0f40bb16d 100644
--- a/common/repositories/base/base_starting_items_repository.h
+++ b/common/repositories/base/base_starting_items_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -20,7 +20,7 @@ public:
 	struct StartingItems {
 		int         id;
 		int         race;
-		int         class;
+		int         class_;
 		int         deityid;
 		int         zoneid;
 		int         itemid;
@@ -43,7 +43,7 @@ public:
 		return {
 			"id",
 			"race",
-			"class",
+			"`class`",
 			"deityid",
 			"zoneid",
 			"itemid",
@@ -91,7 +91,7 @@ public:
 
 		entry.id                     = 0;
 		entry.race                   = 0;
-		entry.class                  = 0;
+		entry.class_                 = 0;
 		entry.deityid                = 0;
 		entry.zoneid                 = 0;
 		entry.itemid                 = 0;
@@ -139,7 +139,7 @@ public:
 
 			entry.id                     = atoi(row[0]);
 			entry.race                   = atoi(row[1]);
-			entry.class                  = atoi(row[2]);
+			entry.class_                 = atoi(row[2]);
 			entry.deityid                = atoi(row[3]);
 			entry.zoneid                 = atoi(row[4]);
 			entry.itemid                 = atoi(row[5]);
@@ -184,7 +184,7 @@ public:
 		auto columns = Columns();
 
 		update_values.push_back(columns[1] + " = " + std::to_string(starting_items_entry.race));
-		update_values.push_back(columns[2] + " = " + std::to_string(starting_items_entry.class));
+		update_values.push_back(columns[2] + " = " + std::to_string(starting_items_entry.class_));
 		update_values.push_back(columns[3] + " = " + std::to_string(starting_items_entry.deityid));
 		update_values.push_back(columns[4] + " = " + std::to_string(starting_items_entry.zoneid));
 		update_values.push_back(columns[5] + " = " + std::to_string(starting_items_entry.itemid));
@@ -218,7 +218,7 @@ public:
 
 		insert_values.push_back(std::to_string(starting_items_entry.id));
 		insert_values.push_back(std::to_string(starting_items_entry.race));
-		insert_values.push_back(std::to_string(starting_items_entry.class));
+		insert_values.push_back(std::to_string(starting_items_entry.class_));
 		insert_values.push_back(std::to_string(starting_items_entry.deityid));
 		insert_values.push_back(std::to_string(starting_items_entry.zoneid));
 		insert_values.push_back(std::to_string(starting_items_entry.itemid));
@@ -260,7 +260,7 @@ public:
 
 			insert_values.push_back(std::to_string(starting_items_entry.id));
 			insert_values.push_back(std::to_string(starting_items_entry.race));
-			insert_values.push_back(std::to_string(starting_items_entry.class));
+			insert_values.push_back(std::to_string(starting_items_entry.class_));
 			insert_values.push_back(std::to_string(starting_items_entry.deityid));
 			insert_values.push_back(std::to_string(starting_items_entry.zoneid));
 			insert_values.push_back(std::to_string(starting_items_entry.itemid));
@@ -306,7 +306,7 @@ public:
 
 			entry.id                     = atoi(row[0]);
 			entry.race                   = atoi(row[1]);
-			entry.class                  = atoi(row[2]);
+			entry.class_                 = atoi(row[2]);
 			entry.deityid                = atoi(row[3]);
 			entry.zoneid                 = atoi(row[4]);
 			entry.itemid                 = atoi(row[5]);
@@ -343,7 +343,7 @@ public:
 
 			entry.id                     = atoi(row[0]);
 			entry.race                   = atoi(row[1]);
-			entry.class                  = atoi(row[2]);
+			entry.class_                 = atoi(row[2]);
 			entry.deityid                = atoi(row[3]);
 			entry.zoneid                 = atoi(row[4]);
 			entry.itemid                 = atoi(row[5]);
diff --git a/common/repositories/base/base_task_activities_repository.h b/common/repositories/base/base_task_activities_repository.h
index ad7f1fee4..e88334e1b 100644
--- a/common/repositories/base/base_task_activities_repository.h
+++ b/common/repositories/base/base_task_activities_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_tasksets_repository.h b/common/repositories/base/base_tasksets_repository.h
index c3feb4ccd..0944f57b3 100644
--- a/common/repositories/base/base_tasksets_repository.h
+++ b/common/repositories/base/base_tasksets_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_timers_repository.h b/common/repositories/base/base_timers_repository.h
index f1d6d97b1..ea3774bc2 100644
--- a/common/repositories/base/base_timers_repository.h
+++ b/common/repositories/base/base_timers_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_titles_repository.h b/common/repositories/base/base_titles_repository.h
index c108c887b..e270b51d1 100644
--- a/common/repositories/base/base_titles_repository.h
+++ b/common/repositories/base/base_titles_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -24,7 +24,7 @@ public:
 		int         max_skill_value;
 		int         min_aa_points;
 		int         max_aa_points;
-		int         class;
+		int         class_;
 		int         gender;
 		int         char_id;
 		int         status;
@@ -48,7 +48,7 @@ public:
 			"max_skill_value",
 			"min_aa_points",
 			"max_aa_points",
-			"class",
+			"`class`",
 			"gender",
 			"char_id",
 			"status",
@@ -97,7 +97,7 @@ public:
 		entry.max_skill_value = -1;
 		entry.min_aa_points   = -1;
 		entry.max_aa_points   = -1;
-		entry.class           = -1;
+		entry.class_          = -1;
 		entry.gender          = -1;
 		entry.char_id         = -1;
 		entry.status          = -1;
@@ -146,7 +146,7 @@ public:
 			entry.max_skill_value = atoi(row[3]);
 			entry.min_aa_points   = atoi(row[4]);
 			entry.max_aa_points   = atoi(row[5]);
-			entry.class           = atoi(row[6]);
+			entry.class_          = atoi(row[6]);
 			entry.gender          = atoi(row[7]);
 			entry.char_id         = atoi(row[8]);
 			entry.status          = atoi(row[9]);
@@ -192,7 +192,7 @@ public:
 		update_values.push_back(columns[3] + " = " + std::to_string(titles_entry.max_skill_value));
 		update_values.push_back(columns[4] + " = " + std::to_string(titles_entry.min_aa_points));
 		update_values.push_back(columns[5] + " = " + std::to_string(titles_entry.max_aa_points));
-		update_values.push_back(columns[6] + " = " + std::to_string(titles_entry.class));
+		update_values.push_back(columns[6] + " = " + std::to_string(titles_entry.class_));
 		update_values.push_back(columns[7] + " = " + std::to_string(titles_entry.gender));
 		update_values.push_back(columns[8] + " = " + std::to_string(titles_entry.char_id));
 		update_values.push_back(columns[9] + " = " + std::to_string(titles_entry.status));
@@ -227,7 +227,7 @@ public:
 		insert_values.push_back(std::to_string(titles_entry.max_skill_value));
 		insert_values.push_back(std::to_string(titles_entry.min_aa_points));
 		insert_values.push_back(std::to_string(titles_entry.max_aa_points));
-		insert_values.push_back(std::to_string(titles_entry.class));
+		insert_values.push_back(std::to_string(titles_entry.class_));
 		insert_values.push_back(std::to_string(titles_entry.gender));
 		insert_values.push_back(std::to_string(titles_entry.char_id));
 		insert_values.push_back(std::to_string(titles_entry.status));
@@ -270,7 +270,7 @@ public:
 			insert_values.push_back(std::to_string(titles_entry.max_skill_value));
 			insert_values.push_back(std::to_string(titles_entry.min_aa_points));
 			insert_values.push_back(std::to_string(titles_entry.max_aa_points));
-			insert_values.push_back(std::to_string(titles_entry.class));
+			insert_values.push_back(std::to_string(titles_entry.class_));
 			insert_values.push_back(std::to_string(titles_entry.gender));
 			insert_values.push_back(std::to_string(titles_entry.char_id));
 			insert_values.push_back(std::to_string(titles_entry.status));
@@ -317,7 +317,7 @@ public:
 			entry.max_skill_value = atoi(row[3]);
 			entry.min_aa_points   = atoi(row[4]);
 			entry.max_aa_points   = atoi(row[5]);
-			entry.class           = atoi(row[6]);
+			entry.class_          = atoi(row[6]);
 			entry.gender          = atoi(row[7]);
 			entry.char_id         = atoi(row[8]);
 			entry.status          = atoi(row[9]);
@@ -355,7 +355,7 @@ public:
 			entry.max_skill_value = atoi(row[3]);
 			entry.min_aa_points   = atoi(row[4]);
 			entry.max_aa_points   = atoi(row[5]);
-			entry.class           = atoi(row[6]);
+			entry.class_          = atoi(row[6]);
 			entry.gender          = atoi(row[7]);
 			entry.char_id         = atoi(row[8]);
 			entry.status          = atoi(row[9]);
diff --git a/common/repositories/base/base_trader_repository.h b/common/repositories/base/base_trader_repository.h
index 1eded1551..1481e6154 100644
--- a/common/repositories/base/base_trader_repository.h
+++ b/common/repositories/base/base_trader_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_tradeskill_recipe_entries_repository.h b/common/repositories/base/base_tradeskill_recipe_entries_repository.h
index 13c293c77..274c58ca1 100644
--- a/common/repositories/base/base_tradeskill_recipe_entries_repository.h
+++ b/common/repositories/base/base_tradeskill_recipe_entries_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_tradeskill_recipe_repository.h b/common/repositories/base/base_tradeskill_recipe_repository.h
index 453d8b7dc..019cea88f 100644
--- a/common/repositories/base/base_tradeskill_recipe_repository.h
+++ b/common/repositories/base/base_tradeskill_recipe_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_traps_repository.h b/common/repositories/base/base_traps_repository.h
index b76072525..07ab550b4 100644
--- a/common/repositories/base/base_traps_repository.h
+++ b/common/repositories/base/base_traps_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_tribute_levels_repository.h b/common/repositories/base/base_tribute_levels_repository.h
index 2e49dab99..fef67ff27 100644
--- a/common/repositories/base/base_tribute_levels_repository.h
+++ b/common/repositories/base/base_tribute_levels_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_tributes_repository.h b/common/repositories/base/base_tributes_repository.h
index 1acd2f63b..c3a7f6324 100644
--- a/common/repositories/base/base_tributes_repository.h
+++ b/common/repositories/base/base_tributes_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_veteran_reward_templates_repository.h b/common/repositories/base/base_veteran_reward_templates_repository.h
index f41c1da3c..283742309 100644
--- a/common/repositories/base/base_veteran_reward_templates_repository.h
+++ b/common/repositories/base/base_veteran_reward_templates_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_zone_points_repository.h b/common/repositories/base/base_zone_points_repository.h
index e34d9bafb..b29cae43a 100644
--- a/common/repositories/base/base_zone_points_repository.h
+++ b/common/repositories/base/base_zone_points_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
diff --git a/common/repositories/base/base_zone_repository.h b/common/repositories/base/base_zone_repository.h
index f31b98491..04188ac93 100644
--- a/common/repositories/base/base_zone_repository.h
+++ b/common/repositories/base/base_zone_repository.h
@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -26,6 +26,7 @@ public:
 		float       safe_x;
 		float       safe_y;
 		float       safe_z;
+		float       safe_heading;
 		float       graveyard_id;
 		int         min_level;
 		int         min_status;
@@ -76,7 +77,7 @@ public:
 		int         castoutdoor;
 		int         hotzone;
 		int         insttype;
-		int         shutdowndelay;
+		int64       shutdowndelay;
 		int         peqzone;
 		int         expansion;
 		int         suspendbuffs;
@@ -127,6 +128,7 @@ public:
 			"safe_x",
 			"safe_y",
 			"safe_z",
+			"safe_heading",
 			"graveyard_id",
 			"min_level",
 			"min_status",
@@ -253,6 +255,7 @@ public:
 		entry.safe_x                    = 0;
 		entry.safe_y                    = 0;
 		entry.safe_z                    = 0;
+		entry.safe_heading              = 0;
 		entry.graveyard_id              = 0;
 		entry.min_level                 = 0;
 		entry.min_status                = 0;
@@ -379,89 +382,90 @@ public:
 			entry.safe_x                    = static_cast<float>(atof(row[5]));
 			entry.safe_y                    = static_cast<float>(atof(row[6]));
 			entry.safe_z                    = static_cast<float>(atof(row[7]));
-			entry.graveyard_id              = static_cast<float>(atof(row[8]));
-			entry.min_level                 = atoi(row[9]);
-			entry.min_status                = atoi(row[10]);
-			entry.zoneidnumber              = atoi(row[11]);
-			entry.version                   = atoi(row[12]);
-			entry.timezone                  = atoi(row[13]);
-			entry.maxclients                = atoi(row[14]);
-			entry.ruleset                   = atoi(row[15]);
-			entry.note                      = row[16] ? row[16] : "";
-			entry.underworld                = static_cast<float>(atof(row[17]));
-			entry.minclip                   = static_cast<float>(atof(row[18]));
-			entry.maxclip                   = static_cast<float>(atof(row[19]));
-			entry.fog_minclip               = static_cast<float>(atof(row[20]));
-			entry.fog_maxclip               = static_cast<float>(atof(row[21]));
-			entry.fog_blue                  = atoi(row[22]);
-			entry.fog_red                   = atoi(row[23]);
-			entry.fog_green                 = atoi(row[24]);
-			entry.sky                       = atoi(row[25]);
-			entry.ztype                     = atoi(row[26]);
-			entry.zone_exp_multiplier       = static_cast<float>(atof(row[27]));
-			entry.walkspeed                 = static_cast<float>(atof(row[28]));
-			entry.time_type                 = atoi(row[29]);
-			entry.fog_red1                  = atoi(row[30]);
-			entry.fog_green1                = atoi(row[31]);
-			entry.fog_blue1                 = atoi(row[32]);
-			entry.fog_minclip1              = static_cast<float>(atof(row[33]));
-			entry.fog_maxclip1              = static_cast<float>(atof(row[34]));
-			entry.fog_red2                  = atoi(row[35]);
-			entry.fog_green2                = atoi(row[36]);
-			entry.fog_blue2                 = atoi(row[37]);
-			entry.fog_minclip2              = static_cast<float>(atof(row[38]));
-			entry.fog_maxclip2              = static_cast<float>(atof(row[39]));
-			entry.fog_red3                  = atoi(row[40]);
-			entry.fog_green3                = atoi(row[41]);
-			entry.fog_blue3                 = atoi(row[42]);
-			entry.fog_minclip3              = static_cast<float>(atof(row[43]));
-			entry.fog_maxclip3              = static_cast<float>(atof(row[44]));
-			entry.fog_red4                  = atoi(row[45]);
-			entry.fog_green4                = atoi(row[46]);
-			entry.fog_blue4                 = atoi(row[47]);
-			entry.fog_minclip4              = static_cast<float>(atof(row[48]));
-			entry.fog_maxclip4              = static_cast<float>(atof(row[49]));
-			entry.fog_density               = static_cast<float>(atof(row[50]));
-			entry.flag_needed               = row[51] ? row[51] : "";
-			entry.canbind                   = atoi(row[52]);
-			entry.cancombat                 = atoi(row[53]);
-			entry.canlevitate               = atoi(row[54]);
-			entry.castoutdoor               = atoi(row[55]);
-			entry.hotzone                   = atoi(row[56]);
-			entry.insttype                  = atoi(row[57]);
-			entry.shutdowndelay             = atoi(row[58]);
-			entry.peqzone                   = atoi(row[59]);
-			entry.expansion                 = atoi(row[60]);
-			entry.suspendbuffs              = atoi(row[61]);
-			entry.rain_chance1              = atoi(row[62]);
-			entry.rain_chance2              = atoi(row[63]);
-			entry.rain_chance3              = atoi(row[64]);
-			entry.rain_chance4              = atoi(row[65]);
-			entry.rain_duration1            = atoi(row[66]);
-			entry.rain_duration2            = atoi(row[67]);
-			entry.rain_duration3            = atoi(row[68]);
-			entry.rain_duration4            = atoi(row[69]);
-			entry.snow_chance1              = atoi(row[70]);
-			entry.snow_chance2              = atoi(row[71]);
-			entry.snow_chance3              = atoi(row[72]);
-			entry.snow_chance4              = atoi(row[73]);
-			entry.snow_duration1            = atoi(row[74]);
-			entry.snow_duration2            = atoi(row[75]);
-			entry.snow_duration3            = atoi(row[76]);
-			entry.snow_duration4            = atoi(row[77]);
-			entry.gravity                   = static_cast<float>(atof(row[78]));
-			entry.type                      = atoi(row[79]);
-			entry.skylock                   = atoi(row[80]);
-			entry.fast_regen_hp             = atoi(row[81]);
-			entry.fast_regen_mana           = atoi(row[82]);
-			entry.fast_regen_endurance      = atoi(row[83]);
-			entry.npc_max_aggro_dist        = atoi(row[84]);
-			entry.max_movement_update_range = atoi(row[85]);
-			entry.min_expansion             = atoi(row[86]);
-			entry.max_expansion             = atoi(row[87]);
-			entry.content_flags             = row[88] ? row[88] : "";
-			entry.content_flags_disabled    = row[89] ? row[89] : "";
-			entry.underworld_teleport_index = atoi(row[90]);
+			entry.safe_heading              = static_cast<float>(atof(row[8]));
+			entry.graveyard_id              = static_cast<float>(atof(row[9]));
+			entry.min_level                 = atoi(row[10]);
+			entry.min_status                = atoi(row[11]);
+			entry.zoneidnumber              = atoi(row[12]);
+			entry.version                   = atoi(row[13]);
+			entry.timezone                  = atoi(row[14]);
+			entry.maxclients                = atoi(row[15]);
+			entry.ruleset                   = atoi(row[16]);
+			entry.note                      = row[17] ? row[17] : "";
+			entry.underworld                = static_cast<float>(atof(row[18]));
+			entry.minclip                   = static_cast<float>(atof(row[19]));
+			entry.maxclip                   = static_cast<float>(atof(row[20]));
+			entry.fog_minclip               = static_cast<float>(atof(row[21]));
+			entry.fog_maxclip               = static_cast<float>(atof(row[22]));
+			entry.fog_blue                  = atoi(row[23]);
+			entry.fog_red                   = atoi(row[24]);
+			entry.fog_green                 = atoi(row[25]);
+			entry.sky                       = atoi(row[26]);
+			entry.ztype                     = atoi(row[27]);
+			entry.zone_exp_multiplier       = static_cast<float>(atof(row[28]));
+			entry.walkspeed                 = static_cast<float>(atof(row[29]));
+			entry.time_type                 = atoi(row[30]);
+			entry.fog_red1                  = atoi(row[31]);
+			entry.fog_green1                = atoi(row[32]);
+			entry.fog_blue1                 = atoi(row[33]);
+			entry.fog_minclip1              = static_cast<float>(atof(row[34]));
+			entry.fog_maxclip1              = static_cast<float>(atof(row[35]));
+			entry.fog_red2                  = atoi(row[36]);
+			entry.fog_green2                = atoi(row[37]);
+			entry.fog_blue2                 = atoi(row[38]);
+			entry.fog_minclip2              = static_cast<float>(atof(row[39]));
+			entry.fog_maxclip2              = static_cast<float>(atof(row[40]));
+			entry.fog_red3                  = atoi(row[41]);
+			entry.fog_green3                = atoi(row[42]);
+			entry.fog_blue3                 = atoi(row[43]);
+			entry.fog_minclip3              = static_cast<float>(atof(row[44]));
+			entry.fog_maxclip3              = static_cast<float>(atof(row[45]));
+			entry.fog_red4                  = atoi(row[46]);
+			entry.fog_green4                = atoi(row[47]);
+			entry.fog_blue4                 = atoi(row[48]);
+			entry.fog_minclip4              = static_cast<float>(atof(row[49]));
+			entry.fog_maxclip4              = static_cast<float>(atof(row[50]));
+			entry.fog_density               = static_cast<float>(atof(row[51]));
+			entry.flag_needed               = row[52] ? row[52] : "";
+			entry.canbind                   = atoi(row[53]);
+			entry.cancombat                 = atoi(row[54]);
+			entry.canlevitate               = atoi(row[55]);
+			entry.castoutdoor               = atoi(row[56]);
+			entry.hotzone                   = atoi(row[57]);
+			entry.insttype                  = atoi(row[58]);
+			entry.shutdowndelay             = strtoll(row[59], NULL, 10);
+			entry.peqzone                   = atoi(row[60]);
+			entry.expansion                 = atoi(row[61]);
+			entry.suspendbuffs              = atoi(row[62]);
+			entry.rain_chance1              = atoi(row[63]);
+			entry.rain_chance2              = atoi(row[64]);
+			entry.rain_chance3              = atoi(row[65]);
+			entry.rain_chance4              = atoi(row[66]);
+			entry.rain_duration1            = atoi(row[67]);
+			entry.rain_duration2            = atoi(row[68]);
+			entry.rain_duration3            = atoi(row[69]);
+			entry.rain_duration4            = atoi(row[70]);
+			entry.snow_chance1              = atoi(row[71]);
+			entry.snow_chance2              = atoi(row[72]);
+			entry.snow_chance3              = atoi(row[73]);
+			entry.snow_chance4              = atoi(row[74]);
+			entry.snow_duration1            = atoi(row[75]);
+			entry.snow_duration2            = atoi(row[76]);
+			entry.snow_duration3            = atoi(row[77]);
+			entry.snow_duration4            = atoi(row[78]);
+			entry.gravity                   = static_cast<float>(atof(row[79]));
+			entry.type                      = atoi(row[80]);
+			entry.skylock                   = atoi(row[81]);
+			entry.fast_regen_hp             = atoi(row[82]);
+			entry.fast_regen_mana           = atoi(row[83]);
+			entry.fast_regen_endurance      = atoi(row[84]);
+			entry.npc_max_aggro_dist        = atoi(row[85]);
+			entry.max_movement_update_range = atoi(row[86]);
+			entry.min_expansion             = atoi(row[87]);
+			entry.max_expansion             = atoi(row[88]);
+			entry.content_flags             = row[89] ? row[89] : "";
+			entry.content_flags_disabled    = row[90] ? row[90] : "";
+			entry.underworld_teleport_index = atoi(row[91]);
 
 			return entry;
 		}
@@ -502,89 +506,90 @@ public:
 		update_values.push_back(columns[5] + " = " + std::to_string(zone_entry.safe_x));
 		update_values.push_back(columns[6] + " = " + std::to_string(zone_entry.safe_y));
 		update_values.push_back(columns[7] + " = " + std::to_string(zone_entry.safe_z));
-		update_values.push_back(columns[8] + " = " + std::to_string(zone_entry.graveyard_id));
-		update_values.push_back(columns[9] + " = " + std::to_string(zone_entry.min_level));
-		update_values.push_back(columns[10] + " = " + std::to_string(zone_entry.min_status));
-		update_values.push_back(columns[11] + " = " + std::to_string(zone_entry.zoneidnumber));
-		update_values.push_back(columns[12] + " = " + std::to_string(zone_entry.version));
-		update_values.push_back(columns[13] + " = " + std::to_string(zone_entry.timezone));
-		update_values.push_back(columns[14] + " = " + std::to_string(zone_entry.maxclients));
-		update_values.push_back(columns[15] + " = " + std::to_string(zone_entry.ruleset));
-		update_values.push_back(columns[16] + " = '" + EscapeString(zone_entry.note) + "'");
-		update_values.push_back(columns[17] + " = " + std::to_string(zone_entry.underworld));
-		update_values.push_back(columns[18] + " = " + std::to_string(zone_entry.minclip));
-		update_values.push_back(columns[19] + " = " + std::to_string(zone_entry.maxclip));
-		update_values.push_back(columns[20] + " = " + std::to_string(zone_entry.fog_minclip));
-		update_values.push_back(columns[21] + " = " + std::to_string(zone_entry.fog_maxclip));
-		update_values.push_back(columns[22] + " = " + std::to_string(zone_entry.fog_blue));
-		update_values.push_back(columns[23] + " = " + std::to_string(zone_entry.fog_red));
-		update_values.push_back(columns[24] + " = " + std::to_string(zone_entry.fog_green));
-		update_values.push_back(columns[25] + " = " + std::to_string(zone_entry.sky));
-		update_values.push_back(columns[26] + " = " + std::to_string(zone_entry.ztype));
-		update_values.push_back(columns[27] + " = " + std::to_string(zone_entry.zone_exp_multiplier));
-		update_values.push_back(columns[28] + " = " + std::to_string(zone_entry.walkspeed));
-		update_values.push_back(columns[29] + " = " + std::to_string(zone_entry.time_type));
-		update_values.push_back(columns[30] + " = " + std::to_string(zone_entry.fog_red1));
-		update_values.push_back(columns[31] + " = " + std::to_string(zone_entry.fog_green1));
-		update_values.push_back(columns[32] + " = " + std::to_string(zone_entry.fog_blue1));
-		update_values.push_back(columns[33] + " = " + std::to_string(zone_entry.fog_minclip1));
-		update_values.push_back(columns[34] + " = " + std::to_string(zone_entry.fog_maxclip1));
-		update_values.push_back(columns[35] + " = " + std::to_string(zone_entry.fog_red2));
-		update_values.push_back(columns[36] + " = " + std::to_string(zone_entry.fog_green2));
-		update_values.push_back(columns[37] + " = " + std::to_string(zone_entry.fog_blue2));
-		update_values.push_back(columns[38] + " = " + std::to_string(zone_entry.fog_minclip2));
-		update_values.push_back(columns[39] + " = " + std::to_string(zone_entry.fog_maxclip2));
-		update_values.push_back(columns[40] + " = " + std::to_string(zone_entry.fog_red3));
-		update_values.push_back(columns[41] + " = " + std::to_string(zone_entry.fog_green3));
-		update_values.push_back(columns[42] + " = " + std::to_string(zone_entry.fog_blue3));
-		update_values.push_back(columns[43] + " = " + std::to_string(zone_entry.fog_minclip3));
-		update_values.push_back(columns[44] + " = " + std::to_string(zone_entry.fog_maxclip3));
-		update_values.push_back(columns[45] + " = " + std::to_string(zone_entry.fog_red4));
-		update_values.push_back(columns[46] + " = " + std::to_string(zone_entry.fog_green4));
-		update_values.push_back(columns[47] + " = " + std::to_string(zone_entry.fog_blue4));
-		update_values.push_back(columns[48] + " = " + std::to_string(zone_entry.fog_minclip4));
-		update_values.push_back(columns[49] + " = " + std::to_string(zone_entry.fog_maxclip4));
-		update_values.push_back(columns[50] + " = " + std::to_string(zone_entry.fog_density));
-		update_values.push_back(columns[51] + " = '" + EscapeString(zone_entry.flag_needed) + "'");
-		update_values.push_back(columns[52] + " = " + std::to_string(zone_entry.canbind));
-		update_values.push_back(columns[53] + " = " + std::to_string(zone_entry.cancombat));
-		update_values.push_back(columns[54] + " = " + std::to_string(zone_entry.canlevitate));
-		update_values.push_back(columns[55] + " = " + std::to_string(zone_entry.castoutdoor));
-		update_values.push_back(columns[56] + " = " + std::to_string(zone_entry.hotzone));
-		update_values.push_back(columns[57] + " = " + std::to_string(zone_entry.insttype));
-		update_values.push_back(columns[58] + " = " + std::to_string(zone_entry.shutdowndelay));
-		update_values.push_back(columns[59] + " = " + std::to_string(zone_entry.peqzone));
-		update_values.push_back(columns[60] + " = " + std::to_string(zone_entry.expansion));
-		update_values.push_back(columns[61] + " = " + std::to_string(zone_entry.suspendbuffs));
-		update_values.push_back(columns[62] + " = " + std::to_string(zone_entry.rain_chance1));
-		update_values.push_back(columns[63] + " = " + std::to_string(zone_entry.rain_chance2));
-		update_values.push_back(columns[64] + " = " + std::to_string(zone_entry.rain_chance3));
-		update_values.push_back(columns[65] + " = " + std::to_string(zone_entry.rain_chance4));
-		update_values.push_back(columns[66] + " = " + std::to_string(zone_entry.rain_duration1));
-		update_values.push_back(columns[67] + " = " + std::to_string(zone_entry.rain_duration2));
-		update_values.push_back(columns[68] + " = " + std::to_string(zone_entry.rain_duration3));
-		update_values.push_back(columns[69] + " = " + std::to_string(zone_entry.rain_duration4));
-		update_values.push_back(columns[70] + " = " + std::to_string(zone_entry.snow_chance1));
-		update_values.push_back(columns[71] + " = " + std::to_string(zone_entry.snow_chance2));
-		update_values.push_back(columns[72] + " = " + std::to_string(zone_entry.snow_chance3));
-		update_values.push_back(columns[73] + " = " + std::to_string(zone_entry.snow_chance4));
-		update_values.push_back(columns[74] + " = " + std::to_string(zone_entry.snow_duration1));
-		update_values.push_back(columns[75] + " = " + std::to_string(zone_entry.snow_duration2));
-		update_values.push_back(columns[76] + " = " + std::to_string(zone_entry.snow_duration3));
-		update_values.push_back(columns[77] + " = " + std::to_string(zone_entry.snow_duration4));
-		update_values.push_back(columns[78] + " = " + std::to_string(zone_entry.gravity));
-		update_values.push_back(columns[79] + " = " + std::to_string(zone_entry.type));
-		update_values.push_back(columns[80] + " = " + std::to_string(zone_entry.skylock));
-		update_values.push_back(columns[81] + " = " + std::to_string(zone_entry.fast_regen_hp));
-		update_values.push_back(columns[82] + " = " + std::to_string(zone_entry.fast_regen_mana));
-		update_values.push_back(columns[83] + " = " + std::to_string(zone_entry.fast_regen_endurance));
-		update_values.push_back(columns[84] + " = " + std::to_string(zone_entry.npc_max_aggro_dist));
-		update_values.push_back(columns[85] + " = " + std::to_string(zone_entry.max_movement_update_range));
-		update_values.push_back(columns[86] + " = " + std::to_string(zone_entry.min_expansion));
-		update_values.push_back(columns[87] + " = " + std::to_string(zone_entry.max_expansion));
-		update_values.push_back(columns[88] + " = '" + EscapeString(zone_entry.content_flags) + "'");
-		update_values.push_back(columns[89] + " = '" + EscapeString(zone_entry.content_flags_disabled) + "'");
-		update_values.push_back(columns[90] + " = " + std::to_string(zone_entry.underworld_teleport_index));
+		update_values.push_back(columns[8] + " = " + std::to_string(zone_entry.safe_heading));
+		update_values.push_back(columns[9] + " = " + std::to_string(zone_entry.graveyard_id));
+		update_values.push_back(columns[10] + " = " + std::to_string(zone_entry.min_level));
+		update_values.push_back(columns[11] + " = " + std::to_string(zone_entry.min_status));
+		update_values.push_back(columns[12] + " = " + std::to_string(zone_entry.zoneidnumber));
+		update_values.push_back(columns[13] + " = " + std::to_string(zone_entry.version));
+		update_values.push_back(columns[14] + " = " + std::to_string(zone_entry.timezone));
+		update_values.push_back(columns[15] + " = " + std::to_string(zone_entry.maxclients));
+		update_values.push_back(columns[16] + " = " + std::to_string(zone_entry.ruleset));
+		update_values.push_back(columns[17] + " = '" + EscapeString(zone_entry.note) + "'");
+		update_values.push_back(columns[18] + " = " + std::to_string(zone_entry.underworld));
+		update_values.push_back(columns[19] + " = " + std::to_string(zone_entry.minclip));
+		update_values.push_back(columns[20] + " = " + std::to_string(zone_entry.maxclip));
+		update_values.push_back(columns[21] + " = " + std::to_string(zone_entry.fog_minclip));
+		update_values.push_back(columns[22] + " = " + std::to_string(zone_entry.fog_maxclip));
+		update_values.push_back(columns[23] + " = " + std::to_string(zone_entry.fog_blue));
+		update_values.push_back(columns[24] + " = " + std::to_string(zone_entry.fog_red));
+		update_values.push_back(columns[25] + " = " + std::to_string(zone_entry.fog_green));
+		update_values.push_back(columns[26] + " = " + std::to_string(zone_entry.sky));
+		update_values.push_back(columns[27] + " = " + std::to_string(zone_entry.ztype));
+		update_values.push_back(columns[28] + " = " + std::to_string(zone_entry.zone_exp_multiplier));
+		update_values.push_back(columns[29] + " = " + std::to_string(zone_entry.walkspeed));
+		update_values.push_back(columns[30] + " = " + std::to_string(zone_entry.time_type));
+		update_values.push_back(columns[31] + " = " + std::to_string(zone_entry.fog_red1));
+		update_values.push_back(columns[32] + " = " + std::to_string(zone_entry.fog_green1));
+		update_values.push_back(columns[33] + " = " + std::to_string(zone_entry.fog_blue1));
+		update_values.push_back(columns[34] + " = " + std::to_string(zone_entry.fog_minclip1));
+		update_values.push_back(columns[35] + " = " + std::to_string(zone_entry.fog_maxclip1));
+		update_values.push_back(columns[36] + " = " + std::to_string(zone_entry.fog_red2));
+		update_values.push_back(columns[37] + " = " + std::to_string(zone_entry.fog_green2));
+		update_values.push_back(columns[38] + " = " + std::to_string(zone_entry.fog_blue2));
+		update_values.push_back(columns[39] + " = " + std::to_string(zone_entry.fog_minclip2));
+		update_values.push_back(columns[40] + " = " + std::to_string(zone_entry.fog_maxclip2));
+		update_values.push_back(columns[41] + " = " + std::to_string(zone_entry.fog_red3));
+		update_values.push_back(columns[42] + " = " + std::to_string(zone_entry.fog_green3));
+		update_values.push_back(columns[43] + " = " + std::to_string(zone_entry.fog_blue3));
+		update_values.push_back(columns[44] + " = " + std::to_string(zone_entry.fog_minclip3));
+		update_values.push_back(columns[45] + " = " + std::to_string(zone_entry.fog_maxclip3));
+		update_values.push_back(columns[46] + " = " + std::to_string(zone_entry.fog_red4));
+		update_values.push_back(columns[47] + " = " + std::to_string(zone_entry.fog_green4));
+		update_values.push_back(columns[48] + " = " + std::to_string(zone_entry.fog_blue4));
+		update_values.push_back(columns[49] + " = " + std::to_string(zone_entry.fog_minclip4));
+		update_values.push_back(columns[50] + " = " + std::to_string(zone_entry.fog_maxclip4));
+		update_values.push_back(columns[51] + " = " + std::to_string(zone_entry.fog_density));
+		update_values.push_back(columns[52] + " = '" + EscapeString(zone_entry.flag_needed) + "'");
+		update_values.push_back(columns[53] + " = " + std::to_string(zone_entry.canbind));
+		update_values.push_back(columns[54] + " = " + std::to_string(zone_entry.cancombat));
+		update_values.push_back(columns[55] + " = " + std::to_string(zone_entry.canlevitate));
+		update_values.push_back(columns[56] + " = " + std::to_string(zone_entry.castoutdoor));
+		update_values.push_back(columns[57] + " = " + std::to_string(zone_entry.hotzone));
+		update_values.push_back(columns[58] + " = " + std::to_string(zone_entry.insttype));
+		update_values.push_back(columns[59] + " = " + std::to_string(zone_entry.shutdowndelay));
+		update_values.push_back(columns[60] + " = " + std::to_string(zone_entry.peqzone));
+		update_values.push_back(columns[61] + " = " + std::to_string(zone_entry.expansion));
+		update_values.push_back(columns[62] + " = " + std::to_string(zone_entry.suspendbuffs));
+		update_values.push_back(columns[63] + " = " + std::to_string(zone_entry.rain_chance1));
+		update_values.push_back(columns[64] + " = " + std::to_string(zone_entry.rain_chance2));
+		update_values.push_back(columns[65] + " = " + std::to_string(zone_entry.rain_chance3));
+		update_values.push_back(columns[66] + " = " + std::to_string(zone_entry.rain_chance4));
+		update_values.push_back(columns[67] + " = " + std::to_string(zone_entry.rain_duration1));
+		update_values.push_back(columns[68] + " = " + std::to_string(zone_entry.rain_duration2));
+		update_values.push_back(columns[69] + " = " + std::to_string(zone_entry.rain_duration3));
+		update_values.push_back(columns[70] + " = " + std::to_string(zone_entry.rain_duration4));
+		update_values.push_back(columns[71] + " = " + std::to_string(zone_entry.snow_chance1));
+		update_values.push_back(columns[72] + " = " + std::to_string(zone_entry.snow_chance2));
+		update_values.push_back(columns[73] + " = " + std::to_string(zone_entry.snow_chance3));
+		update_values.push_back(columns[74] + " = " + std::to_string(zone_entry.snow_chance4));
+		update_values.push_back(columns[75] + " = " + std::to_string(zone_entry.snow_duration1));
+		update_values.push_back(columns[76] + " = " + std::to_string(zone_entry.snow_duration2));
+		update_values.push_back(columns[77] + " = " + std::to_string(zone_entry.snow_duration3));
+		update_values.push_back(columns[78] + " = " + std::to_string(zone_entry.snow_duration4));
+		update_values.push_back(columns[79] + " = " + std::to_string(zone_entry.gravity));
+		update_values.push_back(columns[80] + " = " + std::to_string(zone_entry.type));
+		update_values.push_back(columns[81] + " = " + std::to_string(zone_entry.skylock));
+		update_values.push_back(columns[82] + " = " + std::to_string(zone_entry.fast_regen_hp));
+		update_values.push_back(columns[83] + " = " + std::to_string(zone_entry.fast_regen_mana));
+		update_values.push_back(columns[84] + " = " + std::to_string(zone_entry.fast_regen_endurance));
+		update_values.push_back(columns[85] + " = " + std::to_string(zone_entry.npc_max_aggro_dist));
+		update_values.push_back(columns[86] + " = " + std::to_string(zone_entry.max_movement_update_range));
+		update_values.push_back(columns[87] + " = " + std::to_string(zone_entry.min_expansion));
+		update_values.push_back(columns[88] + " = " + std::to_string(zone_entry.max_expansion));
+		update_values.push_back(columns[89] + " = '" + EscapeString(zone_entry.content_flags) + "'");
+		update_values.push_back(columns[90] + " = '" + EscapeString(zone_entry.content_flags_disabled) + "'");
+		update_values.push_back(columns[91] + " = " + std::to_string(zone_entry.underworld_teleport_index));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -614,6 +619,7 @@ public:
 		insert_values.push_back(std::to_string(zone_entry.safe_x));
 		insert_values.push_back(std::to_string(zone_entry.safe_y));
 		insert_values.push_back(std::to_string(zone_entry.safe_z));
+		insert_values.push_back(std::to_string(zone_entry.safe_heading));
 		insert_values.push_back(std::to_string(zone_entry.graveyard_id));
 		insert_values.push_back(std::to_string(zone_entry.min_level));
 		insert_values.push_back(std::to_string(zone_entry.min_status));
@@ -734,6 +740,7 @@ public:
 			insert_values.push_back(std::to_string(zone_entry.safe_x));
 			insert_values.push_back(std::to_string(zone_entry.safe_y));
 			insert_values.push_back(std::to_string(zone_entry.safe_z));
+			insert_values.push_back(std::to_string(zone_entry.safe_heading));
 			insert_values.push_back(std::to_string(zone_entry.graveyard_id));
 			insert_values.push_back(std::to_string(zone_entry.min_level));
 			insert_values.push_back(std::to_string(zone_entry.min_status));
@@ -858,89 +865,90 @@ public:
 			entry.safe_x                    = static_cast<float>(atof(row[5]));
 			entry.safe_y                    = static_cast<float>(atof(row[6]));
 			entry.safe_z                    = static_cast<float>(atof(row[7]));
-			entry.graveyard_id              = static_cast<float>(atof(row[8]));
-			entry.min_level                 = atoi(row[9]);
-			entry.min_status                = atoi(row[10]);
-			entry.zoneidnumber              = atoi(row[11]);
-			entry.version                   = atoi(row[12]);
-			entry.timezone                  = atoi(row[13]);
-			entry.maxclients                = atoi(row[14]);
-			entry.ruleset                   = atoi(row[15]);
-			entry.note                      = row[16] ? row[16] : "";
-			entry.underworld                = static_cast<float>(atof(row[17]));
-			entry.minclip                   = static_cast<float>(atof(row[18]));
-			entry.maxclip                   = static_cast<float>(atof(row[19]));
-			entry.fog_minclip               = static_cast<float>(atof(row[20]));
-			entry.fog_maxclip               = static_cast<float>(atof(row[21]));
-			entry.fog_blue                  = atoi(row[22]);
-			entry.fog_red                   = atoi(row[23]);
-			entry.fog_green                 = atoi(row[24]);
-			entry.sky                       = atoi(row[25]);
-			entry.ztype                     = atoi(row[26]);
-			entry.zone_exp_multiplier       = static_cast<float>(atof(row[27]));
-			entry.walkspeed                 = static_cast<float>(atof(row[28]));
-			entry.time_type                 = atoi(row[29]);
-			entry.fog_red1                  = atoi(row[30]);
-			entry.fog_green1                = atoi(row[31]);
-			entry.fog_blue1                 = atoi(row[32]);
-			entry.fog_minclip1              = static_cast<float>(atof(row[33]));
-			entry.fog_maxclip1              = static_cast<float>(atof(row[34]));
-			entry.fog_red2                  = atoi(row[35]);
-			entry.fog_green2                = atoi(row[36]);
-			entry.fog_blue2                 = atoi(row[37]);
-			entry.fog_minclip2              = static_cast<float>(atof(row[38]));
-			entry.fog_maxclip2              = static_cast<float>(atof(row[39]));
-			entry.fog_red3                  = atoi(row[40]);
-			entry.fog_green3                = atoi(row[41]);
-			entry.fog_blue3                 = atoi(row[42]);
-			entry.fog_minclip3              = static_cast<float>(atof(row[43]));
-			entry.fog_maxclip3              = static_cast<float>(atof(row[44]));
-			entry.fog_red4                  = atoi(row[45]);
-			entry.fog_green4                = atoi(row[46]);
-			entry.fog_blue4                 = atoi(row[47]);
-			entry.fog_minclip4              = static_cast<float>(atof(row[48]));
-			entry.fog_maxclip4              = static_cast<float>(atof(row[49]));
-			entry.fog_density               = static_cast<float>(atof(row[50]));
-			entry.flag_needed               = row[51] ? row[51] : "";
-			entry.canbind                   = atoi(row[52]);
-			entry.cancombat                 = atoi(row[53]);
-			entry.canlevitate               = atoi(row[54]);
-			entry.castoutdoor               = atoi(row[55]);
-			entry.hotzone                   = atoi(row[56]);
-			entry.insttype                  = atoi(row[57]);
-			entry.shutdowndelay             = atoi(row[58]);
-			entry.peqzone                   = atoi(row[59]);
-			entry.expansion                 = atoi(row[60]);
-			entry.suspendbuffs              = atoi(row[61]);
-			entry.rain_chance1              = atoi(row[62]);
-			entry.rain_chance2              = atoi(row[63]);
-			entry.rain_chance3              = atoi(row[64]);
-			entry.rain_chance4              = atoi(row[65]);
-			entry.rain_duration1            = atoi(row[66]);
-			entry.rain_duration2            = atoi(row[67]);
-			entry.rain_duration3            = atoi(row[68]);
-			entry.rain_duration4            = atoi(row[69]);
-			entry.snow_chance1              = atoi(row[70]);
-			entry.snow_chance2              = atoi(row[71]);
-			entry.snow_chance3              = atoi(row[72]);
-			entry.snow_chance4              = atoi(row[73]);
-			entry.snow_duration1            = atoi(row[74]);
-			entry.snow_duration2            = atoi(row[75]);
-			entry.snow_duration3            = atoi(row[76]);
-			entry.snow_duration4            = atoi(row[77]);
-			entry.gravity                   = static_cast<float>(atof(row[78]));
-			entry.type                      = atoi(row[79]);
-			entry.skylock                   = atoi(row[80]);
-			entry.fast_regen_hp             = atoi(row[81]);
-			entry.fast_regen_mana           = atoi(row[82]);
-			entry.fast_regen_endurance      = atoi(row[83]);
-			entry.npc_max_aggro_dist        = atoi(row[84]);
-			entry.max_movement_update_range = atoi(row[85]);
-			entry.min_expansion             = atoi(row[86]);
-			entry.max_expansion             = atoi(row[87]);
-			entry.content_flags             = row[88] ? row[88] : "";
-			entry.content_flags_disabled    = row[89] ? row[89] : "";
-			entry.underworld_teleport_index = atoi(row[90]);
+			entry.safe_heading              = static_cast<float>(atof(row[8]));
+			entry.graveyard_id              = static_cast<float>(atof(row[9]));
+			entry.min_level                 = atoi(row[10]);
+			entry.min_status                = atoi(row[11]);
+			entry.zoneidnumber              = atoi(row[12]);
+			entry.version                   = atoi(row[13]);
+			entry.timezone                  = atoi(row[14]);
+			entry.maxclients                = atoi(row[15]);
+			entry.ruleset                   = atoi(row[16]);
+			entry.note                      = row[17] ? row[17] : "";
+			entry.underworld                = static_cast<float>(atof(row[18]));
+			entry.minclip                   = static_cast<float>(atof(row[19]));
+			entry.maxclip                   = static_cast<float>(atof(row[20]));
+			entry.fog_minclip               = static_cast<float>(atof(row[21]));
+			entry.fog_maxclip               = static_cast<float>(atof(row[22]));
+			entry.fog_blue                  = atoi(row[23]);
+			entry.fog_red                   = atoi(row[24]);
+			entry.fog_green                 = atoi(row[25]);
+			entry.sky                       = atoi(row[26]);
+			entry.ztype                     = atoi(row[27]);
+			entry.zone_exp_multiplier       = static_cast<float>(atof(row[28]));
+			entry.walkspeed                 = static_cast<float>(atof(row[29]));
+			entry.time_type                 = atoi(row[30]);
+			entry.fog_red1                  = atoi(row[31]);
+			entry.fog_green1                = atoi(row[32]);
+			entry.fog_blue1                 = atoi(row[33]);
+			entry.fog_minclip1              = static_cast<float>(atof(row[34]));
+			entry.fog_maxclip1              = static_cast<float>(atof(row[35]));
+			entry.fog_red2                  = atoi(row[36]);
+			entry.fog_green2                = atoi(row[37]);
+			entry.fog_blue2                 = atoi(row[38]);
+			entry.fog_minclip2              = static_cast<float>(atof(row[39]));
+			entry.fog_maxclip2              = static_cast<float>(atof(row[40]));
+			entry.fog_red3                  = atoi(row[41]);
+			entry.fog_green3                = atoi(row[42]);
+			entry.fog_blue3                 = atoi(row[43]);
+			entry.fog_minclip3              = static_cast<float>(atof(row[44]));
+			entry.fog_maxclip3              = static_cast<float>(atof(row[45]));
+			entry.fog_red4                  = atoi(row[46]);
+			entry.fog_green4                = atoi(row[47]);
+			entry.fog_blue4                 = atoi(row[48]);
+			entry.fog_minclip4              = static_cast<float>(atof(row[49]));
+			entry.fog_maxclip4              = static_cast<float>(atof(row[50]));
+			entry.fog_density               = static_cast<float>(atof(row[51]));
+			entry.flag_needed               = row[52] ? row[52] : "";
+			entry.canbind                   = atoi(row[53]);
+			entry.cancombat                 = atoi(row[54]);
+			entry.canlevitate               = atoi(row[55]);
+			entry.castoutdoor               = atoi(row[56]);
+			entry.hotzone                   = atoi(row[57]);
+			entry.insttype                  = atoi(row[58]);
+			entry.shutdowndelay             = strtoll(row[59], NULL, 10);
+			entry.peqzone                   = atoi(row[60]);
+			entry.expansion                 = atoi(row[61]);
+			entry.suspendbuffs              = atoi(row[62]);
+			entry.rain_chance1              = atoi(row[63]);
+			entry.rain_chance2              = atoi(row[64]);
+			entry.rain_chance3              = atoi(row[65]);
+			entry.rain_chance4              = atoi(row[66]);
+			entry.rain_duration1            = atoi(row[67]);
+			entry.rain_duration2            = atoi(row[68]);
+			entry.rain_duration3            = atoi(row[69]);
+			entry.rain_duration4            = atoi(row[70]);
+			entry.snow_chance1              = atoi(row[71]);
+			entry.snow_chance2              = atoi(row[72]);
+			entry.snow_chance3              = atoi(row[73]);
+			entry.snow_chance4              = atoi(row[74]);
+			entry.snow_duration1            = atoi(row[75]);
+			entry.snow_duration2            = atoi(row[76]);
+			entry.snow_duration3            = atoi(row[77]);
+			entry.snow_duration4            = atoi(row[78]);
+			entry.gravity                   = static_cast<float>(atof(row[79]));
+			entry.type                      = atoi(row[80]);
+			entry.skylock                   = atoi(row[81]);
+			entry.fast_regen_hp             = atoi(row[82]);
+			entry.fast_regen_mana           = atoi(row[83]);
+			entry.fast_regen_endurance      = atoi(row[84]);
+			entry.npc_max_aggro_dist        = atoi(row[85]);
+			entry.max_movement_update_range = atoi(row[86]);
+			entry.min_expansion             = atoi(row[87]);
+			entry.max_expansion             = atoi(row[88]);
+			entry.content_flags             = row[89] ? row[89] : "";
+			entry.content_flags_disabled    = row[90] ? row[90] : "";
+			entry.underworld_teleport_index = atoi(row[91]);
 
 			all_entries.push_back(entry);
 		}
@@ -973,89 +981,90 @@ public:
 			entry.safe_x                    = static_cast<float>(atof(row[5]));
 			entry.safe_y                    = static_cast<float>(atof(row[6]));
 			entry.safe_z                    = static_cast<float>(atof(row[7]));
-			entry.graveyard_id              = static_cast<float>(atof(row[8]));
-			entry.min_level                 = atoi(row[9]);
-			entry.min_status                = atoi(row[10]);
-			entry.zoneidnumber              = atoi(row[11]);
-			entry.version                   = atoi(row[12]);
-			entry.timezone                  = atoi(row[13]);
-			entry.maxclients                = atoi(row[14]);
-			entry.ruleset                   = atoi(row[15]);
-			entry.note                      = row[16] ? row[16] : "";
-			entry.underworld                = static_cast<float>(atof(row[17]));
-			entry.minclip                   = static_cast<float>(atof(row[18]));
-			entry.maxclip                   = static_cast<float>(atof(row[19]));
-			entry.fog_minclip               = static_cast<float>(atof(row[20]));
-			entry.fog_maxclip               = static_cast<float>(atof(row[21]));
-			entry.fog_blue                  = atoi(row[22]);
-			entry.fog_red                   = atoi(row[23]);
-			entry.fog_green                 = atoi(row[24]);
-			entry.sky                       = atoi(row[25]);
-			entry.ztype                     = atoi(row[26]);
-			entry.zone_exp_multiplier       = static_cast<float>(atof(row[27]));
-			entry.walkspeed                 = static_cast<float>(atof(row[28]));
-			entry.time_type                 = atoi(row[29]);
-			entry.fog_red1                  = atoi(row[30]);
-			entry.fog_green1                = atoi(row[31]);
-			entry.fog_blue1                 = atoi(row[32]);
-			entry.fog_minclip1              = static_cast<float>(atof(row[33]));
-			entry.fog_maxclip1              = static_cast<float>(atof(row[34]));
-			entry.fog_red2                  = atoi(row[35]);
-			entry.fog_green2                = atoi(row[36]);
-			entry.fog_blue2                 = atoi(row[37]);
-			entry.fog_minclip2              = static_cast<float>(atof(row[38]));
-			entry.fog_maxclip2              = static_cast<float>(atof(row[39]));
-			entry.fog_red3                  = atoi(row[40]);
-			entry.fog_green3                = atoi(row[41]);
-			entry.fog_blue3                 = atoi(row[42]);
-			entry.fog_minclip3              = static_cast<float>(atof(row[43]));
-			entry.fog_maxclip3              = static_cast<float>(atof(row[44]));
-			entry.fog_red4                  = atoi(row[45]);
-			entry.fog_green4                = atoi(row[46]);
-			entry.fog_blue4                 = atoi(row[47]);
-			entry.fog_minclip4              = static_cast<float>(atof(row[48]));
-			entry.fog_maxclip4              = static_cast<float>(atof(row[49]));
-			entry.fog_density               = static_cast<float>(atof(row[50]));
-			entry.flag_needed               = row[51] ? row[51] : "";
-			entry.canbind                   = atoi(row[52]);
-			entry.cancombat                 = atoi(row[53]);
-			entry.canlevitate               = atoi(row[54]);
-			entry.castoutdoor               = atoi(row[55]);
-			entry.hotzone                   = atoi(row[56]);
-			entry.insttype                  = atoi(row[57]);
-			entry.shutdowndelay             = atoi(row[58]);
-			entry.peqzone                   = atoi(row[59]);
-			entry.expansion                 = atoi(row[60]);
-			entry.suspendbuffs              = atoi(row[61]);
-			entry.rain_chance1              = atoi(row[62]);
-			entry.rain_chance2              = atoi(row[63]);
-			entry.rain_chance3              = atoi(row[64]);
-			entry.rain_chance4              = atoi(row[65]);
-			entry.rain_duration1            = atoi(row[66]);
-			entry.rain_duration2            = atoi(row[67]);
-			entry.rain_duration3            = atoi(row[68]);
-			entry.rain_duration4            = atoi(row[69]);
-			entry.snow_chance1              = atoi(row[70]);
-			entry.snow_chance2              = atoi(row[71]);
-			entry.snow_chance3              = atoi(row[72]);
-			entry.snow_chance4              = atoi(row[73]);
-			entry.snow_duration1            = atoi(row[74]);
-			entry.snow_duration2            = atoi(row[75]);
-			entry.snow_duration3            = atoi(row[76]);
-			entry.snow_duration4            = atoi(row[77]);
-			entry.gravity                   = static_cast<float>(atof(row[78]));
-			entry.type                      = atoi(row[79]);
-			entry.skylock                   = atoi(row[80]);
-			entry.fast_regen_hp             = atoi(row[81]);
-			entry.fast_regen_mana           = atoi(row[82]);
-			entry.fast_regen_endurance      = atoi(row[83]);
-			entry.npc_max_aggro_dist        = atoi(row[84]);
-			entry.max_movement_update_range = atoi(row[85]);
-			entry.min_expansion             = atoi(row[86]);
-			entry.max_expansion             = atoi(row[87]);
-			entry.content_flags             = row[88] ? row[88] : "";
-			entry.content_flags_disabled    = row[89] ? row[89] : "";
-			entry.underworld_teleport_index = atoi(row[90]);
+			entry.safe_heading              = static_cast<float>(atof(row[8]));
+			entry.graveyard_id              = static_cast<float>(atof(row[9]));
+			entry.min_level                 = atoi(row[10]);
+			entry.min_status                = atoi(row[11]);
+			entry.zoneidnumber              = atoi(row[12]);
+			entry.version                   = atoi(row[13]);
+			entry.timezone                  = atoi(row[14]);
+			entry.maxclients                = atoi(row[15]);
+			entry.ruleset                   = atoi(row[16]);
+			entry.note                      = row[17] ? row[17] : "";
+			entry.underworld                = static_cast<float>(atof(row[18]));
+			entry.minclip                   = static_cast<float>(atof(row[19]));
+			entry.maxclip                   = static_cast<float>(atof(row[20]));
+			entry.fog_minclip               = static_cast<float>(atof(row[21]));
+			entry.fog_maxclip               = static_cast<float>(atof(row[22]));
+			entry.fog_blue                  = atoi(row[23]);
+			entry.fog_red                   = atoi(row[24]);
+			entry.fog_green                 = atoi(row[25]);
+			entry.sky                       = atoi(row[26]);
+			entry.ztype                     = atoi(row[27]);
+			entry.zone_exp_multiplier       = static_cast<float>(atof(row[28]));
+			entry.walkspeed                 = static_cast<float>(atof(row[29]));
+			entry.time_type                 = atoi(row[30]);
+			entry.fog_red1                  = atoi(row[31]);
+			entry.fog_green1                = atoi(row[32]);
+			entry.fog_blue1                 = atoi(row[33]);
+			entry.fog_minclip1              = static_cast<float>(atof(row[34]));
+			entry.fog_maxclip1              = static_cast<float>(atof(row[35]));
+			entry.fog_red2                  = atoi(row[36]);
+			entry.fog_green2                = atoi(row[37]);
+			entry.fog_blue2                 = atoi(row[38]);
+			entry.fog_minclip2              = static_cast<float>(atof(row[39]));
+			entry.fog_maxclip2              = static_cast<float>(atof(row[40]));
+			entry.fog_red3                  = atoi(row[41]);
+			entry.fog_green3                = atoi(row[42]);
+			entry.fog_blue3                 = atoi(row[43]);
+			entry.fog_minclip3              = static_cast<float>(atof(row[44]));
+			entry.fog_maxclip3              = static_cast<float>(atof(row[45]));
+			entry.fog_red4                  = atoi(row[46]);
+			entry.fog_green4                = atoi(row[47]);
+			entry.fog_blue4                 = atoi(row[48]);
+			entry.fog_minclip4              = static_cast<float>(atof(row[49]));
+			entry.fog_maxclip4              = static_cast<float>(atof(row[50]));
+			entry.fog_density               = static_cast<float>(atof(row[51]));
+			entry.flag_needed               = row[52] ? row[52] : "";
+			entry.canbind                   = atoi(row[53]);
+			entry.cancombat                 = atoi(row[54]);
+			entry.canlevitate               = atoi(row[55]);
+			entry.castoutdoor               = atoi(row[56]);
+			entry.hotzone                   = atoi(row[57]);
+			entry.insttype                  = atoi(row[58]);
+			entry.shutdowndelay             = strtoll(row[59], NULL, 10);
+			entry.peqzone                   = atoi(row[60]);
+			entry.expansion                 = atoi(row[61]);
+			entry.suspendbuffs              = atoi(row[62]);
+			entry.rain_chance1              = atoi(row[63]);
+			entry.rain_chance2              = atoi(row[64]);
+			entry.rain_chance3              = atoi(row[65]);
+			entry.rain_chance4              = atoi(row[66]);
+			entry.rain_duration1            = atoi(row[67]);
+			entry.rain_duration2            = atoi(row[68]);
+			entry.rain_duration3            = atoi(row[69]);
+			entry.rain_duration4            = atoi(row[70]);
+			entry.snow_chance1              = atoi(row[71]);
+			entry.snow_chance2              = atoi(row[72]);
+			entry.snow_chance3              = atoi(row[73]);
+			entry.snow_chance4              = atoi(row[74]);
+			entry.snow_duration1            = atoi(row[75]);
+			entry.snow_duration2            = atoi(row[76]);
+			entry.snow_duration3            = atoi(row[77]);
+			entry.snow_duration4            = atoi(row[78]);
+			entry.gravity                   = static_cast<float>(atof(row[79]));
+			entry.type                      = atoi(row[80]);
+			entry.skylock                   = atoi(row[81]);
+			entry.fast_regen_hp             = atoi(row[82]);
+			entry.fast_regen_mana           = atoi(row[83]);
+			entry.fast_regen_endurance      = atoi(row[84]);
+			entry.npc_max_aggro_dist        = atoi(row[85]);
+			entry.max_movement_update_range = atoi(row[86]);
+			entry.min_expansion             = atoi(row[87]);
+			entry.max_expansion             = atoi(row[88]);
+			entry.content_flags             = row[89] ? row[89] : "";
+			entry.content_flags_disabled    = row[90] ? row[90] : "";
+			entry.underworld_teleport_index = atoi(row[91]);
 
 			all_entries.push_back(entry);
 		}