diff --git a/dat-schema/poe2/_Core.gql b/dat-schema/poe2/_Core.gql
index 6e8e33b..341b75f 100644
--- a/dat-schema/poe2/_Core.gql
+++ b/dat-schema/poe2/_Core.gql
@@ -267,13 +267,13 @@ type AfflictionEmotionCraftingAudio {
 
 # Added 0.5
 type AfflictionQuestFogBankValues {
-  _: rid
-  _: [rid]
+  _: NPCs
+  _: [NPCs]
   _: [i32]
   _: [i32]
-  _: rid
+  _: NPCs
   _: i32
-  _: [rid]
+  _: [NPCs]
 }
 
 # Added 0.5
@@ -1337,7 +1337,7 @@ type CharacterStartStates {
   _: [rid]
   _: [_] # All rows empty
   _: [_] # All rows empty
-  _: [rid]
+  SupportGems: [SupportGems]
   _: [rid]
   _: bool
 }
@@ -5275,7 +5275,7 @@ type NPCTalk {
   ConsoleQuickAction: NPCTalkConsoleQuickActions
   Music1: Music
   _: i32
-  _: [rid]
+  Characters: [Characters]
   _: i32
   Music2: Music
   _: i32
@@ -5632,7 +5632,7 @@ type PassiveSkills {
   Stat7Value: i32
   _: i32
   _: i32
-  _: rid
+  VariantType: PassiveSkillVariantTypes
   _: i32
   QuestFlag: QuestFlags
   Requirement: ClientStrings
@@ -7431,6 +7431,69 @@ type WieldableClasses {
   _: i32
 }
 
+enum Wordlists @indexing(first: 1) {
+  ITEM_PREFIX
+  ITEM_SUFFIX
+  MONSTER_PREFIX
+  MONSTER_SUFFIX
+  MONSTER_TITLE
+  UNIQUE_ITEM
+  STRONGBOX_PREFIX
+  STRONGBOX_SUFFIX
+  ESSENCE
+  TEST
+  VILLAGER_PREFIX
+  VILLAGER_SUFFIX
+  MERCENARY_PREFIX
+  MERCENARY_SUFFIX
+  INCURSION_UNIQUE_FORGEMASTER_PREFIX
+  INCURSION_UNIQUE_FORGEMASTER_SUFFIX
+  INCURSION_RARE_FORGEHAND_PREFIX
+  INCURSION_RARE_FORGEHAND_SUFFIX
+  INCURSION_RARE_SPY_MASTER_PREFIX
+  INCURSION_RARE_SPY_MASTER_SUFFIX
+  INCURSION_UNIQUE_SPY_MASTER_PREFIX
+  INCURSION_UNIQUE_SPY_MASTER_SUFFIX
+  INCURSION_RARE_DRILL_SERGEANT_PREFIX
+  INCURSION_RARE_DRILL_SERGEANT_SUFFIX
+  INCURSION_RARE_FLESH_SURGEON_PREFIX
+  INCURSION_RARE_FLESH_SURGEON_SUFFIX
+  INCURSION_T3_RARE_FLESH_SURGEON_PREFIX
+  INCURSION_T3_RARE_FLESH_SURGEON_SUFFIX
+  INCURSION_UNIQUE_QUEEN_FLESH_SURGEON_PREFIX
+  INCURSION_UNIQUE_QUEEN_FLESH_SURGEON_SUFFIX
+  INCURSION_RARE_THAUMATURGE_PREFIX
+  INCURSION_RARE_THAUMATURGE_SUFFIX
+  INCURSION_UNIQUE_THAUMATURGE_PREFIX
+  INCURSION_UNIQUE_THAUMATURGE_SUFFIX
+  INCURSION_RARE_BLOOD_PRIEST_PREFIX
+  INCURSION_RARE_BLOOD_PRIEST_SUFFIX
+  INCURSION_UNIQUE_BLOOD_PRIEST_PREFIX
+  INCURSION_UNIQUE_BLOOD_PRIEST_SUFFIX
+  INCURSION_RARE_COMMANDER_PAST_PREFIX
+  INCURSION_RARE_COMMANDER_PAST_SUFFIX
+  INCURSION_UNIQUE_COMMANDER_PAST_PREFIX
+  INCURSION_UNIQUE_COMMANDER_PAST_SUFFIX
+  INCURSION_RARE_COMMANDER_PRESENT_PREFIX
+  INCURSION_RARE_COMMANDER_PRESENT_SUFFIX
+  INCURSION_UNIQUE_COMMANDER_PRESENT_PREFIX
+  INCURSION_UNIQUE_COMMANDER_PRESENT_SUFFIX
+  INCURSION_UNIQUE_STATUE_BOSS_PREFIX
+  INCURSION_UNIQUE_STATUE_BOSS_SUFFIX
+  INCURSION_UNIQUE_QUADRILLA_PREFIX
+  INCURSION_UNIQUE_QUADRILLA_SUFFIX
+  INCURSION_UNIQUE_FUSED_SKELETON_PREFIX
+  INCURSION_UNIQUE_FUSED_SKELETON_SUFFIX
+  INCURSION_UNIQUE_SENTINEL_PREFIX
+  INCURSION_UNIQUE_SENTINEL_SUFFIX
+  INCURSION_UNIQUE_COLOSSUS_PREFIX
+  INCURSION_UNIQUE_COLOSSUS_SUFFIX
+  INCURSION_UNIQUE_SUN_PRIEST_PREFIX
+  INCURSION_UNIQUE_SUN_PRIEST_SUFFIX
+  INCURSION_UNIQUE_CHAINED_BEAST_PREFIX
+  INCURSION_UNIQUE_CHAINED_BEAST_SUFFIX
+}
+
 type WorldAreas {
   Id: string
   Name: string