diff --git a/Glamourer/Interop/Material/MaterialManager.cs b/Glamourer/Interop/Material/MaterialManager.cs
index 81373c5..e065e91 100644
--- a/Glamourer/Interop/Material/MaterialManager.cs
+++ b/Glamourer/Interop/Material/MaterialManager.cs
@@ -197,12 +197,11 @@ public sealed unsafe class MaterialManager : IRequiredService, IDisposable
     /// </summary>
     private static CharacterWeapon GetTempSlot(Weapon* weapon)
     {
-        // TODO: Use ClientStructs
-        var changedData = *(void**)((byte*)weapon + 0xA40);
+        var changedData = weapon->ChangedData;
         if (changedData == null)
             return new CharacterWeapon(weapon->ModelSetId, weapon->SecondaryId, (Variant)weapon->Variant, StainIds.FromWeapon(*weapon));
 
-        return new CharacterWeapon(weapon->ModelSetId, *(SecondaryId*)changedData, ((Variant*)changedData)[2],
-            new StainIds(((StainId*)changedData)[3], ((StainId*)changedData)[4]));
+        return new CharacterWeapon(weapon->ModelSetId, changedData->SecondaryId, changedData->Variant,
+            new StainIds(changedData->Stain0, changedData->Stain1));
     }
 }