diff --git a/eco-core/core-nms/build.gradle b/eco-core/core-nms/build.gradle
index 34b97e1c..4aa1efc1 100644
--- a/eco-core/core-nms/build.gradle
+++ b/eco-core/core-nms/build.gradle
@@ -4,5 +4,6 @@ version rootProject.version
 subprojects {
     dependencies {
         compileOnly project(':eco-core:core-proxy')
+        compileOnly project(':eco-core:core-plugin')
     }
 }
\ No newline at end of file
diff --git a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/ChatComponent.java b/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/ChatComponent.java
index dda46707..24377cc4 100644
--- a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/ChatComponent.java
+++ b/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/ChatComponent.java
@@ -5,6 +5,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.willfp.eco.core.proxy.proxies.ChatComponentProxy;
+import com.willfp.ecoenchants.display.EnchantDisplay;
 import net.minecraft.server.v1_16_R1.ChatBaseComponent;
 import net.minecraft.server.v1_16_R1.ChatHoverable;
 import net.minecraft.server.v1_16_R1.ChatMessage;
@@ -15,7 +16,6 @@ import org.bukkit.Material;
 import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 
 public class ChatComponent implements ChatComponentProxy {
@@ -53,11 +53,7 @@ public class ChatComponent implements ChatComponentProxy {
         String tag = json.getAsJsonObject().get("tag").toString();
         ItemStack itemStack = getFromTag(tag, id);
 
-        try {
-            itemStack = (ItemStack) Class.forName("com.willfp.ecoenchants.display.EnchantDisplay").getMethod("displayEnchantments", ItemStack.class).invoke(null, itemStack);
-        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException | ClassNotFoundException e) {
-            e.printStackTrace();
-        }
+        itemStack = EnchantDisplay.displayEnchantments(itemStack);
 
         json.getAsJsonObject().remove("tag");
         String newTag = toJson(itemStack);
diff --git a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/ChatComponent.java b/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/ChatComponent.java
index 58fb9cc4..209b40a2 100644
--- a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/ChatComponent.java
+++ b/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/ChatComponent.java
@@ -5,6 +5,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.willfp.eco.core.proxy.proxies.ChatComponentProxy;
+import com.willfp.ecoenchants.display.EnchantDisplay;
 import net.minecraft.server.v1_16_R2.ChatBaseComponent;
 import net.minecraft.server.v1_16_R2.ChatHoverable;
 import net.minecraft.server.v1_16_R2.ChatMessage;
@@ -15,7 +16,6 @@ import org.bukkit.Material;
 import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 
 public class ChatComponent implements ChatComponentProxy {
@@ -53,11 +53,7 @@ public class ChatComponent implements ChatComponentProxy {
         String tag = json.getAsJsonObject().get("tag").toString();
         ItemStack itemStack = getFromTag(tag, id);
 
-        try {
-            itemStack = (ItemStack) Class.forName("com.willfp.ecoenchants.display.EnchantDisplay").getMethod("displayEnchantments", ItemStack.class).invoke(null, itemStack);
-        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException | ClassNotFoundException e) {
-            e.printStackTrace();
-        }
+        itemStack = EnchantDisplay.displayEnchantments(itemStack);
 
         json.getAsJsonObject().remove("tag");
         String newTag = toJson(itemStack);
diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/ChatComponent.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/ChatComponent.java
index 93cdbb34..ed13d2be 100644
--- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/ChatComponent.java
+++ b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/ChatComponent.java
@@ -5,6 +5,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.willfp.eco.core.proxy.proxies.ChatComponentProxy;
+import com.willfp.ecoenchants.display.EnchantDisplay;
 import net.minecraft.server.v1_16_R3.ChatBaseComponent;
 import net.minecraft.server.v1_16_R3.ChatHoverable;
 import net.minecraft.server.v1_16_R3.ChatMessage;
@@ -15,7 +16,6 @@ import org.bukkit.Material;
 import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 
 public class ChatComponent implements ChatComponentProxy {
@@ -53,11 +53,7 @@ public class ChatComponent implements ChatComponentProxy {
         String tag = json.getAsJsonObject().get("tag").toString();
         ItemStack itemStack = getFromTag(tag, id);
 
-        try {
-            itemStack = (ItemStack) Class.forName("com.willfp.ecoenchants.display.EnchantDisplay").getMethod("displayEnchantments", ItemStack.class).invoke(null, itemStack);
-        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException | ClassNotFoundException e) {
-            e.printStackTrace();
-        }
+        itemStack = EnchantDisplay.displayEnchantments(itemStack);
 
         json.getAsJsonObject().remove("tag");
         String newTag = toJson(itemStack);
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java
index a82a77ea..2bbc323f 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java
@@ -1,6 +1,8 @@
 package com.willfp.ecoenchants.enchantments;
 
 
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
 import com.google.common.collect.ImmutableList;
 import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.AshArtifact;
 import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.CloudsArtifact;
@@ -228,10 +230,8 @@ import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.EnchantmentStorageMeta;
 
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -244,7 +244,7 @@ public class EcoEnchants {
     public static final String OBTAINING_LOCATION = "obtaining.";
     public static final String GENERAL_LOCATION = "general-config.";
 
-    private static final Map<NamespacedKey, EcoEnchant> byKey = new HashMap<>();
+    private static final BiMap<NamespacedKey, EcoEnchant> byKey = HashBiMap.create();
 
     public static final EcoEnchant TELEKINESIS = new Telekinesis();
     public static final EcoEnchant MARKSMAN = new Marksman();
diff --git a/eco-util/src/main/java/com/willfp/eco/util/VectorUtils.java b/eco-util/src/main/java/com/willfp/eco/util/VectorUtils.java
index 387aa7fa..7fc27ff1 100644
--- a/eco-util/src/main/java/com/willfp/eco/util/VectorUtils.java
+++ b/eco-util/src/main/java/com/willfp/eco/util/VectorUtils.java
@@ -21,7 +21,6 @@ public class VectorUtils {
         } catch (IllegalArgumentException e) {
             return false;
         }
-
         return true;
     }