diff --git a/common/repositories/base/base_aa_ability_repository.h b/common/repositories/base/base_aa_ability_repository.h
index e91813169..49f83e61d 100644
--- a/common/repositories/base/base_aa_ability_repository.h
+++ b/common/repositories/base/base_aa_ability_repository.h
@@ -45,10 +45,10 @@ public:
 		int         status;
 		int         type;
 		int         charges;
-		int8        grant_only;
+		int         grant_only;
 		int         first_rank_id;
-		int8        enabled;
-		int8        reset_on_death;
+		int         enabled;
+		int         reset_on_death;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_account_repository.h b/common/repositories/base/base_account_repository.h
index 75e358a1b..e2f0b5ec2 100644
--- a/common/repositories/base/base_account_repository.h
+++ b/common/repositories/base/base_account_repository.h
@@ -43,15 +43,15 @@ public:
 		int         status;
 		std::string ls_id;
 		int         lsaccount_id;
-		int8        gmspeed;
-		int8        revoked;
+		int         gmspeed;
+		int         revoked;
 		int         karma;
 		std::string minilogin_ip;
-		int8        hideme;
-		int8        rulesflag;
+		int         hideme;
+		int         rulesflag;
 		std::string suspendeduntil;
 		int         time_creation;
-		int8        expansion;
+		int         expansion;
 		std::string ban_reason;
 		std::string suspend_reason;
 	};
diff --git a/common/repositories/base/base_adventure_details_repository.h b/common/repositories/base/base_adventure_details_repository.h
index 94c0d5a9f..5ce8b68ef 100644
--- a/common/repositories/base/base_adventure_details_repository.h
+++ b/common/repositories/base/base_adventure_details_repository.h
@@ -35,15 +35,15 @@
 class BaseAdventureDetailsRepository {
 public:
 	struct AdventureDetails {
-		int   id;
-		int16 adventure_id;
-		int   instance_id;
-		int16 count;
-		int16 assassinate_count;
-		int8  status;
-		int   time_created;
-		int   time_zoned;
-		int   time_completed;
+		int id;
+		int adventure_id;
+		int instance_id;
+		int count;
+		int assassinate_count;
+		int status;
+		int time_created;
+		int time_zoned;
+		int time_completed;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_adventure_template_repository.h b/common/repositories/base/base_adventure_template_repository.h
index 8a5d681a4..41c5df27b 100644
--- a/common/repositories/base/base_adventure_template_repository.h
+++ b/common/repositories/base/base_adventure_template_repository.h
@@ -37,14 +37,14 @@ public:
 	struct AdventureTemplate {
 		int         id;
 		std::string zone;
-		int8        zone_version;
-		int8        is_hard;
-		int8        is_raid;
-		int8        min_level;
-		int8        max_level;
-		int8        type;
+		int         zone_version;
+		int         is_hard;
+		int         is_raid;
+		int         min_level;
+		int         max_level;
+		int         type;
 		int         type_data;
-		int16       type_count;
+		int         type_count;
 		float       assa_x;
 		float       assa_y;
 		float       assa_z;
@@ -52,13 +52,13 @@ public:
 		std::string text;
 		int         duration;
 		int         zone_in_time;
-		int16       win_points;
-		int16       lose_points;
-		int8        theme;
-		int16       zone_in_zone_id;
+		int         win_points;
+		int         lose_points;
+		int         theme;
+		int         zone_in_zone_id;
 		float       zone_in_x;
 		float       zone_in_y;
-		int16       zone_in_object_id;
+		int         zone_in_object_id;
 		float       dest_x;
 		float       dest_y;
 		float       dest_z;
diff --git a/common/repositories/base/base_blocked_spells_repository.h b/common/repositories/base/base_blocked_spells_repository.h
index f29bb9ce4..8f24ed9f0 100644
--- a/common/repositories/base/base_blocked_spells_repository.h
+++ b/common/repositories/base/base_blocked_spells_repository.h
@@ -37,7 +37,7 @@ public:
 	struct BlockedSpells {
 		int         id;
 		int         spellid;
-		int8        type;
+		int         type;
 		int         zoneid;
 		float       x;
 		float       y;
diff --git a/common/repositories/base/base_bug_reports_repository.h b/common/repositories/base/base_bug_reports_repository.h
index 822b4f0a4..779327ef9 100644
--- a/common/repositories/base/base_bug_reports_repository.h
+++ b/common/repositories/base/base_bug_reports_repository.h
@@ -42,7 +42,7 @@ public:
 		int         account_id;
 		int         character_id;
 		std::string character_name;
-		int8        reporter_spoof;
+		int         reporter_spoof;
 		int         category_id;
 		std::string category_name;
 		std::string reporter_name;
@@ -55,15 +55,15 @@ public:
 		int         target_id;
 		std::string target_name;
 		int         optional_info_mask;
-		int8        _can_duplicate;
-		int8        _crash_bug;
-		int8        _target_info;
-		int8        _character_flags;
-		int8        _unknown_value;
+		int         _can_duplicate;
+		int         _crash_bug;
+		int         _target_info;
+		int         _character_flags;
+		int         _unknown_value;
 		std::string bug_report;
 		std::string system_info;
 		std::string report_datetime;
-		int8        bug_status;
+		int         bug_status;
 		std::string last_review;
 		std::string last_reviewer;
 		std::string reviewer_notes;
diff --git a/common/repositories/base/base_bugs_repository.h b/common/repositories/base/base_bugs_repository.h
index e34554e2e..664097890 100644
--- a/common/repositories/base/base_bugs_repository.h
+++ b/common/repositories/base/base_bugs_repository.h
@@ -43,11 +43,11 @@ public:
 		float       y;
 		float       z;
 		std::string type;
-		int8        flag;
+		int         flag;
 		std::string target;
 		std::string bug;
 		std::string date;
-		int8        status;
+		int         status;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_char_create_combinations_repository.h b/common/repositories/base/base_char_create_combinations_repository.h
index 8bdb95d21..cf103ec8a 100644
--- a/common/repositories/base/base_char_create_combinations_repository.h
+++ b/common/repositories/base/base_char_create_combinations_repository.h
@@ -41,8 +41,8 @@ public:
 		int         deity;
 		int         start_zone;
 		int         expansions_req;
-		int8        min_expansion;
-		int8        max_expansion;
+		int         min_expansion;
+		int         max_expansion;
 		std::string content_flags;
 	};
 
diff --git a/common/repositories/base/base_character_activities_repository.h b/common/repositories/base/base_character_activities_repository.h
index be5d6802a..4abc5e7dd 100644
--- a/common/repositories/base/base_character_activities_repository.h
+++ b/common/repositories/base/base_character_activities_repository.h
@@ -35,11 +35,11 @@
 class BaseCharacterActivitiesRepository {
 public:
 	struct CharacterActivities {
-		int  charid;
-		int  taskid;
-		int  activityid;
-		int  donecount;
-		int8 completed;
+		int charid;
+		int taskid;
+		int activityid;
+		int donecount;
+		int completed;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_character_alternate_abilities_repository.h b/common/repositories/base/base_character_alternate_abilities_repository.h
index fd7bb56ad..c578b99a4 100644
--- a/common/repositories/base/base_character_alternate_abilities_repository.h
+++ b/common/repositories/base/base_character_alternate_abilities_repository.h
@@ -35,10 +35,10 @@
 class BaseCharacterAlternateAbilitiesRepository {
 public:
 	struct CharacterAlternateAbilities {
-		int   id;
-		int16 aa_id;
-		int16 aa_value;
-		int16 charges;
+		int id;
+		int aa_id;
+		int aa_value;
+		int charges;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_character_auras_repository.h b/common/repositories/base/base_character_auras_repository.h
index 7c3a84b6f..9959fa2a4 100644
--- a/common/repositories/base/base_character_auras_repository.h
+++ b/common/repositories/base/base_character_auras_repository.h
@@ -35,9 +35,9 @@
 class BaseCharacterAurasRepository {
 public:
 	struct CharacterAuras {
-		int  id;
-		int8 slot;
-		int  spell_id;
+		int id;
+		int slot;
+		int spell_id;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_character_bandolier_repository.h b/common/repositories/base/base_character_bandolier_repository.h
index 5b77dabfb..62f0924b4 100644
--- a/common/repositories/base/base_character_bandolier_repository.h
+++ b/common/repositories/base/base_character_bandolier_repository.h
@@ -36,8 +36,8 @@ class BaseCharacterBandolierRepository {
 public:
 	struct CharacterBandolier {
 		int         id;
-		int8        bandolier_id;
-		int8        bandolier_slot;
+		int         bandolier_id;
+		int         bandolier_slot;
 		int         item_id;
 		int         icon;
 		std::string bandolier_name;
diff --git a/common/repositories/base/base_character_bind_repository.h b/common/repositories/base/base_character_bind_repository.h
index a54b2ff86..9994cb2b2 100644
--- a/common/repositories/base/base_character_bind_repository.h
+++ b/common/repositories/base/base_character_bind_repository.h
@@ -37,7 +37,7 @@ public:
 	struct CharacterBind {
 		int   id;
 		int   slot;
-		int16 zone_id;
+		int   zone_id;
 		int   instance_id;
 		float x;
 		float y;
diff --git a/common/repositories/base/base_character_buffs_repository.h b/common/repositories/base/base_character_buffs_repository.h
index 7b6590c56..ac54813ae 100644
--- a/common/repositories/base/base_character_buffs_repository.h
+++ b/common/repositories/base/base_character_buffs_repository.h
@@ -36,16 +36,16 @@ class BaseCharacterBuffsRepository {
 public:
 	struct CharacterBuffs {
 		int         character_id;
-		int8        slot_id;
-		int16       spell_id;
-		int8        caster_level;
+		int         slot_id;
+		int         spell_id;
+		int         caster_level;
 		std::string caster_name;
 		int         ticsremaining;
 		int         counters;
 		int         numhits;
 		int         melee_rune;
 		int         magic_rune;
-		int8        persistent;
+		int         persistent;
 		int         dot_rune;
 		int         caston_x;
 		int         caston_y;
diff --git a/common/repositories/base/base_character_corpse_items_repository.h b/common/repositories/base/base_character_corpse_items_repository.h
index 31ba7b8e5..a41cac39d 100644
--- a/common/repositories/base/base_character_corpse_items_repository.h
+++ b/common/repositories/base/base_character_corpse_items_repository.h
@@ -35,17 +35,17 @@
 class BaseCharacterCorpseItemsRepository {
 public:
 	struct CharacterCorpseItems {
-		int   corpse_id;
-		int   equip_slot;
-		int   item_id;
-		int   charges;
-		int   aug_1;
-		int   aug_2;
-		int   aug_3;
-		int   aug_4;
-		int   aug_5;
-		int   aug_6;
-		int16 attuned;
+		int corpse_id;
+		int equip_slot;
+		int item_id;
+		int charges;
+		int aug_1;
+		int aug_2;
+		int aug_3;
+		int aug_4;
+		int aug_5;
+		int aug_6;
+		int attuned;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_character_corpses_repository.h b/common/repositories/base/base_character_corpses_repository.h
index 5a9932252..c9d46ff52 100644
--- a/common/repositories/base/base_character_corpses_repository.h
+++ b/common/repositories/base/base_character_corpses_repository.h
@@ -38,18 +38,18 @@ public:
 		int         id;
 		int         charid;
 		std::string charname;
-		int16       zone_id;
-		int16       instance_id;
+		int         zone_id;
+		int         instance_id;
 		float       x;
 		float       y;
 		float       z;
 		float       heading;
 		std::string time_of_death;
 		int         guild_consent_id;
-		int8        is_rezzed;
-		int8        is_buried;
-		int8        was_at_graveyard;
-		int8        is_locked;
+		int         is_rezzed;
+		int         is_buried;
+		int         was_at_graveyard;
+		int         is_locked;
 		int         exp;
 		int         size;
 		int         level;
diff --git a/common/repositories/base/base_character_data_repository.h b/common/repositories/base/base_character_data_repository.h
index 10f812a65..489af6ca3 100644
--- a/common/repositories/base/base_character_data_repository.h
+++ b/common/repositories/base/base_character_data_repository.h
@@ -47,31 +47,31 @@ public:
 		float       x;
 		float       z;
 		float       heading;
-		int8        gender;
-		int16       race;
-		int8        class;
+		int         gender;
+		int         race;
+		int         class;
 		int         level;
 		int         deity;
 		int         birthday;
 		int         last_login;
 		int         time_played;
-		int8        level2;
-		int8        anon;
-		int8        gm;
+		int         level2;
+		int         anon;
+		int         gm;
 		int         face;
-		int8        hair_color;
-		int8        hair_style;
-		int8        beard;
-		int8        beard_color;
-		int8        eye_color_1;
-		int8        eye_color_2;
+		int         hair_color;
+		int         hair_style;
+		int         beard;
+		int         beard_color;
+		int         eye_color_1;
+		int         eye_color_2;
 		int         drakkin_heritage;
 		int         drakkin_tattoo;
 		int         drakkin_details;
-		int8        ability_time_seconds;
-		int8        ability_number;
-		int8        ability_time_minutes;
-		int8        ability_time_hours;
+		int         ability_time_seconds;
+		int         ability_number;
+		int         ability_time_minutes;
+		int         ability_time_hours;
 		int         exp;
 		int         aa_points_spent;
 		int         aa_exp;
@@ -107,7 +107,7 @@ public:
 		int         career_tribute_points;
 		int         tribute_points;
 		int         tribute_active;
-		int8        pvp_status;
+		int         pvp_status;
 		int         pvp_kills;
 		int         pvp_deaths;
 		int         pvp_current_points;
@@ -118,18 +118,18 @@ public:
 		int         pvp2;
 		int         pvp_type;
 		int         show_helm;
-		int8        group_auto_consent;
-		int8        raid_auto_consent;
-		int8        guild_auto_consent;
-		int8        leadership_exp_on;
+		int         group_auto_consent;
+		int         raid_auto_consent;
+		int         guild_auto_consent;
+		int         leadership_exp_on;
 		int         RestTimer;
 		int         air_remaining;
 		int         autosplit_enabled;
-		int8        lfp;
-		int8        lfg;
+		int         lfp;
+		int         lfg;
 		std::string mailkey;
-		int8        xtargets;
-		int8        firstlogon;
+		int         xtargets;
+		int         firstlogon;
 		int         e_aa_effects;
 		int         e_percent_to_aa;
 		int         e_expended_aa_spent;
diff --git a/common/repositories/base/base_character_disciplines_repository.h b/common/repositories/base/base_character_disciplines_repository.h
index 2838c8a0b..4401667d8 100644
--- a/common/repositories/base/base_character_disciplines_repository.h
+++ b/common/repositories/base/base_character_disciplines_repository.h
@@ -35,9 +35,9 @@
 class BaseCharacterDisciplinesRepository {
 public:
 	struct CharacterDisciplines {
-		int   id;
-		int16 slot_id;
-		int16 disc_id;
+		int id;
+		int slot_id;
+		int disc_id;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_character_item_recast_repository.h b/common/repositories/base/base_character_item_recast_repository.h
index 4adaa8547..1f4438ed1 100644
--- a/common/repositories/base/base_character_item_recast_repository.h
+++ b/common/repositories/base/base_character_item_recast_repository.h
@@ -35,9 +35,9 @@
 class BaseCharacterItemRecastRepository {
 public:
 	struct CharacterItemRecast {
-		int   id;
-		int16 recast_type;
-		int   timestamp;
+		int id;
+		int recast_type;
+		int timestamp;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_character_languages_repository.h b/common/repositories/base/base_character_languages_repository.h
index ca6720898..bbbd4011a 100644
--- a/common/repositories/base/base_character_languages_repository.h
+++ b/common/repositories/base/base_character_languages_repository.h
@@ -35,9 +35,9 @@
 class BaseCharacterLanguagesRepository {
 public:
 	struct CharacterLanguages {
-		int   id;
-		int16 lang_id;
-		int16 value;
+		int id;
+		int lang_id;
+		int value;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_character_leadership_abilities_repository.h b/common/repositories/base/base_character_leadership_abilities_repository.h
index 9c47de211..17f57bf85 100644
--- a/common/repositories/base/base_character_leadership_abilities_repository.h
+++ b/common/repositories/base/base_character_leadership_abilities_repository.h
@@ -35,9 +35,9 @@
 class BaseCharacterLeadershipAbilitiesRepository {
 public:
 	struct CharacterLeadershipAbilities {
-		int   id;
-		int16 slot;
-		int16 rank;
+		int id;
+		int slot;
+		int rank;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_character_material_repository.h b/common/repositories/base/base_character_material_repository.h
index 9b4b9671a..a7215027f 100644
--- a/common/repositories/base/base_character_material_repository.h
+++ b/common/repositories/base/base_character_material_repository.h
@@ -35,13 +35,13 @@
 class BaseCharacterMaterialRepository {
 public:
 	struct CharacterMaterial {
-		int  id;
-		int8 slot;
-		int8 blue;
-		int8 green;
-		int8 red;
-		int8 use_tint;
-		int  color;
+		int id;
+		int slot;
+		int blue;
+		int green;
+		int red;
+		int use_tint;
+		int color;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_character_memmed_spells_repository.h b/common/repositories/base/base_character_memmed_spells_repository.h
index 2f46264d8..e4672c756 100644
--- a/common/repositories/base/base_character_memmed_spells_repository.h
+++ b/common/repositories/base/base_character_memmed_spells_repository.h
@@ -35,9 +35,9 @@
 class BaseCharacterMemmedSpellsRepository {
 public:
 	struct CharacterMemmedSpells {
-		int   id;
-		int16 slot_id;
-		int16 spell_id;
+		int id;
+		int slot_id;
+		int spell_id;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_character_pet_buffs_repository.h b/common/repositories/base/base_character_pet_buffs_repository.h
index ce4847244..5cc56ddeb 100644
--- a/common/repositories/base/base_character_pet_buffs_repository.h
+++ b/common/repositories/base/base_character_pet_buffs_repository.h
@@ -39,13 +39,13 @@ public:
 		int         pet;
 		int         slot;
 		int         spell_id;
-		int8        caster_level;
+		int         caster_level;
 		std::string castername;
 		int         ticsremaining;
 		int         counters;
 		int         numhits;
 		int         rune;
-		int8        instrument_mod;
+		int         instrument_mod;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_character_potionbelt_repository.h b/common/repositories/base/base_character_potionbelt_repository.h
index 5de16d8df..7fb753d55 100644
--- a/common/repositories/base/base_character_potionbelt_repository.h
+++ b/common/repositories/base/base_character_potionbelt_repository.h
@@ -35,10 +35,10 @@
 class BaseCharacterPotionbeltRepository {
 public:
 	struct CharacterPotionbelt {
-		int  id;
-		int8 potion_id;
-		int  item_id;
-		int  icon;
+		int id;
+		int potion_id;
+		int item_id;
+		int icon;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_character_skills_repository.h b/common/repositories/base/base_character_skills_repository.h
index 277ac65e8..c43622287 100644
--- a/common/repositories/base/base_character_skills_repository.h
+++ b/common/repositories/base/base_character_skills_repository.h
@@ -35,9 +35,9 @@
 class BaseCharacterSkillsRepository {
 public:
 	struct CharacterSkills {
-		int   id;
-		int16 skill_id;
-		int16 value;
+		int id;
+		int skill_id;
+		int value;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_character_spells_repository.h b/common/repositories/base/base_character_spells_repository.h
index 3fd9887cd..e5a6ab1d9 100644
--- a/common/repositories/base/base_character_spells_repository.h
+++ b/common/repositories/base/base_character_spells_repository.h
@@ -35,9 +35,9 @@
 class BaseCharacterSpellsRepository {
 public:
 	struct CharacterSpells {
-		int   id;
-		int16 slot_id;
-		int16 spell_id;
+		int id;
+		int slot_id;
+		int spell_id;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_character_tasks_repository.h b/common/repositories/base/base_character_tasks_repository.h
index e0ec7236f..00dea5af6 100644
--- a/common/repositories/base/base_character_tasks_repository.h
+++ b/common/repositories/base/base_character_tasks_repository.h
@@ -35,11 +35,11 @@
 class BaseCharacterTasksRepository {
 public:
 	struct CharacterTasks {
-		int  charid;
-		int  taskid;
-		int  slot;
-		int8 type;
-		int  acceptedtime;
+		int charid;
+		int taskid;
+		int slot;
+		int type;
+		int acceptedtime;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_content_flags_repository.h b/common/repositories/base/base_content_flags_repository.h
index 7c7ff3ebf..34127d0e5 100644
--- a/common/repositories/base/base_content_flags_repository.h
+++ b/common/repositories/base/base_content_flags_repository.h
@@ -37,7 +37,7 @@ public:
 	struct ContentFlags {
 		int         id;
 		std::string flag_name;
-		int8        enabled;
+		int         enabled;
 		std::string notes;
 	};
 
diff --git a/common/repositories/base/base_doors_repository.h b/common/repositories/base/base_doors_repository.h
index d8da79ed1..ea08eba8d 100644
--- a/common/repositories/base/base_doors_repository.h
+++ b/common/repositories/base/base_doors_repository.h
@@ -36,23 +36,23 @@ class BaseDoorsRepository {
 public:
 	struct Doors {
 		int         id;
-		int16       doorid;
+		int         doorid;
 		std::string zone;
-		int16       version;
+		int         version;
 		std::string name;
 		float       pos_y;
 		float       pos_x;
 		float       pos_z;
 		float       heading;
-		int16       opentype;
-		int16       guild;
-		int16       lockpick;
+		int         opentype;
+		int         guild;
+		int         lockpick;
 		int         keyitem;
-		int8        nokeyring;
-		int16       triggerdoor;
-		int16       triggertype;
-		int8        disable_timer;
-		int16       doorisopen;
+		int         nokeyring;
+		int         triggerdoor;
+		int         triggertype;
+		int         disable_timer;
+		int         doorisopen;
 		int         door_param;
 		std::string dest_zone;
 		int         dest_instance;
@@ -62,12 +62,12 @@ public:
 		float       dest_heading;
 		int         invert_state;
 		int         incline;
-		int16       size;
+		int         size;
 		float       buffer;
 		int         client_version_mask;
-		int16       is_ldon_door;
-		int8        min_expansion;
-		int8        max_expansion;
+		int         is_ldon_door;
+		int         min_expansion;
+		int         max_expansion;
 		std::string content_flags;
 	};
 
diff --git a/common/repositories/base/base_faction_base_data_repository.h b/common/repositories/base/base_faction_base_data_repository.h
index 808bbef1f..4860af5e5 100644
--- a/common/repositories/base/base_faction_base_data_repository.h
+++ b/common/repositories/base/base_faction_base_data_repository.h
@@ -35,12 +35,12 @@
 class BaseFactionBaseDataRepository {
 public:
 	struct FactionBaseData {
-		int16 client_faction_id;
-		int16 min;
-		int16 max;
-		int16 unk_hero1;
-		int16 unk_hero2;
-		int16 unk_hero3;
+		int client_faction_id;
+		int min;
+		int max;
+		int unk_hero1;
+		int unk_hero2;
+		int unk_hero3;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_faction_list_mod_repository.h b/common/repositories/base/base_faction_list_mod_repository.h
index 264e1dc51..903cdf1e2 100644
--- a/common/repositories/base/base_faction_list_mod_repository.h
+++ b/common/repositories/base/base_faction_list_mod_repository.h
@@ -37,7 +37,7 @@ public:
 	struct FactionListMod {
 		int         id;
 		int         faction_id;
-		int16       mod;
+		int         mod;
 		std::string mod_name;
 	};
 
diff --git a/common/repositories/base/base_faction_list_repository.h b/common/repositories/base/base_faction_list_repository.h
index cbb47991d..d1fa6eabb 100644
--- a/common/repositories/base/base_faction_list_repository.h
+++ b/common/repositories/base/base_faction_list_repository.h
@@ -37,7 +37,7 @@ public:
 	struct FactionList {
 		int         id;
 		std::string name;
-		int16       base;
+		int         base;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_faction_values_repository.h b/common/repositories/base/base_faction_values_repository.h
index 2159bfec7..1f32a8272 100644
--- a/common/repositories/base/base_faction_values_repository.h
+++ b/common/repositories/base/base_faction_values_repository.h
@@ -35,10 +35,10 @@
 class BaseFactionValuesRepository {
 public:
 	struct FactionValues {
-		int   char_id;
-		int   faction_id;
-		int16 current_value;
-		int8  temp;
+		int char_id;
+		int faction_id;
+		int current_value;
+		int temp;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_fishing_repository.h b/common/repositories/base/base_fishing_repository.h
index acd419755..43f5a90c0 100644
--- a/common/repositories/base/base_fishing_repository.h
+++ b/common/repositories/base/base_fishing_repository.h
@@ -38,12 +38,12 @@ public:
 		int         id;
 		int         zoneid;
 		int         Itemid;
-		int16       skill_level;
-		int16       chance;
+		int         skill_level;
+		int         chance;
 		int         npc_id;
 		int         npc_chance;
-		int8        min_expansion;
-		int8        max_expansion;
+		int         min_expansion;
+		int         max_expansion;
 		std::string content_flags;
 	};
 
diff --git a/common/repositories/base/base_forage_repository.h b/common/repositories/base/base_forage_repository.h
index bd6411187..2f3690be4 100644
--- a/common/repositories/base/base_forage_repository.h
+++ b/common/repositories/base/base_forage_repository.h
@@ -38,10 +38,10 @@ public:
 		int         id;
 		int         zoneid;
 		int         Itemid;
-		int16       level;
-		int16       chance;
-		int8        min_expansion;
-		int8        max_expansion;
+		int         level;
+		int         chance;
+		int         min_expansion;
+		int         max_expansion;
 		std::string content_flags;
 	};
 
diff --git a/common/repositories/base/base_friends_repository.h b/common/repositories/base/base_friends_repository.h
index 2028c474a..9fb341b27 100644
--- a/common/repositories/base/base_friends_repository.h
+++ b/common/repositories/base/base_friends_repository.h
@@ -36,7 +36,7 @@ class BaseFriendsRepository {
 public:
 	struct Friends {
 		int         charid;
-		int8        type;
+		int         type;
 		std::string name;
 	};
 
diff --git a/common/repositories/base/base_global_loot_repository.h b/common/repositories/base/base_global_loot_repository.h
index 69bf951c7..0d86b6cdf 100644
--- a/common/repositories/base/base_global_loot_repository.h
+++ b/common/repositories/base/base_global_loot_repository.h
@@ -38,18 +38,18 @@ public:
 		int         id;
 		std::string description;
 		int         loottable_id;
-		int8        enabled;
+		int         enabled;
 		int         min_level;
 		int         max_level;
-		int8        rare;
-		int8        raid;
+		int         rare;
+		int         raid;
 		std::string race;
 		std::string class;
 		std::string bodytype;
 		std::string zone;
-		int8        hot_zone;
-		int8        min_expansion;
-		int8        max_expansion;
+		int         hot_zone;
+		int         min_expansion;
+		int         max_expansion;
 		std::string content_flags;
 	};
 
diff --git a/common/repositories/base/base_ground_spawns_repository.h b/common/repositories/base/base_ground_spawns_repository.h
index b2b46dbb8..3d9ee9977 100644
--- a/common/repositories/base/base_ground_spawns_repository.h
+++ b/common/repositories/base/base_ground_spawns_repository.h
@@ -37,7 +37,7 @@ public:
 	struct GroundSpawns {
 		int         id;
 		int         zoneid;
-		int16       version;
+		int         version;
 		float       max_x;
 		float       max_y;
 		float       max_z;
@@ -49,8 +49,8 @@ public:
 		int         max_allowed;
 		std::string comment;
 		int         respawn_timer;
-		int8        min_expansion;
-		int8        max_expansion;
+		int         min_expansion;
+		int         max_expansion;
 		std::string content_flags;
 	};
 
diff --git a/common/repositories/base/base_group_id_repository.h b/common/repositories/base/base_group_id_repository.h
index 64a07429d..c7d8303ef 100644
--- a/common/repositories/base/base_group_id_repository.h
+++ b/common/repositories/base/base_group_id_repository.h
@@ -38,7 +38,7 @@ public:
 		int         groupid;
 		int         charid;
 		std::string name;
-		int8        ismerc;
+		int         ismerc;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_guild_members_repository.h b/common/repositories/base/base_guild_members_repository.h
index 02b26e7c8..52eb6f51f 100644
--- a/common/repositories/base/base_guild_members_repository.h
+++ b/common/repositories/base/base_guild_members_repository.h
@@ -37,13 +37,13 @@ public:
 	struct GuildMembers {
 		int         char_id;
 		int         guild_id;
-		int8        rank;
-		int8        tribute_enable;
+		int         rank;
+		int         tribute_enable;
 		int         total_tribute;
 		int         last_tribute;
-		int8        banker;
+		int         banker;
 		std::string public_note;
-		int8        alt;
+		int         alt;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_guild_ranks_repository.h b/common/repositories/base/base_guild_ranks_repository.h
index 2d23b41c9..2235068ef 100644
--- a/common/repositories/base/base_guild_ranks_repository.h
+++ b/common/repositories/base/base_guild_ranks_repository.h
@@ -36,16 +36,16 @@ class BaseGuildRanksRepository {
 public:
 	struct GuildRanks {
 		int         guild_id;
-		int8        rank;
+		int         rank;
 		std::string title;
-		int8        can_hear;
-		int8        can_speak;
-		int8        can_invite;
-		int8        can_remove;
-		int8        can_promote;
-		int8        can_demote;
-		int8        can_motd;
-		int8        can_warpeace;
+		int         can_hear;
+		int         can_speak;
+		int         can_invite;
+		int         can_remove;
+		int         can_promote;
+		int         can_demote;
+		int         can_motd;
+		int         can_warpeace;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_guild_relations_repository.h b/common/repositories/base/base_guild_relations_repository.h
index 0ebead9e1..2293bf578 100644
--- a/common/repositories/base/base_guild_relations_repository.h
+++ b/common/repositories/base/base_guild_relations_repository.h
@@ -35,9 +35,9 @@
 class BaseGuildRelationsRepository {
 public:
 	struct GuildRelations {
-		int  guild1;
-		int  guild2;
-		int8 relation;
+		int guild1;
+		int guild2;
+		int relation;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_guilds_repository.h b/common/repositories/base/base_guilds_repository.h
index 19c4573a4..9613aa9ef 100644
--- a/common/repositories/base/base_guilds_repository.h
+++ b/common/repositories/base/base_guilds_repository.h
@@ -38,7 +38,7 @@ public:
 		int         id;
 		std::string name;
 		int         leader;
-		int16       minstatus;
+		int         minstatus;
 		std::string motd;
 		int         tribute;
 		std::string motd_setter;
diff --git a/common/repositories/base/base_instance_list_repository.h b/common/repositories/base/base_instance_list_repository.h
index ac26a94f5..856ea85c7 100644
--- a/common/repositories/base/base_instance_list_repository.h
+++ b/common/repositories/base/base_instance_list_repository.h
@@ -35,13 +35,13 @@
 class BaseInstanceListRepository {
 public:
 	struct InstanceList {
-		int  id;
-		int  zone;
-		int8 version;
-		int8 is_global;
-		int  start_time;
-		int  duration;
-		int8 never_expires;
+		int id;
+		int zone;
+		int version;
+		int is_global;
+		int start_time;
+		int duration;
+		int never_expires;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_inventory_repository.h b/common/repositories/base/base_inventory_repository.h
index b78a911e4..3ae9e72fb 100644
--- a/common/repositories/base/base_inventory_repository.h
+++ b/common/repositories/base/base_inventory_repository.h
@@ -38,7 +38,7 @@ public:
 		int         charid;
 		int         slotid;
 		int         itemid;
-		int16       charges;
+		int         charges;
 		int         color;
 		int         augslot1;
 		int         augslot2;
@@ -46,7 +46,7 @@ public:
 		int         augslot4;
 		int         augslot5;
 		int         augslot6;
-		int8        instnodrop;
+		int         instnodrop;
 		std::string custom_data;
 		int         ornamenticon;
 		int         ornamentidfile;
diff --git a/common/repositories/base/base_inventory_snapshots_repository.h b/common/repositories/base/base_inventory_snapshots_repository.h
index 907d32244..d00caa2c9 100644
--- a/common/repositories/base/base_inventory_snapshots_repository.h
+++ b/common/repositories/base/base_inventory_snapshots_repository.h
@@ -39,7 +39,7 @@ public:
 		int         charid;
 		int         slotid;
 		int         itemid;
-		int16       charges;
+		int         charges;
 		int         color;
 		int         augslot1;
 		int         augslot2;
@@ -47,7 +47,7 @@ public:
 		int         augslot4;
 		int         augslot5;
 		int         augslot6;
-		int8        instnodrop;
+		int         instnodrop;
 		std::string custom_data;
 		int         ornamenticon;
 		int         ornamentidfile;
diff --git a/common/repositories/base/base_item_tick_repository.h b/common/repositories/base/base_item_tick_repository.h
index 0c4ddc5b0..deabd41b9 100644
--- a/common/repositories/base/base_item_tick_repository.h
+++ b/common/repositories/base/base_item_tick_repository.h
@@ -40,7 +40,7 @@ public:
 		int         it_level;
 		int         it_id;
 		std::string it_qglobal;
-		int8        it_bagslot;
+		int         it_bagslot;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_items_repository.h b/common/repositories/base/base_items_repository.h
index 81a5f261e..fe36db64a 100644
--- a/common/repositories/base/base_items_repository.h
+++ b/common/repositories/base/base_items_repository.h
@@ -36,7 +36,7 @@ class BaseItemsRepository {
 public:
 	struct Items {
 		int         id;
-		int16       minstatus;
+		int         minstatus;
 		std::string Name;
 		int         aagi;
 		int         ac;
@@ -44,23 +44,23 @@ public:
 		int         acha;
 		int         adex;
 		int         aint;
-		int8        artifactflag;
+		int         artifactflag;
 		int         asta;
 		int         astr;
 		int         attack;
 		int         augrestrict;
-		int8        augslot1type;
-		int8        augslot1visible;
-		int8        augslot2type;
-		int8        augslot2visible;
-		int8        augslot3type;
-		int8        augslot3visible;
-		int8        augslot4type;
-		int8        augslot4visible;
-		int8        augslot5type;
-		int8        augslot5visible;
-		int8        augslot6type;
-		int8        augslot6visible;
+		int         augslot1type;
+		int         augslot1visible;
+		int         augslot2type;
+		int         augslot2visible;
+		int         augslot3type;
+		int         augslot3visible;
+		int         augslot4type;
+		int         augslot4visible;
+		int         augslot5type;
+		int         augslot5visible;
+		int         augslot6type;
+		int         augslot6visible;
 		int         augtype;
 		int         avoidance;
 		int         awis;
@@ -134,7 +134,7 @@ public:
 		int         mr;
 		int         nodrop;
 		int         norent;
-		int8        pendingloreflag;
+		int         pendingloreflag;
 		int         pr;
 		int         procrate;
 		int         races;
@@ -152,7 +152,7 @@ public:
 		int         spellshield;
 		int         strikethrough;
 		int         stunresist;
-		int8        summonedflag;
+		int         summonedflag;
 		int         tradeskills;
 		int         favor;
 		int         weight;
@@ -260,42 +260,42 @@ public:
 		std::string wornname;
 		std::string focusname;
 		std::string scrollname;
-		int16       dsmitigation;
-		int16       heroic_str;
-		int16       heroic_int;
-		int16       heroic_wis;
-		int16       heroic_agi;
-		int16       heroic_dex;
-		int16       heroic_sta;
-		int16       heroic_cha;
-		int16       heroic_pr;
-		int16       heroic_dr;
-		int16       heroic_fr;
-		int16       heroic_cr;
-		int16       heroic_mr;
-		int16       heroic_svcorrup;
-		int16       healamt;
-		int16       spelldmg;
-		int16       clairvoyance;
-		int16       backstabdmg;
+		int         dsmitigation;
+		int         heroic_str;
+		int         heroic_int;
+		int         heroic_wis;
+		int         heroic_agi;
+		int         heroic_dex;
+		int         heroic_sta;
+		int         heroic_cha;
+		int         heroic_pr;
+		int         heroic_dr;
+		int         heroic_fr;
+		int         heroic_cr;
+		int         heroic_mr;
+		int         heroic_svcorrup;
+		int         healamt;
+		int         spelldmg;
+		int         clairvoyance;
+		int         backstabdmg;
 		std::string created;
-		int16       elitematerial;
-		int16       ldonsellbackrate;
-		int16       scriptfileid;
-		int16       expendablearrow;
-		int16       powersourcecapacity;
-		int16       bardeffect;
-		int16       bardeffecttype;
-		int16       bardlevel2;
-		int16       bardlevel;
-		int16       bardunk1;
-		int16       bardunk2;
-		int16       bardunk3;
-		int16       bardunk4;
-		int16       bardunk5;
+		int         elitematerial;
+		int         ldonsellbackrate;
+		int         scriptfileid;
+		int         expendablearrow;
+		int         powersourcecapacity;
+		int         bardeffect;
+		int         bardeffecttype;
+		int         bardlevel2;
+		int         bardlevel;
+		int         bardunk1;
+		int         bardunk2;
+		int         bardunk3;
+		int         bardunk4;
+		int         bardunk5;
 		std::string bardname;
-		int16       bardunk7;
-		int16       UNK214;
+		int         bardunk7;
+		int         UNK214;
 		int         UNK219;
 		int         UNK220;
 		int         UNK221;
diff --git a/common/repositories/base/base_ldon_trap_templates_repository.h b/common/repositories/base/base_ldon_trap_templates_repository.h
index 7b437c6d5..2864117b2 100644
--- a/common/repositories/base/base_ldon_trap_templates_repository.h
+++ b/common/repositories/base/base_ldon_trap_templates_repository.h
@@ -35,11 +35,11 @@
 class BaseLdonTrapTemplatesRepository {
 public:
 	struct LdonTrapTemplates {
-		int   id;
-		int8  type;
-		int16 spell_id;
-		int16 skill;
-		int8  locked;
+		int id;
+		int type;
+		int spell_id;
+		int skill;
+		int locked;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_lfguild_repository.h b/common/repositories/base/base_lfguild_repository.h
index 4f5f7fff8..32dcd5fdf 100644
--- a/common/repositories/base/base_lfguild_repository.h
+++ b/common/repositories/base/base_lfguild_repository.h
@@ -35,11 +35,11 @@
 class BaseLfguildRepository {
 public:
 	struct Lfguild {
-		int8        type;
+		int         type;
 		std::string name;
 		std::string comment;
-		int8        fromlevel;
-		int8        tolevel;
+		int         fromlevel;
+		int         tolevel;
 		int         classes;
 		int         aacount;
 		int         timezone;
diff --git a/common/repositories/base/base_logsys_categories_repository.h b/common/repositories/base/base_logsys_categories_repository.h
index 2d21ec28f..a10744651 100644
--- a/common/repositories/base/base_logsys_categories_repository.h
+++ b/common/repositories/base/base_logsys_categories_repository.h
@@ -37,9 +37,9 @@ public:
 	struct LogsysCategories {
 		int         log_category_id;
 		std::string log_category_description;
-		int16       log_to_console;
-		int16       log_to_file;
-		int16       log_to_gmsay;
+		int         log_to_console;
+		int         log_to_file;
+		int         log_to_gmsay;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_lootdrop_entries_repository.h b/common/repositories/base/base_lootdrop_entries_repository.h
index 7e2a99929..830a9ea49 100644
--- a/common/repositories/base/base_lootdrop_entries_repository.h
+++ b/common/repositories/base/base_lootdrop_entries_repository.h
@@ -37,13 +37,13 @@ public:
 	struct LootdropEntries {
 		int   lootdrop_id;
 		int   item_id;
-		int16 item_charges;
-		int8  equip_item;
+		int   item_charges;
+		int   equip_item;
 		float chance;
 		float disabled_chance;
-		int8  minlevel;
-		int8  maxlevel;
-		int8  multiplier;
+		int   minlevel;
+		int   maxlevel;
+		int   multiplier;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_lootdrop_repository.h b/common/repositories/base/base_lootdrop_repository.h
index e1b41634a..081adb9bf 100644
--- a/common/repositories/base/base_lootdrop_repository.h
+++ b/common/repositories/base/base_lootdrop_repository.h
@@ -37,8 +37,8 @@ public:
 	struct Lootdrop {
 		int         id;
 		std::string name;
-		int8        min_expansion;
-		int8        max_expansion;
+		int         min_expansion;
+		int         max_expansion;
 		std::string content_flags;
 	};
 
diff --git a/common/repositories/base/base_loottable_entries_repository.h b/common/repositories/base/base_loottable_entries_repository.h
index 712e8ffa9..d405b0894 100644
--- a/common/repositories/base/base_loottable_entries_repository.h
+++ b/common/repositories/base/base_loottable_entries_repository.h
@@ -37,9 +37,9 @@ public:
 	struct LoottableEntries {
 		int   loottable_id;
 		int   lootdrop_id;
-		int8  multiplier;
-		int8  droplimit;
-		int8  mindrop;
+		int   multiplier;
+		int   droplimit;
+		int   mindrop;
 		float probability;
 	};
 
diff --git a/common/repositories/base/base_loottable_repository.h b/common/repositories/base/base_loottable_repository.h
index f301c8a4b..2fee78710 100644
--- a/common/repositories/base/base_loottable_repository.h
+++ b/common/repositories/base/base_loottable_repository.h
@@ -40,9 +40,9 @@ public:
 		int         mincash;
 		int         maxcash;
 		int         avgcoin;
-		int8        done;
-		int8        min_expansion;
-		int8        max_expansion;
+		int         done;
+		int         min_expansion;
+		int         max_expansion;
 		std::string content_flags;
 	};
 
diff --git a/common/repositories/base/base_mail_repository.h b/common/repositories/base/base_mail_repository.h
index 5b92400a9..efc14bab4 100644
--- a/common/repositories/base/base_mail_repository.h
+++ b/common/repositories/base/base_mail_repository.h
@@ -42,7 +42,7 @@ public:
 		std::string subject;
 		std::string body;
 		std::string to;
-		int8        status;
+		int         status;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_merchantlist_repository.h b/common/repositories/base/base_merchantlist_repository.h
index ea32bddba..0d72eaa5b 100644
--- a/common/repositories/base/base_merchantlist_repository.h
+++ b/common/repositories/base/base_merchantlist_repository.h
@@ -38,13 +38,13 @@ public:
 		int         merchantid;
 		int         slot;
 		int         item;
-		int16       faction_required;
-		int8        level_required;
-		int16       alt_currency_cost;
+		int         faction_required;
+		int         level_required;
+		int         alt_currency_cost;
 		int         classes_required;
 		int         probability;
-		int8        min_expansion;
-		int8        max_expansion;
+		int         min_expansion;
+		int         max_expansion;
 		std::string content_flags;
 	};
 
diff --git a/common/repositories/base/base_merchantlist_temp_repository.h b/common/repositories/base/base_merchantlist_temp_repository.h
index a2f22121c..23ce44ac5 100644
--- a/common/repositories/base/base_merchantlist_temp_repository.h
+++ b/common/repositories/base/base_merchantlist_temp_repository.h
@@ -35,10 +35,10 @@
 class BaseMerchantlistTempRepository {
 public:
 	struct MerchantlistTemp {
-		int  npcid;
-		int8 slot;
-		int  itemid;
-		int  charges;
+		int npcid;
+		int slot;
+		int itemid;
+		int charges;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_npc_emotes_repository.h b/common/repositories/base/base_npc_emotes_repository.h
index 55bcba51e..286c89783 100644
--- a/common/repositories/base/base_npc_emotes_repository.h
+++ b/common/repositories/base/base_npc_emotes_repository.h
@@ -37,8 +37,8 @@ public:
 	struct NpcEmotes {
 		int         id;
 		int         emoteid;
-		int8        event_;
-		int8        type;
+		int         event_;
+		int         type;
 		std::string text;
 	};
 
diff --git a/common/repositories/base/base_npc_faction_entries_repository.h b/common/repositories/base/base_npc_faction_entries_repository.h
index c24952184..396021a62 100644
--- a/common/repositories/base/base_npc_faction_entries_repository.h
+++ b/common/repositories/base/base_npc_faction_entries_repository.h
@@ -35,11 +35,11 @@
 class BaseNpcFactionEntriesRepository {
 public:
 	struct NpcFactionEntries {
-		int  npc_faction_id;
-		int  faction_id;
-		int  value;
-		int8 npc_value;
-		int8 temp;
+		int npc_faction_id;
+		int faction_id;
+		int value;
+		int npc_value;
+		int temp;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_npc_faction_repository.h b/common/repositories/base/base_npc_faction_repository.h
index 91a6a2502..f20d4632f 100644
--- a/common/repositories/base/base_npc_faction_repository.h
+++ b/common/repositories/base/base_npc_faction_repository.h
@@ -38,7 +38,7 @@ public:
 		int         id;
 		std::string name;
 		int         primaryfaction;
-		int8        ignore_primary_assist;
+		int         ignore_primary_assist;
 	};
 
 	static std::string PrimaryKey()
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 42bee911c..5117c4f36 100644
--- a/common/repositories/base/base_npc_spells_effects_entries_repository.h
+++ b/common/repositories/base/base_npc_spells_effects_entries_repository.h
@@ -35,14 +35,14 @@
 class BaseNpcSpellsEffectsEntriesRepository {
 public:
 	struct NpcSpellsEffectsEntries {
-		int   id;
-		int   npc_spells_effects_id;
-		int16 spell_effect_id;
-		int8  minlevel;
-		int8  maxlevel;
-		int   se_base;
-		int   se_limit;
-		int   se_max;
+		int id;
+		int npc_spells_effects_id;
+		int spell_effect_id;
+		int minlevel;
+		int maxlevel;
+		int se_base;
+		int se_limit;
+		int se_max;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_npc_spells_entries_repository.h b/common/repositories/base/base_npc_spells_entries_repository.h
index 828df44ea..1ae15be21 100644
--- a/common/repositories/base/base_npc_spells_entries_repository.h
+++ b/common/repositories/base/base_npc_spells_entries_repository.h
@@ -35,18 +35,18 @@
 class BaseNpcSpellsEntriesRepository {
 public:
 	struct NpcSpellsEntries {
-		int   id;
-		int   npc_spells_id;
-		int16 spellid;
-		int   type;
-		int8  minlevel;
-		int8  maxlevel;
-		int16 manacost;
-		int   recast_delay;
-		int16 priority;
-		int   resist_adjust;
-		int16 min_hp;
-		int16 max_hp;
+		int id;
+		int npc_spells_id;
+		int spellid;
+		int type;
+		int minlevel;
+		int maxlevel;
+		int manacost;
+		int recast_delay;
+		int priority;
+		int resist_adjust;
+		int min_hp;
+		int max_hp;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_npc_spells_repository.h b/common/repositories/base/base_npc_spells_repository.h
index a6b8fda6b..444a3a3da 100644
--- a/common/repositories/base/base_npc_spells_repository.h
+++ b/common/repositories/base/base_npc_spells_repository.h
@@ -38,24 +38,24 @@ public:
 		int         id;
 		std::string name;
 		int         parent_list;
-		int16       attack_proc;
-		int8        proc_chance;
-		int16       range_proc;
-		int16       rproc_chance;
-		int16       defensive_proc;
-		int16       dproc_chance;
+		int         attack_proc;
+		int         proc_chance;
+		int         range_proc;
+		int         rproc_chance;
+		int         defensive_proc;
+		int         dproc_chance;
 		int         fail_recast;
 		int         engaged_no_sp_recast_min;
 		int         engaged_no_sp_recast_max;
-		int8        engaged_b_self_chance;
-		int8        engaged_b_other_chance;
-		int8        engaged_d_chance;
+		int         engaged_b_self_chance;
+		int         engaged_b_other_chance;
+		int         engaged_d_chance;
 		int         pursue_no_sp_recast_min;
 		int         pursue_no_sp_recast_max;
-		int8        pursue_d_chance;
+		int         pursue_d_chance;
 		int         idle_no_sp_recast_min;
 		int         idle_no_sp_recast_max;
-		int8        idle_b_chance;
+		int         idle_b_chance;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_npc_types_repository.h b/common/repositories/base/base_npc_types_repository.h
index 551372bfd..c85eba178 100644
--- a/common/repositories/base/base_npc_types_repository.h
+++ b/common/repositories/base/base_npc_types_repository.h
@@ -38,15 +38,15 @@ public:
 		int         id;
 		std::string name;
 		std::string lastname;
-		int8        level;
-		int16       race;
-		int8        class;
+		int         level;
+		int         race;
+		int         class;
 		int         bodytype;
 		int         hp;
 		int         mana;
-		int8        gender;
-		int8        texture;
-		int8        helmtexture;
+		int         gender;
+		int         texture;
+		int         helmtexture;
 		int         herosforgemodel;
 		float       size;
 		int         hp_regen_rate;
@@ -61,7 +61,7 @@ public:
 		int         trap_template;
 		int         mindmg;
 		int         maxdmg;
-		int16       attack_count;
+		int         attack_count;
 		std::string npcspecialattks;
 		std::string special_abilities;
 		int         aggroradius;
@@ -77,32 +77,32 @@ public:
 		int         drakkin_tattoo;
 		int         drakkin_details;
 		int         armortint_id;
-		int8        armortint_red;
-		int8        armortint_green;
-		int8        armortint_blue;
+		int         armortint_red;
+		int         armortint_green;
+		int         armortint_blue;
 		int         d_melee_texture1;
 		int         d_melee_texture2;
 		std::string ammo_idfile;
-		int8        prim_melee_type;
-		int8        sec_melee_type;
-		int8        ranged_type;
+		int         prim_melee_type;
+		int         sec_melee_type;
+		int         ranged_type;
 		float       runspeed;
-		int16       MR;
-		int16       CR;
-		int16       DR;
-		int16       FR;
-		int16       PR;
-		int16       Corrup;
-		int16       PhR;
-		int16       see_invis;
-		int16       see_invis_undead;
+		int         MR;
+		int         CR;
+		int         DR;
+		int         FR;
+		int         PR;
+		int         Corrup;
+		int         PhR;
+		int         see_invis;
+		int         see_invis_undead;
 		int         qglobal;
-		int16       AC;
-		int8        npc_aggro;
-		int8        spawn_limit;
+		int         AC;
+		int         npc_aggro;
+		int         spawn_limit;
 		float       attack_speed;
-		int8        attack_delay;
-		int8        findable;
+		int         attack_delay;
+		int         findable;
 		int         STR;
 		int         STA;
 		int         DEX;
@@ -110,53 +110,53 @@ public:
 		int         _INT;
 		int         WIS;
 		int         CHA;
-		int8        see_hide;
-		int8        see_improved_hide;
-		int8        trackable;
-		int8        isbot;
-		int8        exclude;
+		int         see_hide;
+		int         see_improved_hide;
+		int         trackable;
+		int         isbot;
+		int         exclude;
 		int         ATK;
 		int         Accuracy;
 		int         Avoidance;
-		int16       slow_mitigation;
-		int16       version;
-		int8        maxlevel;
+		int         slow_mitigation;
+		int         version;
+		int         maxlevel;
 		int         scalerate;
-		int8        private_corpse;
-		int8        unique_spawn_by_name;
-		int8        underwater;
-		int8        isquest;
+		int         private_corpse;
+		int         unique_spawn_by_name;
+		int         underwater;
+		int         isquest;
 		int         emoteid;
 		float       spellscale;
 		float       healscale;
-		int8        no_target_hotkey;
-		int8        raid_target;
-		int8        armtexture;
-		int8        bracertexture;
-		int8        handtexture;
-		int8        legtexture;
-		int8        feettexture;
-		int8        light;
-		int8        walkspeed;
+		int         no_target_hotkey;
+		int         raid_target;
+		int         armtexture;
+		int         bracertexture;
+		int         handtexture;
+		int         legtexture;
+		int         feettexture;
+		int         light;
+		int         walkspeed;
 		int         peqid;
-		int8        unique_;
-		int8        fixed;
-		int8        ignore_despawn;
-		int8        show_name;
-		int8        untargetable;
-		int16       charm_ac;
+		int         unique_;
+		int         fixed;
+		int         ignore_despawn;
+		int         show_name;
+		int         untargetable;
+		int         charm_ac;
 		int         charm_min_dmg;
 		int         charm_max_dmg;
-		int8        charm_attack_delay;
+		int         charm_attack_delay;
 		int         charm_accuracy_rating;
 		int         charm_avoidance_rating;
 		int         charm_atk;
-		int8        skip_global_loot;
-		int8        rare_spawn;
-		int8        stuck_behavior;
-		int16       model;
-		int8        flymode;
-		int8        always_aggro;
+		int         skip_global_loot;
+		int         rare_spawn;
+		int         stuck_behavior;
+		int         model;
+		int         flymode;
+		int         always_aggro;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_npc_types_tint_repository.h b/common/repositories/base/base_npc_types_tint_repository.h
index c704426ad..f451ee292 100644
--- a/common/repositories/base/base_npc_types_tint_repository.h
+++ b/common/repositories/base/base_npc_types_tint_repository.h
@@ -37,33 +37,33 @@ public:
 	struct NpcTypesTint {
 		int         id;
 		std::string tint_set_name;
-		int8        red1h;
-		int8        grn1h;
-		int8        blu1h;
-		int8        red2c;
-		int8        grn2c;
-		int8        blu2c;
-		int8        red3a;
-		int8        grn3a;
-		int8        blu3a;
-		int8        red4b;
-		int8        grn4b;
-		int8        blu4b;
-		int8        red5g;
-		int8        grn5g;
-		int8        blu5g;
-		int8        red6l;
-		int8        grn6l;
-		int8        blu6l;
-		int8        red7f;
-		int8        grn7f;
-		int8        blu7f;
-		int8        red8x;
-		int8        grn8x;
-		int8        blu8x;
-		int8        red9x;
-		int8        grn9x;
-		int8        blu9x;
+		int         red1h;
+		int         grn1h;
+		int         blu1h;
+		int         red2c;
+		int         grn2c;
+		int         blu2c;
+		int         red3a;
+		int         grn3a;
+		int         blu3a;
+		int         red4b;
+		int         grn4b;
+		int         blu4b;
+		int         red5g;
+		int         grn5g;
+		int         blu5g;
+		int         red6l;
+		int         grn6l;
+		int         blu6l;
+		int         red7f;
+		int         grn7f;
+		int         blu7f;
+		int         red8x;
+		int         grn8x;
+		int         blu8x;
+		int         red9x;
+		int         grn9x;
+		int         blu9x;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_object_contents_repository.h b/common/repositories/base/base_object_contents_repository.h
index 3b4b21859..c1b183cce 100644
--- a/common/repositories/base/base_object_contents_repository.h
+++ b/common/repositories/base/base_object_contents_repository.h
@@ -39,7 +39,7 @@ public:
 		int         parentid;
 		int         bagidx;
 		int         itemid;
-		int16       charges;
+		int         charges;
 		std::string droptime;
 		int         augslot1;
 		int         augslot2;
diff --git a/common/repositories/base/base_object_repository.h b/common/repositories/base/base_object_repository.h
index 92db58261..e8f340f22 100644
--- a/common/repositories/base/base_object_repository.h
+++ b/common/repositories/base/base_object_repository.h
@@ -37,13 +37,13 @@ public:
 	struct Object {
 		int         id;
 		int         zoneid;
-		int16       version;
+		int         version;
 		float       xpos;
 		float       ypos;
 		float       zpos;
 		float       heading;
 		int         itemid;
-		int16       charges;
+		int         charges;
 		std::string objectname;
 		int         type;
 		int         icon;
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 95029bdb3..f2a73afc7 100644
--- a/common/repositories/base/base_perl_event_export_settings_repository.h
+++ b/common/repositories/base/base_perl_event_export_settings_repository.h
@@ -37,11 +37,11 @@ public:
 	struct PerlEventExportSettings {
 		int         event_id;
 		std::string event_description;
-		int16       export_qglobals;
-		int16       export_mob;
-		int16       export_zone;
-		int16       export_item;
-		int16       export_event;
+		int         export_qglobals;
+		int         export_mob;
+		int         export_zone;
+		int         export_item;
+		int         export_event;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_petitions_repository.h b/common/repositories/base/base_petitions_repository.h
index 61f642f9a..033f7120e 100644
--- a/common/repositories/base/base_petitions_repository.h
+++ b/common/repositories/base/base_petitions_repository.h
@@ -49,7 +49,7 @@ public:
 		int         charlevel;
 		int         checkouts;
 		int         unavailables;
-		int8        ischeckedout;
+		int         ischeckedout;
 		int         senttime;
 	};
 
diff --git a/common/repositories/base/base_pets_repository.h b/common/repositories/base/base_pets_repository.h
index ebc99527f..ef91281ce 100644
--- a/common/repositories/base/base_pets_repository.h
+++ b/common/repositories/base/base_pets_repository.h
@@ -38,10 +38,10 @@ public:
 		std::string type;
 		int         petpower;
 		int         npcID;
-		int8        temp;
-		int8        petcontrol;
-		int8        petnaming;
-		int8        monsterflag;
+		int         temp;
+		int         petcontrol;
+		int         petnaming;
+		int         monsterflag;
 		int         equipmentset;
 	};
 
diff --git a/common/repositories/base/base_raid_details_repository.h b/common/repositories/base/base_raid_details_repository.h
index 2776eaaad..51b293ea4 100644
--- a/common/repositories/base/base_raid_details_repository.h
+++ b/common/repositories/base/base_raid_details_repository.h
@@ -37,7 +37,7 @@ public:
 	struct RaidDetails {
 		int         raidid;
 		int         loottype;
-		int8        locked;
+		int         locked;
 		std::string motd;
 	};
 
diff --git a/common/repositories/base/base_raid_members_repository.h b/common/repositories/base/base_raid_members_repository.h
index 6f33506d9..2878ea884 100644
--- a/common/repositories/base/base_raid_members_repository.h
+++ b/common/repositories/base/base_raid_members_repository.h
@@ -38,12 +38,12 @@ public:
 		int         raidid;
 		int         charid;
 		int         groupid;
-		int8        _class;
-		int8        level;
+		int         _class;
+		int         level;
 		std::string name;
-		int8        isgroupleader;
-		int8        israidleader;
-		int8        islooter;
+		int         isgroupleader;
+		int         israidleader;
+		int         islooter;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_respawn_times_repository.h b/common/repositories/base/base_respawn_times_repository.h
index 9eaac14d9..e95598529 100644
--- a/common/repositories/base/base_respawn_times_repository.h
+++ b/common/repositories/base/base_respawn_times_repository.h
@@ -35,10 +35,10 @@
 class BaseRespawnTimesRepository {
 public:
 	struct RespawnTimes {
-		int   id;
-		int   start;
-		int   duration;
-		int16 instance_id;
+		int id;
+		int start;
+		int duration;
+		int instance_id;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_rule_sets_repository.h b/common/repositories/base/base_rule_sets_repository.h
index b4b024525..0d0f48d43 100644
--- a/common/repositories/base/base_rule_sets_repository.h
+++ b/common/repositories/base/base_rule_sets_repository.h
@@ -35,7 +35,7 @@
 class BaseRuleSetsRepository {
 public:
 	struct RuleSets {
-		int8        ruleset_id;
+		int         ruleset_id;
 		std::string name;
 	};
 
diff --git a/common/repositories/base/base_rule_values_repository.h b/common/repositories/base/base_rule_values_repository.h
index a92a89c68..749b18a87 100644
--- a/common/repositories/base/base_rule_values_repository.h
+++ b/common/repositories/base/base_rule_values_repository.h
@@ -35,7 +35,7 @@
 class BaseRuleValuesRepository {
 public:
 	struct RuleValues {
-		int8        ruleset_id;
+		int         ruleset_id;
 		std::string rule_name;
 		std::string rule_value;
 		std::string notes;
diff --git a/common/repositories/base/base_skill_caps_repository.h b/common/repositories/base/base_skill_caps_repository.h
index 06ad2ba34..561aaeef7 100644
--- a/common/repositories/base/base_skill_caps_repository.h
+++ b/common/repositories/base/base_skill_caps_repository.h
@@ -35,11 +35,11 @@
 class BaseSkillCapsRepository {
 public:
 	struct SkillCaps {
-		int8 skillID;
-		int8 class;
-		int8 level;
-		int  cap;
-		int8 class_;
+		int skillID;
+		int class;
+		int level;
+		int cap;
+		int class_;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_spawn2_repository.h b/common/repositories/base/base_spawn2_repository.h
index 003b135b2..ffff6b294 100644
--- a/common/repositories/base/base_spawn2_repository.h
+++ b/common/repositories/base/base_spawn2_repository.h
@@ -38,7 +38,7 @@ public:
 		int         id;
 		int         spawngroupID;
 		std::string zone;
-		int16       version;
+		int         version;
 		float       x;
 		float       y;
 		float       z;
@@ -48,8 +48,8 @@ public:
 		int         pathgrid;
 		int         _condition;
 		int         cond_value;
-		int8        enabled;
-		int8        animation;
+		int         enabled;
+		int         animation;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_spawn_condition_values_repository.h b/common/repositories/base/base_spawn_condition_values_repository.h
index 5e27e3a66..fbcac8e70 100644
--- a/common/repositories/base/base_spawn_condition_values_repository.h
+++ b/common/repositories/base/base_spawn_condition_values_repository.h
@@ -36,7 +36,7 @@ class BaseSpawnConditionValuesRepository {
 public:
 	struct SpawnConditionValues {
 		int         id;
-		int8        value;
+		int         value;
 		std::string zone;
 		int         instance_id;
 	};
diff --git a/common/repositories/base/base_spawn_conditions_repository.h b/common/repositories/base/base_spawn_conditions_repository.h
index 5d81e44b6..967e038fa 100644
--- a/common/repositories/base/base_spawn_conditions_repository.h
+++ b/common/repositories/base/base_spawn_conditions_repository.h
@@ -38,7 +38,7 @@ public:
 		std::string zone;
 		int         id;
 		int         value;
-		int8        onchange;
+		int         onchange;
 		std::string name;
 	};
 
diff --git a/common/repositories/base/base_spawn_events_repository.h b/common/repositories/base/base_spawn_events_repository.h
index 0a89251a5..aa871a7b9 100644
--- a/common/repositories/base/base_spawn_events_repository.h
+++ b/common/repositories/base/base_spawn_events_repository.h
@@ -40,15 +40,15 @@ public:
 		int         cond_id;
 		std::string name;
 		int         period;
-		int8        next_minute;
-		int8        next_hour;
-		int8        next_day;
-		int8        next_month;
+		int         next_minute;
+		int         next_hour;
+		int         next_day;
+		int         next_month;
 		int         next_year;
-		int8        enabled;
-		int8        action;
+		int         enabled;
+		int         action;
 		int         argument;
-		int8        strict;
+		int         strict;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_spawnentry_repository.h b/common/repositories/base/base_spawnentry_repository.h
index 48d24415e..66bdb4060 100644
--- a/common/repositories/base/base_spawnentry_repository.h
+++ b/common/repositories/base/base_spawnentry_repository.h
@@ -35,10 +35,10 @@
 class BaseSpawnentryRepository {
 public:
 	struct Spawnentry {
-		int   spawngroupID;
-		int   npcID;
-		int16 chance;
-		int   condition_value_filter;
+		int spawngroupID;
+		int npcID;
+		int chance;
+		int condition_value_filter;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_spawngroup_repository.h b/common/repositories/base/base_spawngroup_repository.h
index a67965be0..fceacd2b0 100644
--- a/common/repositories/base/base_spawngroup_repository.h
+++ b/common/repositories/base/base_spawngroup_repository.h
@@ -37,7 +37,7 @@ public:
 	struct Spawngroup {
 		int         id;
 		std::string name;
-		int8        spawn_limit;
+		int         spawn_limit;
 		float       dist;
 		float       max_x;
 		float       min_x;
@@ -45,9 +45,9 @@ public:
 		float       min_y;
 		int         delay;
 		int         mindelay;
-		int8        despawn;
+		int         despawn;
 		int         despawn_timer;
-		int8        wp_spawns;
+		int         wp_spawns;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_start_zones_repository.h b/common/repositories/base/base_start_zones_repository.h
index eb5c882fe..770c9f9fd 100644
--- a/common/repositories/base/base_start_zones_repository.h
+++ b/common/repositories/base/base_start_zones_repository.h
@@ -49,9 +49,9 @@ public:
 		float       bind_x;
 		float       bind_y;
 		float       bind_z;
-		int8        select_rank;
-		int8        min_expansion;
-		int8        max_expansion;
+		int         select_rank;
+		int         min_expansion;
+		int         max_expansion;
 		std::string content_flags;
 	};
 
diff --git a/common/repositories/base/base_starting_items_repository.h b/common/repositories/base/base_starting_items_repository.h
index 4c932d200..5efab9ab4 100644
--- a/common/repositories/base/base_starting_items_repository.h
+++ b/common/repositories/base/base_starting_items_repository.h
@@ -41,11 +41,11 @@ public:
 		int         deityid;
 		int         zoneid;
 		int         itemid;
-		int8        item_charges;
-		int8        gm;
+		int         item_charges;
+		int         gm;
 		int         slot;
-		int8        min_expansion;
-		int8        max_expansion;
+		int         min_expansion;
+		int         max_expansion;
 		std::string content_flags;
 	};
 
diff --git a/common/repositories/base/base_task_activities_repository.h b/common/repositories/base/base_task_activities_repository.h
index 2b09b0417..6847c12a0 100644
--- a/common/repositories/base/base_task_activities_repository.h
+++ b/common/repositories/base/base_task_activities_repository.h
@@ -38,7 +38,7 @@ public:
 		int         taskid;
 		int         activityid;
 		int         step;
-		int8        activitytype;
+		int         activitytype;
 		std::string target_name;
 		std::string item_list;
 		std::string skill_list;
@@ -49,7 +49,7 @@ public:
 		int         goalcount;
 		int         delivertonpc;
 		std::string zones;
-		int8        optional;
+		int         optional;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_tasks_repository.h b/common/repositories/base/base_tasks_repository.h
index 34a5bae10..641d1733c 100644
--- a/common/repositories/base/base_tasks_repository.h
+++ b/common/repositories/base/base_tasks_repository.h
@@ -36,19 +36,19 @@ class BaseTasksRepository {
 public:
 	struct Tasks {
 		int         id;
-		int8        type;
+		int         type;
 		int         duration;
-		int8        duration_code;
+		int         duration_code;
 		std::string title;
 		std::string description;
 		std::string reward;
 		int         rewardid;
 		int         cashreward;
 		int         xpreward;
-		int8        rewardmethod;
-		int8        minlevel;
-		int8        maxlevel;
-		int8        repeatable;
+		int         rewardmethod;
+		int         minlevel;
+		int         maxlevel;
+		int         repeatable;
 		int         faction_reward;
 		std::string completion_emote;
 	};
diff --git a/common/repositories/base/base_timers_repository.h b/common/repositories/base/base_timers_repository.h
index 8a87ff3fd..459c85c28 100644
--- a/common/repositories/base/base_timers_repository.h
+++ b/common/repositories/base/base_timers_repository.h
@@ -35,11 +35,11 @@
 class BaseTimersRepository {
 public:
 	struct Timers {
-		int  char_id;
-		int  type;
-		int  start;
-		int  duration;
-		int8 enable;
+		int char_id;
+		int type;
+		int start;
+		int duration;
+		int enable;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_titles_repository.h b/common/repositories/base/base_titles_repository.h
index 0ed79fcc9..5bb5cd9f5 100644
--- a/common/repositories/base/base_titles_repository.h
+++ b/common/repositories/base/base_titles_repository.h
@@ -36,21 +36,21 @@ class BaseTitlesRepository {
 public:
 	struct Titles {
 		int         id;
-		int8        skill_id;
+		int         skill_id;
 		int         min_skill_value;
 		int         max_skill_value;
 		int         min_aa_points;
 		int         max_aa_points;
-		int8        class;
-		int8        gender;
+		int         class;
+		int         gender;
 		int         char_id;
 		int         status;
 		int         item_id;
 		std::string prefix;
 		std::string suffix;
 		int         title_set;
-		int8        min_expansion;
-		int8        max_expansion;
+		int         min_expansion;
+		int         max_expansion;
 		std::string content_flags;
 	};
 
diff --git a/common/repositories/base/base_trader_repository.h b/common/repositories/base/base_trader_repository.h
index bfdf1e54b..71bd9a83f 100644
--- a/common/repositories/base/base_trader_repository.h
+++ b/common/repositories/base/base_trader_repository.h
@@ -35,12 +35,12 @@
 class BaseTraderRepository {
 public:
 	struct Trader {
-		int  char_id;
-		int  item_id;
-		int  serialnumber;
-		int  charges;
-		int  item_cost;
-		int8 slot_id;
+		int char_id;
+		int item_id;
+		int serialnumber;
+		int charges;
+		int item_cost;
+		int slot_id;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_tradeskill_recipe_entries_repository.h b/common/repositories/base/base_tradeskill_recipe_entries_repository.h
index 3efa08866..dbab250a0 100644
--- a/common/repositories/base/base_tradeskill_recipe_entries_repository.h
+++ b/common/repositories/base/base_tradeskill_recipe_entries_repository.h
@@ -35,14 +35,14 @@
 class BaseTradeskillRecipeEntriesRepository {
 public:
 	struct TradeskillRecipeEntries {
-		int  id;
-		int  recipe_id;
-		int  item_id;
-		int8 successcount;
-		int8 failcount;
-		int8 componentcount;
-		int8 salvagecount;
-		int8 iscontainer;
+		int id;
+		int recipe_id;
+		int item_id;
+		int successcount;
+		int failcount;
+		int componentcount;
+		int salvagecount;
+		int iscontainer;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_tradeskill_recipe_repository.h b/common/repositories/base/base_tradeskill_recipe_repository.h
index 9a850174f..2716abbb7 100644
--- a/common/repositories/base/base_tradeskill_recipe_repository.h
+++ b/common/repositories/base/base_tradeskill_recipe_repository.h
@@ -37,17 +37,17 @@ public:
 	struct TradeskillRecipe {
 		int         id;
 		std::string name;
-		int16       tradeskill;
-		int16       skillneeded;
-		int16       trivial;
-		int8        nofail;
-		int8        replace_container;
+		int         tradeskill;
+		int         skillneeded;
+		int         trivial;
+		int         nofail;
+		int         replace_container;
 		std::string notes;
-		int8        must_learn;
-		int8        quest;
-		int8        enabled;
-		int8        min_expansion;
-		int8        max_expansion;
+		int         must_learn;
+		int         quest;
+		int         enabled;
+		int         min_expansion;
+		int         max_expansion;
 		std::string content_flags;
 	};
 
diff --git a/common/repositories/base/base_traps_repository.h b/common/repositories/base/base_traps_repository.h
index cb1643048..ff1bc8474 100644
--- a/common/repositories/base/base_traps_repository.h
+++ b/common/repositories/base/base_traps_repository.h
@@ -37,11 +37,11 @@ public:
 	struct Traps {
 		int         id;
 		std::string zone;
-		int16       version;
+		int         version;
 		int         x;
 		int         y;
 		int         z;
-		int8        chance;
+		int         chance;
 		float       maxzdiff;
 		float       radius;
 		int         effect;
@@ -52,12 +52,12 @@ public:
 		int         level;
 		int         respawn_time;
 		int         respawn_var;
-		int8        triggered_number;
-		int8        group;
-		int8        despawn_when_triggered;
-		int8        undetectable;
-		int8        min_expansion;
-		int8        max_expansion;
+		int         triggered_number;
+		int         group;
+		int         despawn_when_triggered;
+		int         undetectable;
+		int         min_expansion;
+		int         max_expansion;
 		std::string content_flags;
 	};
 
diff --git a/common/repositories/base/base_tributes_repository.h b/common/repositories/base/base_tributes_repository.h
index b6b8d4745..d3120d9ae 100644
--- a/common/repositories/base/base_tributes_repository.h
+++ b/common/repositories/base/base_tributes_repository.h
@@ -39,7 +39,7 @@ public:
 		int         unknown;
 		std::string name;
 		std::string descr;
-		int8        isguild;
+		int         isguild;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_veteran_reward_templates_repository.h b/common/repositories/base/base_veteran_reward_templates_repository.h
index 4f8366470..eeade8c23 100644
--- a/common/repositories/base/base_veteran_reward_templates_repository.h
+++ b/common/repositories/base/base_veteran_reward_templates_repository.h
@@ -38,8 +38,8 @@ public:
 		int         claim_id;
 		std::string name;
 		int         item_id;
-		int16       charges;
-		int8        reward_slot;
+		int         charges;
+		int         reward_slot;
 	};
 
 	static std::string PrimaryKey()
diff --git a/common/repositories/base/base_zone_points_repository.h b/common/repositories/base/base_zone_points_repository.h
index 708e5fe31..1b84254ab 100644
--- a/common/repositories/base/base_zone_points_repository.h
+++ b/common/repositories/base/base_zone_points_repository.h
@@ -38,7 +38,7 @@ public:
 		int         id;
 		std::string zone;
 		int         version;
-		int16       number;
+		int         number;
 		float       y;
 		float       x;
 		float       z;
@@ -47,13 +47,13 @@ public:
 		float       target_x;
 		float       target_z;
 		float       target_heading;
-		int16       zoneinst;
+		int         zoneinst;
 		int         target_zone_id;
 		int         target_instance;
 		float       buffer;
 		int         client_version_mask;
-		int8        min_expansion;
-		int8        max_expansion;
+		int         min_expansion;
+		int         max_expansion;
 		std::string content_flags;
 	};