diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/LoadableConfigWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/config/LoadableConfigWrapper.java
index 870cdfcc..3d33be28 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/config/LoadableConfigWrapper.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/config/LoadableConfigWrapper.java
@@ -2,7 +2,9 @@ package com.willfp.eco.core.config;
 
 import com.willfp.eco.core.config.interfaces.LoadableConfig;
 import com.willfp.eco.core.config.wrapper.ConfigWrapper;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 import java.io.IOException;
@@ -44,4 +46,9 @@ public abstract class LoadableConfigWrapper extends ConfigWrapper<LoadableConfig
     public String getName() {
         return this.getHandle().getName();
     }
+
+    @Override
+    public @Nullable YamlConfiguration getBukkitHandle() {
+        return this.getHandle().getBukkitHandle();
+    }
 }
diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/interfaces/Config.java b/eco-api/src/main/java/com/willfp/eco/core/config/interfaces/Config.java
index 010d4509..1db49384 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/config/interfaces/Config.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/config/interfaces/Config.java
@@ -2,7 +2,6 @@ package com.willfp.eco.core.config.interfaces;
 
 import com.willfp.eco.core.config.ConfigType;
 import com.willfp.eco.util.StringUtils;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -544,14 +543,6 @@ public interface Config extends Cloneable {
     @Nullable
     List<? extends Config> getSubsectionsOrNull(@NotNull String path);
 
-    /**
-     * Get bukkit {@link YamlConfiguration}.
-     *
-     * @return The config, or null if config is not yaml-based.
-     */
-    @Nullable
-    YamlConfiguration getBukkitHandle();
-
     /**
      * Get config type.
      *
diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/interfaces/LoadableConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/interfaces/LoadableConfig.java
index 4abe4ee2..8eb67140 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/config/interfaces/LoadableConfig.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/config/interfaces/LoadableConfig.java
@@ -1,5 +1,8 @@
 package com.willfp.eco.core.config.interfaces;
 
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.jetbrains.annotations.Nullable;
+
 import java.io.File;
 import java.io.IOException;
 
@@ -39,4 +42,12 @@ public interface LoadableConfig extends Config {
      * @return The name.
      */
     String getName();
+
+    /**
+     * Get bukkit {@link YamlConfiguration}.
+     *
+     * @return The config, or null if config is not yaml-based.
+     */
+    @Nullable
+    YamlConfiguration getBukkitHandle();
 }
diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/json/wrapper/LoadableJSONConfigWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/config/json/wrapper/LoadableJSONConfigWrapper.java
index 86de0859..f51b7098 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/config/json/wrapper/LoadableJSONConfigWrapper.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/config/json/wrapper/LoadableJSONConfigWrapper.java
@@ -3,7 +3,9 @@ package com.willfp.eco.core.config.json.wrapper;
 import com.willfp.eco.core.config.interfaces.JSONConfig;
 import com.willfp.eco.core.config.interfaces.LoadableConfig;
 import org.apache.commons.lang.Validate;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 import java.io.IOException;
@@ -51,4 +53,9 @@ public abstract class LoadableJSONConfigWrapper extends JSONConfigWrapper implem
     public String getName() {
         return ((LoadableConfig) this.getHandle()).getName();
     }
+
+    @Override
+    public @Nullable YamlConfiguration getBukkitHandle() {
+        return null;
+    }
 }
diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/ConfigWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/ConfigWrapper.java
index 571b0456..5994968f 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/ConfigWrapper.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/ConfigWrapper.java
@@ -190,11 +190,6 @@ public abstract class ConfigWrapper<T extends Config> implements Config {
         return handle.clone();
     }
 
-    @Override
-    public @Nullable YamlConfiguration getBukkitHandle() {
-        return handle.getBukkitHandle();
-    }
-
     @Override
     public @NotNull ConfigType getType() {
         return handle.getType();
diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/yaml/wrapper/LoadableYamlConfigWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/config/yaml/wrapper/LoadableYamlConfigWrapper.java
index 9cb7c974..c77270a5 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/config/yaml/wrapper/LoadableYamlConfigWrapper.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/config/yaml/wrapper/LoadableYamlConfigWrapper.java
@@ -3,7 +3,9 @@ package com.willfp.eco.core.config.yaml.wrapper;
 import com.willfp.eco.core.config.interfaces.Config;
 import com.willfp.eco.core.config.interfaces.LoadableConfig;
 import org.apache.commons.lang.Validate;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 import java.io.IOException;
@@ -51,4 +53,9 @@ public abstract class LoadableYamlConfigWrapper extends YamlConfigWrapper implem
     public String getName() {
         return ((LoadableConfig) this.getHandle()).getName();
     }
+
+    @Override
+    public @Nullable YamlConfiguration getBukkitHandle() {
+        return ((LoadableConfig) this.getHandle()).getBukkitHandle();
+    }
 }
diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/json/EcoJSONConfigWrapper.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/json/EcoJSONConfigWrapper.kt
index b91edbe1..39d26d59 100644
--- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/json/EcoJSONConfigWrapper.kt
+++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/json/EcoJSONConfigWrapper.kt
@@ -297,10 +297,6 @@ open class EcoJSONConfigWrapper : JSONConfig {
         return ConfigType.JSON
     }
 
-    override fun getBukkitHandle(): YamlConfiguration? {
-        return null
-    }
-
     override fun clone(): JSONConfig {
         return EcoJSONConfigSection(this.values.toMutableMap())
     }
diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/json/EcoLoadableJSONConfig.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/json/EcoLoadableJSONConfig.kt
index 6218b599..7ad56eac 100644
--- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/json/EcoLoadableJSONConfig.kt
+++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/json/EcoLoadableJSONConfig.kt
@@ -2,6 +2,7 @@ package com.willfp.eco.internal.config.json
 
 import com.willfp.eco.core.PluginLike
 import com.willfp.eco.core.config.interfaces.LoadableConfig
+import org.bukkit.configuration.file.YamlConfiguration
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.FileOutputStream
@@ -80,6 +81,10 @@ open class EcoLoadableJSONConfig(
         return configFile
     }
 
+    override fun getBukkitHandle(): YamlConfiguration? {
+        return null
+    }
+
     init {
         val directory = File(this.plugin.dataFolder, subDirectoryPath)
         if (!directory.exists()) {
diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/yaml/EcoLoadableYamlConfig.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/yaml/EcoLoadableYamlConfig.kt
index 4ebe46c0..16bd2995 100644
--- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/yaml/EcoLoadableYamlConfig.kt
+++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/yaml/EcoLoadableYamlConfig.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package com.willfp.eco.internal.config.yaml
 
 import com.willfp.eco.core.PluginLike
@@ -60,10 +62,6 @@ open class EcoLoadableYamlConfig(
         handle.save(getConfigFile())
     }
 
-    override fun getBukkitHandle(): YamlConfiguration {
-        return handle
-    }
-
     override fun getName(): String {
         return name
     }
@@ -72,6 +70,10 @@ open class EcoLoadableYamlConfig(
         return configFile
     }
 
+    override fun getBukkitHandle(): YamlConfiguration? {
+        return handle
+    }
+
     init {
         val directory = File(this.plugin.dataFolder, subDirectoryPath)
         if (!directory.exists()) {
diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/yaml/EcoYamlConfigWrapper.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/yaml/EcoYamlConfigWrapper.kt
index 623d28e5..6a04058b 100644
--- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/yaml/EcoYamlConfigWrapper.kt
+++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/yaml/EcoYamlConfigWrapper.kt
@@ -287,10 +287,6 @@ open class EcoYamlConfigWrapper<T : ConfigurationSection> : Config {
         }
     }
 
-    override fun getBukkitHandle(): YamlConfiguration? {
-        return this.handle as? YamlConfiguration
-    }
-
     override fun getType(): ConfigType {
         return ConfigType.JSON
     }