diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/CobblerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/CobblerBlockEntity.kt
index a54b1a092..b575ae8dd 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/CobblerBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/CobblerBlockEntity.kt
@@ -13,6 +13,8 @@ import ru.dbotthepony.mc.otm.block.entity.JobStatus
 import ru.dbotthepony.mc.otm.block.entity.MatteryWorkerBlockEntity
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.container.HandlerFilter
+import ru.dbotthepony.mc.otm.container.slotted.AutomationFilters
+import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer
 import ru.dbotthepony.mc.otm.menu.tech.CobblerMenu
 import ru.dbotthepony.mc.otm.registry.game.MBlockEntities
 
@@ -22,8 +24,8 @@ class CobblerBlockEntity(blockPos: BlockPos, blockState: BlockState)
 		return CobblerMenu(containerID, inventory, this)
 	}
 
-	val container = MatteryContainer(this::itemContainerUpdated, CONTAINER_SIZE).also(::addDroppableContainer)
-	val itemConfig = ConfigurableItemHandler(output = container.handler(HandlerFilter.OnlyOut))
+	val container = SlottedContainer.simple(CONTAINER_SIZE, AutomationFilters.ONLY_OUT.simpleProvider, ::itemContainerUpdated).also(::addDroppableContainer)
+	val itemConfig = ConfigurableItemHandler(output = container)
 
 	init {
 		savetables.stateful(::container, INVENTORY_KEY)
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/CobblerMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/CobblerMenu.kt
index 272fcc3cb..a7258ace0 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/CobblerMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/CobblerMenu.kt
@@ -1,29 +1,31 @@
 package ru.dbotthepony.mc.otm.menu.tech
 
-import net.minecraft.world.SimpleContainer
 import net.minecraft.world.entity.player.Inventory
 import ru.dbotthepony.mc.otm.block.entity.RedstoneSetting
 import ru.dbotthepony.mc.otm.block.entity.tech.CobblerBlockEntity
-import ru.dbotthepony.mc.otm.core.immutableList
+import ru.dbotthepony.mc.otm.container.EnhancedContainer
 import ru.dbotthepony.mc.otm.menu.OutputMenuSlot
 import ru.dbotthepony.mc.otm.menu.MatteryMenu
 import ru.dbotthepony.mc.otm.menu.input.EnumInputWithFeedback
 import ru.dbotthepony.mc.otm.menu.input.ItemConfigPlayerInput
+import ru.dbotthepony.mc.otm.menu.makeSlots
 import ru.dbotthepony.mc.otm.menu.widget.ProgressGaugeWidget
 import ru.dbotthepony.mc.otm.registry.game.MMenus
 
-class CobblerMenu @JvmOverloads constructor(
+class CobblerMenu(
 	p_38852_: Int,
 	inventory: Inventory,
 	tile: CobblerBlockEntity? = null
 ) : MatteryMenu(MMenus.COBBLESTONE_GENERATOR, p_38852_, inventory, tile) {
-	val storageSlots = (tile?.container ?: SimpleContainer(CobblerBlockEntity.CONTAINER_SIZE)).let { c -> immutableList(c.containerSize) { addStorageSlot(OutputMenuSlot(c, it)) } }
+	val storageSlots = makeSlots(tile?.container ?: EnhancedContainer(CobblerBlockEntity.CONTAINER_SIZE), ::OutputMenuSlot)
 	val redstone = EnumInputWithFeedback<RedstoneSetting>(this)
 	val itemConfig = ItemConfigPlayerInput(this)
 
 	val progress = ProgressGaugeWidget(this)
 
 	init {
+		addStorageSlot(storageSlots)
+
 		if (tile != null) {
 			progress.with(tile.jobEventLoops[0])
 			redstone.with(tile.redstoneControl::redstoneSetting)