diff --git a/Plugin/plugin.iml b/Plugin/plugin.iml
index a8176037..67926335 100644
--- a/Plugin/plugin.iml
+++ b/Plugin/plugin.iml
@@ -1,31 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="minecraft" name="Minecraft">
-      <configuration>
-        <autoDetectTypes>
-          <platformType>SPIGOT</platformType>
-        </autoDetectTypes>
-      </configuration>
-    </facet>
-  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="v1_15_R1" />
+    <orderEntry type="module" module-name="v1_16_R1" />
+    <orderEntry type="module" module-name="v1_16_R2" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.15-R0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.13-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
-    <orderEntry type="module" module-name="API" />
+    <orderEntry type="library" name="Maven: com.willfp.ecoenchants:API:4.1.0-pre11" level="project" />
     <orderEntry type="module" module-name="v1_15_R1" />
     <orderEntry type="module" module-name="v1_16_R1" />
     <orderEntry type="module" module-name="v1_16_R2" />
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/Main.java b/Plugin/src/main/java/com/willfp/ecoenchants/Main.java
index 3504bc5a..bbe9f3ed 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/Main.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/Main.java
@@ -31,9 +31,9 @@ public class Main extends JavaPlugin {
     public static String newVersion;
 
     /**
-     * Has AdvancedEnchantments?
+     * Has Essentials?
      */
-    public static boolean hasAE;
+    public static boolean hasEssentials;
 
     /**
      * ProtocolLib
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java
index eebb4be6..71db65f4 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java
@@ -1,12 +1,10 @@
 package com.willfp.ecoenchants.enchantments;
 
 import com.earth2me.essentials.Enchantments;
-import com.earth2me.essentials.Essentials;
 import com.willfp.ecoenchants.Main;
 import com.willfp.ecoenchants.config.ConfigManager;
 import com.willfp.ecoenchants.config.configs.EnchantmentConfig;
 import com.willfp.ecoenchants.nms.Target;
-import com.willfp.ecoenchants.util.EssentialsUtils;
 import org.apache.commons.lang.WordUtils;
 import org.apache.commons.lang.reflect.FieldUtils;
 import org.bukkit.Material;
@@ -104,12 +102,7 @@ public abstract class EcoEnchant extends Enchantment implements Listener {
             Enchantment.registerEnchantment(this);
 
             if(Main.hasEssentials) {
-                Map<String, Enchantment> essentialsMap = EssentialsUtils.getEnchantmentsMap();
-                if (essentialsMap != null) {
-                    String key = this.getKey().getKey();
-                    essentialsMap.remove(key);
-                    essentialsMap.put(key, this);
-                }
+                ((Map<String, Enchantment>) FieldUtils.readDeclaredStaticField(Enchantments.class, "ENCHANTMENTS", true)).put(this.getKey().getKey(), this);
             }
         } catch (NoSuchFieldException | IllegalAccessException ignored) {}
     }
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java b/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java
index 6507ec8a..541e1d3c 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java
@@ -143,9 +143,9 @@ public class Loader {
                 Bukkit.getLogger().info("Lands: §9DISABLED");
             }
 
-            Main.hasAE = Bukkit.getPluginManager().isPluginEnabled("AdvancedEnchantments");
-            if(Main.hasAE) Bukkit.getLogger().info("AdvancedEnchantments: §aENABLED");
-            else Bukkit.getLogger().info("AdvancedEnchantments: §9DISABLED");
+            Main.hasEssentials = Bukkit.getPluginManager().isPluginEnabled("Essentials");
+            if(Main.hasEssentials) Bukkit.getLogger().info("Essentials: §aENABLED");
+            else Bukkit.getLogger().info("Essentials: §9DISABLED");
 
             Bukkit.getLogger().info("");
             Bukkit.getLogger().info("Loading Anticheat Integrations...");
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/util/EssentialsUtils.java b/Plugin/src/main/java/com/willfp/ecoenchants/util/EssentialsUtils.java
deleted file mode 100644
index b0539267..00000000
--- a/Plugin/src/main/java/com/willfp/ecoenchants/util/EssentialsUtils.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.willfp.ecoenchants.util;
-
-import com.earth2me.essentials.Enchantments;
-import org.apache.commons.lang.reflect.FieldUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.enchantments.Enchantment;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Map;
-
-public class EssentialsUtils {
-    private static Map<String, Enchantment> essentialsEnchantmentsMap;
-    private static boolean hasCheckedEnchantmentsMap;
-
-    @Nullable
-    public static Map<String, Enchantment> getEnchantmentsMap() {
-        if (hasCheckedEnchantmentsMap) return essentialsEnchantmentsMap;
-
-        if (Bukkit.getPluginManager().isPluginEnabled("Essentials")) {
-            try {
-                Class<?> essEnchantmentsClass = Enchantments.class;
-
-                Object enchantments = FieldUtils.readDeclaredStaticField(essEnchantmentsClass, "ENCHANTMENTS", true);
-                if (enchantments instanceof Map) {
-                    hasCheckedEnchantmentsMap = true;
-                    //noinspection unchecked - we know the type of it
-                    return essentialsEnchantmentsMap = (Map<String, Enchantment>) enchantments;
-                }
-            } catch (IllegalAccessException e) {
-                hasCheckedEnchantmentsMap = true;
-                return null;
-            }
-        }
-        hasCheckedEnchantmentsMap = true;
-        return null;
-    }
-}