diff --git a/core/src/main/java/com/lemonlightmc/moreplugins/base/IPluginBase.java b/core/src/main/java/com/lemonlightmc/moreplugins/base/IPluginBase.java
index 3649588..7d964f4 100644
--- a/core/src/main/java/com/lemonlightmc/moreplugins/base/IPluginBase.java
+++ b/core/src/main/java/com/lemonlightmc/moreplugins/base/IPluginBase.java
@@ -15,7 +15,6 @@
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginAwareness;
-import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginLoadOrder;
 import org.bukkit.plugin.PluginLoader;
 import org.bukkit.plugin.PluginManager;
@@ -79,13 +78,13 @@ public static interface IPluginDescription {
 
   public void onEnable();
 
-  public String getName();
+  public PluginInfo getInfo();
 
   public String getKey();
 
-  public String getFullName();
+  public String getName();
 
-  public PluginDescriptionFile getDescription();
+  public String getFullName();
 
   public String getPrefix();
 
@@ -140,4 +139,5 @@ public static interface IPluginDescription {
 
   @Deprecated
   public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args);
+
 }
diff --git a/core/src/main/java/com/lemonlightmc/moreplugins/base/PluginBase.java b/core/src/main/java/com/lemonlightmc/moreplugins/base/PluginBase.java
index bc33d85..0ec40ca 100644
--- a/core/src/main/java/com/lemonlightmc/moreplugins/base/PluginBase.java
+++ b/core/src/main/java/com/lemonlightmc/moreplugins/base/PluginBase.java
@@ -1,22 +1,13 @@
 package com.lemonlightmc.moreplugins.base;
 
-import com.lemonlightmc.moreplugins.config.Config;
-import com.lemonlightmc.moreplugins.messages.Logger;
 import com.lemonlightmc.moreplugins.messages.MessageProvider;
 import com.lemonlightmc.moreplugins.scheduler.Scheduler;
+import com.lemonlightmc.moreplugins.utils.ResourceUtils;
 import com.lemonlightmc.moreplugins.utils.StringUtils;
 import com.lemonlightmc.moreplugins.version.Version;
 
 import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 import org.bukkit.Bukkit;
@@ -33,7 +24,7 @@
 import org.bukkit.plugin.ServicesManager;
 import org.bukkit.plugin.java.JavaPluginLoader;
 
-public class PluginBase extends org.bukkit.plugin.PluginBase implements IPluginBase {
+public abstract class PluginBase extends org.bukkit.plugin.PluginBase implements IPluginBase {
 
   private boolean isEnabled = false;
   private PluginLoader loader = null;
@@ -45,12 +36,12 @@ public class PluginBase extends org.bukkit.plugin.PluginBase implements IPluginB
   private final File dataFolder = null;
   private ClassLoader classLoader = null;
   private boolean naggable = true;
-  private Config config = null;
   private MessageProvider messageProvider = null;
 
   private static PluginBase instance = null;
 
   public PluginBase() {
+    super();
     classLoader = this.getClass().getClassLoader();
     this.server = Bukkit.getServer();
     this.scheduler = new Scheduler();
@@ -67,7 +58,6 @@ protected PluginBase(
     this.loader = loader;
     this.file = file;
     this.info = new PluginInfo(info);
-    this.config = Config.from(dataFolder.toPath().resolve("config.yml"));
   }
 
   public static boolean hasInstance() {
@@ -83,33 +73,9 @@ public static <I extends PluginBase> I getInstance() {
     return (I) instance;
   }
 
-  public static PluginLoader getInstancePluginLoader() {
-    return getInstance().loader;
-  }
-
-  public static PluginManager getInstancePluginManager() {
-    return getInstance().server.getPluginManager();
-  }
-
-  public static Server getInstanceServer() {
-    return getInstance().server;
-  }
-
-  public static ServicesManager getInstanceServicesManager() {
-    return getInstance().server.getServicesManager();
-  }
-
-  public static Scheduler getInstanceScheduler() {
-    return getInstance().scheduler;
-  }
-
-  public static MessageProvider getInstanceMessageProvider() {
-    return getInstance().messageProvider;
-  }
-
   @Override
-  public String getFullName() {
-    return info.getFullName();
+  public PluginInfo getInfo() {
+    return info;
   }
 
   @Override
@@ -118,8 +84,8 @@ public String getKey() {
   }
 
   @Override
-  public PluginDescriptionFile getDescription() {
-    return info.descriptionFile;
+  public String getFullName() {
+    return info.getFullName();
   }
 
   @Override
@@ -132,6 +98,15 @@ public Version getVersion() {
     return info.getVersion();
   }
 
+  @Override
+  public PluginDescriptionFile getDescription() {
+    return info.descriptionFile;
+  }
+
+  protected File getFile() {
+    return file;
+  }
+
   @Override
   public File getDataFolder() {
     return dataFolder;
@@ -145,13 +120,20 @@ public File getDataFile(final String... path) {
   }
 
   @Override
-  public PluginLoader getPluginLoader() {
-    return loader;
+  public boolean isEnabled() {
+    return isEnabled;
   }
 
-  @Override
-  public PluginManager getPluginManager() {
-    return server.getPluginManager();
+  public void setEnabled(final boolean enabled) {
+    if (isEnabled != enabled) {
+      isEnabled = enabled;
+
+      if (isEnabled) {
+        onEnable();
+      } else {
+        onDisable();
+      }
+    }
   }
 
   @Override
@@ -159,6 +141,20 @@ public Server getServer() {
     return server;
   }
 
+  @Override
+  public PluginLoader getPluginLoader() {
+    return loader;
+  }
+
+  public ClassLoader getClassLoader() {
+    return classLoader;
+  }
+
+  @Override
+  public PluginManager getPluginManager() {
+    return server.getPluginManager();
+  }
+
   @Override
   public ServicesManager getServicesManager() {
     return server.getServicesManager();
@@ -170,144 +166,61 @@ public Scheduler getScheduler() {
   }
 
   @Override
-  public MessageProvider getMessageProvider() {
-    return messageProvider;
+  public java.util.logging.Logger getLogger() {
+    return server.getLogger();
   }
 
   @Override
-  public boolean isEnabled() {
-    return isEnabled;
-  }
-
-  protected File getFile() {
-    return file;
+  public MessageProvider getMessageProvider() {
+    return messageProvider;
   }
 
+  @Deprecated
   @Override
   public FileConfiguration getConfig() {
-    return config.getConfig();
+    throw new UnsupportedOperationException(
+        "FileConfiguration is not supported in PluginBase. Use Configurate instead.");
   }
 
   @Override
   public void reloadConfig() {
-    config.reload();
+    // Configurate.reloadAll();
   }
 
   @Override
   public void saveConfig() {
-    config.save();
+    // Configurate.saveAll();
   }
 
   @Override
   public void loadConfig() {
-    config.load();
+    // Configurate.loadAll();
   }
 
   @Override
   public void loadConfig(final File file) {
-    config.load(file);
+    // Configurate.load(file.getName());
   }
 
   @Override
   public void saveDefaultConfig() {
-    config.createDefault();
-  }
-
-  protected Reader getTextResource(final String file) {
-    final InputStream in = getResource(file);
-
-    return in == null
-        ? null
-        : new InputStreamReader(in, StandardCharsets.UTF_8);
-  }
-
-  @Override
-  public void saveResource(String resourcePath, final boolean replace) {
-    if (resourcePath == null || resourcePath.equals("")) {
-      throw new IllegalArgumentException(
-          "ResourcePath cannot be null or empty");
-    }
-
-    resourcePath = resourcePath.replace('\\', '/');
-    final InputStream in = getResource(resourcePath);
-    if (in == null) {
-      throw new IllegalArgumentException(
-          "The embedded resource '" +
-              resourcePath +
-              "' cannot be found in " +
-              file);
-    }
-
-    final File outFile = new File(dataFolder, resourcePath);
-    final int lastIndex = resourcePath.lastIndexOf('/');
-    final File outDir = new File(
-        dataFolder,
-        resourcePath.substring(0, lastIndex >= 0 ? lastIndex : 0));
-
-    if (!outDir.exists()) {
-      outDir.mkdirs();
-    }
-
-    try {
-      if (!outFile.exists() || replace) {
-        final OutputStream out = new FileOutputStream(outFile);
-        final byte[] buf = new byte[1024];
-        int len;
-        while ((len = in.read(buf)) > 0) {
-          out.write(buf, 0, len);
-        }
-        out.close();
-        in.close();
-      } else {
-        Logger.warn(
-            "Could not save " +
-                outFile.getName() +
-                " to " +
-                outFile +
-                " because " +
-                outFile.getName() +
-                " already exists.");
-      }
-    } catch (final IOException ex) {
-      Logger.warn("Could not save " + outFile.getName() + " to " + outFile);
-      ex.printStackTrace();
-    }
+    // Configurate.createDefault();
   }
 
+  @Deprecated
   @Override
   public InputStream getResource(final String filename) {
-    if (filename == null) {
-      throw new IllegalArgumentException("Filename cannot be null");
-    }
-
-    try {
-      final URL url = getClassLoader().getResource(filename);
-      if (url == null) {
-        return null;
-      }
-
-      final URLConnection connection = url.openConnection();
-      connection.setUseCaches(false);
-      return connection.getInputStream();
-    } catch (final IOException ex) {
-      return null;
-    }
+    return ResourceUtils.getResourceStream(filename);
   }
 
-  public ClassLoader getClassLoader() {
-    return classLoader;
-  }
-
-  public void setEnabled(final boolean enabled) {
-    if (isEnabled != enabled) {
-      isEnabled = enabled;
-
-      if (isEnabled) {
-        onEnable();
-      } else {
-        onDisable();
-      }
+  @Deprecated
+  @Override
+  public void saveResource(final String path, final boolean replace) {
+    final File file = ResourceUtils.getResourceFile(path);
+    if (file == null) {
+      return;
     }
+    ResourceUtils.saveResource(file, new File(dataFolder, path));
   }
 
   @Deprecated
@@ -357,29 +270,28 @@ public String toString() {
     return info.getFullName();
   }
 
-  @Override
-  public java.util.logging.Logger getLogger() {
-    return server.getLogger();
-  }
-
   @Override
   @Deprecated
   public List<String> onTabComplete(final CommandSender sender, final Command command, final String label,
       final String[] args) {
-    throw new UnsupportedOperationException("Unimplemented method 'onTabComplete'");
+    throw new UnsupportedOperationException(
+        "onTabComplete is not supported in Main Plugin. Create Command with CommandAPI instead!");
   }
 
   @Override
   @Deprecated
   public boolean onCommand(final CommandSender sender, final Command command, final String label, final String[] args) {
-    throw new UnsupportedOperationException("Unimplemented method 'onCommand'");
+    throw new UnsupportedOperationException(
+        "onCommand is not supported in Main Plugin. Create Command with CommandAPI instead!");
   }
 
+  @Deprecated
   @Override
   public ChunkGenerator getDefaultWorldGenerator(final String worldName, final String id) {
     return null;
   }
 
+  @Deprecated
   @Override
   public BiomeProvider getDefaultBiomeProvider(final String worldName, final String id) {
     return null;
diff --git a/core/src/main/java/com/lemonlightmc/moreplugins/base/PluginInfo.java b/core/src/main/java/com/lemonlightmc/moreplugins/base/PluginInfo.java
index 64e7ce5..b780edb 100644
--- a/core/src/main/java/com/lemonlightmc/moreplugins/base/PluginInfo.java
+++ b/core/src/main/java/com/lemonlightmc/moreplugins/base/PluginInfo.java
@@ -1,7 +1,7 @@
 package com.lemonlightmc.moreplugins.base;
 
 import java.util.List;
-import java.util.Objects;
+import java.util.Locale;
 import java.util.Set;
 
 import org.bukkit.permissions.Permission;
@@ -35,12 +35,12 @@ public String getName() {
 
   @Override
   public String getKey() {
-    return descriptionFile.getName().toLowerCase();
+    return descriptionFile.getName().toLowerCase(Locale.ROOT);
   }
 
   @Override
   public String getFullName() {
-    return descriptionFile.getFullName();
+    return descriptionFile.getName() + " v" + version.formatted(true);
   }
 
   @Override
@@ -48,6 +48,10 @@ public Version getVersion() {
     return version;
   }
 
+  public String getFormattedVersion() {
+    return version.formatted(true);
+  }
+
   @Override
   public String getPrefix() {
     return descriptionFile.getPrefix();
@@ -135,14 +139,18 @@ public PermissionDefault getPermissionDefault() {
 
   @Override
   public String toString() {
-    return "PluginDescription [getName()=" + getName() + ", getFullName()=" + getFullName() + ", getVersion()="
-        + getVersion() + ", getPrefix()=" + getPrefix() + ", getDescription()=" + getDescription()
-        + ", getApiVersion()=" + getApiVersion() + ", getMain()=" + getMain() + ", getAuthors()=" + getAuthors()
-        + ", getContributors()=" + getContributors() + ", getWebsite()=" + getWebsite() + ", getDepend()=" + getDepend()
-        + ", getSoftDepend()=" + getSoftDepend() + ", getLoadOrder()=" + getLoadOrder() + ", getLoadBefore()="
-        + getLoadBefore() + ", getProvides()=" + getProvides() + ", getLibraries()=" + getLibraries()
-        + ", getCommands()=" + getCommands() + ", getAwareness()=" + getAwareness() + ", getPermissions()="
-        + getPermissions() + ", getPermissionDefault()=" + getPermissionDefault() + "]";
+    return "PluginDescription [getFullName()=" + getFullName() + ", getMain()=" + getMain() + ", getPrefix()="
+        + getPrefix() + ", getDescription()=" + getDescription() + ", getApiVersion()=" + getApiVersion()
+        + ", getAuthors()=" + getAuthors() + ", getDepend()=" + getDepend() + ", getSoftDepend()=" + getSoftDepend()
+        + ", getProvides()=" + getProvides() + "]";
+  }
+
+  @Override
+  public int hashCode() {
+    int result = 31 + getFullName().hashCode();
+    result = 31 * result + getMain().hashCode();
+    result = 31 * result + getClass().hashCode();
+    return 31 * result + ((apiVersion == null) ? 0 : apiVersion.hashCode());
   }
 
   @Override
@@ -154,17 +162,11 @@ public boolean equals(final Object obj) {
       return false;
     }
     final PluginInfo other = (PluginInfo) obj;
-    return Objects.equals(descriptionFile.getName(), other.getName())
-        && Objects.equals(version, other.version)
-        && Objects.equals(apiVersion, other.apiVersion)
-        && Objects.equals(descriptionFile.getMain(), other.getMain())
-        && Objects.equals(descriptionFile.getFullName(), other.getFullName())
-        && Objects.equals(descriptionFile.getPrefix(), other.getPrefix());
+    if (apiVersion == null || other.apiVersion != null) {
+      return false;
+    }
+    return descriptionFile.equals(other.descriptionFile) && version.equals(other.version)
+        && apiVersion.equals(other.apiVersion);
   }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(descriptionFile.getName(), version, apiVersion, descriptionFile.getMain(),
-        descriptionFile.getFullName(), descriptionFile.getPrefix());
-  }
 }
diff --git a/core/src/main/java/com/lemonlightmc/moreplugins/events/EventsAPI.java b/core/src/main/java/com/lemonlightmc/moreplugins/events/EventsAPI.java
index 8a87a82..67271e0 100644
--- a/core/src/main/java/com/lemonlightmc/moreplugins/events/EventsAPI.java
+++ b/core/src/main/java/com/lemonlightmc/moreplugins/events/EventsAPI.java
@@ -29,18 +29,19 @@ public static <T extends Event> EventBuilder<T> builder(final Class<T> eventClas
   }
 
   public static <T extends Event> T call(final T event) {
-    MorePlugins.getInstancePluginManager().callEvent(event);
+    MorePlugins.getInstance().getPluginManager().callEvent(event);
     return event;
   }
 
   public static <T extends Event> T callAsync(final T event) {
-    MorePlugins.getInstanceScheduler().runAsync(() -> MorePlugins.getInstancePluginManager().callEvent(event));
+    MorePlugins.getInstance().getScheduler()
+        .runAsync(() -> MorePlugins.getInstance().getPluginManager().callEvent(event));
     return event;
 
   }
 
   public static <T extends Event> T callSync(final T event) {
-    MorePlugins.getInstanceScheduler().run(() -> MorePlugins.getInstancePluginManager().callEvent(event));
+    MorePlugins.getInstance().getScheduler().run(() -> MorePlugins.getInstance().getPluginManager().callEvent(event));
     return event;
   }
 
@@ -65,7 +66,7 @@ public static void unregister(final BaseListener listener) {
 
   public static void register(final Listener listener) {
     if (listener != null) {
-      MorePlugins.getInstancePluginManager().registerEvents(listener, MorePlugins.instance);
+      MorePlugins.getInstance().getPluginManager().registerEvents(listener, MorePlugins.instance);
     }
   }
 
@@ -73,7 +74,7 @@ public static void register(final BaseListener listener) {
     if (listener == null || listener.isRegistered) {
       return;
     }
-    MorePlugins.getInstancePluginManager().registerEvents(listener, MorePlugins.instance);
+    MorePlugins.getInstance().getPluginManager().registerEvents(listener, MorePlugins.instance);
     listener.isRegistered = true;
     listener.onRegister();
   }
@@ -83,7 +84,7 @@ public static void register(final Class<? extends Event> event, final Listener l
     if (listener == null || event == null || executor == null) {
       return;
     }
-    MorePlugins.getInstancePluginManager().registerEvent(event, listener,
+    MorePlugins.getInstance().getPluginManager().registerEvent(event, listener,
         priority == null ? EventPriority.NORMAL : priority, executor, MorePlugins.instance);
   }
 
@@ -92,7 +93,7 @@ public static void register(final Class<? extends Event> event, final Listener l
     if (listener == null || event == null || executor == null) {
       return;
     }
-    MorePlugins.getInstancePluginManager().registerEvent(event, listener,
+    MorePlugins.getInstance().getPluginManager().registerEvent(event, listener,
         priority == null ? EventPriority.NORMAL : priority, executor, MorePlugins.instance,
         ignoreCancelled);
   }
diff --git a/core/src/main/java/com/lemonlightmc/moreplugins/messages/Logger.java b/core/src/main/java/com/lemonlightmc/moreplugins/messages/Logger.java
index 3be763e..5b15cb9 100644
--- a/core/src/main/java/com/lemonlightmc/moreplugins/messages/Logger.java
+++ b/core/src/main/java/com/lemonlightmc/moreplugins/messages/Logger.java
@@ -3,28 +3,140 @@
 import com.lemonlightmc.moreplugins.base.MorePlugins;
 import com.lemonlightmc.moreplugins.utils.StringUtils.Replaceable;
 
+import java.util.function.Supplier;
+
 import org.bukkit.Bukkit;
 
 public class Logger {
+  public static java.util.logging.Logger getLogger() {
+    return Bukkit.getLogger();
+  }
+
+  public static void fine(String msg) {
+    msg = MessageFormatter.format(msg);
+    if (msg == null) {
+      return;
+    }
+    Bukkit.getLogger().fine(msg);
+  }
+
+  public static void fine(String msg, final Replaceable... replaceables) {
+    msg = MessageFormatter.format(msg, replaceables);
+    if (msg == null) {
+      return;
+    }
+    Bukkit.getLogger().fine(msg);
+  }
+
+  public static void fine(final Supplier<String> msgSupplier) {
+    final String msg = MessageFormatter.format(msgSupplier.get());
+    if (msg == null) {
+      return;
+    }
+    Bukkit.getLogger().fine(msg);
+  }
+
+  public static void fine(final Supplier<String> msgSupplier, final Replaceable... replaceables) {
+    final String msg = MessageFormatter.format(msgSupplier.get(), replaceables);
+    if (msg == null) {
+      return;
+    }
+    Bukkit.getLogger().fine(msg);
+  }
+
+  public static void info(String msg) {
+    msg = MessageFormatter.format(msg);
+    if (msg == null) {
+      return;
+    }
+    Bukkit.getLogger().info(msg);
+  }
 
   public static void info(String msg, final Replaceable... replaceables) {
-    msg = MessageFormatter.format(msg, false, true, replaceables);
-    if (msg == null)
+    msg = MessageFormatter.format(msg, replaceables);
+    if (msg == null) {
+      return;
+    }
+    Bukkit.getLogger().info(msg);
+  }
+
+  public static void info(final Supplier<String> msgSupplier) {
+    final String msg = MessageFormatter.format(msgSupplier.get());
+    if (msg == null) {
+      return;
+    }
+    Bukkit.getLogger().info(msg);
+  }
+
+  public static void info(final Supplier<String> msgSupplier, final Replaceable... replaceables) {
+    final String msg = MessageFormatter.format(msgSupplier.get(), replaceables);
+    if (msg == null) {
       return;
+    }
     Bukkit.getLogger().info(msg);
   }
 
+  public static void warn(String msg) {
+    msg = MessageFormatter.format(msg);
+    if (msg == null) {
+      return;
+    }
+    Bukkit.getLogger().warning(msg);
+  }
+
   public static void warn(String msg, final Replaceable... replaceables) {
-    msg = MessageFormatter.format(msg, false, true, replaceables);
-    if (msg == null)
+    msg = MessageFormatter.format(msg, replaceables);
+    if (msg == null) {
       return;
+    }
+    Bukkit.getLogger().warning(msg);
+  }
+
+  public static void warn(final Supplier<String> msgSupplier) {
+    final String msg = MessageFormatter.format(msgSupplier.get());
+    if (msg == null) {
+      return;
+    }
+    Bukkit.getLogger().warning(msg);
+  }
+
+  public static void warn(final Supplier<String> msgSupplier, final Replaceable... replaceables) {
+    final String msg = MessageFormatter.format(msgSupplier.get(), replaceables);
+    if (msg == null) {
+      return;
+    }
     Bukkit.getLogger().warning(msg);
   }
 
+  public static void severe(String msg) {
+    msg = MessageFormatter.format(msg);
+    if (msg == null) {
+      return;
+    }
+    Bukkit.getLogger().severe(msg);
+  }
+
   public static void severe(String msg, final Replaceable... replaceables) {
-    msg = MessageFormatter.format(msg, false, true, replaceables);
-    if (msg == null)
+    msg = MessageFormatter.format(msg, replaceables);
+    if (msg == null) {
+      return;
+    }
+    Bukkit.getLogger().severe(msg);
+  }
+
+  public static void severe(final Supplier<String> msgSupplier) {
+    final String msg = MessageFormatter.format(msgSupplier.get());
+    if (msg == null) {
+      return;
+    }
+    Bukkit.getLogger().severe(msg);
+  }
+
+  public static void severe(final Supplier<String> msgSupplier, final Replaceable... replaceables) {
+    final String msg = MessageFormatter.format(msgSupplier.get(), replaceables);
+    if (msg == null) {
       return;
+    }
     Bukkit.getLogger().severe(msg);
   }
 
diff --git a/core/src/main/java/com/lemonlightmc/moreplugins/messages/MessageMeta.java b/core/src/main/java/com/lemonlightmc/moreplugins/messages/MessageMeta.java
index 394e584..e238679 100644
--- a/core/src/main/java/com/lemonlightmc/moreplugins/messages/MessageMeta.java
+++ b/core/src/main/java/com/lemonlightmc/moreplugins/messages/MessageMeta.java
@@ -5,7 +5,7 @@
 import java.util.ResourceBundle;
 
 import com.lemonlightmc.moreplugins.messages.IMessageSource.IMessageMeta;
-import com.lemonlightmc.moreplugins.utils.RessourceUtils;
+import com.lemonlightmc.moreplugins.utils.ResourceUtils;
 import com.lemonlightmc.moreplugins.utils.StringUtils;
 import com.lemonlightmc.moreplugins.version.Version;
 
@@ -62,16 +62,16 @@ public void modify(final Properties props) {
   @Override
   public void modify(final ResourceBundle bundle) {
     if (bundle.containsKey("meta.locale")) {
-      this.locale = StringUtils.parseLocale(RessourceUtils.getResourceBundleString(bundle, "meta.locale", "en"));
+      this.locale = StringUtils.parseLocale(ResourceUtils.getResourceBundleString(bundle, "meta.locale", "en"));
     }
     if (bundle.containsKey("meta.version")) {
-      this.version = new Version(RessourceUtils.getResourceBundleString(bundle, "meta.version", "1.0.0"));
+      this.version = new Version(ResourceUtils.getResourceBundleString(bundle, "meta.version", "1.0.0"));
     }
     if (bundle.containsKey("meta.author")) {
-      this.author = RessourceUtils.getResourceBundleString(bundle, "meta.author", "Unknown");
+      this.author = ResourceUtils.getResourceBundleString(bundle, "meta.author", "Unknown");
     }
     if (bundle.containsKey("meta.description")) {
-      this.description = RessourceUtils.getResourceBundleString(bundle, "meta.description", "No description");
+      this.description = ResourceUtils.getResourceBundleString(bundle, "meta.description", "No description");
     }
   }
 
diff --git a/core/src/main/java/com/lemonlightmc/moreplugins/messages/MessageSource.java b/core/src/main/java/com/lemonlightmc/moreplugins/messages/MessageSource.java
index ebf0b9f..c508e55 100644
--- a/core/src/main/java/com/lemonlightmc/moreplugins/messages/MessageSource.java
+++ b/core/src/main/java/com/lemonlightmc/moreplugins/messages/MessageSource.java
@@ -17,7 +17,7 @@
 import java.util.ResourceBundle;
 import java.util.function.Supplier;
 
-import com.lemonlightmc.moreplugins.utils.RessourceUtils;
+import com.lemonlightmc.moreplugins.utils.ResourceUtils;
 
 public class MessageSource implements IMessageSource {
 
@@ -151,7 +151,7 @@ public FileMessageSource(final Path file) {
     public FileMessageSource(final File file) {
       super();
       this.file = file;
-      hasDefault = RessourceUtils.hasResource("translations/" + file.getName() + ".properties");
+      hasDefault = ResourceUtils.hasResource("translations/" + file.getName() + ".properties");
     }
 
     public File getFile() {
@@ -223,13 +223,13 @@ public void save(final Map<String, String> data) {
     @Override
     public void createDefault() {
       final String resourcePath = "translations/" + file + ".properties";
-      final File resource = RessourceUtils.getResourceFile(resourcePath);
+      final File resource = ResourceUtils.getResourceFile(resourcePath);
       if (resource == null || !resource.exists()) {
         Logger.warn("No default message resource found for: " + file);
         return;
       }
       try {
-        RessourceUtils.saveResource(file, resource);
+        ResourceUtils.saveResource(file, resource);
       } catch (final Exception e) {
       }
     }
@@ -292,7 +292,7 @@ private void _load(final ResourceBundle bundle) {
         if (key.startsWith("meta.")) {
           continue;
         }
-        messages.put(key, RessourceUtils.getResourceBundleString(bundle, key, key));
+        messages.put(key, ResourceUtils.getResourceBundleString(bundle, key, key));
       }
     }
   }
diff --git a/core/src/main/java/com/lemonlightmc/moreplugins/wrapper/Countdown.java b/core/src/main/java/com/lemonlightmc/moreplugins/wrapper/Countdown.java
index b897900..00ab9d1 100644
--- a/core/src/main/java/com/lemonlightmc/moreplugins/wrapper/Countdown.java
+++ b/core/src/main/java/com/lemonlightmc/moreplugins/wrapper/Countdown.java
@@ -102,7 +102,7 @@ public void start() {
     this.durationTime = duration.get();
     this.startTime = System.currentTimeMillis();
     start.accept(CountdownInfo.from(this));
-    task = PluginBase.getInstanceScheduler().runEveryAsync(() -> {
+    task = PluginBase.getInstance().getScheduler().runEveryAsync(() -> {
       final CountdownInfo info = CountdownInfo.from(this);
       count.accept(info);
       if (hasEnded()) {
diff --git a/database/src/main/java/com/lemonlightmc/moreplugins/v2/DbStatement.java b/database/src/main/java/com/lemonlightmc/moreplugins/v2/DbStatement.java
index 99378a5..6e1baef 100644
--- a/database/src/main/java/com/lemonlightmc/moreplugins/v2/DbStatement.java
+++ b/database/src/main/java/com/lemonlightmc/moreplugins/v2/DbStatement.java
@@ -36,6 +36,7 @@ public DbStatement(Database db) throws SQLException {
     }
   }
 
+  @SuppressWarnings("unused")
   public void startTransaction() throws SQLException {
     try (DatabaseTiming timing = db.timings("startTransaction")) {
       dbConn.setAutoCommit(false);
@@ -43,6 +44,7 @@ public void startTransaction() throws SQLException {
     }
   }
 
+  @SuppressWarnings("unused")
   public void commit() throws SQLException {
     if (!isDirty) {
       return;
@@ -67,6 +69,7 @@ private synchronized void runEvents(List<Consumer<DbStatement>> runnables) {
     this.onRollback.clear();
   }
 
+  @SuppressWarnings("unused")
   public synchronized void rollback() throws SQLException {
     if (!isDirty) {
       return;
@@ -95,6 +98,7 @@ public synchronized void onRollback(Consumer<DbStatement> run) {
     }
   }
 
+  @SuppressWarnings("unused")
   public DbStatement query(String query) throws SQLException {
     this.query = query;
     try (DatabaseTiming timing = db.timings("query: " + query)) {
@@ -145,6 +149,7 @@ public <T> List<T> executeQueryGetFirstColumnResults(String query, Object... par
     return dbRows;
   }
 
+  @SuppressWarnings("unused")
   private void prepareExecute(Object... params) throws SQLException {
     try (DatabaseTiming timing = db.timings("prepareExecute: " + query)) {
       closeResult();
@@ -158,6 +163,7 @@ private void prepareExecute(Object... params) throws SQLException {
     }
   }
 
+  @SuppressWarnings("unused")
   public int executeUpdate(Object... params) throws SQLException {
     try (DatabaseTiming timing = db.timings("executeUpdate: " + query)) {
       try {
@@ -177,6 +183,7 @@ public int executeUpdate(Object... params) throws SQLException {
     }
   }
 
+  @SuppressWarnings("unused")
   public DbStatement execute(Object... params) throws SQLException {
     try (DatabaseTiming timing = db.timings("execute: " + query)) {
       try {
@@ -198,6 +205,7 @@ public DbStatement execute(Object... params) throws SQLException {
     return this;
   }
 
+  @SuppressWarnings("unused")
   public Long getLastInsertId() throws SQLException {
     try (DatabaseTiming timing = db.timings("getLastInsertId")) {
       try (ResultSet genKeys = preparedStatement.getGeneratedKeys()) {
@@ -213,6 +221,7 @@ public Long getLastInsertId() throws SQLException {
     }
   }
 
+  @SuppressWarnings("unused")
   public ArrayList<DbRow> getResults() throws SQLException {
     if (resultSet == null) {
       return null;
@@ -276,6 +285,7 @@ private void closeStatement() throws SQLException {
     }
   }
 
+  @SuppressWarnings("unused")
   public void close() {
     try (DatabaseTiming timing = db.timings("close")) {
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 8bdaf60..d997cfc 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2a84e18..c61a118 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index ef07e01..739907d 100755
--- a/gradlew
+++ b/gradlew
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
diff --git a/gradlew.bat b/gradlew.bat
index db3a6ac..c4bdd3a 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell