diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/BedBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/BedBlockEntity.kt
index afd14169c..6b332e2b4 100644
--- a/src/main/java/de/bixilon/minosoft/data/entities/block/BedBlockEntity.kt
+++ b/src/main/java/de/bixilon/minosoft/data/entities/block/BedBlockEntity.kt
@@ -13,11 +13,9 @@
 
 package de.bixilon.minosoft.data.entities.block
 
-import de.bixilon.minosoft.data.registries.MultiResourceLocationAble
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.text.ChatColors
 import de.bixilon.minosoft.protocol.network.connection.PlayConnection
-import de.bixilon.minosoft.util.KUtil.toResourceLocationList
 
 class BedBlockEntity(connection: PlayConnection) : BlockEntity(connection) {
     var color = ChatColors.RED
@@ -28,9 +26,8 @@ class BedBlockEntity(connection: PlayConnection) : BlockEntity(connection) {
         color = ChatColors.RED // ToDo
     }
 
-    companion object : BlockEntityFactory<BedBlockEntity>, MultiResourceLocationAble {
+    companion object : BlockEntityFactory<BedBlockEntity> {
         override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:bed")
-        override val ALIASES: Set<ResourceLocation> = setOf("minecraft:Bed").toResourceLocationList()
 
         override fun build(connection: PlayConnection): BedBlockEntity {
             return BedBlockEntity(connection)
diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/SignBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/SignBlockEntity.kt
index 4ca7192a1..4e8002133 100644
--- a/src/main/java/de/bixilon/minosoft/data/entities/block/SignBlockEntity.kt
+++ b/src/main/java/de/bixilon/minosoft/data/entities/block/SignBlockEntity.kt
@@ -13,13 +13,11 @@
 
 package de.bixilon.minosoft.data.entities.block
 
-import de.bixilon.minosoft.data.registries.MultiResourceLocationAble
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.text.ChatComponent
 import de.bixilon.minosoft.protocol.network.connection.PlayConnection
 import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
 import de.bixilon.minosoft.util.KUtil.nullCast
-import de.bixilon.minosoft.util.KUtil.toResourceLocationList
 
 class SignBlockEntity(connection: PlayConnection) : BlockEntity(connection) {
     var lines: Array<ChatComponent> = Array(ProtocolDefinition.SIGN_LINES) { ChatComponent.of("") }
@@ -33,9 +31,8 @@ class SignBlockEntity(connection: PlayConnection) : BlockEntity(connection) {
         }
     }
 
-    companion object : BlockEntityFactory<SignBlockEntity>, MultiResourceLocationAble {
+    companion object : BlockEntityFactory<SignBlockEntity> {
         override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:sign")
-        override val ALIASES: Set<ResourceLocation> = setOf("minecraft:Sign").toResourceLocationList()
 
         override fun build(connection: PlayConnection): SignBlockEntity {
             return SignBlockEntity(connection)
diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/SkullBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/SkullBlockEntity.kt
index 4de5fbc7f..f11aa4075 100644
--- a/src/main/java/de/bixilon/minosoft/data/entities/block/SkullBlockEntity.kt
+++ b/src/main/java/de/bixilon/minosoft/data/entities/block/SkullBlockEntity.kt
@@ -13,16 +13,13 @@
 
 package de.bixilon.minosoft.data.entities.block
 
-import de.bixilon.minosoft.data.registries.MultiResourceLocationAble
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.protocol.network.connection.PlayConnection
-import de.bixilon.minosoft.util.KUtil.toResourceLocationList
 
 class SkullBlockEntity(connection: PlayConnection) : BlockEntity(connection) {
 
-    companion object : BlockEntityFactory<SkullBlockEntity>, MultiResourceLocationAble {
+    companion object : BlockEntityFactory<SkullBlockEntity> {
         override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:skull")
-        override val ALIASES: Set<ResourceLocation> = setOf("minecraft:Skull").toResourceLocationList()
 
         override fun build(connection: PlayConnection): SkullBlockEntity {
             return SkullBlockEntity(connection)
diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/container/HopperBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/container/HopperBlockEntity.kt
index c3797d1ab..22ae9faa5 100644
--- a/src/main/java/de/bixilon/minosoft/data/entities/block/container/HopperBlockEntity.kt
+++ b/src/main/java/de/bixilon/minosoft/data/entities/block/container/HopperBlockEntity.kt
@@ -14,17 +14,14 @@
 package de.bixilon.minosoft.data.entities.block.container
 
 import de.bixilon.minosoft.data.entities.block.BlockEntityFactory
-import de.bixilon.minosoft.data.registries.MultiResourceLocationAble
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.protocol.network.connection.PlayConnection
-import de.bixilon.minosoft.util.KUtil.toResourceLocationList
 
 class HopperBlockEntity(connection: PlayConnection) : ContainerBlockEntity(connection) {
 
 
-    companion object : BlockEntityFactory<HopperBlockEntity>, MultiResourceLocationAble {
+    companion object : BlockEntityFactory<HopperBlockEntity> {
         override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:hopper")
-        override val ALIASES: Set<ResourceLocation> = setOf("minecraft:Hopper").toResourceLocationList()
 
         override fun build(connection: PlayConnection): HopperBlockEntity {
             return HopperBlockEntity(connection)
diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/ChestBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/ChestBlockEntity.kt
index 8367e8945..29670b9e1 100644
--- a/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/ChestBlockEntity.kt
+++ b/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/ChestBlockEntity.kt
@@ -14,16 +14,13 @@
 package de.bixilon.minosoft.data.entities.block.container.storage
 
 import de.bixilon.minosoft.data.entities.block.BlockEntityFactory
-import de.bixilon.minosoft.data.registries.MultiResourceLocationAble
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.protocol.network.connection.PlayConnection
-import de.bixilon.minosoft.util.KUtil.toResourceLocationList
 
 class ChestBlockEntity(connection: PlayConnection) : StorageBlockEntity(connection) {
 
-    companion object : BlockEntityFactory<ChestBlockEntity>, MultiResourceLocationAble {
+    companion object : BlockEntityFactory<ChestBlockEntity> {
         override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:chest")
-        override val ALIASES: Set<ResourceLocation> = setOf("minecraft:Chest").toResourceLocationList()
 
         override fun build(connection: PlayConnection): ChestBlockEntity {
             return ChestBlockEntity(connection)
diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/EnderChestBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/EnderChestBlockEntity.kt
index df3151c40..8c796dea0 100644
--- a/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/EnderChestBlockEntity.kt
+++ b/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/EnderChestBlockEntity.kt
@@ -14,16 +14,13 @@
 package de.bixilon.minosoft.data.entities.block.container.storage
 
 import de.bixilon.minosoft.data.entities.block.BlockEntityFactory
-import de.bixilon.minosoft.data.registries.MultiResourceLocationAble
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.protocol.network.connection.PlayConnection
-import de.bixilon.minosoft.util.KUtil.toResourceLocationList
 
 class EnderChestBlockEntity(connection: PlayConnection) : StorageBlockEntity(connection) {
 
-    companion object : BlockEntityFactory<EnderChestBlockEntity>, MultiResourceLocationAble {
+    companion object : BlockEntityFactory<EnderChestBlockEntity> {
         override val RESOURCE_LOCATION: ResourceLocation = ResourceLocation("minecraft:ender_chest")
-        override val ALIASES: Set<ResourceLocation> = setOf("minecraft:EnderChest").toResourceLocationList()
 
         override fun build(connection: PlayConnection): EnderChestBlockEntity {
             return EnderChestBlockEntity(connection)
diff --git a/src/main/java/de/bixilon/minosoft/data/registries/entities/EntityType.kt b/src/main/java/de/bixilon/minosoft/data/registries/entities/EntityType.kt
index d387a974b..f2af00aa3 100644
--- a/src/main/java/de/bixilon/minosoft/data/registries/entities/EntityType.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/entities/EntityType.kt
@@ -43,6 +43,10 @@ data class EntityType(
     val factory: EntityFactory<out Entity>,
 ) : RegistryItem(), Translatable {
 
+    override fun toString(): String {
+        return resourceLocation.toString()
+    }
+
     fun build(connection: PlayConnection, position: Vec3d, rotation: EntityRotation, entityMetaData: EntityMetaData?, versionId: Int): Entity? {
         return DefaultEntityFactories.buildEntity(factory, connection, position, rotation, entityMetaData, versionId)
     }