diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/effects/Effect.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/effects/Effect.java
index 4ea5496..91aa4c5 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/effects/Effect.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/effects/Effect.java
@@ -3,8 +3,6 @@ package com.willfp.reforges.effects;
 import com.willfp.eco.core.config.interfaces.JSONConfig;
 import com.willfp.reforges.ReforgesPlugin;
 import com.willfp.reforges.reforges.util.Watcher;
-import lombok.AccessLevel;
-import lombok.Getter;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
@@ -18,7 +16,6 @@ public abstract class Effect implements Listener, Watcher {
     /**
      * Instance of reforges.
      */
-    @Getter(AccessLevel.PROTECTED)
     private final ReforgesPlugin plugin = ReforgesPlugin.getInstance();
 
     /**
@@ -99,6 +96,13 @@ public abstract class Effect implements Listener, Watcher {
     protected void handleDisable(@NotNull final Player player) {
         // Override when needed.
     }
+    /**
+     * Get instance of reforges.
+     * @return The instance.
+     */
+    protected ReforgesPlugin getPlugin() {
+        return this.plugin;
+    }
 
     @Override
     public boolean equals(Object o) {
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeLookup.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeLookup.java
index e2a4917..a21b7ce 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeLookup.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeLookup.java
@@ -1,6 +1,7 @@
 package com.willfp.reforges.reforges.util;
 
 import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.util.ListUtils;
 import com.willfp.reforges.ReforgesPlugin;
 import com.willfp.reforges.conditions.ConfiguredCondition;
 import com.willfp.reforges.reforges.Reforge;
@@ -138,8 +139,8 @@ public class ReforgeLookup {
         ReforgeLookup.clearCaches(player);
         PLUGIN.getScheduler().run(() -> {
             List<Reforge> after = ReforgeLookup.provideReforges(player);
-            Map<Reforge, Integer> beforeFrequency = listToFrequencyMap(before);
-            Map<Reforge, Integer> afterFrequency = listToFrequencyMap(after);
+            Map<Reforge, Integer> beforeFrequency = ListUtils.listToFrequencyMap(before);
+            Map<Reforge, Integer> afterFrequency = ListUtils.listToFrequencyMap(after);
 
             List<Reforge> added = new ArrayList<>();
             List<Reforge> removed = new ArrayList<>();
@@ -206,19 +207,6 @@ public class ReforgeLookup {
         });
     }
 
-    private static <T> Map<T, Integer> listToFrequencyMap(@NotNull final List<T> list) {
-        Map<T, Integer> frequencyMap = new HashMap<>();
-        for (T object : list) {
-            if (frequencyMap.containsKey(object)) {
-                frequencyMap.put(object, frequencyMap.get(object) + 1);
-            } else {
-                frequencyMap.put(object, 1);
-            }
-        }
-
-        return frequencyMap;
-    }
-
     static {
         registerProvider(player -> Map.of(
                 player.getInventory().getItemInMainHand(),
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt
index 4a18d03..de473b7 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt
@@ -20,13 +20,14 @@ class EffectAddAbility : Effect("add_ultimateskills_ability") {
             config.getDouble("amount")
         )
         player.persistentDataContainer.set(
-            ReforgesPlugin.getInstance().namespacedKeyFactory.create("addAbility"), PersistentDataType.STRING,
+            ReforgesPlugin.getInstance().namespacedKeyFactory.create("addAbility"),
+            PersistentDataType.STRING,
             NumberUtils.format(config.getDouble("amount")) + "::" + config.getString("ability", false)
         )
     }
 
     override fun handleDisable(player: Player) {
-        player.persistentDataContainer.get(ReforgesPlugin.getInstance().namespacedKeyFactory.create("addAbility"), PersistentDataType.STRING)
+        player.persistentDataContainer.get(this.plugin.namespacedKeyFactory.create("addAbility"), PersistentDataType.STRING)
             ?.let {
                 HyperSkills.getInstance().api.removeAbility(
                     player.uniqueId,
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddPerk.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddPerk.kt
index 7f57eb9..ef85d1a 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddPerk.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddPerk.kt
@@ -2,7 +2,6 @@ package com.willfp.reforges.integrations.ultimateskills
 
 import com.willfp.eco.core.config.interfaces.JSONConfig
 import com.willfp.eco.util.NumberUtils
-import com.willfp.reforges.ReforgesPlugin
 import com.willfp.reforges.effects.Effect
 import mc.ultimatecore.skills.HyperSkills
 import mc.ultimatecore.skills.objects.perks.Perk
@@ -19,13 +18,13 @@ class EffectAddPerk : Effect("add_ultimateskills_perk") {
             Perk.valueOf(config.getString("perk", false)),
             config.getDouble("amount")
         )
-        player.persistentDataContainer.set(ReforgesPlugin.getInstance().namespacedKeyFactory.create("addPerk"), PersistentDataType.STRING,
+        player.persistentDataContainer.set(this.plugin.namespacedKeyFactory.create("addPerk"), PersistentDataType.STRING,
             NumberUtils.format(config.getDouble("amount")) + "::" + config.getString("perk", false)
         )
     }
 
     override fun handleDisable(player: Player) {
-        player.persistentDataContainer.get(ReforgesPlugin.getInstance().namespacedKeyFactory.create("addPerk"), PersistentDataType.STRING)
+        player.persistentDataContainer.get(this.plugin.namespacedKeyFactory.create("addPerk"), PersistentDataType.STRING)
             ?.let {
                 HyperSkills.getInstance().api.removePerk(
                     player.uniqueId,