diff --git a/gradle.properties b/gradle.properties
index f7ab030..dd2a85b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,14 +1,14 @@
 org.gradle.jvmargs=-Xmx4G
 
 # BTA
-bta_version=7.1
+bta_version=7.2-pre2
 
 # Loader & Mod Menu
-loader_version=0.15.6-babric.4-bta
+loader_version=0.15.6-babric.6-bta
 mod_menu_version=2.0.5
 
 # HalpLibe
-halplibe_version=3.5.2
+halplibe_version=4.1.3
 
 # Mod
 mod_version=1.2.1
diff --git a/src/main/java/rootenginear/sortchest/mixin/GameSettingsMixin.java b/src/main/java/rootenginear/sortchest/mixin/GameSettingsMixin.java
index 92f05f4..b4d2d31 100644
--- a/src/main/java/rootenginear/sortchest/mixin/GameSettingsMixin.java
+++ b/src/main/java/rootenginear/sortchest/mixin/GameSettingsMixin.java
@@ -2,16 +2,17 @@
 
 import net.minecraft.client.option.GameSettings;
 import net.minecraft.client.option.KeyBinding;
+import net.minecraft.client.input.InputDevice;
 import org.spongepowered.asm.mixin.Mixin;
 import rootenginear.sortchest.interfaces.ISortChestSettings;
 
 @Mixin(value = GameSettings.class, remap = false)
 public class GameSettingsMixin implements ISortChestSettings {
 	
-	public KeyBinding keyRefill = new KeyBinding("sortchest.refill").bindKeyboard(0x13); //R
-	public KeyBinding keyFill = new KeyBinding("sortchest.fill").bindKeyboard(0x21); //F
-	public KeyBinding keyDump = new KeyBinding("sortchest.dump").bindKeyboard(0x20); //D
-	public KeyBinding keySort = new KeyBinding("sortchest.sort").bindKeyboard(0x1F); //S
+	public KeyBinding keyRefill = new KeyBinding("sortchest.refill").setDefault(InputDevice.keyboard, 0x13); //R
+	public KeyBinding keyFill = new KeyBinding("sortchest.fill").setDefault(InputDevice.keyboard, 0x21); //F
+	public KeyBinding keyDump = new KeyBinding("sortchest.dump").setDefault(InputDevice.keyboard, 0x20); //D
+	public KeyBinding keySort = new KeyBinding("sortchest.sort").setDefault(InputDevice.keyboard, 0x1F); //S
 
 	@Override
 	public KeyBinding bta_rootenginear_mods$getKeySort() {
diff --git a/src/main/java/rootenginear/sortchest/mixin/GuiContainerMixin.java b/src/main/java/rootenginear/sortchest/mixin/GuiContainerMixin.java
index 592c5a1..53d0cd0 100644
--- a/src/main/java/rootenginear/sortchest/mixin/GuiContainerMixin.java
+++ b/src/main/java/rootenginear/sortchest/mixin/GuiContainerMixin.java
@@ -19,7 +19,6 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import rootenginear.sortchest.gui.GuiSortChestButton;
 import rootenginear.sortchest.interfaces.ISortChestSettings;
-import rootenginear.sortchest.mixin.accessor.GuiChestAccessor;
 import rootenginear.sortchest.utils.Utils;
 
 import java.util.ArrayList;
@@ -66,7 +65,7 @@ private void doSort(char c, int _i, int mouseX, int mouseY, CallbackInfo ci) {
 			return;
 		}
 
-		int countInvSlots = ((GuiChestAccessor) this).getInventoryRows() * 9;
+		int countInvSlots = this.inventorySlots.inventorySlots.size() - 36;
 
 		if (key == keyFill) {
 			dumpItemToChest(playerController, entityPlayer, windowId, countInvSlots);
diff --git a/src/main/java/rootenginear/sortchest/mixin/accessor/GuiChestAccessor.java b/src/main/java/rootenginear/sortchest/mixin/accessor/GuiChestAccessor.java
deleted file mode 100644
index 94f64bf..0000000
--- a/src/main/java/rootenginear/sortchest/mixin/accessor/GuiChestAccessor.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package rootenginear.sortchest.mixin.accessor;
-
-import net.minecraft.client.gui.GuiChest;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(value = {GuiChest.class}, remap = false)
-public interface GuiChestAccessor {
-	@Accessor
-	int getInventoryRows();
-}
diff --git a/src/main/java/rootenginear/sortchest/utils/Utils.java b/src/main/java/rootenginear/sortchest/utils/Utils.java
index 89c6354..e858145 100644
--- a/src/main/java/rootenginear/sortchest/utils/Utils.java
+++ b/src/main/java/rootenginear/sortchest/utils/Utils.java
@@ -4,6 +4,7 @@
 
 public class Utils {
 	public static boolean isNotChest(Object object) {
-		return !(object instanceof GuiChest);
+	    String name = object.getClass().getSimpleName();
+		return !(object instanceof GuiChest) && !name.equals("ContainerWideChest") && !name.equals("GuiDiamondChest") && !name.equals("GuiIronChest");
 	}
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 511a749..11f76c9 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -34,7 +34,7 @@
 		"sortchest.mixins.json"
 	],
 	"depends": {
-		"minecraft": "7.1",
+		"minecraft": "~7.2-beta.2",
 		"fabricloader": ">=0.15.5",
 		"halplibe": ">=3.5.2"
 	},
diff --git a/src/main/resources/sortchest.mixins.json b/src/main/resources/sortchest.mixins.json
index 29dc275..f6ff799 100644
--- a/src/main/resources/sortchest.mixins.json
+++ b/src/main/resources/sortchest.mixins.json
@@ -7,7 +7,6 @@
     "GameSettingsMixin",
     "GuiContainerMixin",
     "GuiScreenMixin",
-    "accessor.GuiChestAccessor"
   ],
   "injectors": {
     "defaultRequire": 1