diff --git a/dat-schema/3_04_Delve.gql b/dat-schema/3_04_Delve.gql
index bbf8901..e0c1fb3 100644
--- a/dat-schema/3_04_Delve.gql
+++ b/dat-schema/3_04_Delve.gql
@@ -51,6 +51,7 @@ type DelveCraftingModifiers @tags(list: ["crafting"]) {
   _: [i32]
   _: [i32]
   _: bool
+  _: bool
 }
 
 type DelveCraftingModifierDescriptions {
diff --git a/dat-schema/3_26_Mercenaries.gql b/dat-schema/3_26_Mercenaries.gql
index 6b6727b..8fdeb5b 100644
--- a/dat-schema/3_26_Mercenaries.gql
+++ b/dat-schema/3_26_Mercenaries.gql
@@ -1,17 +1,3 @@
-type MercenaryClasses {
-  Id: string
-  MonsterVariety: MonsterVarieties
-  _: i32
-  TerrainFeature: ExtraTerrainFeatures
-  _: i32
-  _: i32
-  ClassIcon: string
-  HouseIcon: string
-  Attribute: MercenaryAttributes
-  HouseBuffIcon: string
-  MonsterVarietyAllied: MonsterVarieties
-}
-
 type MercenaryAttributes {
   Id: string
   Name: string
@@ -40,6 +26,21 @@ type MercenaryBuilds {
   _: [string]
   Achievements: [AchievementItems]
   WieldableTypes: [MercenaryWieldableTypes]
+  BuildStats: [MercenaryBuildExtraStats]
+}
+
+type MercenaryBuildExtraStats {
+  Id: string
+  Stat: Stats
+  _: i32
+  _: i32
+  _: i32
+  Category: MercenaryBuildStatsCategories
+}
+
+type MercenaryBuildStatsCategories {
+  Id: string
+  Name: string
 }
 
 type MercenaryBuildVisualOverrides {
@@ -48,6 +49,23 @@ type MercenaryBuildVisualOverrides {
   MtxGameSpecific: MtxTypeGameSpecific
 }
 
+type MercenaryClasses {
+  Id: string
+  MonsterVariety: MonsterVarieties
+  _: i32
+  TerrainFeature: ExtraTerrainFeatures
+  _: i32
+  _: i32
+  ClassIcon: string
+  HouseIcon: string
+  Attribute: MercenaryAttributes
+  HouseBuffIcon: string
+  MonsterVarietyAllied: MonsterVarieties
+  HouseSpawnChanceStats: [Stats]
+  AttributeSpawnChanceStats: [Stats]
+  HouseName: string
+}
+
 type MercenaryFlavourText {
   Id: string
   Description: string
diff --git a/dat-schema/3_27_Keepers_of_the_Flame.gql b/dat-schema/3_27_Keepers_of_the_Flame.gql
index 7fd31e4..a703344 100644
--- a/dat-schema/3_27_Keepers_of_the_Flame.gql
+++ b/dat-schema/3_27_Keepers_of_the_Flame.gql
@@ -51,6 +51,7 @@ type BrequelFruitTypes {
   _: i32
   _: rid
   _: rid
+  _: i32
 }
 
 type BrequelGrafts {
diff --git a/dat-schema/3_29_Curse_of_the_Allflame.gql b/dat-schema/3_29_Curse_of_the_Allflame.gql
index ea804ad..fbfe910 100644
--- a/dat-schema/3_29_Curse_of_the_Allflame.gql
+++ b/dat-schema/3_29_Curse_of_the_Allflame.gql
@@ -5,16 +5,16 @@ type DeepwaterBalancePerLevel {
 
 type DeepwaterBiomes {
   Id: string
-  _: rid
+  WorldArea: WorldAreas
 }
 
 type DeepwaterCharts {
-  _: rid
-  _: rid
+  BaseItemType: BaseItemTypes
+  Biome: DeepwaterBiomes
 }
 
 type DeepwaterConnectionStrings {
-  _: i32
+  Id: i32
   _: [ClientStrings]
 }
 
@@ -24,34 +24,45 @@ type DeepwaterConstants {
 }
 
 type DeepwaterCraftingClasses {
-  _: rid
+  ItemClass: ItemClasses
   _: i32
   _: bool
 }
 
 type DeepwaterCraftingCurrencies {
-  _: rid
+  Currency: CurrencyItems
+  _: i32
   _: i32
   _: i32
+  Cost: i32
   _: i32
+  _: [_]
+  _: [_]
+  NPCAudio: NPCTextAudio
   _: i32
+  _: string
+  _: bool
+  _: i32
+  _: i32
+  _: i32
+  _: bool
 }
 
 type DeepwaterCraftingDialogueByClass {
-  _: rid
-  _: [rid]
-  _: [i32]
+  ItemClass: ItemClasses
+  NPCDialogue: [NPCTextAudio]
+  DialogueWeighting: [i32]
   _: i32
 }
 
 type DeepwaterLifeScalingPerLevel {
-  _: i32
-  _: i32
+  Level: i32
+  Life: i32
 }
 
 type DeepwaterLockerLayout {
   Id: string
-  _: rid
+  BaseItemType: BaseItemTypes
   _: bool
   _: string
   _: i32
@@ -69,34 +80,34 @@ type DeepwaterLockerLayout {
 type DeepwaterLootBottles {
   Id: string
   _: i32
-  _: rid
-  _: rid
+  _: rid # All rows empty
+  Description: ClientStrings2
   _: bool
 }
 
 type DeepwaterLootBottleUniqueMessages {
-  _: rid
-  _: rid
+  Unique: Words
+  Message: ClientStrings2
 }
 
 type DeepwaterRooms {
   Id: string
-  _: string
+  ArmFiles: string @file(ext: ".arm")
   _: i32
-  _: string
+  Name: string
   _: i32
   _: i32
   _: i32
-  _: rid
+  Biome: DeepwaterBiomes
   _: i32
-  _: rid
+  _: rid # All rows empty
   _: i32
   _: i32
-  _: [rid]
-  _: [i32]
+  Stats: [Stats]
+  StatValues: [i32]
   _: DeepwaterRooms
   _: bool
-  _: [rid]
+  AchievementItems: [AchievementItems]
   _: bool
 }
 
diff --git a/dat-schema/_Core.gql b/dat-schema/_Core.gql
index 87501f6..573d456 100644
--- a/dat-schema/_Core.gql
+++ b/dat-schema/_Core.gql
@@ -284,6 +284,14 @@ type AlternateTreeVersions {
   _: i32
 }
 
+type AnimatedGuardianInventories {
+  Inventory: Inventories
+  _: i32
+  _: [i32]
+  _: [i32]
+  _: i32
+}
+
 type AnimatedObjectFlags {
   AOFile: string @file(ext: ".ao")
   _: i32
@@ -531,6 +539,7 @@ type AtlasNode {
   _: i32
   _: i32
   _: bool
+  _: i32
 }
 
 type AtlasNodeDefinition {
@@ -551,6 +560,7 @@ type AtlasNodeDefinition {
   Area2: WorldAreas
   _: bool
   Header: MapNodeHeader
+  _: i32
 }
 
 type AtlasPositions {
@@ -698,6 +708,16 @@ type BloodTypes {
   EffectFirstBloodCrit: MicrotransactionPortalVariations
 }
 
+type BreachStashTabSubStashGroup {
+  Id: string
+  Name: string
+  Group: BreachStashTabSubStashGroup
+  Icon: string
+  _: string
+  _: bool
+  _: f32
+}
+
 enum BuffCategories @indexing(first: 0) { _ }
 
 type BuffDefinitions {
@@ -1510,6 +1530,22 @@ type DynamicCraftingBenchTypes {
   SoundEffect: SoundEffects
   _: [rid]
   _: i32
+  _: rid
+  _: rid
+  _: rid
+  _: rid
+  _: bool
+  _: rid
+  _: rid
+  _: rid
+  _: rid
+  _: rid
+  _: rid
+  _: rid
+  _: string
+  _: bool
+  OpenSound: SoundEffects
+  CloseSound: SoundEffects
 }
 
 type EclipseMods {
@@ -2152,6 +2188,67 @@ type GrantedEffectStatSetsPerLevel {
   FloatStatsValues: [f32]
 }
 
+type GraphicalItemExchange {
+  Id: string
+  BackgroundArt: string
+  Red: i32
+  Green: i32
+  Blue: i32
+  _: i32
+  _: i32
+  _: i32
+  ButtonLabel: ClientStrings2
+  _: rid # All rows empty
+  _: i32
+  _: bool
+}
+
+type GraphicalItemExchangeSlot {
+  Item: GraphicalItemExchange
+  _: i32
+  Inventory: Inventories
+  _: i32
+  _: i32
+  _: i32
+  _: i32
+  _: i32
+  _: i32
+  _: i32
+  _: bool
+  _: bool
+  ItemCondition: [ItemConditions]
+  GlowArt: string
+  _: i32
+  _: string
+  _: bool
+  _: bool
+}
+
+type GraphicalItemReceptacle {
+  Id: string @unique
+  BackgroundArt: string
+  HoverMessage: ClientStrings
+  _: bool
+  _: bool
+  SoundEffect: SoundEffects
+  _: string
+  ErrorMessage: ClientStrings
+  Script: string
+  _: bool
+  AreaName: ClientStrings2
+  Icon: string
+  Description: ClientStrings
+  _: f32
+  _: f32
+  _: i32
+  _: i32
+  _: i32
+  _: i32
+  _: bool
+  SoundEffect1: SoundEffects
+  SoundEffect2: SoundEffects
+}
+
 type GroundEffects {
   GroundEffectTypesKey: GroundEffectTypes
   _: i32
@@ -2339,6 +2436,7 @@ type Inventories {
   _: i32
   _: bool
   _: i32
+  _: rid # All rows empty
 }
 
 enum InventoryType @indexing(first: 0) { _ }
@@ -2402,6 +2500,9 @@ type ItemConditions {
   _: bool
   MinLevel: i32
   MaxLevel: i32
+  _: [_]
+  UniqueName: Words
+  _: rid # All rows empty
 }
 
 type ItemCosts {
@@ -2696,6 +2797,8 @@ type LeagueInfo {
   _: string @localized
   _: [i32]
   _: string
+  _: bool
+  _: f32
 }
 
 type LeagueInfoPanelVersions {
@@ -2791,6 +2894,7 @@ type MapDeviceRecipes @tags(list: ["item:recipe"]) {
   _: bool
   _: [i32]
   AtlasNode: AtlasNode
+  _: bool
 }
 
 type MapDeviceLayouts {
@@ -2807,6 +2911,7 @@ type MapDeviceLayouts {
   _: i32
   _: i32
   _: [i32]
+  _: i32
 }
 
 type MapDevices {
@@ -2823,6 +2928,7 @@ type MapDevices {
   _: i32
   _: i32
   _: [i32]
+  HideoutDoodan: HideoutDoodads
 }
 
 enum MapFragmentFamilies @indexing(first: 0) { _ }
@@ -2980,6 +3086,7 @@ type MapSeriesTiers {
   SecretsTier: i32
   KeepersTier: i32
   MirageTier: i32
+  AbyssalTier: i32
 }
 
 type MapStashSpecialSubStashGroup {
@@ -3092,6 +3199,7 @@ type MicrotransactionCategory {
 
 type MicrotransactionCharacterPortraitVariations {
   MtxTypeGameSpecific: MtxTypeGameSpecific
+  _: i32
 }
 
 type MicrotransactionCombineFormula {
@@ -3199,6 +3307,7 @@ type MinimapIcons {
   MinimapIconPointerMaxDistance: i32
   _: i32
   _: i32
+  _: i32
 }
 
 type MiniQuestStates {
@@ -3270,9 +3379,9 @@ type MiscObjects {
   Id: string @unique
   EffectVirtualPath: string @files(ext: [".ot", ".otc"])
   PreloadGroupsKeys: [PreloadGroups]
+  EffectHASH32: u32
   _: i32
-  _: i32
-  _: i32
+  ObjectHASH32: u32
 }
 
 type MiscObjectsArtVariations {
@@ -3351,12 +3460,13 @@ enum ModDomains @indexing(first: 1) {
 type ModEffectStats {
   StatsKey: Stats
   TagsKeys: [Tags]
-  _: bool
-  _: i32
-  _: bool
-  _: bool
-  _: bool
+  ApplyToExplicit: bool
   _: i32
+  ApplyToImplicit: bool
+  ApplyToPrefix: bool
+  ApplyToSuffix: bool
+  Multiplier: i32
+  ApplyToEnchant: bool
 }
 
 type ModEquivalencies {
@@ -3365,6 +3475,9 @@ type ModEquivalencies {
   ModsKey1: Mods
   ModsKey2: Mods
   _: bool
+  AbyssalMods1: Mods
+  AbyssalMods2: Mods
+  AbyssalMods3: Mods
 }
 
 type ModFamily {
@@ -3498,6 +3611,12 @@ type ModSellPriceTypes {
 
 enum ModSetNames @indexing(first: 0) { _ }
 
+type ModSlotType {
+  Id: string
+  _: string
+  ClientString: ClientStrings
+}
+
 type ModType {
   Name: string @unique
   _: [Stats]
@@ -3594,7 +3713,6 @@ type MonsterDeathConditions {
   _: bool
   Mods: [Mods]
   _: i32
-  _: bool
   Animation: [Animation]
   _: i32
   ActiveSkill1: ActiveSkills
@@ -4134,6 +4252,7 @@ type NPCVendorDialogue {
   DialogueCondition: [NPCVendorDialogueConditions]
   _: i32
   _: i32
+  Script: string
 }
 
 type NPCVendorDialogueConditions {
@@ -4258,6 +4377,7 @@ type NPCTalk {
   _: i32
   _: NPCTalk
   Inventory: Inventories
+  _: string
 }
 
 type NPCTalkCategory {
@@ -4288,6 +4408,7 @@ type NPCTextAudio {
   _: bool
   _: f32
   Cooldown: [MiscCooldowns]
+  _: i32
 }
 
 enum NPCTextAudioInterruptRules @indexing(first: 0) { _ }
@@ -4338,6 +4459,10 @@ type PackSizes {
   _: i32
 }
 
+type Pacts {
+  Id: string
+}
+
 type PassiveJewelRadii {
   ID: string
   RingOuterRadius: i32
@@ -4391,6 +4516,7 @@ type PassiveSkillOverrides {
   RequiresAdjacent: i32
   MaxAdjacent: i32
   AllocatedPassiveSkill: PassiveSkills
+  TattooBlockingPassive: [PassiveSkills]
 }
 
 type PassiveSkillOverrideTypes {
@@ -4517,6 +4643,25 @@ type PassiveSkillTrees {
   PassiveSkillGraph: string
 }
 
+type PassiveSkillTreeConnectionArt {
+  Id: string @unique
+  Normal: string
+  Intermediate2: string
+  Intermediate: string
+  Active: string
+  Mask: string
+  Ornament1: string
+  Ornament2: string
+}
+
+type PassiveSkillTreeConnectionArtDescriptions {
+  ConnectionArt: PassiveSkillTreeConnectionArt
+  _: f32
+  _: f32
+  _: i32
+  _: i32
+}
+
 type PassiveSkillTreeTutorial {
   Id: string
   CharactersKey: Characters
@@ -4614,11 +4759,10 @@ type Pet {
   HideoutCategory: HideoutDoodadCategory
   Skills: [GrantedEffectsPerLevel]
   _: i32
-  _: bool
-  _: rid # All rows empty
+  _: rid
   _: bool
   _: bool
-  _: string
+  MiscObject: MiscObjects
   DropEffect: DropEffects
 }
 
@@ -4932,6 +5076,7 @@ type RogueExileGiants {
 type Rulesets {
   Id: string @unique
   _: [Rulesets]
+  _: [_] # All rows empty
 }
 
 type RunicCircles {
@@ -5109,6 +5254,11 @@ type SkillTrapVariations {
   MiscAnimated: MiscAnimated
 }
 
+type SocketedItemArtOverrides {
+  BaseItemType: BaseItemTypes
+  Override: string
+}
+
 type SocketNotches {
   Id: string
   Description: string
@@ -5239,14 +5389,6 @@ type StashType {
   Icon: string
 }
 
-type StaticLifeBarStyle {
-  Id: string @unique
-  FrameLeftArt: string
-  FrameMiddleArt: string
-  FrameRightArt: string
-  BossOrnamentArt: string
-}
-
 type StatDescriptionFunctions {
   Id: string
   TranslationId: string @unique
@@ -5264,6 +5406,14 @@ enum StatInterpolationTypes @indexing(first: 1) {
   EXPONENTIAL
 }
 
+type StaticLifeBarStyle {
+  Id: string @unique
+  FrameLeftArt: string
+  FrameMiddleArt: string
+  FrameRightArt: string
+  BossOrnamentArt: string
+}
+
 type Stats @tags(list: ["crafting"]) {
   Id: string @unique
   _: bool
@@ -5502,6 +5652,12 @@ type Tips {
   Id: string @unique
   Text: string
   TextXBox: string
+  MinLevel: i32
+  MaxLevel: i32
+  _: i32
+  _: i32
+  _: [_] # All rows empty
+  _: i32
 }
 
 type Topologies {
@@ -5608,6 +5764,20 @@ type UIArtAscendancy {
   _: i32
 }
 
+type UILocation {
+  Id: string
+  _: i32
+  _: i32
+  _: i32
+  _: i32
+}
+
+type UISize {
+  Id: string
+  Width: i32
+  Height: i32
+}
+
 enum UITalkCategories @indexing(first: 0) { _ }
 
 type UITalkText {
@@ -5896,6 +6066,8 @@ type WorldAreaLeagueChances {
   _: i32
   _: i32
   _: i32
+  _: i32
+  _: i32
 }
 
 type WorldObjectDisplayedApplicableItems {
@@ -5962,6 +6134,7 @@ type AlternateTreeArt {
   Circle1: string
   Circle2: string
   Glow: string
+  ConnectionArt: PassiveSkillTreeConnectionArt
 }
 
 # Added 3.21
@@ -6196,6 +6369,8 @@ type DisplayCaseTypes {
   TopRightCorner: string
   BottomLeftCorner: string
   BottomRightCorner: string
+  _: f32
+  _: bool
 }
 
 # Added 3.22
@@ -6584,6 +6759,8 @@ type MicrotransactionAfkEffects {
   _: i32
   FlyingStat: [Stats]
   _: bool
+  EffectPack: MiscEffectPacks
+  _: bool
 }
 
 # Added 3.19
@@ -6699,6 +6876,7 @@ type MicrotransactionObjectEffects {
   _: f32
   _: bool
   _: i32
+  _: i32
 }
 
 # Added 3.21
@@ -6927,6 +7105,8 @@ type StatisticTrackingMicrotransactionsStatistics {
   _: bool
   Text: ClientStrings
   Type: StatisticTrackingMicrotransactionCounterType
+  _: bool
+  _: bool
 }
 
 # Added 3.20
diff --git a/dat-schema/poe2/_Core.gql b/dat-schema/poe2/_Core.gql
index 2d9873d..45787c9 100644
--- a/dat-schema/poe2/_Core.gql
+++ b/dat-schema/poe2/_Core.gql
@@ -256,6 +256,7 @@ type AfflictionQuestFogBankValues {
 type AfflictionSpecialEventVisuals {
   Id: string
   Icon: string @file(ext: ".dds")
+  Icon2: string @file(ext: ".dds")
   IconBright: string @file(ext: ".dds")
 }
 
@@ -906,6 +907,7 @@ type BrequelPassiveSubTrees {
   Wombgift: BaseItemTypes
   RewardStringSingle: ClientStrings2
   RewardStringMultiple: ClientStrings2
+  MaxPoints: i32
 }
 
 # Added 0.5
@@ -2466,7 +2468,7 @@ type ExpeditionBalancePerLevel {
   _: i32
   _: i32
   _: i32
-  _: i32
+  _: f32
   _: i32
   _: i32
 }
@@ -4385,7 +4387,7 @@ type MinionType {
   _: bool
   _: rid
   _: bool
-  _: bool
+  Invulnerable: bool
 }
 
 type MiniQuestStates {
@@ -4495,10 +4497,10 @@ type MobileTutorialGroup {
 type ModEffectStats {
   Stat: Stats
   Tags: [Tags]
-  _: bool
+  ApplyToExplicit: bool
   _: i32
-  _: bool
-  MaxStacks: i32
+  ApplyToImplicit: bool
+  Multiplier: i32
 }
 
 type ModGrantedSkills {
@@ -6554,6 +6556,7 @@ type SoulCores {
   _: bool
   ExtraDescription: ClientStrings2
   _: bool
+  CanSocketInCorruptedSanctified: bool
 }
 
 # Added 0.3
@@ -6595,7 +6598,7 @@ type StandaloneBosses {
   Monster: MonsterVarieties
   _: i32
   _: bool
-  InvisibleMonster: [MonsterVarieties]
+  _: [rid]
   _: [i32]
 }
 
@@ -6670,7 +6673,7 @@ type StatisticTrackingMicrotransactionCounterType {
 
 # Added 0.3
 type StatisticTrackingMicrotransactionOnEnteringArea {
-  _: rid @unique
+  Area: WorldAreas @unique
   _: i32
 }
 
@@ -6686,7 +6689,7 @@ type StatisticTrackingMicrotransactions {
 
 # Added 0.3
 type StatisticTrackingMicrotransactionsOnKill {
-  _: rid @unique
+  Monster: MonsterVarieties @unique
   _: i32
 }
 
@@ -6805,6 +6808,50 @@ type TableCharge {
   _: i32
 }
 
+type TableMonsterSpawners {
+  Metadata: string
+  AreaLevel: i32
+  SpawnsMonsters: [MonsterVarieties]
+  _: i32
+  _: i32
+  _: i32
+  _: i32
+  _: i32
+  _: i32
+  _: i32
+  _: i32
+  _: bool
+  _: bool
+  _: bool
+  _: bool
+  _: bool
+  _: bool
+  _: i32
+  _: i32
+  _: i32
+  _: i32
+  _: rid
+  _: bool
+  _: bool
+  Script1: string
+  _: bool
+  _: bool
+  Script2: string
+  _: [i32]
+  _: i32
+  _: i32
+  _: i32
+  _: i32
+  _: i32
+  _: i32
+  _: i32
+  _: i32
+  _: i32
+  _: i32
+  _: bool
+  _: [_]
+}
+
 type TacticianTotemBuffs {
   ActiveSkill: ActiveSkills
   BuffTemplate: BuffTemplates
@@ -7112,7 +7159,7 @@ type UniqueChests {
   _: [i32]
   AOFile: string @file(ext: ".ao")
   _: bool
-  _: [i32]
+  DaemonMods: [Mods]
   AppearanceChestsKey: Chests
   ChestsKey: Chests
   Achievement: [AchievementItems]