diff --git a/src/main/java/net/minestom/server/item/component/CustomData.java b/src/main/java/net/minestom/server/item/component/CustomData.java
index 0c00926ea..012ea1d0f 100644
--- a/src/main/java/net/minestom/server/item/component/CustomData.java
+++ b/src/main/java/net/minestom/server/item/component/CustomData.java
@@ -1,11 +1,11 @@
 package net.minestom.server.item.component;
 
+import net.kyori.adventure.nbt.CompoundBinaryTag;
 import net.minestom.server.network.NetworkBuffer;
 import net.minestom.server.tag.Tag;
 import org.jetbrains.annotations.NotNull;
-import org.jglrxavpok.hephaistos.nbt.NBTCompound;
 
-public record CustomData(@NotNull NBTCompound nbt) implements ItemComponent {
+public record CustomData(@NotNull CompoundBinaryTag nbt) implements ItemComponent {
     static final Tag<CustomData> TAG = Tag.Structure("ab", CustomData.class);
 
     static final NetworkBuffer.Type<CustomData> NETWORK_TYPE = new NetworkBuffer.Type<>() {
@@ -16,7 +16,7 @@ public record CustomData(@NotNull NBTCompound nbt) implements ItemComponent {
 
         @Override
         public CustomData read(@NotNull NetworkBuffer buffer) {
-            return new CustomData((NBTCompound) buffer.read(NetworkBuffer.NBT));
+            return new CustomData((CompoundBinaryTag) buffer.read(NetworkBuffer.NBT));
         }
     };
 
diff --git a/src/main/java/net/minestom/server/network/NetworkBufferTypeImpl.java b/src/main/java/net/minestom/server/network/NetworkBufferTypeImpl.java
index 6347280d2..0b1fcff0b 100644
--- a/src/main/java/net/minestom/server/network/NetworkBufferTypeImpl.java
+++ b/src/main/java/net/minestom/server/network/NetworkBufferTypeImpl.java
@@ -2,7 +2,6 @@ package net.minestom.server.network;
 
 import net.kyori.adventure.nbt.BinaryTag;
 import net.kyori.adventure.nbt.CompoundBinaryTag;
-import net.kyori.adventure.nbt.EndBinaryTag;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import net.minestom.server.adventure.serializer.nbt.NbtComponentSerializer;
@@ -420,7 +419,7 @@ interface NetworkBufferTypeImpl<T> extends NetworkBuffer.Type<T> {
             buffer.read(VAR_INT); // Added components
             buffer.read(VAR_INT); // Removed components
 
-            return ItemStack.fromNBT(material, new NBTCompound(), count);
+            return ItemStack.fromNBT(material, CompoundBinaryTag.empty(), count);
         }
     }
 
diff --git a/src/main/java/net/minestom/server/network/packet/server/configuration/RegistryDataPacket.java b/src/main/java/net/minestom/server/network/packet/server/configuration/RegistryDataPacket.java
index df09adb35..cf0fc3eac 100644
--- a/src/main/java/net/minestom/server/network/packet/server/configuration/RegistryDataPacket.java
+++ b/src/main/java/net/minestom/server/network/packet/server/configuration/RegistryDataPacket.java
@@ -6,7 +6,6 @@ import net.minestom.server.network.packet.server.ServerPacket;
 import net.minestom.server.network.packet.server.ServerPacketIdentifier;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jglrxavpok.hephaistos.nbt.NBTCompound;
 
 import java.util.List;
 
diff --git a/src/main/java/net/minestom/server/world/biomes/BiomeManager.java b/src/main/java/net/minestom/server/world/biomes/BiomeManager.java
index 2a787db0c..b7d39dfe4 100644
--- a/src/main/java/net/minestom/server/world/biomes/BiomeManager.java
+++ b/src/main/java/net/minestom/server/world/biomes/BiomeManager.java
@@ -14,11 +14,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
-
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Allows servers to register custom dimensions. Also used during player joining to send the list of all existing dimensions.
- * <p>
  */
 public final class BiomeManager {
     private final CachedPacket registryDataPacket = new CachedPacket(this::createRegistryDataPacket);