diff --git a/definitions/AuctionHouseCategory.dbd b/definitions/AuctionHouseCategory.dbd
index 8027984878..c0a03502d9 100644
--- a/definitions/AuctionHouseCategory.dbd
+++ b/definitions/AuctionHouseCategory.dbd
@@ -9,15 +9,6 @@ int OrderIndex
 int DefaultAuctionHouseFilter? // guessed, seems to be off by one though, i.e. pre-9.2.5 enum
 int<AuctionHouseCategory::ID> ParentCategory?
 int AuctionHouseExtraColumn? // 0: None, 1: Ilvl, 2: Slots, 3: Level, 4: Skill
-locstring Field_9_2_7_44767_000_lang?
-locstring Field_9_2_7_44767_001_lang?
-int Field_9_2_7_44767_002?
-int Field_9_2_7_44767_003?
-int Field_9_2_7_44767_004?
-int Field_9_2_7_44767_005?
-int Field_9_2_7_44767_006?
-int Field_9_2_7_44767_007?
-int Field_9_2_7_44767_008?
 
 LAYOUT 68AEBFF6
 BUILD 9.2.5.42850, 9.2.5.43022, 9.2.5.43057, 9.2.5.43180, 9.2.5.43254, 9.2.5.43412
@@ -49,15 +40,15 @@ $noninline,relation$ParentCategory<32>
 
 LAYOUT A528FA70
 BUILD 9.2.7.44767, 9.2.7.44931, 9.2.7.44981, 9.2.7.45114, 9.2.7.45161, 9.2.7.45338, 9.2.7.45745
-Field_9_2_7_44767_000_lang
-Field_9_2_7_44767_001_lang
-$id$Field_9_2_7_44767_002<32>
-Field_9_2_7_44767_003<32>
-Field_9_2_7_44767_004<32>
-Field_9_2_7_44767_005<8>
-Field_9_2_7_44767_006<32>
-Field_9_2_7_44767_007<u8>
-$noninline,relation$Field_9_2_7_44767_008<32>
+Description_lang
+SortedProperty_lang
+$id$ID<32>
+ItemClass<32>
+ItemSubClass<32>
+InventoryType<8>
+OrderIndex<32>
+DefaultAuctionHouseFilter<u8>
+$noninline,relation$ParentCategory<32>
 
 LAYOUT 431DFE55
 BUILD 10.0.0.43342
diff --git a/definitions/BattlePetSpecies.dbd b/definitions/BattlePetSpecies.dbd
index 3e4e51cf6e..633d528bb9 100644
--- a/definitions/BattlePetSpecies.dbd
+++ b/definitions/BattlePetSpecies.dbd
@@ -11,17 +11,6 @@ locstring SourceText_lang
 int SourceTypeEnum
 int<Spell::ID> SummonSpellID
 int<Covenant::ID> CovenantID?
-locstring Field_3_4_1_46722_000_lang?
-locstring Field_3_4_1_46722_001_lang?
-int Field_3_4_1_46722_002?
-int Field_3_4_1_46722_003?
-int Field_3_4_1_46722_004?
-int Field_3_4_1_46722_005?
-int Field_3_4_1_46722_006?
-int Field_3_4_1_46722_007?
-int Field_3_4_1_46722_008?
-int Field_3_4_1_46722_009?
-int Field_3_4_1_46722_010?
 
 LAYOUT F700B25B
 BUILD 3.4.0.43659, 3.4.0.43682, 3.4.0.43746, 3.4.0.43788, 3.4.0.43866, 3.4.0.43881, 3.4.0.43929, 3.4.0.43955, 3.4.0.44064, 3.4.0.44184, 3.4.0.44250, 3.4.0.44301, 3.4.0.44369, 3.4.0.44463, 3.4.0.44547, 3.4.0.44644, 3.4.0.44701, 3.4.0.44729, 3.4.0.44832, 3.4.0.44925, 3.4.0.44930, 3.4.0.44996, 3.4.0.45043, 3.4.0.45064, 3.4.0.45102, 3.4.0.45166, 3.4.0.45189, 3.4.0.45264, 3.4.0.45327, 3.4.0.45435, 3.4.0.45506, 3.4.0.45572, 3.4.0.45613, 3.4.0.45704, 3.4.0.45770, 3.4.0.45772, 3.4.0.45854, 3.4.0.45942, 3.4.0.46158, 3.4.0.46182, 3.4.0.46248, 3.4.0.46269, 3.4.0.46368, 3.4.0.46779, 3.4.0.46902, 3.4.0.47168, 3.4.0.47659
@@ -40,17 +29,17 @@ LoadoutUIModelSceneID<32>
 LAYOUT A8750D81
 BUILD 3.4.2.49311, 3.4.2.49442, 3.4.2.49563, 3.4.2.49584
 BUILD 3.4.1.46722, 3.4.1.46917, 3.4.1.46973, 3.4.1.47014, 3.4.1.47110, 3.4.1.47245, 3.4.1.47496, 3.4.1.47585, 3.4.1.47612, 3.4.1.47720, 3.4.1.47800, 3.4.1.47925, 3.4.1.47966, 3.4.1.48019, 3.4.1.48120, 3.4.1.48340, 3.4.1.48503, 3.4.1.48632, 3.4.1.49345
-Field_3_4_1_46722_000_lang
-Field_3_4_1_46722_001_lang
-$id$Field_3_4_1_46722_002<32>
-Field_3_4_1_46722_003<32>
-Field_3_4_1_46722_004<32>
-Field_3_4_1_46722_005<32>
-Field_3_4_1_46722_006<u8>
-Field_3_4_1_46722_007<32>
-Field_3_4_1_46722_008<8>
-Field_3_4_1_46722_009<32>
-Field_3_4_1_46722_010<32>
+Description_lang
+SourceText_lang
+$id$ID<32>
+CreatureID<32>
+SummonSpellID<32>
+IconFileDataID<32>
+PetTypeEnum<u8>
+Flags<32>
+SourceTypeEnum<8>
+CardUIModelSceneID<32>
+LoadoutUIModelSceneID<32>
 
 BUILD 5.0.1.15464
 $id$ID<32>
diff --git a/definitions/Campaign.dbd b/definitions/Campaign.dbd
index 9164776cd9..b7d9c2ae8a 100644
--- a/definitions/Campaign.dbd
+++ b/definitions/Campaign.dbd
@@ -12,8 +12,8 @@ int Flags // &0x01: useNormalQuestIcons
 int<PlayerCondition::ID> OnlyStallIf // if given and evals to false, don't mark as stalled.
 int<PlayerCondition::ID> Field_9_0_1_35755_007?
 int DisplayPriority?
-int Field_10_0_2_45779_012?
-int Field_10_0_2_46144_013?
+int<PlayerCondition::ID> Field_10_0_2_45779_012?
+int<PlayerCondition::ID> Field_10_0_2_46144_013?
 
 LAYOUT E317A3DC
 BUILD 2.5.1.38043, 2.5.1.38061, 2.5.1.38093, 2.5.1.38118, 2.5.1.38119, 2.5.1.38169, 2.5.1.38225, 2.5.1.38285, 2.5.1.38339, 2.5.1.38364, 2.5.1.38401, 2.5.1.38453, 2.5.1.38502, 2.5.1.38521, 2.5.1.38537, 2.5.1.38548, 2.5.1.38561, 2.5.1.38598, 2.5.1.38644, 2.5.1.38677, 2.5.1.38692, 2.5.1.38707, 2.5.1.38739, 2.5.1.38741, 2.5.1.38757, 2.5.1.38835, 2.5.1.38892, 2.5.1.38921, 2.5.1.38988, 2.5.1.39170, 2.5.1.39399, 2.5.1.39475, 2.5.1.39603, 2.5.1.39640
diff --git a/definitions/CharacterServiceInfo.dbd b/definitions/CharacterServiceInfo.dbd
index 5f4b169f53..e0d582b947 100644
--- a/definitions/CharacterServiceInfo.dbd
+++ b/definitions/CharacterServiceInfo.dbd
@@ -11,7 +11,7 @@ locstring PopupTitle_lang
 int<UiTextureKit::ID> PopupUITextureKitID
 int Priority
 int ProfessionLevel
-int Field_1_14_1_40666_003?
+int Field_1_14_1_40666_003? // 0: Free trial?, 1: Level boosts?, 2: Char transfer, faction/race change?
 
 LAYOUT 371E296E
 BUILD 8.0.1.26624, 8.0.1.26629, 8.0.1.26637, 8.0.1.26640, 8.0.1.26683, 8.0.1.26707, 8.0.1.26714, 8.0.1.26715, 8.0.1.26734, 8.0.1.26766
diff --git a/definitions/ChrClassRaceSex.dbd b/definitions/ChrClassRaceSex.dbd
index dd5eef5780..60faf2d205 100644
--- a/definitions/ChrClassRaceSex.dbd
+++ b/definitions/ChrClassRaceSex.dbd
@@ -2,10 +2,10 @@ COLUMNS
 int ID
 int<ChrClasses::ID> ClassID
 int Flags
-int RaceID
+int<ChrRaces::ID> RaceID
 int Sex
-int SoundID
-int VoiceSoundFilterID
+int<CreatureSoundData::ID> SoundID
+int<SoundFilter::ID> VoiceSoundFilterID
 
 LAYOUT 5E29DFA1, 204BD561, C05CAB5B
 BUILD 9.2.5.42850, 9.2.5.43022, 9.2.5.43057, 9.2.5.43180
diff --git a/definitions/ChrCustomizationReq.dbd b/definitions/ChrCustomizationReq.dbd
index c1811bb3d7..083c5da392 100644
--- a/definitions/ChrCustomizationReq.dbd
+++ b/definitions/ChrCustomizationReq.dbd
@@ -7,14 +7,6 @@ int OverrideArchive? // -1: allow any, otherwise must match OverrideArchive cvar
 int<ItemModifiedAppearance::ID> ReqItemModifiedAppearanceID
 int ReqQuestID?
 locstring ReqSource_lang?
-locstring Field_3_4_1_46722_000_lang?
-int Field_3_4_1_46722_001?
-int Field_3_4_1_46722_002?
-int Field_3_4_1_46722_003?
-int Field_3_4_1_46722_004?
-int Field_3_4_1_46722_005?
-int Field_3_4_1_46722_006?
-int Field_3_4_1_46722_007?
 int Field_10_1_5_49516_000?
 
 LAYOUT F390B9A6
@@ -29,14 +21,14 @@ ReqItemModifiedAppearanceID<32>
 LAYOUT D776559A
 BUILD 3.4.2.49311, 3.4.2.49442, 3.4.2.49563, 3.4.2.49584
 BUILD 3.4.1.46722, 3.4.1.46917, 3.4.1.46973, 3.4.1.47014, 3.4.1.47110, 3.4.1.47245, 3.4.1.47496, 3.4.1.47585, 3.4.1.47612, 3.4.1.47720, 3.4.1.47800, 3.4.1.47925, 3.4.1.47966, 3.4.1.48019, 3.4.1.48120, 3.4.1.48340, 3.4.1.48503, 3.4.1.48632, 3.4.1.49345
-Field_3_4_1_46722_000_lang
-$id$Field_3_4_1_46722_001<32>
-Field_3_4_1_46722_002<32>
-Field_3_4_1_46722_003<32>
-Field_3_4_1_46722_004<32>
-Field_3_4_1_46722_005<32>
-Field_3_4_1_46722_006<32>
-Field_3_4_1_46722_007<32>
+ReqSource_lang
+$id$ID<32>
+ReqType<32>
+ClassMask<32>
+ReqAchievementID<32>
+ReqQuestID<32>
+OverrideArchive<32>
+ReqItemModifiedAppearanceID<32>
 
 LAYOUT AA163FDE
 BUILD 9.0.1.34081, 9.0.1.34098, 9.0.1.34137
diff --git a/definitions/ChrModelTextureLayer.dbd b/definitions/ChrModelTextureLayer.dbd
index 9926fda337..4c5b9c2e93 100644
--- a/definitions/ChrModelTextureLayer.dbd
+++ b/definitions/ChrModelTextureLayer.dbd
@@ -9,16 +9,6 @@ int Field_9_0_1_34365_006?
 int TextureSectionTypeBitMask? // -1 for non section texture or bit of CharComponentTextureSections::SectionType
 int<CharComponentTextureLayouts::ID> CharComponentTextureLayoutsID
 int TextureSectionTypeBitMask2?
-int Field_3_4_1_46722_000?
-int Field_3_4_1_46722_001?
-int Field_3_4_1_46722_002?
-int Field_3_4_1_46722_003?
-int Field_3_4_1_46722_004?
-int Field_3_4_1_46722_005?
-int Field_3_4_1_46722_006?
-int Field_3_4_1_46722_007?
-int Field_3_4_1_46722_008?
-int Field_3_4_1_46722_009?
 
 LAYOUT DD39DBA5
 BUILD 3.4.0.43659, 3.4.0.43682, 3.4.0.43746, 3.4.0.43788, 3.4.0.43866, 3.4.0.43881, 3.4.0.43929, 3.4.0.43955, 3.4.0.44064, 3.4.0.44184, 3.4.0.44250, 3.4.0.44301, 3.4.0.44369, 3.4.0.44463, 3.4.0.44547, 3.4.0.44644, 3.4.0.44701, 3.4.0.44729, 3.4.0.44832, 3.4.0.44925, 3.4.0.44930, 3.4.0.44996, 3.4.0.45043, 3.4.0.45064, 3.4.0.45102, 3.4.0.45166, 3.4.0.45189, 3.4.0.45264, 3.4.0.45327, 3.4.0.45435, 3.4.0.45506, 3.4.0.45572, 3.4.0.45613, 3.4.0.45704, 3.4.0.45770, 3.4.0.45772, 3.4.0.45854, 3.4.0.45942, 3.4.0.46158, 3.4.0.46182, 3.4.0.46248, 3.4.0.46269, 3.4.0.46368, 3.4.0.46779, 3.4.0.46902, 3.4.0.47168, 3.4.0.47659
@@ -35,16 +25,16 @@ $noninline,relation$CharComponentTextureLayoutsID<32>
 LAYOUT CB9100A6
 BUILD 3.4.2.49311, 3.4.2.49442, 3.4.2.49563, 3.4.2.49584
 BUILD 3.4.1.46722, 3.4.1.46917, 3.4.1.46973, 3.4.1.47014, 3.4.1.47110, 3.4.1.47245, 3.4.1.47496, 3.4.1.47585, 3.4.1.47612, 3.4.1.47720, 3.4.1.47800, 3.4.1.47925, 3.4.1.47966, 3.4.1.48019, 3.4.1.48120, 3.4.1.48340, 3.4.1.48503, 3.4.1.48632, 3.4.1.49345
-$id$Field_3_4_1_46722_000<32>
-Field_3_4_1_46722_001<32>
-Field_3_4_1_46722_002<32>
-Field_3_4_1_46722_003<32>
-Field_3_4_1_46722_004<32>
-Field_3_4_1_46722_005<32>
-Field_3_4_1_46722_006<32>
-Field_3_4_1_46722_007<32>[3]
-Field_3_4_1_46722_008<32>[2]
-$noninline,relation$Field_3_4_1_46722_009<32>
+$id$ID<32>
+TextureType<32>
+Layer<32>
+Flags<32>
+BlendMode<32>
+TextureSectionTypeBitMask<32>
+TextureSectionTypeBitMask2<32>
+Field_9_0_1_34365_006<32>[3]
+ChrModelTextureTargetID<32>[2]
+$noninline,relation$CharComponentTextureLayoutsID<32>
 
 LAYOUT 5BDD8C6A
 BUILD 9.0.1.34365, 9.0.1.34392, 9.0.1.34490, 9.0.1.34615, 9.0.1.34714, 9.0.1.34821, 9.0.1.34902, 9.0.1.34972, 9.0.1.35078, 9.0.1.35167, 9.0.1.35213, 9.0.1.35256, 9.0.1.35282, 9.0.1.35360, 9.0.1.35432, 9.0.1.35482, 9.0.1.35522, 9.0.1.35598
diff --git a/definitions/ChrRaces.dbd b/definitions/ChrRaces.dbd
index 13e026b80e..bb15bd85aa 100644
--- a/definitions/ChrRaces.dbd
+++ b/definitions/ChrRaces.dbd
@@ -78,7 +78,7 @@ float Field_9_0_1_35256_034? // probably: fallback for CharStartKit::Field_9_0_1
 int<ChrRaces::ID> HelmetAnimScalingRaceID?
 float Field_9_1_0_38312_030?
 float Field_9_1_0_38312_031?
-int Field_10_0_0_44649_045?
+int Field_10_0_0_44649_045? // 1 for dragonriding races
 
 BUILD 0.5.3.3368
 BUILD 0.5.3.3368-0.6.0.3592
diff --git a/definitions/CraftingReagentRequirement.dbd b/definitions/CraftingReagentRequirement.dbd
index 0312ef83e9..ad4b4b219c 100644
--- a/definitions/CraftingReagentRequirement.dbd
+++ b/definitions/CraftingReagentRequirement.dbd
@@ -1,7 +1,7 @@
 COLUMNS
 int ID
-int RequiredModifiedCraftingCategoryID?
-int ModifiedCraftingCategoryID?
+int<ModifiedCraftingCategory::ID> RequiredModifiedCraftingCategoryID?
+int<ModifiedCraftingCategory::ID> ModifiedCraftingCategoryID?
 
 LAYOUT 3F971F7F
 BUILD 10.1.5.49516
diff --git a/definitions/CreatureDisplayInfoTrn.dbd b/definitions/CreatureDisplayInfoTrn.dbd
index d6322bcc11..deeea0d6c4 100644
--- a/definitions/CreatureDisplayInfoTrn.dbd
+++ b/definitions/CreatureDisplayInfoTrn.dbd
@@ -1,11 +1,11 @@
 COLUMNS
 int ID
 int<DissolveEffect::ID> DissolveEffectID
-int DstCreatureDisplayInfoID
-int FinishVisualKitID
+int<CreatureDisplayInfo::ID> DstCreatureDisplayInfoID
+int<SpellVisualKit::ID> FinishVisualKitID
 float MaxTime
-int SrcCreatureDisplayInfoID
-int StartVisualKitID
+int<CreatureDisplayInfo::ID> SrcCreatureDisplayInfoID
+int<SpellVisualKit::ID> StartVisualKitID
 
 LAYOUT 04148090
 BUILD 7.3.2.25079, 7.3.2.25163, 7.3.2.25196, 7.3.2.25208, 7.3.2.25255, 7.3.2.25326, 7.3.2.25383, 7.3.2.25442, 7.3.2.25455, 7.3.2.25477, 7.3.2.25480, 7.3.2.25497, 7.3.2.25516, 7.3.2.25549
@@ -50,10 +50,10 @@ BUILD 1.13.3.32790, 1.13.3.32836, 1.13.3.32887, 1.13.3.33155, 1.13.3.33302, 1.13
 BUILD 1.13.2.30073, 1.13.2.30112, 1.13.2.30113, 1.13.2.30128, 1.13.2.30172, 1.13.2.30232, 1.13.2.30265, 1.13.2.30287, 1.13.2.30406, 1.13.2.30550, 1.13.2.30682, 1.13.2.30786, 1.13.2.30862, 1.13.2.30901, 1.13.2.30979, 1.13.2.31043, 1.13.2.31118, 1.13.2.31209, 1.13.2.31402, 1.13.2.31407, 1.13.2.31446, 1.13.2.31650, 1.13.2.31687, 1.13.2.31727, 1.13.2.31830, 1.13.2.31882, 1.13.2.32089, 1.13.2.32421, 1.13.2.32600
 $noninline,id$ID<32>
 DstCreatureDisplayInfoID<32>
-DissolveEffectID<u32>
 StartVisualKitID<u32>
+FinishVisualKitID<u32>
 MaxTime
-FinishVisualKitID<32>
+DissolveEffectID<32>
 $noninline,relation$SrcCreatureDisplayInfoID<32>
 
 LAYOUT 500975B6
@@ -70,10 +70,10 @@ BUILD 1.14.1.40487, 1.14.1.40594, 1.14.1.40666, 1.14.1.40688, 1.14.1.40800, 1.14
 BUILD 1.14.0.39802, 1.14.0.39958, 1.14.0.40140, 1.14.0.40179, 1.14.0.40237, 1.14.0.40347, 1.14.0.40441, 1.14.0.40618
 $noninline,id$ID<32>
 DstCreatureDisplayInfoID<32>
-DissolveEffectID<u32>
 StartVisualKitID<u32>
+FinishVisualKitID<u32>
 MaxTime
-FinishVisualKitID<32>
+DissolveEffectID<32>
 $noninline,relation$SrcCreatureDisplayInfoID<32>
 
 LAYOUT 7B61A667
@@ -90,8 +90,8 @@ BUILD 3.4.1.46722, 3.4.1.46917, 3.4.1.46973, 3.4.1.47014, 3.4.1.47110, 3.4.1.472
 BUILD 3.4.0.43659, 3.4.0.43682, 3.4.0.43746, 3.4.0.43788, 3.4.0.43866, 3.4.0.43881, 3.4.0.43929, 3.4.0.43955, 3.4.0.44064, 3.4.0.44184, 3.4.0.44250, 3.4.0.44301, 3.4.0.44369, 3.4.0.44463, 3.4.0.44547, 3.4.0.44644, 3.4.0.44701, 3.4.0.44729, 3.4.0.44832, 3.4.0.44925, 3.4.0.44930, 3.4.0.44996, 3.4.0.45043, 3.4.0.45064, 3.4.0.45102, 3.4.0.45166, 3.4.0.45189, 3.4.0.45264, 3.4.0.45327, 3.4.0.45435, 3.4.0.45506, 3.4.0.45572, 3.4.0.45613, 3.4.0.45704, 3.4.0.45770, 3.4.0.45772, 3.4.0.45854, 3.4.0.45942, 3.4.0.46158, 3.4.0.46182, 3.4.0.46248, 3.4.0.46269, 3.4.0.46368, 3.4.0.46779, 3.4.0.46902, 3.4.0.47168, 3.4.0.47659
 $noninline,id$ID<32>
 DstCreatureDisplayInfoID<32>
-DissolveEffectID<u32>
 StartVisualKitID<u32>
+FinishVisualKitID<u32>
 MaxTime
-FinishVisualKitID<32>
+DissolveEffectID<32>
 $noninline,relation$SrcCreatureDisplayInfoID<32>
diff --git a/definitions/CreatureXUiWidgetSet.dbd b/definitions/CreatureXUiWidgetSet.dbd
index e167de84a0..05b9dfb0bf 100644
--- a/definitions/CreatureXUiWidgetSet.dbd
+++ b/definitions/CreatureXUiWidgetSet.dbd
@@ -2,7 +2,7 @@ COLUMNS
 int ID
 int<Creature::ID> CreatureID?
 int<UiWidgetSet::ID> UiWidgetSetID?
-int Field_9_0_1_34821_002?
+int<UnitCondition::ID> UnitConditionID?
 
 LAYOUT CB7DB164
 BUILD 10.0.0.43342
@@ -16,7 +16,7 @@ BUILD 9.0.1.34821, 9.0.1.34902, 9.0.1.34972, 9.0.1.35078, 9.0.1.35167, 9.0.1.352
 $noninline,id$ID<32>
 CreatureID<32>
 UiWidgetSetID<32>
-Field_9_0_1_34821_002<32>
+UnitConditionID<32>
 
 LAYOUT D5F78F74
 BUILD 10.1.5.49516
@@ -30,4 +30,4 @@ BUILD 9.2.5.43519, 9.2.5.43630, 9.2.5.43741, 9.2.5.43810, 9.2.5.43903, 9.2.5.439
 $noninline,id$ID<32>
 CreatureID<32>
 UiWidgetSetID<32>
-Field_9_0_1_34821_002<32>
+UnitConditionID<32>
diff --git a/definitions/DungeonMapChunk.dbd b/definitions/DungeonMapChunk.dbd
index 0519774a8e..25eeacbd5a 100644
--- a/definitions/DungeonMapChunk.dbd
+++ b/definitions/DungeonMapChunk.dbd
@@ -6,7 +6,6 @@ int<DungeonMap::ID> DungeonMapID
 float MinZ
 int DoodadPlacementID
 int Field_1_13_0_28211_000?
-float Field_1_13_0_28211_001?
 int Field_1_13_0_28211_002?
 int Field_1_13_0_28211_003?
 int Field_1_13_0_28211_004?
@@ -15,7 +14,7 @@ LAYOUT F1BD499A
 BUILD 1.13.0.28211
 $noninline,id$ID<32>
 Field_1_13_0_28211_000<32>
-Field_1_13_0_28211_001
+MinZ
 Field_1_13_0_28211_002<u32>
 Field_1_13_0_28211_003<u16>
 Field_1_13_0_28211_004<u16>
diff --git a/definitions/Faction.dbd b/definitions/Faction.dbd
index 6ce44b25ea..32106586ce 100644
--- a/definitions/Faction.dbd
+++ b/definitions/Faction.dbd
@@ -17,24 +17,10 @@ int<Faction::ID> ParagonFactionID
 int ReputationMax
 int<Faction::ID> RenownFactionID?
 int<CurrencyTypes::ID> RenownCurrencyID?
-int Field_3_4_1_46722_000?
-locstring Field_3_4_1_46722_001_lang?
-locstring Field_3_4_1_46722_002_lang?
-int Field_3_4_1_46722_003?
-int Field_3_4_1_46722_004?
-int Field_3_4_1_46722_005?
-int Field_3_4_1_46722_006?
-int Field_3_4_1_46722_007?
 int Field_3_4_1_46722_008?
 int Field_3_4_1_46722_009?
 int Field_3_4_1_46722_010?
 int Field_3_4_1_46722_011?
-int Field_3_4_1_46722_012?
-int Field_3_4_1_46722_013?
-int Field_3_4_1_46722_014?
-int Field_3_4_1_46722_015?
-float Field_3_4_1_46722_016?
-int Field_3_4_1_46722_017?
 
 BUILD 0.5.3.3368
 BUILD 0.5.3.3368-0.9.1.3810
@@ -129,24 +115,24 @@ ParentFactionCap<u8>[2]
 LAYOUT 767B5394
 BUILD 3.4.2.49311, 3.4.2.49442, 3.4.2.49563, 3.4.2.49584
 BUILD 3.4.1.46722, 3.4.1.46917, 3.4.1.46973, 3.4.1.47014, 3.4.1.47110, 3.4.1.47245, 3.4.1.47496, 3.4.1.47585, 3.4.1.47612, 3.4.1.47720, 3.4.1.47800, 3.4.1.47925, 3.4.1.47966, 3.4.1.48019, 3.4.1.48120, 3.4.1.48340, 3.4.1.48503, 3.4.1.48632, 3.4.1.49345
-Field_3_4_1_46722_000<64>[4]
-Field_3_4_1_46722_001_lang
-Field_3_4_1_46722_002_lang
-$id$Field_3_4_1_46722_003<32>
-Field_3_4_1_46722_004<16>
-Field_3_4_1_46722_005<u16>
-Field_3_4_1_46722_006<u8>
-Field_3_4_1_46722_007<u8>
+ReputationRaceMask<64>[4]
+Name_lang
+Description_lang
+$id$ID<32>
+ReputationIndex<16>
+ParentFactionID<u16>
+Expansion<u8>
+FriendshipRepID<u8>
 Field_3_4_1_46722_008<32>
 Field_3_4_1_46722_009<u16>
 Field_3_4_1_46722_010<32>
 Field_3_4_1_46722_011<32>
-Field_3_4_1_46722_012<16>[4]
-Field_3_4_1_46722_013<u16>[4]
-Field_3_4_1_46722_014<32>[4]
-Field_3_4_1_46722_015<32>[4]
-Field_3_4_1_46722_016[2]
-Field_3_4_1_46722_017<u8>[2]
+ReputationClassMask<16>[4]
+ReputationFlags<u16>[4]
+ReputationBase<32>[4]
+ReputationMax<32>[4]
+ParentFactionMod[2]
+ParentFactionCap<u8>[2]
 
 BUILD 4.0.0.11792
 BUILD 3.3.0.10958-3.3.5.12340
diff --git a/definitions/FlightCapability.dbd b/definitions/FlightCapability.dbd
index 64ac7c3a3b..546314e902 100644
--- a/definitions/FlightCapability.dbd
+++ b/definitions/FlightCapability.dbd
@@ -1,22 +1,6 @@
 COLUMNS
 int ID
-float Field_10_0_0_44795_000?
-float Field_10_0_0_44795_001?
-float Field_10_0_0_44795_002?
-float Field_10_0_0_44795_003?
-float Field_10_0_0_44795_004?
-float Field_10_0_0_44795_005?
-float Field_10_0_0_44795_006?
-float Field_10_0_0_44999_007?
-float Field_10_0_0_44999_008?
-float Field_10_0_0_44999_009?
-float Field_10_0_0_44999_010?
-float Field_10_0_0_44999_011?
-float Field_10_0_0_45232_008?
-float Field_10_0_0_45232_010?
-float Field_10_0_0_45232_012?
-float Field_10_0_0_45232_013?
-float Field_10_0_0_45232_014?
+float Field_10_0_0_44167_002?
 float Field_10_0_0_45232_017?
 float Field_10_0_0_45232_018?
 float Field_10_0_0_45232_019?
@@ -25,7 +9,6 @@ float Field_10_0_0_45232_021?
 float Field_10_0_0_45335_022?
 float AirFriction?
 float MaxVel?
-float Field_10_0_0_45697_002?
 float DoubleJumpVelMod?
 float LiftCoefficient?
 float GlideStartMinHeight?
@@ -40,61 +23,72 @@ float TurnVelocityThresholdMin?
 float TurnVelocityThresholdMax?
 float SurfaceFriction?
 float OverMaxDeceleration?
-float Field_10_0_0_45697_017?
-float Field_10_0_0_45697_018?
-float Field_10_0_0_45697_019?
-float Field_10_0_0_45697_020?
-float Field_10_0_0_45697_021?
-float Field_10_0_0_45697_022?
 int<Spell::ID> SpellID?
 
-LAYOUT 8596C374
-BUILD 10.0.0.44795, 10.0.0.44876, 10.0.0.44895
+LAYOUT 66B425C7
+BUILD 10.0.0.44167
 $noninline,id$ID<32>
-Field_10_0_0_44795_000
-Field_10_0_0_44795_001
-Field_10_0_0_44795_002
-Field_10_0_0_44795_003
-Field_10_0_0_44795_004
-Field_10_0_0_44795_005
-Field_10_0_0_44795_006
+AirFriction
+MaxVel
+Field_10_0_0_44167_002
+DoubleJumpVelMod
+
+LAYOUT C8E5E07A
+BUILD 10.0.0.44402
+$noninline,id$ID<32>
+AirFriction
+MaxVel
+Field_10_0_0_44167_002
+DoubleJumpVelMod
+LiftCoefficient
+
+LAYOUT 8596C374
+BUILD 10.0.0.44475, 10.0.0.44592, 10.0.0.44645, 10.0.0.44649, 10.0.0.44707, 10.0.0.44795, 10.0.0.44876, 10.0.0.44895
+$noninline,id$ID<32>
+AirFriction
+MaxVel
+Field_10_0_0_44167_002
+DoubleJumpVelMod
+LiftCoefficient
+GlideStartMinHeight
+AddImpulseMaxSpeed
 
 LAYOUT 05CED64E
 BUILD 10.0.0.44999, 10.0.0.45141
 $noninline,id$ID<32>
-Field_10_0_0_44795_000
-Field_10_0_0_44795_001
-Field_10_0_0_44795_002
-Field_10_0_0_44795_003
-Field_10_0_0_44795_004
-Field_10_0_0_44795_005
-Field_10_0_0_44795_006
-Field_10_0_0_44999_007
-Field_10_0_0_44999_008
-Field_10_0_0_44999_009
-Field_10_0_0_44999_010
-Field_10_0_0_44999_011
+AirFriction
+MaxVel
+Field_10_0_0_44167_002
+DoubleJumpVelMod
+LiftCoefficient
+GlideStartMinHeight
+AddImpulseMaxSpeed
+BankingRateMin
+PitchingRateDownMin
+PitchingRateUpMin
+SurfaceFriction
+OverMaxDeceleration
 
 LAYOUT C9DE9BE4
 BUILD 10.0.0.45232
 $noninline,id$ID<32>
-Field_10_0_0_44795_000
-Field_10_0_0_44795_001
-Field_10_0_0_44795_002
-Field_10_0_0_44795_003
-Field_10_0_0_44795_004
-Field_10_0_0_44795_005
-Field_10_0_0_44795_006
-Field_10_0_0_44999_007
-Field_10_0_0_45232_008
-Field_10_0_0_44999_008
-Field_10_0_0_45232_010
-Field_10_0_0_44999_009
-Field_10_0_0_45232_012
-Field_10_0_0_45232_013
-Field_10_0_0_45232_014
-Field_10_0_0_44999_010
-Field_10_0_0_44999_011
+AirFriction
+MaxVel
+Field_10_0_0_44167_002
+DoubleJumpVelMod
+LiftCoefficient
+GlideStartMinHeight
+AddImpulseMaxSpeed
+BankingRateMin
+BankingRateMax
+PitchingRateDownMin
+PitchingRateDownMax
+PitchingRateUpMin
+PitchingRateUpMax
+TurnVelocityThresholdMin
+TurnVelocityThresholdMax
+SurfaceFriction
+OverMaxDeceleration
 Field_10_0_0_45232_017
 Field_10_0_0_45232_018
 Field_10_0_0_45232_019
@@ -105,23 +99,23 @@ LAYOUT 2BA64B0A
 BUILD 10.0.2.45480, 10.0.2.45505, 10.0.2.45569, 10.0.2.45632
 BUILD 10.0.0.45335, 10.0.0.45454, 10.0.0.45570
 $noninline,id$ID<32>
-Field_10_0_0_44795_000
-Field_10_0_0_44795_001
-Field_10_0_0_44795_002
-Field_10_0_0_44795_003
-Field_10_0_0_44795_004
-Field_10_0_0_44795_005
-Field_10_0_0_44795_006
-Field_10_0_0_44999_007
-Field_10_0_0_45232_008
-Field_10_0_0_44999_008
-Field_10_0_0_45232_010
-Field_10_0_0_44999_009
-Field_10_0_0_45232_012
-Field_10_0_0_45232_013
-Field_10_0_0_45232_014
-Field_10_0_0_44999_010
-Field_10_0_0_44999_011
+AirFriction
+MaxVel
+Field_10_0_0_44167_002
+DoubleJumpVelMod
+LiftCoefficient
+GlideStartMinHeight
+AddImpulseMaxSpeed
+BankingRateMin
+BankingRateMax
+PitchingRateDownMin
+PitchingRateDownMax
+PitchingRateUpMin
+PitchingRateUpMax
+TurnVelocityThresholdMin
+TurnVelocityThresholdMax
+SurfaceFriction
+OverMaxDeceleration
 Field_10_0_0_45232_017
 Field_10_0_0_45232_018
 Field_10_0_0_45232_019
@@ -139,7 +133,7 @@ BUILD 10.0.0.45661, 10.0.0.45697, 10.0.0.45970, 10.0.0.46047, 10.0.0.46112, 10.0
 $noninline,id$ID<32>
 AirFriction
 MaxVel
-Field_10_0_0_45697_002
+Field_10_0_0_44167_002
 DoubleJumpVelMod
 LiftCoefficient
 GlideStartMinHeight
@@ -154,10 +148,10 @@ TurnVelocityThresholdMin
 TurnVelocityThresholdMax
 SurfaceFriction
 OverMaxDeceleration
-Field_10_0_0_45697_017
-Field_10_0_0_45697_018
-Field_10_0_0_45697_019
-Field_10_0_0_45697_020
-Field_10_0_0_45697_021
-Field_10_0_0_45697_022
+Field_10_0_0_45232_017
+Field_10_0_0_45232_018
+Field_10_0_0_45232_019
+Field_10_0_0_45232_020
+Field_10_0_0_45232_021
+Field_10_0_0_45335_022
 SpellID<32>
diff --git a/definitions/GameObjectDiffAnimMap.dbd b/definitions/GameObjectDiffAnimMap.dbd
index 1a242eaa51..5c9684cd54 100644
--- a/definitions/GameObjectDiffAnimMap.dbd
+++ b/definitions/GameObjectDiffAnimMap.dbd
@@ -3,7 +3,7 @@ int ID
 int GameObjectDiffAnimID
 int<Difficulty::ID> DifficultyID
 int Animation
-int AttachmentDisplayID
+int<GameObjectDisplayInfo::ID> AttachmentDisplayID
 
 LAYOUT 55525850
 BUILD 2.5.4.42581, 2.5.4.42695, 2.5.4.42757, 2.5.4.42800, 2.5.4.42869, 2.5.4.42870, 2.5.4.42873, 2.5.4.42917, 2.5.4.42940, 2.5.4.43400, 2.5.4.43638, 2.5.4.43861, 2.5.4.44036, 2.5.4.44171, 2.5.4.44400, 2.5.4.44833
diff --git a/definitions/ItemBonusTreeGroupEntry.dbd b/definitions/ItemBonusTreeGroupEntry.dbd
index 5294f76a98..3619f1c626 100644
--- a/definitions/ItemBonusTreeGroupEntry.dbd
+++ b/definitions/ItemBonusTreeGroupEntry.dbd
@@ -1,6 +1,6 @@
 COLUMNS
 int ID
-int ItemBonusTreeID?
+int<ItemBonusTree::ID> ItemBonusTreeID?
 int ItemBonusTreeGroupID?
 
 LAYOUT D18146A8
diff --git a/definitions/ItemFixup.dbd b/definitions/ItemFixup.dbd
index 336db0373a..3a1577ce70 100644
--- a/definitions/ItemFixup.dbd
+++ b/definitions/ItemFixup.dbd
@@ -1,9 +1,9 @@
 COLUMNS
 int ID
-int Field_10_1_0_49092_000?
+int<ItemCondition::ID> ItemConditionID?
 
 LAYOUT 31DF97E4
 BUILD 10.1.5.49516
 BUILD 10.1.0.49092, 10.1.0.49190, 10.1.0.49222, 10.1.0.49255, 10.1.0.49318, 10.1.0.49365, 10.1.0.49407, 10.1.0.49426, 10.1.0.49444, 10.1.0.49474, 10.1.0.49570
 $noninline,id$ID<32>
-Field_10_1_0_49092_000<32>
+ItemConditionID<32>
diff --git a/definitions/ItemGroupIlvlScalingEntry.dbd b/definitions/ItemGroupIlvlScalingEntry.dbd
index 21d9d95970..7b64b197fb 100644
--- a/definitions/ItemGroupIlvlScalingEntry.dbd
+++ b/definitions/ItemGroupIlvlScalingEntry.dbd
@@ -1,7 +1,7 @@
 COLUMNS
 int ID
-int CurrencyTypeID?
-int ItemID?
+int<CurrencyTypes::ID> CurrencyTypeID?
+int<Item::ID> ItemID?
 float CostScaling?
 int Field_10_1_0_48480_003? // some kind of account wide flag
 int Field_10_1_0_48480_004?
diff --git a/definitions/ItemRecraft.dbd b/definitions/ItemRecraft.dbd
index 2a428f91d4..b2d2ea3f95 100644
--- a/definitions/ItemRecraft.dbd
+++ b/definitions/ItemRecraft.dbd
@@ -1,26 +1,22 @@
 COLUMNS
 int ID?
-int Field_10_1_0_49092_001?
-int Field_10_1_0_49092_002?
-int Field_10_1_0_49092_003?
-int Field_10_1_0_49190_000?
-int Field_10_1_0_49190_001?
-int Field_10_1_0_49190_002?
+int<ItemFixup::ID> ItemFixupID?
+int<SharedString::ID> SharedStringID?
 int Field_10_1_0_49190_003?
-int Field_10_1_0_49190_004?
+int<Item::ID> ItemID?
 
 LAYOUT B3CD553B
 BUILD 10.1.0.49092
 $id$ID<32>
-Field_10_1_0_49092_001<32>
-Field_10_1_0_49092_002<32>
-$noninline,relation$Field_10_1_0_49092_003<32>
+ItemFixupID<32>
+SharedStringID<32>
+$noninline,relation$ItemID<32>
 
 LAYOUT E00E7F34
 BUILD 10.1.5.49516
 BUILD 10.1.0.49190, 10.1.0.49222, 10.1.0.49255, 10.1.0.49318, 10.1.0.49365, 10.1.0.49407, 10.1.0.49426, 10.1.0.49444, 10.1.0.49474, 10.1.0.49570
-$id$Field_10_1_0_49190_000<32>
-Field_10_1_0_49190_001<32>
-Field_10_1_0_49190_002<32>
+$id$ID<32>
+ItemFixupID<32>
+SharedStringID<32>
 Field_10_1_0_49190_003<32>
-$noninline,relation$Field_10_1_0_49190_004<32>
+$noninline,relation$ItemID<32>
diff --git a/definitions/QuestLabel.dbd b/definitions/QuestLabel.dbd
index 84d8f19f3f..322e046fb2 100644
--- a/definitions/QuestLabel.dbd
+++ b/definitions/QuestLabel.dbd
@@ -1,10 +1,10 @@
 COLUMNS
 int ID
-int Field_10_1_5_49516_000?
-int Field_10_1_5_49516_001?
+int LabelID?
+int<QuestV2::ID> QuestID?
 
 LAYOUT 1E62975A
 BUILD 10.1.5.49516
 $noninline,id$ID<32>
-Field_10_1_5_49516_000<32>
-$noninline,relation$Field_10_1_5_49516_001<32>
+LabelID<32>
+$noninline,relation$QuestID<32>