diff --git a/Brio/Capabilities/Actor/StatusEffectCapability.cs b/Brio/Capabilities/Actor/StatusEffectCapability.cs
index 0c18ed1b..b3cfbdbe 100644
--- a/Brio/Capabilities/Actor/StatusEffectCapability.cs
+++ b/Brio/Capabilities/Actor/StatusEffectCapability.cs
@@ -3,7 +3,7 @@
 using Brio.Resources;
 using Brio.UI.Widgets.Actor;
 using Dalamud.Game.ClientState.Objects.Types;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
diff --git a/Brio/Game/Actor/Appearance/ActorAppearance.cs b/Brio/Game/Actor/Appearance/ActorAppearance.cs
index 19b4098c..f1d9b9e9 100644
--- a/Brio/Game/Actor/Appearance/ActorAppearance.cs
+++ b/Brio/Game/Actor/Appearance/ActorAppearance.cs
@@ -1,6 +1,6 @@
 using Brio.Game.Actor.Extensions;
 using FFXIVClientStructs.FFXIV.Client.Game.Character;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using DalamudCharacter = Dalamud.Game.ClientState.Objects.Types.ICharacter;
 
 namespace Brio.Game.Actor.Appearance;
@@ -20,7 +20,7 @@ public unsafe static ActorAppearance FromCharacter(DalamudCharacter character)
         var native = character.Native();
         ActorAppearance actorAppearance = new()
         {
-            ModelCharaId = native->CharacterData.ModelCharaId
+            ModelCharaId = native->ModelCharaId
         };
 
         actorAppearance.Weapons.MainHand = native->DrawData.Weapon(DrawDataContainer.WeaponSlot.MainHand).ModelId;
@@ -77,18 +77,18 @@ public static ActorAppearance FromBNpc(BNpcBase npc)
     {
         ActorAppearance actorAppearance = new()
         {
-            ModelCharaId = (int)npc.ModelChara.Row
+            ModelCharaId = (int)npc.ModelChara.RowId
         };
 
 
-        if(npc.BNpcCustomize.Row != 0 && npc.BNpcCustomize.Value != null)
+        if(npc.BNpcCustomize.RowId != 0 && npc.BNpcCustomize.ValueNullable is not null)
         {
             var customize = npc.BNpcCustomize.Value!;
 
-            actorAppearance.Customize.Race = (Races)customize.Race.Row;
+            actorAppearance.Customize.Race = (Races)customize.Race.RowId;
             actorAppearance.Customize.Gender = (Genders)customize.Gender;
             actorAppearance.Customize.BodyType = (BodyTypes)customize.BodyType;
-            actorAppearance.Customize.Tribe = (Tribes)customize.Tribe.Row;
+            actorAppearance.Customize.Tribe = (Tribes)customize.Tribe.RowId;
             actorAppearance.Customize.Height = customize.Height;
             actorAppearance.Customize.FaceType = customize.Face;
             actorAppearance.Customize.HairStyle = customize.HairStyle;
@@ -113,7 +113,7 @@ public static ActorAppearance FromBNpc(BNpcBase npc)
             actorAppearance.Customize.FacePaintColor = customize.FacePaintColor;
         }
 
-        if(npc.NpcEquip.Row != 0 && npc.NpcEquip.Value != null)
+        if(npc.NpcEquip.RowId != 0 && npc.NpcEquip.ValueNullable is not null)
         {
             var (mainHand, offHand, equipment) = FromNpcEquip(npc.NpcEquip.Value!);
             actorAppearance.Weapons.MainHand = mainHand;
@@ -131,13 +131,13 @@ public static ActorAppearance FromENpc(ENpcBase npc)
     {
         ActorAppearance actorAppearance = new()
         {
-            ModelCharaId = (int)npc.ModelChara.Row
+            ModelCharaId = (int)npc.ModelChara.RowId
         };
 
-        actorAppearance.Customize.Race = (Races)npc.Race.Row;
+        actorAppearance.Customize.Race = (Races)npc.Race.RowId;
         actorAppearance.Customize.Gender = (Genders)npc.Gender;
         actorAppearance.Customize.BodyType = (BodyTypes)npc.BodyType;
-        actorAppearance.Customize.Tribe = (Tribes)npc.Tribe.Row;
+        actorAppearance.Customize.Tribe = (Tribes)npc.Tribe.RowId;
         actorAppearance.Customize.Height = npc.Height;
         actorAppearance.Customize.FaceType = npc.Face;
         actorAppearance.Customize.HairStyle = npc.HairStyle;
@@ -162,7 +162,7 @@ public static ActorAppearance FromENpc(ENpcBase npc)
         actorAppearance.Customize.FacePaintColor = npc.FacePaintColor;
 
 
-        if(npc.NpcEquip.Row != 0 && npc.NpcEquip.Value != null)
+        if(npc.NpcEquip.RowId != 0 && npc.NpcEquip.ValueNullable != null)
         {
             var (mainHand, offHand, equipment) = FromNpcEquip(npc.NpcEquip.Value!);
             actorAppearance.Weapons.MainHand = mainHand;
@@ -173,109 +173,109 @@ public static ActorAppearance FromENpc(ENpcBase npc)
         if(npc.ModelMainHand != 0)
             actorAppearance.Weapons.MainHand.Value = npc.ModelMainHand;
 
-        if(npc.DyeMainHand.Row != 0)
+        if(npc.DyeMainHand.RowId != 0)
         {
-            actorAppearance.Weapons.MainHand.Stain0 = (byte)npc.DyeMainHand.Row;
-            actorAppearance.Weapons.MainHand.Stain1 = (byte)npc.Dye2MainHand.Row;
+            actorAppearance.Weapons.MainHand.Stain0 = (byte)npc.DyeMainHand.RowId;
+            actorAppearance.Weapons.MainHand.Stain1 = (byte)npc.Dye2MainHand.RowId;
         }
 
         if(npc.ModelOffHand != 0)
             actorAppearance.Weapons.OffHand.Value = npc.ModelOffHand;
 
-        if(npc.DyeOffHand.Row != 0)
+        if(npc.DyeOffHand.RowId != 0)
         {
-            actorAppearance.Weapons.OffHand.Stain0 = (byte)npc.DyeOffHand.Row;
-            actorAppearance.Weapons.OffHand.Stain1 = (byte)npc.Dye2OffHand.Row;
+            actorAppearance.Weapons.OffHand.Stain0 = (byte)npc.DyeOffHand.RowId;
+            actorAppearance.Weapons.OffHand.Stain1 = (byte)npc.Dye2OffHand.RowId;
         }
 
         if(npc.ModelHead != 0)
             actorAppearance.Equipment.Head.Value = npc.ModelHead;
 
-        if(npc.DyeHead.Row != 0)
+        if(npc.DyeHead.RowId != 0)
         {
-            actorAppearance.Equipment.Head.Stain0 = (byte)npc.DyeHead.Row;
-            actorAppearance.Equipment.Head.Stain1 = (byte)npc.Dye2Head.Row;
+            actorAppearance.Equipment.Head.Stain0 = (byte)npc.DyeHead.RowId;
+            actorAppearance.Equipment.Head.Stain1 = (byte)npc.Dye2Head.RowId;
         }
 
         if(npc.ModelBody != 0)
             actorAppearance.Equipment.Top.Value = npc.ModelBody;
 
-        if(npc.DyeBody.Row != 0)
+        if(npc.DyeBody.RowId != 0)
         {
-            actorAppearance.Equipment.Top.Stain0 = (byte)npc.DyeBody.Row;
-            actorAppearance.Equipment.Top.Stain1 = (byte)npc.Dye2Body.Row;
+            actorAppearance.Equipment.Top.Stain0 = (byte)npc.DyeBody.RowId;
+            actorAppearance.Equipment.Top.Stain1 = (byte)npc.Dye2Body.RowId;
         }
 
         if(npc.ModelHands != 0)
             actorAppearance.Equipment.Arms.Value = npc.ModelHands;
 
-        if(npc.DyeHands.Row != 0)
+        if(npc.DyeHands.RowId != 0)
         {
-            actorAppearance.Equipment.Arms.Stain0 = (byte)npc.DyeHands.Row;
-            actorAppearance.Equipment.Arms.Stain1 = (byte)npc.Dye2Hands.Row;
+            actorAppearance.Equipment.Arms.Stain0 = (byte)npc.DyeHands.RowId;
+            actorAppearance.Equipment.Arms.Stain1 = (byte)npc.Dye2Hands.RowId;
         }
 
         if(npc.ModelLegs != 0)
             actorAppearance.Equipment.Legs.Value = npc.ModelLegs;
 
-        if(npc.DyeLegs.Row != 0)
+        if(npc.DyeLegs.RowId != 0)
         {
-            actorAppearance.Equipment.Legs.Stain0 = (byte)npc.DyeLegs.Row;
-            actorAppearance.Equipment.Legs.Stain1 = (byte)npc.Dye2Legs.Row;
+            actorAppearance.Equipment.Legs.Stain0 = (byte)npc.DyeLegs.RowId;
+            actorAppearance.Equipment.Legs.Stain1 = (byte)npc.Dye2Legs.RowId;
         }
 
         if(npc.ModelFeet != 0)
             actorAppearance.Equipment.Feet.Value = npc.ModelFeet;
 
-        if(npc.DyeFeet.Row != 0)
+        if(npc.DyeFeet.RowId != 0)
         {
-            actorAppearance.Equipment.Feet.Stain0 = (byte)npc.DyeFeet.Row;
-            actorAppearance.Equipment.Feet.Stain1 = (byte)npc.Dye2Feet.Row;
+            actorAppearance.Equipment.Feet.Stain0 = (byte)npc.DyeFeet.RowId;
+            actorAppearance.Equipment.Feet.Stain1 = (byte)npc.Dye2Feet.RowId;
         }
 
         if(npc.ModelEars != 0)
             actorAppearance.Equipment.Ear.Value = npc.ModelEars;
 
-        if(npc.DyeEars.Row != 0)
+        if(npc.DyeEars.RowId != 0)
         {
-            actorAppearance.Equipment.Ear.Stain0 = (byte)npc.DyeEars.Row;
-            actorAppearance.Equipment.Ear.Stain1 = (byte)npc.Dye2Ears.Row;
+            actorAppearance.Equipment.Ear.Stain0 = (byte)npc.DyeEars.RowId;
+            actorAppearance.Equipment.Ear.Stain1 = (byte)npc.Dye2Ears.RowId;
         }
 
         if(npc.ModelNeck != 0)
             actorAppearance.Equipment.Neck.Value = npc.ModelNeck;
 
-        if(npc.DyeNeck.Row != 0)
+        if(npc.DyeNeck.RowId != 0)
         {
-            actorAppearance.Equipment.Neck.Stain0 = (byte)npc.DyeNeck.Row;
-            actorAppearance.Equipment.Neck.Stain1 = (byte)npc.Dye2Neck.Row;
+            actorAppearance.Equipment.Neck.Stain0 = (byte)npc.DyeNeck.RowId;
+            actorAppearance.Equipment.Neck.Stain1 = (byte)npc.Dye2Neck.RowId;
         }
 
         if(npc.ModelWrists != 0)
             actorAppearance.Equipment.Wrist.Value = npc.ModelWrists;
 
-        if(npc.DyeWrists.Row != 0)
+        if(npc.DyeWrists.RowId != 0)
         {
-            actorAppearance.Equipment.Wrist.Stain0 = (byte)npc.DyeWrists.Row;
-            actorAppearance.Equipment.Wrist.Stain1 = (byte)npc.Dye2Wrists.Row;
+            actorAppearance.Equipment.Wrist.Stain0 = (byte)npc.DyeWrists.RowId;
+            actorAppearance.Equipment.Wrist.Stain1 = (byte)npc.Dye2Wrists.RowId;
         }
 
         if(npc.ModelRightRing != 0)
             actorAppearance.Equipment.RFinger.Value = npc.ModelRightRing;
 
-        if(npc.DyeRightRing.Row != 0)
+        if(npc.DyeRightRing.RowId != 0)
         {
-            actorAppearance.Equipment.RFinger.Stain0 = (byte)npc.DyeRightRing.Row;
-            actorAppearance.Equipment.RFinger.Stain1 = (byte)npc.Dye2RightRing.Row;
+            actorAppearance.Equipment.RFinger.Stain0 = (byte)npc.DyeRightRing.RowId;
+            actorAppearance.Equipment.RFinger.Stain1 = (byte)npc.Dye2RightRing.RowId;
         }
 
         if(npc.ModelLeftRing != 0)
             actorAppearance.Equipment.LFinger.Value = npc.ModelLeftRing;
 
-        if(npc.DyeLeftRing.Row != 0)
+        if(npc.DyeLeftRing.RowId != 0)
         {
-            actorAppearance.Equipment.LFinger.Stain0 = (byte)npc.DyeLeftRing.Row;
-            actorAppearance.Equipment.LFinger.Stain1 = (byte)npc.Dye2LeftRing.Row;
+            actorAppearance.Equipment.LFinger.Stain0 = (byte)npc.DyeLeftRing.RowId;
+            actorAppearance.Equipment.LFinger.Stain1 = (byte)npc.Dye2LeftRing.RowId;
         }
 
         // TODO: Can NPCs have facewear?
@@ -291,42 +291,42 @@ private static (WeaponModelId, WeaponModelId, ActorEquipment) FromNpcEquip(NpcEq
         var offHand = new WeaponModelId();
 
         equipment.Head.Value = npcEquip.ModelHead;
-        equipment.Head.Stain0 = (byte)npcEquip.DyeHead.Row;
-        equipment.Head.Stain1 = (byte)npcEquip.Dye2Head.Row;
+        equipment.Head.Stain0 = (byte)npcEquip.DyeHead.RowId;
+        equipment.Head.Stain1 = (byte)npcEquip.Dye2Head.RowId;
         equipment.Top.Value = npcEquip.ModelBody;
-        equipment.Top.Stain0 = (byte)npcEquip.DyeBody.Row;
-        equipment.Top.Stain1 = (byte)npcEquip.Dye2Body.Row;
+        equipment.Top.Stain0 = (byte)npcEquip.DyeBody.RowId;
+        equipment.Top.Stain1 = (byte)npcEquip.Dye2Body.RowId;
         equipment.Arms.Value = npcEquip.ModelHands;
-        equipment.Arms.Stain0 = (byte)npcEquip.DyeHands.Row;
-        equipment.Arms.Stain1 = (byte)npcEquip.Dye2Hands.Row;
+        equipment.Arms.Stain0 = (byte)npcEquip.DyeHands.RowId;
+        equipment.Arms.Stain1 = (byte)npcEquip.Dye2Hands.RowId;
         equipment.Legs.Value = npcEquip.ModelLegs;
-        equipment.Legs.Stain0 = (byte)npcEquip.DyeLegs.Row;
-        equipment.Legs.Stain1 = (byte)npcEquip.Dye2Legs.Row;
+        equipment.Legs.Stain0 = (byte)npcEquip.DyeLegs.RowId;
+        equipment.Legs.Stain1 = (byte)npcEquip.Dye2Legs.RowId;
         equipment.Feet.Value = npcEquip.ModelFeet;
-        equipment.Feet.Stain0 = (byte)npcEquip.DyeFeet.Row;
-        equipment.Feet.Stain1 = (byte)npcEquip.Dye2Feet.Row;
+        equipment.Feet.Stain0 = (byte)npcEquip.DyeFeet.RowId;
+        equipment.Feet.Stain1 = (byte)npcEquip.Dye2Feet.RowId;
         equipment.Ear.Value = npcEquip.ModelEars;
-        equipment.Ear.Stain0 = (byte)npcEquip.DyeEars.Row;
-        equipment.Ear.Stain1 = (byte)npcEquip.Dye2Ears.Row;
+        equipment.Ear.Stain0 = (byte)npcEquip.DyeEars.RowId;
+        equipment.Ear.Stain1 = (byte)npcEquip.Dye2Ears.RowId;
         equipment.Neck.Value = npcEquip.ModelNeck;
-        equipment.Neck.Stain0 = (byte)npcEquip.DyeNeck.Row;
-        equipment.Neck.Stain1 = (byte)npcEquip.Dye2Neck.Row;
+        equipment.Neck.Stain0 = (byte)npcEquip.DyeNeck.RowId;
+        equipment.Neck.Stain1 = (byte)npcEquip.Dye2Neck.RowId;
         equipment.Wrist.Value = npcEquip.ModelWrists;
-        equipment.Wrist.Stain0 = (byte)npcEquip.DyeWrists.Row;
-        equipment.Wrist.Stain1 = (byte)npcEquip.Dye2Wrists.Row;
+        equipment.Wrist.Stain0 = (byte)npcEquip.DyeWrists.RowId;
+        equipment.Wrist.Stain1 = (byte)npcEquip.Dye2Wrists.RowId;
         equipment.RFinger.Value = npcEquip.ModelRightRing;
-        equipment.RFinger.Stain0 = (byte)npcEquip.DyeRightRing.Row;
-        equipment.RFinger.Stain1 = (byte)npcEquip.Dye2RightRing.Row;
+        equipment.RFinger.Stain0 = (byte)npcEquip.DyeRightRing.RowId;
+        equipment.RFinger.Stain1 = (byte)npcEquip.Dye2RightRing.RowId;
         equipment.LFinger.Value = npcEquip.ModelLeftRing;
-        equipment.LFinger.Stain0 = (byte)npcEquip.DyeLeftRing.Row;
-        equipment.LFinger.Stain1 = (byte)npcEquip.Dye2LeftRing.Row;
+        equipment.LFinger.Stain0 = (byte)npcEquip.DyeLeftRing.RowId;
+        equipment.LFinger.Stain1 = (byte)npcEquip.Dye2LeftRing.RowId;
 
         mainHand.Value = npcEquip.ModelMainHand;
-        mainHand.Stain0 = (byte)npcEquip.DyeMainHand.Row;
-        mainHand.Stain1 = (byte)npcEquip.Dye2MainHand.Row;
+        mainHand.Stain0 = (byte)npcEquip.DyeMainHand.RowId;
+        mainHand.Stain1 = (byte)npcEquip.Dye2MainHand.RowId;
         offHand.Value = npcEquip.ModelOffHand;
-        offHand.Stain0 = (byte)npcEquip.DyeOffHand.Row;
-        offHand.Stain1 = (byte)npcEquip.Dye2OffHand.Row;
+        offHand.Stain0 = (byte)npcEquip.DyeOffHand.RowId;
+        offHand.Stain1 = (byte)npcEquip.Dye2OffHand.RowId;
 
         return (mainHand, offHand, equipment);
     }
diff --git a/Brio/Game/Actor/Appearance/AppearanceExtensions.cs b/Brio/Game/Actor/Appearance/AppearanceExtensions.cs
index cc57b038..144b4d44 100644
--- a/Brio/Game/Actor/Appearance/AppearanceExtensions.cs
+++ b/Brio/Game/Actor/Appearance/AppearanceExtensions.cs
@@ -1,4 +1,4 @@
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 
 namespace Brio.Game.Actor.Appearance;
 
diff --git a/Brio/Game/Actor/Appearance/AppearanceSanitizer.cs b/Brio/Game/Actor/Appearance/AppearanceSanitizer.cs
index f1e5fe2a..818733a3 100644
--- a/Brio/Game/Actor/Appearance/AppearanceSanitizer.cs
+++ b/Brio/Game/Actor/Appearance/AppearanceSanitizer.cs
@@ -47,6 +47,6 @@ public static void SanitizeAppearance(ref ActorAppearance appearance, ActorAppea
 
     public static unsafe BrioCharaMakeType? GetCharaMakeType(ActorAppearance appearance)
     {
-        return GameDataProvider.Instance.CharaMakeTypes.Select(x => x.Value).FirstOrDefault(x => x.Race.Row == (uint)appearance.Customize.Race && x.Tribe.Row == (uint)appearance.Customize.Tribe && x.Gender == appearance.Customize.Gender);
+        return GameDataProvider.Instance.CharaMakeTypes.Select(x => x.Value).FirstOrDefault(x => x.Race.RowId == (uint)appearance.Customize.Race && x.Tribe.RowId == (uint)appearance.Customize.Tribe && x.Gender == appearance.Customize.Gender);
     }
 }
diff --git a/Brio/Game/Actor/Appearance/SpecialAppearances.cs b/Brio/Game/Actor/Appearance/SpecialAppearances.cs
index e8248754..47f95d1c 100644
--- a/Brio/Game/Actor/Appearance/SpecialAppearances.cs
+++ b/Brio/Game/Actor/Appearance/SpecialAppearances.cs
@@ -1,6 +1,6 @@
 using Brio.Resources;
 using FFXIVClientStructs.FFXIV.Client.Game.Character;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 
 namespace Brio.Game.Actor.Appearance;
 
@@ -43,4 +43,4 @@ internal static class SpecialAppearances
     };
 
     public static ENpcBase DefaultHumanEventNpc = GameDataProvider.Instance.ENpcBases[1029275];
-}
\ No newline at end of file
+}
diff --git a/Brio/Game/Actor/Extensions/CharacterExtensions.cs b/Brio/Game/Actor/Extensions/CharacterExtensions.cs
index 1e1d8968..734922ff 100644
--- a/Brio/Game/Actor/Extensions/CharacterExtensions.cs
+++ b/Brio/Game/Actor/Extensions/CharacterExtensions.cs
@@ -168,6 +168,6 @@ public static unsafe IReadOnlyList<CharacterBaseInfo> GetCharacterBases(this ICh
     public static unsafe BrioCharaMakeType? GetCharaMakeType(this ICharacter go)
     {
         var drawData = go.Native()->DrawData;
-        return GameDataProvider.Instance.CharaMakeTypes.Select(x => x.Value).FirstOrDefault(x => x.Race.Row == (uint)drawData.CustomizeData.Race && x.Tribe.Row == (uint)drawData.CustomizeData.Tribe && x.Gender == (Genders)drawData.CustomizeData.Sex);
+        return GameDataProvider.Instance.CharaMakeTypes.Select(x => x.Value).FirstOrDefault(x => x.Race.RowId == (uint)drawData.CustomizeData.Race && x.Tribe.RowId == (uint)drawData.CustomizeData.Tribe && x.Gender == (Genders)drawData.CustomizeData.Sex);
     }
 }
diff --git a/Brio/Game/Actor/Extensions/StatusManagerExtensions.cs b/Brio/Game/Actor/Extensions/StatusManagerExtensions.cs
index 517fb9dd..d268be4a 100644
--- a/Brio/Game/Actor/Extensions/StatusManagerExtensions.cs
+++ b/Brio/Game/Actor/Extensions/StatusManagerExtensions.cs
@@ -1,6 +1,6 @@
 using Brio.Resources;
 using Dalamud.Game.ClientState.Objects.Types;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using System.Collections.Generic;
 using StatusManager = FFXIVClientStructs.FFXIV.Client.Game.StatusManager;
 
diff --git a/Brio/Game/Types/ActionTimelineTypes.cs b/Brio/Game/Types/ActionTimelineTypes.cs
index 054378a5..13706c51 100644
--- a/Brio/Game/Types/ActionTimelineTypes.cs
+++ b/Brio/Game/Types/ActionTimelineTypes.cs
@@ -1,5 +1,5 @@
 using Brio.Resources;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using OneOf;
 using OneOf.Types;
 
diff --git a/Brio/Game/Types/ActorAppearanceTypes.cs b/Brio/Game/Types/ActorAppearanceTypes.cs
index 17f91385..df545b1e 100644
--- a/Brio/Game/Types/ActorAppearanceTypes.cs
+++ b/Brio/Game/Types/ActorAppearanceTypes.cs
@@ -1,9 +1,9 @@
 using Brio.Game.Actor.Appearance;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using OneOf;
 using OneOf.Types;
-using Companion = Lumina.Excel.GeneratedSheets.Companion;
-using Ornament = Lumina.Excel.GeneratedSheets.Ornament;
+using Companion = Lumina.Excel.Sheets.Companion;
+using Ornament = Lumina.Excel.Sheets.Ornament;
 
 namespace Brio.Game.Types;
 
@@ -13,8 +13,8 @@ internal partial class ActorAppearanceUnion : OneOfBase<BNpcBase, ENpcBase, Moun
     public static implicit operator ActorAppearance(ActorAppearanceUnion union) => union.Match(
         bnpc => ActorAppearance.FromBNpc(bnpc),
         enpc => ActorAppearance.FromENpc(enpc),
-        mount => ActorAppearance.FromModelChara((int)mount.ModelChara.Row),
-        companion => ActorAppearance.FromModelChara((int)companion.Model.Row),
+        mount => ActorAppearance.FromModelChara((int)mount.ModelChara.RowId),
+        companion => ActorAppearance.FromModelChara((int)companion.Model.RowId),
         ornament => ActorAppearance.FromModelChara(ornament.Model),
         none => new ActorAppearance()
     );
diff --git a/Brio/Game/Types/CompanionTypes.cs b/Brio/Game/Types/CompanionTypes.cs
index eb117ec3..64613ee1 100644
--- a/Brio/Game/Types/CompanionTypes.cs
+++ b/Brio/Game/Types/CompanionTypes.cs
@@ -1,5 +1,5 @@
 using Brio.Resources;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using OneOf;
 using OneOf.Types;
 
@@ -43,4 +43,4 @@ public static implicit operator CompanionContainer(CompanionRowUnion row) => row
         ornament => new CompanionContainer(CompanionKind.Ornament, (ushort)ornament.RowId),
         none => new CompanionContainer(CompanionKind.None, (ushort)0)
     );
-}
\ No newline at end of file
+}
diff --git a/Brio/Game/Types/DyeTypes.cs b/Brio/Game/Types/DyeTypes.cs
index 46c1373f..5225428f 100644
--- a/Brio/Game/Types/DyeTypes.cs
+++ b/Brio/Game/Types/DyeTypes.cs
@@ -1,5 +1,5 @@
 using Brio.Resources;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using OneOf;
 using OneOf.Types;
 
diff --git a/Brio/Game/Types/FacewearTypes.cs b/Brio/Game/Types/FacewearTypes.cs
index b95d85b0..9482b68d 100644
--- a/Brio/Game/Types/FacewearTypes.cs
+++ b/Brio/Game/Types/FacewearTypes.cs
@@ -1,5 +1,5 @@
 using Brio.Resources;
-using Lumina.Excel.GeneratedSheets2;
+using Lumina.Excel.Sheets;
 using OneOf;
 using OneOf.Types;
 
diff --git a/Brio/Game/Types/ItemTypes.cs b/Brio/Game/Types/ItemTypes.cs
index 4d2f0947..3359abcb 100644
--- a/Brio/Game/Types/ItemTypes.cs
+++ b/Brio/Game/Types/ItemTypes.cs
@@ -1,4 +1,4 @@
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using OneOf;
 using OneOf.Types;
 
diff --git a/Brio/Game/Types/WeatherTypes.cs b/Brio/Game/Types/WeatherTypes.cs
index 2c76bdb3..cb985713 100644
--- a/Brio/Game/Types/WeatherTypes.cs
+++ b/Brio/Game/Types/WeatherTypes.cs
@@ -1,5 +1,5 @@
 using Brio.Resources;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using OneOf;
 using OneOf.Types;
 
@@ -10,7 +10,7 @@ internal partial class WeatherUnion : OneOfBase<Weather, None>
 {
     public static implicit operator WeatherUnion(WeatherId weatherId)
     {
-        if(weatherId.Id != 0 && GameDataProvider.Instance.Weathers.TryGetValue(weatherId.Id, out var weather))
+        if(weatherId.Id != 0 && GameDataProvider.Instance.Weathers.TryGetValue(weatherId.Id, out Weather weather))
             return weather;
 
         return new None();
diff --git a/Brio/Game/World/WeatherService.cs b/Brio/Game/World/WeatherService.cs
index d3980260..ac96d2d6 100644
--- a/Brio/Game/World/WeatherService.cs
+++ b/Brio/Game/World/WeatherService.cs
@@ -7,7 +7,7 @@
 using Dalamud.Hooking;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Environment;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
diff --git a/Brio/Resources/Extra/ModelDatabase.cs b/Brio/Resources/Extra/ModelDatabase.cs
index 1f875ee7..49b8d924 100644
--- a/Brio/Resources/Extra/ModelDatabase.cs
+++ b/Brio/Resources/Extra/ModelDatabase.cs
@@ -1,7 +1,7 @@
 using Brio.Core;
 using Brio.Game.Actor.Appearance;
 using FFXIVClientStructs.FFXIV.Client.Game.Character;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -22,15 +22,15 @@ public ModelDatabase()
         var items = GameDataProvider.Instance.Items.Values;
         foreach(var item in items)
         {
-            var slots = item.EquipSlotCategory.Value?.GetEquipSlots() ?? ActorEquipSlot.None;
+            var slots = item.EquipSlotCategory.ValueNullable?.GetEquipSlots() ?? ActorEquipSlot.None;
             if(slots != ActorEquipSlot.None)
             {
-                var modelInfo = new ModelInfo(item.ModelMain, item.RowId, item.Name, item.Icon, slots, item);
+                var modelInfo = new ModelInfo(item.ModelMain, item.RowId, item.Name.ToString(), item.Icon, slots, item);
                 AddModel(modelInfo);
 
                 if(item.ModelSub != 0)
                 {
-                    modelInfo = new ModelInfo(item.ModelSub, item.RowId, item.Name, item.Icon, ActorEquipSlot.OffHand, item);
+                    modelInfo = new ModelInfo(item.ModelSub, item.RowId, item.Name.ToString(), item.Icon, ActorEquipSlot.OffHand, item);
                     AddModel(modelInfo);
                 }
             }
diff --git a/Brio/Resources/GameDataProvider.cs b/Brio/Resources/GameDataProvider.cs
index aa1f1db8..ad4aa943 100644
--- a/Brio/Resources/GameDataProvider.cs
+++ b/Brio/Resources/GameDataProvider.cs
@@ -2,10 +2,10 @@
 using Brio.Resources.Extra;
 using Brio.Resources.Sheets;
 using Dalamud.Plugin.Services;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using System.Collections.Generic;
 using System.Linq;
-using Glasses = Lumina.Excel.GeneratedSheets2.Glasses;
+using Glasses = Lumina.Excel.Sheets.Glasses;
 
 namespace Brio.Resources;
 
diff --git a/Brio/Resources/Sheets/BrioCharaMakeType.cs b/Brio/Resources/Sheets/BrioCharaMakeType.cs
index 385feecc..a4280ca8 100644
--- a/Brio/Resources/Sheets/BrioCharaMakeType.cs
+++ b/Brio/Resources/Sheets/BrioCharaMakeType.cs
@@ -1,14 +1,17 @@
 using Brio.Game.Actor.Appearance;
 using Dalamud.Game.ClientState.Objects.Enums;
+using EmbedIO.Utilities;
+using FFXIVClientStructs.FFXIV.Component.Excel;
+using Lumina;
 using Lumina.Data;
 using Lumina.Excel;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using System.Linq;
 
 namespace Brio.Resources.Sheets;
 
 [Sheet("CharaMakeType")]
-internal class BrioCharaMakeType : ExcelRow
+internal class BrioCharaMakeType : IExcelRow<BrioCharaMakeType>
 {
     public const int MenuCount = 28;
     public const int SubMenuParamCount = 100;
@@ -17,11 +20,11 @@ internal class BrioCharaMakeType : ExcelRow
     public const int FaceCount = 8;
     public const int FaceFeatureCount = 7;
 
-    public LazyRow<Race> Race { get; private set; } = null!;
-    public LazyRow<Tribe> Tribe { get; private set; } = null!;
+    public RowRef<Race>? Race { get; private set; } = null!;
+    public RowRef<Tribe>? Tribe { get; private set; } = null!;
     public Genders Gender { get; private set; }
 
-    public LazyRow<Lobby>[] Lobbys { get; } = new LazyRow<Lobby>[MenuCount];
+    public RowRef<Lobby>[]? Lobbys { get; } = new RowRef<Lobby>[MenuCount];
 
     public byte[] InitVals { get; } = new byte[MenuCount];
 
@@ -43,20 +46,21 @@ internal class BrioCharaMakeType : ExcelRow
 
     public int[,] FacialFeature { get; } = new int[FaceCount, SubMenuGraphicCount];
 
-
-    public override void PopulateData(RowParser parser, Lumina.GameData gameData, Language language)
+    public uint RowId => throw new System.NotImplementedException(); //
+   
+    public static BrioCharaMakeType Create(ExcelPage page, uint offset, uint row)
     {
-        base.PopulateData(parser, gameData, language);
-
-        Race = new LazyRow<Race>(gameData, parser.ReadColumn<int>(0), language);
-        Tribe = new LazyRow<Tribe>(gameData, parser.ReadColumn<int>(1), language);
-        Gender = (Genders)parser.ReadColumn<sbyte>(2);
-
+        BrioCharaMakeType brioCharaMake = new BrioCharaMakeType();
+        
+        brioCharaMake.Race = new RowRef<Race>(page.Module, (uint)page.ReadInt32(0));
+        brioCharaMake.Tribe = new RowRef<Tribe>(page.Module, (uint)page.ReadInt32(1));
+        brioCharaMake.Gender = (Genders)page.ReadInt8(2);
+      
         for(int i = 0; i < MenuCount; i++)
-            Lobbys[i] = new LazyRow<Lobby>(gameData, parser.ReadColumn<uint>(3 + i), language);
+            brioCharaMake.Lobbys[i] = new RowRef<Lobby>(page.Module, parser.ReadColumn<uint>(3 + i), language);
 
         for(int i = 0; i < MenuCount; i++)
-            InitVals[i] = parser.ReadColumn<byte>(31 + i);
+            brioCharaMake.InitVals[i] = parser.ReadColumn<byte>(31 + i);
 
         for(int i = 0; i < MenuCount; i++)
             SubMenuType[i] = (MenuType)parser.ReadColumn<byte>(59 + i);
@@ -87,6 +91,16 @@ public override void PopulateData(RowParser parser, Lumina.GameData gameData, La
         for(int i = 0; i < FaceCount; i++)
             for(int x = 0; x < FaceFeatureCount; x++)
                 FacialFeature[i, x] = parser.ReadColumn<int>(3291 + (x * FaceCount) + i);
+
+
+        return brioCharaMake;
+    }
+
+    public override void PopulateData(RowParser parser, Lumina.GameData gameData, Language language)
+    {
+        base.PopulateData(parser, gameData, language);
+
+
     }
 
     public MenuCollection BuildMenus()
@@ -95,13 +109,13 @@ public MenuCollection BuildMenus()
 
         for(int i = 0; i < MenuCount; ++i)
         {
-            var lobby = Lobbys[i].Value;
+            var lobby = Lobbys[i].ValueNullable;
 
             if(lobby == null)
                 continue;
 
 
-            var title = lobby.Text?.RawString ?? "Unknown";
+            var title = lobby.Value.Text.ToString() ?? "Unknown";
             var menuType = SubMenuType[i];
             var subMenuNum = SubMenuNum[i];
             var subMenuMask = SubMenuMask[i];
@@ -121,12 +135,13 @@ public MenuCollection BuildMenus()
                 subParams[x] = (int)SubMenuParam[i, x];
             }
 
-            menus[i] = new Menu(i, RowId, title, (Races)Race.Row, (Tribes)Tribe.Row, Gender, lobby, menuType, subMenuMask, customizeIndex, initialValue, subParams, subGraphics, Voice, FacialFeature);
+            menus[i] = new Menu(i, RowId, title, (Races)((RowRef?)Race).Value.RowId, (Tribes)Tribe.RowId, Gender, lobby.Value, menuType, subMenuMask, customizeIndex, initialValue, subParams, subGraphics, Voice, FacialFeature);
         }
 
         return new MenuCollection(menus);
     }
 
+
     public class MenuCollection(Menu[] menus)
     {
         public Menu[] Menus { get; } = menus;
diff --git a/Brio/Resources/Sheets/BrioHairMakeType.cs b/Brio/Resources/Sheets/BrioHairMakeType.cs
index 4a22b9b6..3c9022a5 100644
--- a/Brio/Resources/Sheets/BrioHairMakeType.cs
+++ b/Brio/Resources/Sheets/BrioHairMakeType.cs
@@ -1,8 +1,9 @@
 using Brio.Game.Actor.Appearance;
+using FFXIVClientStructs.FFXIV.Component.Excel;
 using Lumina;
 using Lumina.Data;
 using Lumina.Excel;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 
 namespace Brio.Resources.Sheets;
 
diff --git a/Brio/UI/Controls/Editors/CustomizeEditor.cs b/Brio/UI/Controls/Editors/CustomizeEditor.cs
index a08d76a3..354bd269 100644
--- a/Brio/UI/Controls/Editors/CustomizeEditor.cs
+++ b/Brio/UI/Controls/Editors/CustomizeEditor.cs
@@ -265,7 +265,7 @@ private bool DrawHairSelect(ref ActorCustomize customize, BrioCharaMakeType.Menu
     {
         bool madeChange = false;
 
-        var hairStyles = GameDataProvider.Instance.HairMakeTypes[menu.CharaMakeRow].HairStyles.Where(x => x.Row != 0).Select(x => x.Value!)!;
+        var hairStyles = GameDataProvider.Instance.HairMakeTypes[menu.CharaMakeRow].HairStyles.Where(x => x.RowId != 0).Select(x => x.Value!)!;
 
         var hairColors = GameDataProvider.Instance.HumanData.GetHairColors(customize.Tribe, customize.Gender);
         var hairHighlightColors = GameDataProvider.Instance.HumanData.GetHairHighlightColors();
@@ -433,7 +433,7 @@ private bool DrawFacePaintSelect(ref ActorCustomize customize, BrioCharaMakeType
     {
         bool madeChange = false;
 
-        var facePaints = GameDataProvider.Instance.HairMakeTypes[menu.CharaMakeRow].FacePaints.Where(x => x.Row != 0).Select(x => x.Value!)!;
+        var facePaints = GameDataProvider.Instance.HairMakeTypes[menu.CharaMakeRow].FacePaints.Where(x => x.RowId != 0).Select(x => x.Value!)!;
 
         var facePaintColors = GameDataProvider.Instance.HumanData.GetFacepaintColors();
 
diff --git a/Brio/UI/Controls/Selectors/ActionTimelineSelector.cs b/Brio/UI/Controls/Selectors/ActionTimelineSelector.cs
index 44b7d32d..8595348a 100644
--- a/Brio/UI/Controls/Selectors/ActionTimelineSelector.cs
+++ b/Brio/UI/Controls/Selectors/ActionTimelineSelector.cs
@@ -44,44 +44,44 @@ protected override void PopulateList()
         {
             // Loop
             var timeline = emote.ActionTimeline[0];
-            if(timeline.Value != null && timeline.Row != 0)
+            if(timeline.Value != null && timeline.RowId != 0)
             {
-                AddItem(new ActionTimelineSelectorEntry(emote.Name, (ushort)timeline.Row, emote.RowId, timeline.Value.Key, ActionTimelineSelectorEntry.OriginalType.Emote, ActionTimelineSelectorEntry.AnimationPurpose.Standard, (ActionTimelineSlots)timeline.Value.Slot, emote.Icon));
+                AddItem(new ActionTimelineSelectorEntry(emote.Name, (ushort)timeline.RowId, emote.RowId, timeline.Value.Key, ActionTimelineSelectorEntry.OriginalType.Emote, ActionTimelineSelectorEntry.AnimationPurpose.Standard, (ActionTimelineSlots)timeline.Value.Slot, emote.Icon));
             }
 
             // Intro
             timeline = emote.ActionTimeline[1];
-            if(timeline.Value != null && timeline.Row != 0)
+            if(timeline.Value != null && timeline.RowId != 0)
             {
-                AddItem(new ActionTimelineSelectorEntry(emote.Name, (ushort)timeline.Row, emote.RowId, timeline.Value.Key, ActionTimelineSelectorEntry.OriginalType.Emote, ActionTimelineSelectorEntry.AnimationPurpose.Intro, (ActionTimelineSlots)timeline.Value.Slot, emote.Icon));
+                AddItem(new ActionTimelineSelectorEntry(emote.Name, (ushort)timeline.RowId, emote.RowId, timeline.Value.Key, ActionTimelineSelectorEntry.OriginalType.Emote, ActionTimelineSelectorEntry.AnimationPurpose.Intro, (ActionTimelineSlots)timeline.Value.Slot, emote.Icon));
             }
 
             // Ground
             timeline = emote.ActionTimeline[2];
-            if(timeline.Value != null && timeline.Row != 0)
+            if(timeline.Value != null && timeline.RowId != 0)
             {
-                AddItem(new ActionTimelineSelectorEntry(emote.Name, (ushort)timeline.Row, emote.RowId, timeline.Value.Key, ActionTimelineSelectorEntry.OriginalType.Emote, ActionTimelineSelectorEntry.AnimationPurpose.Ground, (ActionTimelineSlots)timeline.Value.Slot, emote.Icon));
+                AddItem(new ActionTimelineSelectorEntry(emote.Name, (ushort)timeline.RowId, emote.RowId, timeline.Value.Key, ActionTimelineSelectorEntry.OriginalType.Emote, ActionTimelineSelectorEntry.AnimationPurpose.Ground, (ActionTimelineSlots)timeline.Value.Slot, emote.Icon));
             }
 
             // Chair
             timeline = emote.ActionTimeline[3];
-            if(timeline.Value != null && timeline.Row != 0)
+            if(timeline.Value != null && timeline.RowId != 0)
             {
-                AddItem(new ActionTimelineSelectorEntry(emote.Name, (ushort)timeline.Row, emote.RowId, timeline.Value.Key, ActionTimelineSelectorEntry.OriginalType.Emote, ActionTimelineSelectorEntry.AnimationPurpose.Chair, (ActionTimelineSlots)timeline.Value.Slot, emote.Icon));
+                AddItem(new ActionTimelineSelectorEntry(emote.Name, (ushort)timeline.RowId, emote.RowId, timeline.Value.Key, ActionTimelineSelectorEntry.OriginalType.Emote, ActionTimelineSelectorEntry.AnimationPurpose.Chair, (ActionTimelineSlots)timeline.Value.Slot, emote.Icon));
             }
 
             // Upper Body
             timeline = emote.ActionTimeline[4];
-            if(timeline.Value != null && timeline.Row != 0)
+            if(timeline.Value != null && timeline.RowId != 0)
             {
-                AddItem(new ActionTimelineSelectorEntry(emote.Name, (ushort)timeline.Row, emote.RowId, timeline.Value.Key, ActionTimelineSelectorEntry.OriginalType.Emote, ActionTimelineSelectorEntry.AnimationPurpose.Blend, (ActionTimelineSlots)timeline.Value.Slot, emote.Icon));
+                AddItem(new ActionTimelineSelectorEntry(emote.Name, (ushort)timeline.RowId, emote.RowId, timeline.Value.Key, ActionTimelineSelectorEntry.OriginalType.Emote, ActionTimelineSelectorEntry.AnimationPurpose.Blend, (ActionTimelineSlots)timeline.Value.Slot, emote.Icon));
             }
         }
 
         foreach(var action in GameDataProvider.Instance.Actions.Values)
         {
-            if(action.AnimationEnd.Value != null && action.AnimationEnd.Row != 0)
-                AddItem(new ActionTimelineSelectorEntry(action.Name, (ushort)action.AnimationEnd.Row, action.RowId, action.AnimationEnd.Value.Key, ActionTimelineSelectorEntry.OriginalType.Action, ActionTimelineSelectorEntry.AnimationPurpose.Action, (ActionTimelineSlots)action.AnimationEnd.Value.Slot, action.Icon));
+            if(action.AnimationEnd.Value != null && action.AnimationEnd.RowId != 0)
+                AddItem(new ActionTimelineSelectorEntry(action.Name, (ushort)action.AnimationEnd.RowId, action.RowId, action.AnimationEnd.Value.Key, ActionTimelineSelectorEntry.OriginalType.Action, ActionTimelineSelectorEntry.AnimationPurpose.Action, (ActionTimelineSlots)action.AnimationEnd.Value.Slot, action.Icon));
 
         }
     }
diff --git a/Brio/UI/Controls/Selectors/CompanionSelector.cs b/Brio/UI/Controls/Selectors/CompanionSelector.cs
index 204fde0a..ee05f213 100644
--- a/Brio/UI/Controls/Selectors/CompanionSelector.cs
+++ b/Brio/UI/Controls/Selectors/CompanionSelector.cs
@@ -64,8 +64,8 @@ protected override bool Filter(CompanionRowUnion item, string search)
             return true;
 
         bool shouldFilter = item.Match(
-            companion => !_showCompanions || companion.Model.Row == 0,
-            mount => !_showMounts || mount.ModelChara.Row == 0,
+            companion => !_showCompanions || companion.Model.RowId == 0,
+            mount => !_showMounts || mount.ModelChara.RowId == 0,
             ornament => !_showOrnaments || ornament.Model == 0,
             none => false
         );
@@ -74,8 +74,8 @@ protected override bool Filter(CompanionRowUnion item, string search)
             return false;
 
         var searchText = item.Match(
-            companion => $"{companion.Singular} {companion.Plural} {companion.RowId} {companion.Model.Row}",
-            mount => $"{mount.Singular} {mount.Plural} {mount.RowId} {mount.ModelChara.Row}",
+            companion => $"{companion.Singular} {companion.Plural} {companion.RowId} {companion.Model.RowId}",
+            mount => $"{mount.Singular} {mount.Plural} {mount.RowId} {mount.ModelChara.RowId}",
             ornament => $"{ornament.Singular} {ornament.Plural} {ornament.RowId} {ornament.Model}",
             none => "none"
         );
diff --git a/Brio/UI/Controls/Selectors/DyeSelector.cs b/Brio/UI/Controls/Selectors/DyeSelector.cs
index 6af9d73b..b54ff0be 100644
--- a/Brio/UI/Controls/Selectors/DyeSelector.cs
+++ b/Brio/UI/Controls/Selectors/DyeSelector.cs
@@ -2,7 +2,7 @@
 using Brio.Resources;
 using Brio.UI.Controls.Stateless;
 using ImGuiNET;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using OneOf.Types;
 using System.Numerics;
 
diff --git a/Brio/UI/Controls/Selectors/NpcSelector.cs b/Brio/UI/Controls/Selectors/NpcSelector.cs
index 3ff4995c..fd5305eb 100644
--- a/Brio/UI/Controls/Selectors/NpcSelector.cs
+++ b/Brio/UI/Controls/Selectors/NpcSelector.cs
@@ -2,7 +2,7 @@
 using Brio.Resources;
 using Brio.UI.Controls.Stateless;
 using ImGuiNET;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using System;
 using System.Collections.Generic;
 using System.Numerics;
@@ -39,11 +39,9 @@ protected override void PopulateList()
             string name = $"E:{npc.RowId:D7}";
 
             var resident = GameDataProvider.Instance.ENpcResidents[npc.RowId];
-            if(resident != null)
-            {
-                if(!string.IsNullOrEmpty(resident.Singular))
-                    name = resident.Singular;
-            }
+
+            if(!string.IsNullOrEmpty(resident.Singular.ToString()))
+                name = resident.Singular.ToString();
 
             name = ResolveName(name);
             AddItem(new NpcSelectorEntry(name, 0, npc));
@@ -51,17 +49,17 @@ protected override void PopulateList()
 
         foreach(var (_, mount) in GameDataProvider.Instance.Mounts)
         {
-            AddItem(new NpcSelectorEntry(mount.Singular ?? $"Mount {mount.RowId}", mount.Icon, mount));
+            AddItem(new NpcSelectorEntry(mount.Singular.ToString() ?? $"Mount {mount.RowId}", mount.Icon, mount));
         }
 
         foreach(var (_, companion) in GameDataProvider.Instance.Companions)
         {
-            AddItem(new NpcSelectorEntry(companion.Singular ?? $"Companion {companion.RowId}", companion.Icon, companion));
+            AddItem(new NpcSelectorEntry(companion.Singular.ToString() ?? $"Companion {companion.RowId}", companion.Icon, companion));
         }
 
         foreach(var (_, ornament) in GameDataProvider.Instance.Ornaments)
         {
-            AddItem(new NpcSelectorEntry(ornament.Singular ?? $"Ornament {ornament.RowId}", ornament.Icon, ornament));
+            AddItem(new NpcSelectorEntry(ornament.Singular.ToString() ?? $"Ornament {ornament.RowId}", ornament.Icon, ornament));
         }
     }
 
@@ -76,8 +74,8 @@ private static string ResolveName(string name)
         {
             var nameId = uint.Parse(name.Substring(2));
             if(GameDataProvider.Instance.BNpcNames.TryGetValue(nameId, out var nameRef))
-                if(nameRef != null && !string.IsNullOrEmpty(nameRef.Singular))
-                    name = nameRef.Singular;
+                if(!string.IsNullOrEmpty(nameRef.Singular.ToString()))
+                    name = nameRef.Singular.ToString();
         }
 
         return name;
@@ -110,10 +108,10 @@ protected override void DrawOptions()
     protected override void DrawItem(NpcSelectorEntry item, bool isHovered)
     {
         var details = item.Appearance.Match(
-            bnpc => $"Battle NPC: {bnpc.RowId}\nModel: {bnpc.ModelChara.Row}",
-            enpc => $"Event NPC: {enpc.RowId}\nModel: {enpc.ModelChara.Row}",
-            mount => $"Mount: {mount.RowId}\nModel: {mount.ModelChara.Row}",
-            companion => $"Companion: {companion.RowId}\nModel: {companion.Model.Row}",
+            bnpc => $"Battle NPC: {bnpc.RowId}\nModel: {bnpc.ModelChara.RowId}",
+            enpc => $"Event NPC: {enpc.RowId}\nModel: {enpc.ModelChara.RowId}",
+            mount => $"Mount: {mount.RowId}\nModel: {mount.ModelChara.RowId}",
+            companion => $"Companion: {companion.RowId}\nModel: {companion.Model.RowId}",
             ornament => $"Ornament: {ornament.RowId}\nModel: {ornament.Model}",
             none => ""
         );
@@ -128,8 +126,8 @@ protected override bool Filter(NpcSelectorEntry item, string search)
         bool shouldHide = item.Appearance.Match(
             bnpc => !showBNpcs || bnpc.RowId == 0,
             enpc => !showENpcs || enpc.RowId == 0,
-            mount => !showMounts || mount.ModelChara.Row == 0,
-            companion => !showCompanions || companion.Model.Row == 0,
+            mount => !showMounts || mount.ModelChara.RowId == 0,
+            companion => !showCompanions || companion.Model.RowId == 0,
             ornament => !showOrnaments || ornament.Model == 0,
             none => true
         );
@@ -138,10 +136,10 @@ protected override bool Filter(NpcSelectorEntry item, string search)
             return false;
 
         string searchTerm = item.Appearance.Match(
-            bnpc => $"{item.Name} {bnpc.RowId} {bnpc.ModelChara.Row}",
-            enpc => $"{item.Name} {enpc.RowId} {enpc.ModelChara.Row}",
-            mount => $"{item.Name} {mount.RowId} {mount.ModelChara.Row}",
-            companion => $"{item.Name} {companion.RowId} {companion.Model.Row}",
+            bnpc => $"{item.Name} {bnpc.RowId} {bnpc.ModelChara.RowId}",
+            enpc => $"{item.Name} {enpc.RowId} {enpc.ModelChara.RowId}",
+            mount => $"{item.Name} {mount.RowId} {mount.ModelChara.RowId}",
+            companion => $"{item.Name} {companion.RowId} {companion.Model.RowId}",
             ornament => $"{item.Name} {ornament.RowId} {ornament.Model}",
             none => ""
         );
diff --git a/Brio/UI/Controls/Selectors/StatusEffectSelector.cs b/Brio/UI/Controls/Selectors/StatusEffectSelector.cs
index 7cd85743..ecdccaa6 100644
--- a/Brio/UI/Controls/Selectors/StatusEffectSelector.cs
+++ b/Brio/UI/Controls/Selectors/StatusEffectSelector.cs
@@ -1,7 +1,7 @@
 using Brio.Resources;
 using Dalamud.Interface.Textures.TextureWraps;
 using ImGuiNET;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using System;
 using System.Numerics;
 
@@ -33,7 +33,7 @@ protected override void DrawItem(Status item, bool isHovered)
 
         ImGui.Image(tex.ImGuiHandle, iconSize);
         ImGui.SameLine();
-        ImGui.Text($"{item.Name}\n{item.RowId}\nVFX: {item.VFX.Row} / Hit: {item.HitEffect.Row}");
+        ImGui.Text($"{item.Name}\n{item.RowId}\nVFX: {item.VFX.RowId} / Hit: {item.HitEffect.RowId}");
     }
 
     protected override int Compare(Status itemA, Status itemB)
@@ -52,7 +52,7 @@ protected override bool Filter(Status item, string search)
         if(item.StatusCategory == 0)
             return false;
 
-        var searchTerm = $"{item.Name} {item.RowId} {item.VFX.Row} {item.HitEffect.Row}";
+        var searchTerm = $"{item.Name} {item.RowId} {item.VFX.RowId} {item.HitEffect.RowId}";
 
         if(searchTerm.Contains(search, StringComparison.InvariantCultureIgnoreCase))
             return true;
diff --git a/Brio/UI/Controls/Selectors/WeatherSelector.cs b/Brio/UI/Controls/Selectors/WeatherSelector.cs
index 50a8c457..e6551905 100644
--- a/Brio/UI/Controls/Selectors/WeatherSelector.cs
+++ b/Brio/UI/Controls/Selectors/WeatherSelector.cs
@@ -2,7 +2,7 @@
 using Brio.Resources;
 using Brio.UI.Controls.Stateless;
 using ImGuiNET;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using System.Collections.Generic;
 using System.Numerics;
 
@@ -51,7 +51,7 @@ protected override bool Filter(WeatherUnion item, string search)
         return item.Match(
             (weatherRow) =>
             {
-                if(string.IsNullOrEmpty(weatherRow.Name))
+                if(string.IsNullOrEmpty(weatherRow.Name.ToString()))
                     return false;
 
                 if(!_showInvalidWeathers && !_validWeathers.Contains(weatherRow))
diff --git a/Brio/UI/Controls/Stateless/ImBrio.Companions.cs b/Brio/UI/Controls/Stateless/ImBrio.Companions.cs
index f0b511e6..a2f1af21 100644
--- a/Brio/UI/Controls/Stateless/ImBrio.Companions.cs
+++ b/Brio/UI/Controls/Stateless/ImBrio.Companions.cs
@@ -8,8 +8,8 @@ internal static partial class ImBrio
     public static bool BorderedGameIcon(string id, CompanionRowUnion union, bool showText = true, ImGuiButtonFlags flags = ImGuiButtonFlags.MouseButtonLeft, Vector2? size = null)
     {
         var (description, icon) = union.Match(
-           companion => ($"{companion.Singular}\n{companion.RowId}\nModel: {companion.Model.Row}", companion.Icon),
-           mount => ($"{mount.Singular}\n{mount.RowId}\nModel: {mount.ModelChara.Row}", mount.Icon),
+           companion => ($"{companion.Singular}\n{companion.RowId}\nModel: {companion.Model.RowId}", companion.Icon),
+           mount => ($"{mount.Singular}\n{mount.RowId}\nModel: {mount.ModelChara.RowId}", mount.Icon),
            ornament => ($"{ornament.Singular}\n{ornament.RowId}\nModel: {ornament.Model}", ornament.Icon),
            none => ("None", (uint)0)
        );