diff --git a/eco-api/src/main/java/com/willfp/eco/core/Eco.java b/eco-api/src/main/java/com/willfp/eco/core/Eco.java
index e5d43261..a3743070 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/Eco.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/Eco.java
@@ -136,7 +136,6 @@ public interface Eco {
      *
      * @param plugin The plugin.
      */
-    @NotNull
     void createPAPIIntegration(@NotNull EcoPlugin plugin);
 
     /**
@@ -169,6 +168,7 @@ public interface Eco {
      * @param requiresChangesToSave If the config must be changed in order to save the config.
      * @return The config implementation.
      */
+    @NotNull
     LoadableConfig createUpdatableConfig(@NotNull String configName,
                                          @NotNull PluginLike plugin,
                                          @NotNull String subDirectoryPath,
@@ -189,6 +189,7 @@ public interface Eco {
      * @param requiresChangesToSave If the config must be changed in order to save the config.
      * @return The config implementation.
      */
+    @NotNull
     LoadableConfig createLoadableConfig(@NotNull String configName,
                                         @NotNull PluginLike plugin,
                                         @NotNull String subDirectoryPath,
@@ -202,6 +203,7 @@ public interface Eco {
      * @param config The handle.
      * @return The config implementation.
      */
+    @NotNull
     Config wrapConfigurationSection(@NotNull ConfigurationSection config);
 
     /**
@@ -211,6 +213,7 @@ public interface Eco {
      * @param type   The config type.
      * @return The config implementation.
      */
+    @NotNull
     Config createConfig(@NotNull Map<String, Object> values,
                         @NotNull ConfigType type);
 
@@ -221,6 +224,7 @@ public interface Eco {
      * @param type     The type.
      * @return The config implementation.
      */
+    @NotNull
     Config createConfig(@NotNull String contents,
                         @NotNull ConfigType type);
 
@@ -331,6 +335,7 @@ public interface Eco {
      *
      * @return The keys.
      */
+    @NotNull
     Set<PersistentDataKey<?>> getRegisteredPersistentDataKeys();
 
     /**
@@ -339,6 +344,7 @@ public interface Eco {
      * @param uuid The UUID.
      * @return The profile.
      */
+    @NotNull
     PlayerProfile loadPlayerProfile(@NotNull UUID uuid);
 
     /**
@@ -346,6 +352,7 @@ public interface Eco {
      *
      * @return The profile.
      */
+    @NotNull
     ServerProfile getServerProfile();
 
     /**
diff --git a/eco-api/src/main/kotlin/com/willfp/eco/core/lookup/Testable.kt b/eco-api/src/main/kotlin/com/willfp/eco/core/lookup/Testable.kt
new file mode 100644
index 00000000..a0af2ace
--- /dev/null
+++ b/eco-api/src/main/kotlin/com/willfp/eco/core/lookup/Testable.kt
@@ -0,0 +1,7 @@
+@file:JvmName("TestableExtensions")
+
+package com.willfp.eco.core.lookup
+
+/** @see Testable.matches */
+fun <T> T?.matches(test: Testable<T>) =
+    test.matches(this)