diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/AchievementEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/AchievementEntry.cs
index 37ae1093ff..3a22c64b2b 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/AchievementEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/AchievementEntry.cs
@@ -1,9 +1,8 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
     [DBFile("Achievement")]
-
     public sealed class AchievementEntry
     {
         public string Description;
@@ -18,7 +17,7 @@ public sealed class AchievementEntry
         public sbyte MinimumCriteria;
         public sbyte Points;
         public int Flags;
-        public short UiOrder;
+        public ushort UiOrder;
         public int IconFileID;
         public int RewardItemID;
         public uint CriteriaTree;
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/AreaTableEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/AreaTableEntry.cs
index 2b96a5cc9e..5e4b9a2196 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/AreaTableEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/AreaTableEntry.cs
@@ -1,4 +1,4 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/BroadcastTextEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/BroadcastTextEntry.cs
index d4f3b88cea..d81155a14f 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/BroadcastTextEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/BroadcastTextEntry.cs
@@ -1,9 +1,8 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
     [DBFile("BroadcastText")]
-
     public sealed class BroadcastTextEntry
     {
         public string Text;
@@ -17,7 +16,7 @@ public sealed class BroadcastTextEntry
         public uint ChatBubbleDurationMs;
         public int VoiceOverPriorityID;
         [Cardinality(2)]
-        public uint[] SoundEntriesID = new uint[2];
+        public uint[] SoundKitID = new uint[2];
         [Cardinality(3)]
         public ushort[] EmoteID = new ushort[3];
         [Cardinality(3)]
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/CreatureDifficultyEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/CreatureDifficultyEntry.cs
index b4693589c4..4162040e84 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/CreatureDifficultyEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/CreatureDifficultyEntry.cs
@@ -1,19 +1,19 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
     [DBFile("CreatureDifficulty")]
-
     public sealed class CreatureDifficultyEntry
     {
         [Index(true)]
         public uint ID;
-        public int UnkMin;
-        public int UnkMax;
-        public ushort FactionTemplateID;
+        public int Unknown901_0;
+        public int Unknown901_1;
+        public ushort FactionID;
         public int ContentTuningID;
         [Cardinality(8)]
         public int[] Flags = new int[8];
-        public uint CreatureID;
+        [NonInlineRelation(typeof(uint))]
+        public int CreatureID;
     }
 }
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/CreatureDisplayInfoEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/CreatureDisplayInfoEntry.cs
index f29a490a6d..0cb11272ac 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/CreatureDisplayInfoEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/CreatureDisplayInfoEntry.cs
@@ -1,4 +1,4 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
@@ -31,8 +31,8 @@ public sealed class CreatureDisplayInfoEntry
         public int DissolveOutEffectID;
         public sbyte CreatureModelMinLod;
         public ushort ConditionalCreatureModelID;
-        public float Unknown_1100_1;
-        public ushort Unknown_1100_2;
+        public float MountMaxBankingAngle;
+        public ushort Unknown1100;
         [Cardinality(4)]
         public int[] TextureVariationFileDataID = new int[4];
     }
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/CreatureEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/CreatureEntry.cs
index 468928778e..b67b8305a8 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/CreatureEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/CreatureEntry.cs
@@ -1,4 +1,4 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
@@ -16,10 +16,10 @@ public sealed class CreatureEntry
         public ushort CreatureFamily;
         public byte StartAnimState;
         [Cardinality(4)]
-        public uint[] DisplayID = new uint[4];
+        public int[] DisplayID = new int[4];
         [Cardinality(4)]
         public float[] DisplayProbability = new float[4];
         [Cardinality(3)]
-        public uint[] AlwaysItem = new uint[3];
+        public int[] AlwaysItem = new int[3];
     }
 }
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/CreatureFamilyEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/CreatureFamilyEntry.cs
index c13864ddb9..e5557d91e5 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/CreatureFamilyEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/CreatureFamilyEntry.cs
@@ -1,9 +1,8 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
     [DBFile("CreatureFamily")]
-
     public sealed class CreatureFamilyEntry
     {
         [Index(true)]
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/CriteriaEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/CriteriaEntry.cs
index 487c5a7816..e046e36bdb 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/CriteriaEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/CriteriaEntry.cs
@@ -1,4 +1,4 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
@@ -17,6 +17,6 @@ public sealed class CriteriaEntry
         public int FailAsset;
         public int Flags;
         public short EligibilityWorldStateID;
-        public sbyte EligibilityWorldStatevalue;
+        public sbyte EligibilityWorldStateValue;
     }
 }
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/CriteriaTreeEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/CriteriaTreeEntry.cs
index 6894be5611..2229fa1fd5 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/CriteriaTreeEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/CriteriaTreeEntry.cs
@@ -1,4 +1,4 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/DifficultyEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/DifficultyEntry.cs
index aaa9b2aca5..bec7b885bd 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/DifficultyEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/DifficultyEntry.cs
@@ -1,4 +1,4 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
@@ -17,8 +17,8 @@ public sealed class DifficultyEntry
         public ushort Flags;
         public byte ItemContext;
         public byte ToggleDifficultyID;
-        public uint GroupSizeHealthCurveID;         // unproven
-        public uint GroupSizeDmgCurveID;            // unproven
-        public uint GroupSizeSpellPointsCurveID;    // unproven
+        public uint GroupSizeHealthCurveID;
+        public uint GroupSizeDmgCurveID;
+        public uint GroupSizeSpellPointsCurveID;
     }
 }
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/FactionEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/FactionEntry.cs
index 2d8401df77..1e0a563778 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/FactionEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/FactionEntry.cs
@@ -1,4 +1,4 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
@@ -33,4 +33,3 @@ public sealed class FactionEntry
         public byte[] ParentFactionCap = new byte[2];
     }
 }
-
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/FactionTemplateEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/FactionTemplateEntry.cs
index 8cb77fdb5d..75ac7ccc43 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/FactionTemplateEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/FactionTemplateEntry.cs
@@ -1,4 +1,4 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/ItemEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/ItemEntry.cs
index 35bd9c8406..5288fdfff1 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/ItemEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/ItemEntry.cs
@@ -1,4 +1,4 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/ItemSparseEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/ItemSparseEntry.cs
index 679f02a890..b5e0c2c03e 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/ItemSparseEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/ItemSparseEntry.cs
@@ -1,5 +1,4 @@
-using DBFileReaderLib.Attributes;
-using System;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
@@ -48,7 +47,7 @@ public sealed class ItemSparseEntry
         public ushort RequiredTransmogHoliday;
         public ushort RequiredHoliday;
         public ushort GemProperties;
-        public ushort SocketMatchEnchantmentId;
+        public ushort SocketMatchEnchantmentID;
         public ushort TotemCategoryID;
         public ushort InstanceBound;
         [Cardinality(2)]
@@ -71,7 +70,7 @@ public sealed class ItemSparseEntry
         public byte Material;
         public byte PageMaterialID;
         public byte Bonding;
-        public byte DamageDamageType;
+        public byte DamageType;
         public byte ContainerSlots;
         public byte RequiredPVPMedal;
         public byte RequiredPVPRank;
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/MapDifficultyEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/MapDifficultyEntry.cs
index 796eb5ea04..f389de868f 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/MapDifficultyEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/MapDifficultyEntry.cs
@@ -1,10 +1,9 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
     [DBFile("MapDifficulty")]
-
-    public class MapDifficultyEntry
+    public sealed class MapDifficultyEntry
     {
         [Index(true)]
         public uint ID;
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/MapEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/MapEntry.cs
index 3aaa47b742..768c189152 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/MapEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/MapEntry.cs
@@ -1,4 +1,4 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
@@ -33,6 +33,6 @@ public sealed class MapEntry
         public int NavigationMaxDistance;
         public int PreloadFileDataID;
         [Cardinality(3)]
-        public uint[] Flags = new uint[3];
+        public int[] Flags = new int[3];
     }
 }
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/PhaseEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/PhaseEntry.cs
index 0e206f1bfc..cc970c5946 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/PhaseEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/PhaseEntry.cs
@@ -1,4 +1,4 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
@@ -7,6 +7,6 @@ public sealed class PhaseEntry
     {
         [Index(true)]
         public uint ID;
-        public short Flags;
+        public int Flags;
     }
 }
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/PhaseXPhaseGroupEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/PhaseXPhaseGroupEntry.cs
index d3a86eecea..2b42add888 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/PhaseXPhaseGroupEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/PhaseXPhaseGroupEntry.cs
@@ -1,14 +1,14 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
     [DBFile("PhaseXPhaseGroup")]
-
     public sealed class PhaseXPhaseGroupEntry
     {
         [Index(true)]
         public uint ID;
         public ushort PhaseID;
-        public ushort PhaseGroupID;
+        [NonInlineRelation(typeof(uint))]
+        public int PhaseGroupID;
     }
 }
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/QuestLineXQuestEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/QuestLineXQuestEntry.cs
index 7ebdedc19a..69fe4a1981 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/QuestLineXQuestEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/QuestLineXQuestEntry.cs
@@ -1,4 +1,4 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
@@ -6,7 +6,7 @@ namespace WowPacketParser.DBC.Structures.TheWarWithin
     public sealed class QuestLineXQuestEntry
     {
         [Index(true)]
-        public int ID;
+        public uint ID;
         public uint QuestLineID;
         public uint QuestID;
         public uint OrderIndex;
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/SpellEffectEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/SpellEffectEntry.cs
index cc63e0418e..335b237b92 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/SpellEffectEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/SpellEffectEntry.cs
@@ -1,9 +1,8 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
     [DBFile("SpellEffect")]
-
     public sealed class SpellEffectEntry
     {
         [Index(true)]
@@ -30,7 +29,7 @@ public sealed class SpellEffectEntry
         public float Variance;
         public float ResourceCoefficient;
         public float GroupSizeBasePointsCoefficient;
-        public float EffectBasePoints;
+        public float EffectBasePointsF;
         public int ScalingClass;
         [Cardinality(2)]
         public int[] EffectMiscValue = new int[2];
@@ -40,6 +39,7 @@ public sealed class SpellEffectEntry
         public int[] EffectSpellClassMask = new int[4];
         [Cardinality(2)]
         public short[] ImplicitTarget = new short[2];
+        [NonInlineRelation(typeof(uint))]
         public int SpellID;
     }
 }
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/SpellEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/SpellEntry.cs
index dfd0e8841f..887a2e5679 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/SpellEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/SpellEntry.cs
@@ -1,9 +1,8 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {
     [DBFile("Spell")]
-
     public sealed class SpellEntry
     {
         [Index(true)]
diff --git a/WowPacketParser/DBC/Structures/TheWarWithin/SpellNameEntry.cs b/WowPacketParser/DBC/Structures/TheWarWithin/SpellNameEntry.cs
index 5fe972abc5..84c7d453e0 100644
--- a/WowPacketParser/DBC/Structures/TheWarWithin/SpellNameEntry.cs
+++ b/WowPacketParser/DBC/Structures/TheWarWithin/SpellNameEntry.cs
@@ -1,4 +1,4 @@
-using DBFileReaderLib.Attributes;
+using DBFileReaderLib.Attributes;
 
 namespace WowPacketParser.DBC.Structures.TheWarWithin
 {