diff --git a/dat-schema/3_05_Betrayal.gql b/dat-schema/3_05_Betrayal.gql
index 79da290..1ed5038 100644
--- a/dat-schema/3_05_Betrayal.gql
+++ b/dat-schema/3_05_Betrayal.gql
@@ -142,22 +142,6 @@ type SafehouseBYOCrafting @tags(list: ["crafting"]) {
   ServerCommand2: string
 }
 
-type SafehouseCraftingSpreeType {
-  Id: string
-  Currencies: [SafehouseCraftingSpreeCurrencies]
-  CurrencyCount: [i32]
-  _: [rid]
-  Disabled: bool
-  ItemClassText: string
-  _: i32
-}
-
-type SafehouseCraftingSpreeCurrencies {
-  Id: string @unique
-  BaseItemTypesKey: BaseItemTypes
-  HasSpecificBaseItem: bool
-}
-
 type Scarabs {
   Type: ScarabTypes
   Items: [BaseItemTypes]
diff --git a/dat-schema/3_17_Siege_of_the_Atlas.gql b/dat-schema/3_17_Siege_of_the_Atlas.gql
index f0ed10f..454ef9d 100644
--- a/dat-schema/3_17_Siege_of_the_Atlas.gql
+++ b/dat-schema/3_17_Siege_of_the_Atlas.gql
@@ -61,16 +61,6 @@ type PrimordialBossLifeScalingPerLevel {
   Scale: i32
 }
 
-type AtlasUpgradesInventoryLayout {
-  Id: string
-  _: i32
-  Voidstone: BaseItemTypes
-  _: i32
-  Objective: string
-  GrantAtlasUpgrade: QuestFlags
-  _: rid
-}
-
 type AtlasPassiveSkillTreeGroupType {
   Id: string @unique
 }
diff --git a/dat-schema/3_18_Sentinel.gql b/dat-schema/3_18_Sentinel.gql
index 6b3833f..f09095f 100644
--- a/dat-schema/3_18_Sentinel.gql
+++ b/dat-schema/3_18_Sentinel.gql
@@ -21,11 +21,6 @@ type DroneTypes {
   NotPoweredText: string
 }
 
-type SentinelCraftingCurrency {
-  Currency: BaseItemTypes
-  Type: i32
-}
-
 type SentinelDroneInventoryLayout {
   DroneType: DroneTypes
   _: i32
diff --git a/dat-schema/3_27_Keepers_of_the_Flame.gql b/dat-schema/3_27_Keepers_of_the_Flame.gql
index 00bd74a..7f0419f 100644
--- a/dat-schema/3_27_Keepers_of_the_Flame.gql
+++ b/dat-schema/3_27_Keepers_of_the_Flame.gql
@@ -3,14 +3,6 @@ type BreachBossLifeScalingPerLevel {
   LifeMultiplier: i32
 }
 
-type BreachElement {
-  Element: string
-  _: rid
-  BaseBreachstone: BaseItemTypes
-  BossMapMod: Stats
-  DuplicateBoss: Stats
-}
-
 type BrequelFruitRewardTypes {
   Id: string @unique
   Name: string
diff --git a/dat-schema/_Core.gql b/dat-schema/_Core.gql
index fb30ff1..5f0c254 100644
--- a/dat-schema/_Core.gql
+++ b/dat-schema/_Core.gql
@@ -1202,15 +1202,6 @@ type CraftingBenchTypes {
   _: bool
 }
 
-type CraftingBenchUnlockCategories {
-  Id: string @unique
-  _: i32
-  _: [i32]
-  UnlockType: string
-  CraftingItemClassCategories: [CraftingItemClassCategories]
-  ObtainingDescription: string
-}
-
 type CraftingItemClassCategories {
   Id: string @unique
   ItemClasses: [ItemClasses]
@@ -1424,13 +1415,6 @@ type DropEffects {
   AOFile: string @file(ext: ".ao")
 }
 
-type DropPool {
-  Group: string @unique
-  Weight: i32
-  _: [i32]
-  WeightHardmode: i32
-}
-
 type EclipseMods {
   Key: string @unique
   SpawnWeight_TagsKeys: [Tags]
@@ -2802,19 +2786,6 @@ type MapSeriesTiers {
   MirageTier: i32
 }
 
-type MapStashSpecialTypeEntries {
-  Id: string
-  _: i32
-  MapItem: BaseItemTypes
-  Name: string @localized
-  _: i32
-  IsShaperGuardian: bool
-  IsElderGuardian: bool
-  _: rid
-  _: rid
-  _: rid
-}
-
 type MapStashUniqueMapInfo {
   UniqueMap: UniqueMaps
   BaseItem: BaseItemTypes
@@ -5147,33 +5118,6 @@ type Topologies {
   _: i32
 }
 
-type TradeMarketCategory {
-  Id: string
-  Name: string @localized
-  StyleFlag: TradeMarketCategoryStyleFlag
-  Group: TradeMarketCategoryGroups
-  _: [i32]
-  _: bool
-  IsDisabled: bool
-}
-
-type TradeMarketCategoryGroups {
-  Id: string
-  Name: string @localized
-}
-
-type TradeMarketCategoryListAllClass {
-  TradeCategory: TradeMarketCategory
-  ItemClass: ItemClasses
-}
-
-type TradeMarketIndexItemAs {
-  Item: rid
-  IndexAs: rid
-}
-
-enum TradeMarketCategoryStyleFlag @indexing(first: 0) { _ }
-
 type TriggerBeam {
   _: i32
   _: [MiscBeams]
@@ -5640,15 +5584,6 @@ type BreachArtVariations {
   _: rid
 }
 
-# Added 3.21
-type Breachstones {
-  BaseType: BaseItemTypes @unique
-  MapTierEquivalent: i32
-  _: i32 @unique
-  UpgradesTo: BaseItemTypes
-  UpgradeCurrency: BaseItemTypes
-}
-
 type BossKillEvent {
   _: string
   QuestFlag: QuestFlags
@@ -5772,12 +5707,6 @@ type EntityInfobarStyle {
   LifeBarRight: string
 }
 
-# Added 3.17
-type FlaskStashBaseTypeOrdering {
-  Flask: Flasks @unique
-  Order: i32 @unique
-}
-
 # Added 3.20
 type GameObjectTasksFromStats {
   _: rid @unique
@@ -5827,20 +5756,6 @@ enum GemStyles @indexing(first: 1) {
   DEFAULT
 }
 
-# Added 3.20
-type GoldActScaling {
-  Act: string @unique
-  _: i32
-  _: i32
-  _: i32
-}
-
-# Added 3.20
-type GoldConstants {
-  Id: string @unique
-  _: i32
-}
-
 # Added 3.20
 type HardModeExtraContentChances {
   Id: string @unique
@@ -6000,15 +5915,6 @@ type LegacyAtlasInfluenceOutcomes {
   _: [_]
 }
 
-# Added 3.22
-type MapStashSubstashGroup {
-  Id: string @unique
-  Label: string
-  Icon: string
-  _: rid
-  Description: string
-}
-
 type MemoryLineModifiers {
   MemoryLineType: MemoryLineType
   _: i32
@@ -6409,12 +6315,6 @@ type TormentedSpiritLifeScalingPerLevel {
   Life: i32
 }
 
-# Added 3.19
-type TradeMarketImplicitModDisplay {
-  _: rid @unique
-  _: string
-}
-
 # Added 3.21
 type TryTheNewLeagueVersions {
   League: string
diff --git a/dat-schema/poe2/AtlasUpgradesInventoryLayout.gql b/dat-schema/poe2/AtlasUpgradesInventoryLayout.gql
new file mode 100644
index 0000000..de76f36
--- /dev/null
+++ b/dat-schema/poe2/AtlasUpgradesInventoryLayout.gql
@@ -0,0 +1,10 @@
+type AtlasUpgradesInventoryLayout {
+  Id: string
+  _: i32
+  Voidstone: BaseItemTypes
+  _: i32
+  Objective: string
+  GrantAtlasUpgrade: QuestFlags
+  _: rid
+}
+
diff --git a/dat-schema/poe2/BreachElement.gql b/dat-schema/poe2/BreachElement.gql
new file mode 100644
index 0000000..ed15566
--- /dev/null
+++ b/dat-schema/poe2/BreachElement.gql
@@ -0,0 +1,8 @@
+type BreachElement {
+  Element: string
+  _: rid
+  BaseBreachstone: BaseItemTypes
+  BossMapMod: Stats
+  DuplicateBoss: Stats
+}
+
diff --git a/dat-schema/poe2/Breachstones.gql b/dat-schema/poe2/Breachstones.gql
new file mode 100644
index 0000000..51c1ca9
--- /dev/null
+++ b/dat-schema/poe2/Breachstones.gql
@@ -0,0 +1,7 @@
+type Breachstones {
+  BaseType: BaseItemTypes @unique
+  MapTierEquivalent: i32
+  _: i32 @unique
+  UpgradesTo: BaseItemTypes
+  UpgradeCurrency: BaseItemTypes
+}
diff --git a/dat-schema/poe2/CraftingBenchUnlockCategories.gql b/dat-schema/poe2/CraftingBenchUnlockCategories.gql
new file mode 100644
index 0000000..bfcecd4
--- /dev/null
+++ b/dat-schema/poe2/CraftingBenchUnlockCategories.gql
@@ -0,0 +1,8 @@
+type CraftingBenchUnlockCategories {
+  Id: string @unique
+  _: i32
+  _: [i32]
+  UnlockType: string
+  CraftingItemClassCategories: [CraftingItemClassCategories]
+  ObtainingDescription: string
+}
diff --git a/dat-schema/poe2/FlaskStashBaseTypeOrdering.gql b/dat-schema/poe2/FlaskStashBaseTypeOrdering.gql
new file mode 100644
index 0000000..65e43e8
--- /dev/null
+++ b/dat-schema/poe2/FlaskStashBaseTypeOrdering.gql
@@ -0,0 +1,4 @@
+type FlaskStashBaseTypeOrdering {
+  Flask: Flasks @unique
+  Order: i32 @unique
+}