diff --git a/build.gradle b/build.gradle
index 2ec4ee4..48fb81a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,7 +47,7 @@ allprojects {
     dependencies {
         compileOnly 'com.willfp:eco:6.46.0'
         implementation 'com.willfp:libreforge:3.118.0'
-        implementation 'com.willfp:ecomponent:1.2.0'
+        implementation 'com.willfp:ecomponent:1.3.0'
         implementation 'org.joml:joml:1.10.4'
 
         compileOnly 'org.jetbrains:annotations:23.0.0'
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt
index c11f99a..0659329 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt
@@ -21,9 +21,7 @@ import com.willfp.eco.core.items.isEmpty
 import com.willfp.eco.core.price.ConfiguredPrice
 import com.willfp.eco.core.sound.PlayableSound
 import com.willfp.ecomponent.CaptiveItem
-import com.willfp.ecomponent.MenuStateVar
-import com.willfp.ecomponent.NotNullMenuStateVar
-import com.willfp.ecomponent.lazyWithReceiver
+import com.willfp.ecomponent.menuStateVar
 import com.willfp.ecomponent.setSlot
 import com.willfp.reforges.reforges.PriceMultipliers
 import com.willfp.reforges.reforges.Reforge
@@ -48,15 +46,13 @@ private data class ReforgeGUIStatus(
 
 private class ReforgePriceChangeEvent : MenuEvent
 
-private val Menu.reforgeStatus by lazyWithReceiver<Menu, MenuStateVar<ReforgeGUIStatus>> {
-    NotNullMenuStateVar(
-        this, "reforge_status", ReforgeGUIStatus(
-            ReforgeStatus.NO_ITEM,
-            ConfiguredPrice.createOrFree(emptyConfig()),
-            false
-        )
+private val Menu.reforgeStatus by menuStateVar(
+    ReforgeGUIStatus(
+        ReforgeStatus.NO_ITEM,
+        ConfiguredPrice.createOrFree(emptyConfig()),
+        false
     )
-}
+)
 
 private class IndicatorSlot(
     plugin: EcoPlugin