diff --git a/pom.xml b/pom.xml
index 00609dc..edfc587 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.tomff.beesplus</groupId>
     <artifactId>BeesPlus</artifactId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.15.2-R0.1-SNAPSHOT</version>
+            <version>1.16.3-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/com/tomff/beesplus/core/items/CustomItem.java b/src/main/java/com/tomff/beesplus/core/items/CustomItem.java
index dbb04e2..1d7b1b9 100644
--- a/src/main/java/com/tomff/beesplus/core/items/CustomItem.java
+++ b/src/main/java/com/tomff/beesplus/core/items/CustomItem.java
@@ -5,10 +5,10 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.Map;
 
-public abstract class CustomItem {
+public interface CustomItem {
 
-    public abstract String[] getRecipe();
-    public abstract Map<Character, Material> getIngredients();
-    public abstract ItemStack getResult();
+    String[] getRecipe();
+    Map<Character, Material> getIngredients();
+    ItemStack getResult();
 
 }
diff --git a/src/main/java/com/tomff/beesplus/items/BeeHiveUpgrade.java b/src/main/java/com/tomff/beesplus/items/BeeHiveUpgrade.java
index 224bcae..11dfcc5 100644
--- a/src/main/java/com/tomff/beesplus/items/BeeHiveUpgrade.java
+++ b/src/main/java/com/tomff/beesplus/items/BeeHiveUpgrade.java
@@ -24,8 +24,7 @@ import org.bukkit.persistence.PersistentDataType;
 import java.util.HashMap;
 import java.util.Map;
 
-public class BeeHiveUpgrade extends CustomItem implements Listener {
-
+public class BeeHiveUpgrade implements CustomItem, Listener {
     private NamespacedKey upgradeKey;
     private int maxPopulation;
 
@@ -34,7 +33,6 @@ public class BeeHiveUpgrade extends CustomItem implements Listener {
         maxPopulation = beesPlus.getConfig().getInt("beehiveupgrade.maximumpopulation", 9);
     }
 
-    @Override
     public String[] getRecipe() {
         return new String[] {
                 "CCC",
@@ -43,7 +41,6 @@ public class BeeHiveUpgrade extends CustomItem implements Listener {
         };
     }
 
-    @Override
     public Map<Character, Material> getIngredients() {
         Map<Character, Material> ingredients = new HashMap<>();
 
@@ -53,7 +50,6 @@ public class BeeHiveUpgrade extends CustomItem implements Listener {
         return ingredients;
     }
 
-    @Override
     public ItemStack getResult() {
         return new ItemBuilder(Material.HONEYCOMB)
                 .setName(Localization.get(Localization.BEEHIVE_UPGRADE_ITEM_NAME))
diff --git a/src/main/java/com/tomff/beesplus/items/BeeProtectionBoots.java b/src/main/java/com/tomff/beesplus/items/BeeProtectionBoots.java
index e77af44..be9a9ae 100644
--- a/src/main/java/com/tomff/beesplus/items/BeeProtectionBoots.java
+++ b/src/main/java/com/tomff/beesplus/items/BeeProtectionBoots.java
@@ -9,8 +9,7 @@ import org.bukkit.inventory.ItemStack;
 import java.util.HashMap;
 import java.util.Map;
 
-public class BeeProtectionBoots extends CustomItem {
-    @Override
+public class BeeProtectionBoots implements CustomItem {
     public String[] getRecipe() {
         return new String[] {
                 "SSS",
@@ -19,7 +18,6 @@ public class BeeProtectionBoots extends CustomItem {
         };
     }
 
-    @Override
     public Map<Character, Material> getIngredients() {
         Map<Character, Material> ingredients = new HashMap<>();
 
@@ -29,7 +27,6 @@ public class BeeProtectionBoots extends CustomItem {
         return ingredients;
     }
 
-    @Override
     public ItemStack getResult() {
         return new ItemBuilder(Material.CHAINMAIL_BOOTS)
                 .setName(Localization.get(Localization.BEE_PROTECTION_BOOTS))
diff --git a/src/main/java/com/tomff/beesplus/items/BeeProtectionChestplate.java b/src/main/java/com/tomff/beesplus/items/BeeProtectionChestplate.java
index b88b90c..b9e04f7 100644
--- a/src/main/java/com/tomff/beesplus/items/BeeProtectionChestplate.java
+++ b/src/main/java/com/tomff/beesplus/items/BeeProtectionChestplate.java
@@ -9,8 +9,7 @@ import org.bukkit.inventory.ItemStack;
 import java.util.HashMap;
 import java.util.Map;
 
-public class BeeProtectionChestplate extends CustomItem {
-    @Override
+public class BeeProtectionChestplate implements CustomItem {
     public String[] getRecipe() {
         return new String[] {
                 "SSS",
@@ -19,7 +18,6 @@ public class BeeProtectionChestplate extends CustomItem {
         };
     }
 
-    @Override
     public Map<Character, Material> getIngredients() {
         Map<Character, Material> ingredients = new HashMap<>();
 
@@ -29,7 +27,6 @@ public class BeeProtectionChestplate extends CustomItem {
         return ingredients;
     }
 
-    @Override
     public ItemStack getResult() {
         return new ItemBuilder(Material.CHAINMAIL_CHESTPLATE)
                 .setName(Localization.get(Localization.BEE_PROTECTION_CHESTPLATE))
diff --git a/src/main/java/com/tomff/beesplus/items/BeeProtectionHelmet.java b/src/main/java/com/tomff/beesplus/items/BeeProtectionHelmet.java
index 9d1f446..e6264c3 100644
--- a/src/main/java/com/tomff/beesplus/items/BeeProtectionHelmet.java
+++ b/src/main/java/com/tomff/beesplus/items/BeeProtectionHelmet.java
@@ -9,8 +9,7 @@ import org.bukkit.inventory.ItemStack;
 import java.util.HashMap;
 import java.util.Map;
 
-public class BeeProtectionHelmet extends CustomItem {
-    @Override
+public class BeeProtectionHelmet implements CustomItem {
     public String[] getRecipe() {
         return new String[] {
                 "SSS",
@@ -19,7 +18,6 @@ public class BeeProtectionHelmet extends CustomItem {
         };
     }
 
-    @Override
     public Map<Character, Material> getIngredients() {
         Map<Character, Material> ingredients = new HashMap<>();
 
@@ -29,7 +27,6 @@ public class BeeProtectionHelmet extends CustomItem {
         return ingredients;
     }
 
-    @Override
     public ItemStack getResult() {
         return new ItemBuilder(Material.CHAINMAIL_HELMET)
                 .setName(Localization.get(Localization.BEE_PROTECTION_HELMET))
diff --git a/src/main/java/com/tomff/beesplus/items/BeeProtectionLeggings.java b/src/main/java/com/tomff/beesplus/items/BeeProtectionLeggings.java
index dc5d439..dc3e202 100644
--- a/src/main/java/com/tomff/beesplus/items/BeeProtectionLeggings.java
+++ b/src/main/java/com/tomff/beesplus/items/BeeProtectionLeggings.java
@@ -9,8 +9,7 @@ import org.bukkit.inventory.ItemStack;
 import java.util.HashMap;
 import java.util.Map;
 
-public class BeeProtectionLeggings extends CustomItem {
-    @Override
+public class BeeProtectionLeggings implements CustomItem {
     public String[] getRecipe() {
         return new String[] {
                 "SSS",
@@ -19,7 +18,6 @@ public class BeeProtectionLeggings extends CustomItem {
         };
     }
 
-    @Override
     public Map<Character, Material> getIngredients() {
         Map<Character, Material> ingredients = new HashMap<>();
 
@@ -29,7 +27,6 @@ public class BeeProtectionLeggings extends CustomItem {
         return ingredients;
     }
 
-    @Override
     public ItemStack getResult() {
         return new ItemBuilder(Material.CHAINMAIL_LEGGINGS)
                 .setName(Localization.get(Localization.BEE_PROTECTION_LEGGINGS))