diff --git a/gradle.properties b/gradle.properties
index 50704a6..1dd2e1e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,18 +4,18 @@ org.gradle.jvmargs=-Xmx1G
 # check these on https://modmuss50.me/fabric.html
 
 minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.1
+yarn_mappings=1.21.4+build.2
 loader_version=0.16.9
 
 # Fabric API
-fabric_version=0.110.5+1.21.4
+fabric_version=0.111.0+1.21.4
 
 # Mod Properties
-mod_version=3.3.2
+mod_version=3.3.3
 maven_group=systems.brn
 archives_base_name=Serverstorage
 
 # Dependencies
-polymer_version=0.11.0+1.21.4-rc1
+polymer_version=0.11.1+1.21.4
 server_translations_api_version=2.4.0+1.21.2-rc1
 servergui_version=1.8.1+1.21.4
\ No newline at end of file
diff --git a/src/main/java/systems/brn/serverstorage/items/SimpleBlockItem.java b/src/main/java/systems/brn/serverstorage/items/SimpleBlockItem.java
index 1ca0381..c339b0f 100644
--- a/src/main/java/systems/brn/serverstorage/items/SimpleBlockItem.java
+++ b/src/main/java/systems/brn/serverstorage/items/SimpleBlockItem.java
@@ -22,7 +22,7 @@ public class SimpleBlockItem extends PolymerBlockItem implements PolymerItem {
 
     public SimpleBlockItem(Item.Settings settings, Block block, Identifier identifier) {
         super(block, settings, Items.BARRIER);
-        this.polymerModel = identifier.withPath("item/" + identifier.getPath());
+        this.polymerModel = identifier;
     }
 
     @Override
diff --git a/src/main/java/systems/brn/serverstorage/items/SimpleItem.java b/src/main/java/systems/brn/serverstorage/items/SimpleItem.java
index e28b195..a614df4 100644
--- a/src/main/java/systems/brn/serverstorage/items/SimpleItem.java
+++ b/src/main/java/systems/brn/serverstorage/items/SimpleItem.java
@@ -24,7 +24,7 @@ public class SimpleItem extends SimplePolymerItem implements PolymerItem {
 
     public SimpleItem(Settings settings, Identifier identifier) {
         super(settings, Items.STICK);
-        this.polymerModel = identifier.withPath("item/" + identifier.getPath());
+        this.polymerModel = identifier;
     }
 
     @Override
diff --git a/src/main/resources/assets/serverstorage/items/bus_connector.json b/src/main/resources/assets/serverstorage/items/bus_connector.json
new file mode 100644
index 0000000..ec5e9ae
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/bus_connector.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "serverstorage:block/bus_connector"
+  }
+}
diff --git a/src/main/resources/assets/serverstorage/items/diamond_antenna.json b/src/main/resources/assets/serverstorage/items/diamond_antenna.json
new file mode 100644
index 0000000..4657833
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/diamond_antenna.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/diamond_antenna"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/diamond_drive.json b/src/main/resources/assets/serverstorage/items/diamond_drive.json
new file mode 100644
index 0000000..133380c
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/diamond_drive.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/diamond_drive"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/diamond_head.json b/src/main/resources/assets/serverstorage/items/diamond_head.json
new file mode 100644
index 0000000..4d70119
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/diamond_head.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/diamond_head"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/diamond_platter.json b/src/main/resources/assets/serverstorage/items/diamond_platter.json
new file mode 100644
index 0000000..fa1d3fc
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/diamond_platter.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/diamond_platter"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/drive_container.json b/src/main/resources/assets/serverstorage/items/drive_container.json
new file mode 100644
index 0000000..6b97199
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/drive_container.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "serverstorage:block/drive_container"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/golden_antenna.json b/src/main/resources/assets/serverstorage/items/golden_antenna.json
new file mode 100644
index 0000000..7c80a71
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/golden_antenna.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/golden_antenna"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/golden_drive.json b/src/main/resources/assets/serverstorage/items/golden_drive.json
new file mode 100644
index 0000000..1a49159
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/golden_drive.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/golden_drive"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/golden_head.json b/src/main/resources/assets/serverstorage/items/golden_head.json
new file mode 100644
index 0000000..2a54c1d
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/golden_head.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/golden_head"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/golden_platter.json b/src/main/resources/assets/serverstorage/items/golden_platter.json
new file mode 100644
index 0000000..dba6e32
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/golden_platter.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/golden_platter"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/inventory_interface.json b/src/main/resources/assets/serverstorage/items/inventory_interface.json
new file mode 100644
index 0000000..d6cebaf
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/inventory_interface.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "serverstorage:block/inventory_interface"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/iron_antenna.json b/src/main/resources/assets/serverstorage/items/iron_antenna.json
new file mode 100644
index 0000000..4f709f5
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/iron_antenna.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/iron_antenna"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/iron_drive.json b/src/main/resources/assets/serverstorage/items/iron_drive.json
new file mode 100644
index 0000000..515a6fe
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/iron_drive.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/iron_drive"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/iron_head.json b/src/main/resources/assets/serverstorage/items/iron_head.json
new file mode 100644
index 0000000..88ece17
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/iron_head.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/iron_head"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/iron_platter.json b/src/main/resources/assets/serverstorage/items/iron_platter.json
new file mode 100644
index 0000000..2a172b9
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/iron_platter.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/iron_platter"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/material_cpu.json b/src/main/resources/assets/serverstorage/items/material_cpu.json
new file mode 100644
index 0000000..4206cff
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/material_cpu.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/material_cpu"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/material_cpu_substrate.json b/src/main/resources/assets/serverstorage/items/material_cpu_substrate.json
new file mode 100644
index 0000000..8efc09e
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/material_cpu_substrate.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/material_cpu_substrate"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/material_drive_casing.json b/src/main/resources/assets/serverstorage/items/material_drive_casing.json
new file mode 100644
index 0000000..4dc34e6
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/material_drive_casing.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/material_drive_casing"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/material_drive_controller.json b/src/main/resources/assets/serverstorage/items/material_drive_controller.json
new file mode 100644
index 0000000..884277e
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/material_drive_controller.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/material_drive_controller"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/material_pcb.json b/src/main/resources/assets/serverstorage/items/material_pcb.json
new file mode 100644
index 0000000..0c460dd
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/material_pcb.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/material_pcb"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/material_pcb_substrate.json b/src/main/resources/assets/serverstorage/items/material_pcb_substrate.json
new file mode 100644
index 0000000..472b8f5
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/material_pcb_substrate.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/material_pcb_substrate"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/module_antenna.json b/src/main/resources/assets/serverstorage/items/module_antenna.json
new file mode 100644
index 0000000..87be939
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/module_antenna.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/module_antenna"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/module_antenna_connector.json b/src/main/resources/assets/serverstorage/items/module_antenna_connector.json
new file mode 100644
index 0000000..48049ad
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/module_antenna_connector.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/module_antenna_connector"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/module_bus.json b/src/main/resources/assets/serverstorage/items/module_bus.json
new file mode 100644
index 0000000..4ec9ec9
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/module_bus.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/module_bus"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/module_configuration.json b/src/main/resources/assets/serverstorage/items/module_configuration.json
new file mode 100644
index 0000000..b7cae2d
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/module_configuration.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/module_configuration"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/module_container.json b/src/main/resources/assets/serverstorage/items/module_container.json
new file mode 100644
index 0000000..b78c863
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/module_container.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/module_container"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/module_display.json b/src/main/resources/assets/serverstorage/items/module_display.json
new file mode 100644
index 0000000..5957726
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/module_display.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/module_display"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/module_drive.json b/src/main/resources/assets/serverstorage/items/module_drive.json
new file mode 100644
index 0000000..9e970ca
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/module_drive.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/module_drive"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/module_filtering.json b/src/main/resources/assets/serverstorage/items/module_filtering.json
new file mode 100644
index 0000000..31ea6d5
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/module_filtering.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/module_filtering"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/module_inventory.json b/src/main/resources/assets/serverstorage/items/module_inventory.json
new file mode 100644
index 0000000..2afb68c
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/module_inventory.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/module_inventory"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/module_modem.json b/src/main/resources/assets/serverstorage/items/module_modem.json
new file mode 100644
index 0000000..a7ee032
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/module_modem.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/module_modem"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/module_netherite_upgrade.json b/src/main/resources/assets/serverstorage/items/module_netherite_upgrade.json
new file mode 100644
index 0000000..aa53c88
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/module_netherite_upgrade.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/module_netherite_upgrade"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/module_pagination.json b/src/main/resources/assets/serverstorage/items/module_pagination.json
new file mode 100644
index 0000000..35ef2a6
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/module_pagination.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/module_pagination"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/module_pcb.json b/src/main/resources/assets/serverstorage/items/module_pcb.json
new file mode 100644
index 0000000..5b59233
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/module_pcb.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/module_pcb"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/module_radio.json b/src/main/resources/assets/serverstorage/items/module_radio.json
new file mode 100644
index 0000000..1090ce0
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/module_radio.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/module_radio"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/module_transport.json b/src/main/resources/assets/serverstorage/items/module_transport.json
new file mode 100644
index 0000000..f6b5ebe
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/module_transport.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/module_transport"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/netherite_antenna.json b/src/main/resources/assets/serverstorage/items/netherite_antenna.json
new file mode 100644
index 0000000..edb7b1b
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/netherite_antenna.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/netherite_antenna"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/netherite_drive.json b/src/main/resources/assets/serverstorage/items/netherite_drive.json
new file mode 100644
index 0000000..2a99159
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/netherite_drive.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/netherite_drive"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/netherite_head.json b/src/main/resources/assets/serverstorage/items/netherite_head.json
new file mode 100644
index 0000000..7a40439
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/netherite_head.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/netherite_head"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/netherite_platter.json b/src/main/resources/assets/serverstorage/items/netherite_platter.json
new file mode 100644
index 0000000..2fb048d
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/netherite_platter.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/netherite_platter"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/radio_interface.json b/src/main/resources/assets/serverstorage/items/radio_interface.json
new file mode 100644
index 0000000..6cce3b3
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/radio_interface.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "serverstorage:block/radio_interface"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/storage.json b/src/main/resources/assets/serverstorage/items/storage.json
new file mode 100644
index 0000000..64d43e5
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/storage.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "serverstorage:block/storage"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/serverstorage/items/wireless_terminal.json b/src/main/resources/assets/serverstorage/items/wireless_terminal.json
new file mode 100644
index 0000000..d3f9085
--- /dev/null
+++ b/src/main/resources/assets/serverstorage/items/wireless_terminal.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model":  "serverstorage:item/wireless_terminal"
+  }
+}
\ No newline at end of file