diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java
index 27b57a4..af88ef2 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java
@@ -42,7 +42,7 @@ import java.util.Objects;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-public class EcoBoss extends PluginDependent {
+public class EcoBoss extends PluginDependent<EcoPlugin> {
     /**
      * The name of the boss.
      */
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java
index fac1dee..43bea32 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java
@@ -28,7 +28,7 @@ import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicLong;
 
-public class LivingEcoBoss extends PluginDependent {
+public class LivingEcoBoss extends PluginDependent<EcoPlugin> {
     /**
      * The entity.
      */
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AttackListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AttackListeners.java
index 80adacd..fc58cf2 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AttackListeners.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AttackListeners.java
@@ -21,7 +21,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class AttackListeners extends PluginDependent implements Listener {
+public class AttackListeners extends PluginDependent<EcoPlugin> implements Listener {
     /**
      * Create new attack listeners.
      *
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/DeathListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/DeathListeners.java
index 39cfcd4..3726b35 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/DeathListeners.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/DeathListeners.java
@@ -26,7 +26,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-public class DeathListeners extends PluginDependent implements Listener {
+public class DeathListeners extends PluginDependent<EcoPlugin> implements Listener {
     /**
      * Create new death listeners.
      *
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/PassiveListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/PassiveListeners.java
index 446e13d..1e9719c 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/PassiveListeners.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/PassiveListeners.java
@@ -12,7 +12,7 @@ import org.bukkit.event.Listener;
 import org.jetbrains.annotations.NotNull;
 import org.spigotmc.event.entity.EntityMountEvent;
 
-public class PassiveListeners extends PluginDependent implements Listener {
+public class PassiveListeners extends PluginDependent<EcoPlugin> implements Listener {
     /**
      * Create new attack listeners.
      *
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/SpawnListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/SpawnListeners.java
index 439cde8..8446e84 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/SpawnListeners.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/SpawnListeners.java
@@ -12,7 +12,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.jetbrains.annotations.NotNull;
 
-public class SpawnListeners extends PluginDependent implements Listener {
+public class SpawnListeners extends PluginDependent<EcoPlugin> implements Listener {
     /**
      * Create new spawn listeners and link them to a plugin.
      *
diff --git a/eco-core/core-proxy/src/main/java/com/willfp/ecobosses/proxy/util/ProxyFactory.java b/eco-core/core-proxy/src/main/java/com/willfp/ecobosses/proxy/util/ProxyFactory.java
index 5bd6408..633a95c 100644
--- a/eco-core/core-proxy/src/main/java/com/willfp/ecobosses/proxy/util/ProxyFactory.java
+++ b/eco-core/core-proxy/src/main/java/com/willfp/ecobosses/proxy/util/ProxyFactory.java
@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.IdentityHashMap;
 import java.util.Map;
 
-public class ProxyFactory<T extends AbstractProxy> extends PluginDependent {
+public class ProxyFactory<T extends AbstractProxy> extends PluginDependent<EcoPlugin> {
     /**
      * Cached proxy implementations in order to not perform expensive reflective class-finding.
      */