diff --git a/pom.xml b/pom.xml
index a7964b0..fc87ab0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.jeff_media</groupId>
     <artifactId>SpigotUpdateChecker</artifactId>
-    <version>3.0.3</version>
+    <version>3.0.4</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -63,7 +63,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.5.0</version>
                 <configuration>
                     <minimizeJar>true</minimizeJar>
                 </configuration>
@@ -82,6 +82,17 @@
                                     </excludes>
                                 </filter>
                             </filters>
+                            <artifactSet>
+                                <includes>
+                                    <include>com.github.Anon8281:UniversalScheduler</include>
+                                </includes>
+                            </artifactSet>
+                            <relocations>
+                                <relocation>
+                                    <pattern>com.github.Anon8281.universalScheduler</pattern>
+                                    <shadedPattern>com.jeff_media.updatechecker.universalScheduler</shadedPattern>
+                                </relocation>
+                            </relocations>
                         </configuration>
                     </execution>
                 </executions>
@@ -146,6 +157,10 @@
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -167,6 +182,12 @@
             <version>23.0.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.Anon8281</groupId>
+            <artifactId>UniversalScheduler</artifactId>
+            <version>0.1.6</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <distributionManagement>
diff --git a/src/main/java/com/jeff_media/updatechecker/UpdateChecker.java b/src/main/java/com/jeff_media/updatechecker/UpdateChecker.java
index 501c6fb..fe80785 100644
--- a/src/main/java/com/jeff_media/updatechecker/UpdateChecker.java
+++ b/src/main/java/com/jeff_media/updatechecker/UpdateChecker.java
@@ -18,6 +18,9 @@
 
 package com.jeff_media.updatechecker;
 
+import com.github.Anon8281.universalScheduler.UniversalScheduler;
+import com.github.Anon8281.universalScheduler.scheduling.schedulers.TaskScheduler;
+import com.github.Anon8281.universalScheduler.scheduling.tasks.MyScheduledTask;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
@@ -41,7 +44,7 @@
 @SuppressWarnings("UnusedReturnValue")
 public class UpdateChecker {
 
-    static final String VERSION = "3.0.1";
+    static final String VERSION = "3.0.4";
     private static final String SPIGOT_CHANGELOG_SUFFIX = "/history";
     private static final String SPIGOT_DOWNLOAD_LINK = "https://www.spigotmc.org/resources/";
     private static final String SPIGOT_UPDATE_API = "https://api.spigotmc.org/simple/0.2/index.php?action=getResource&id=%s";
@@ -81,7 +84,9 @@ public class UpdateChecker {
     private BiConsumer<CommandSender[], String> onSuccess = (requesters, latestVersion) -> {
     };
     private String paidDownloadLink = null;
-    private int taskId = -1;
+    private static TaskScheduler scheduler;
+    @Nullable
+    private MyScheduledTask updaterTask = null;
     private int timeout = 0;
     private String usedVersion;
     private String userAgentString = null;
@@ -107,7 +112,6 @@ public UpdateChecker(@NotNull JavaPlugin plugin, @NotNull VersionSupplier suppli
     }
 
     private void init() {
-
         Objects.requireNonNull(plugin, "Plugin cannot be null.");
 
         this.usedVersion = plugin.getDescription().getVersion().trim();
@@ -116,6 +120,8 @@ private void init() {
             usingPaidVersion = true;
         }
 
+        scheduler = UniversalScheduler.getScheduler(plugin);
+
         if (!listenerAlreadyRegistered) {
             Bukkit.getPluginManager().registerEvents(new UpdateCheckListener(), plugin);
             listenerAlreadyRegistered = true;
@@ -280,9 +286,9 @@ public UpdateChecker checkEveryXHours(double hours) {
         long ticks = ((int) seconds) * 20L;
         stop();
         if (ticks > 0) {
-            taskId = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, () -> checkNow(Bukkit.getConsoleSender()), ticks, ticks);
+            updaterTask = getScheduler().runTaskTimer(() -> checkNow(Bukkit.getConsoleSender()), ticks, ticks);
         } else {
-            taskId = -1;
+            updaterTask = null;
         }
         return this;
     }
@@ -293,10 +299,10 @@ public UpdateChecker checkEveryXHours(double hours) {
      * its previous task.
      */
     public UpdateChecker stop() {
-        if (taskId != -1) {
-            Bukkit.getScheduler().cancelTask(taskId);
+        if (updaterTask != null) {
+            updaterTask.cancel();
         }
-        taskId = -1;
+        updaterTask = null;
         return this;
     }
 
@@ -320,7 +326,7 @@ public UpdateChecker checkNow(@Nullable CommandSender... requesters) {
             userAgentString = UserAgentBuilder.getDefaultUserAgent().build();
         }
 
-        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+        getScheduler().runTaskAsynchronously(() -> {
 
             UpdateCheckEvent updateCheckEvent;
 
@@ -345,12 +351,12 @@ public UpdateChecker checkNow(@Nullable CommandSender... requesters) {
                 updateCheckEvent = new UpdateCheckEvent(UpdateCheckSuccess.SUCCESS);
             } catch (final IOException exception) {
                 updateCheckEvent = new UpdateCheckEvent(UpdateCheckSuccess.FAIL);
-                Bukkit.getScheduler().runTask(plugin, () -> getOnFail().accept(requesters, exception));
+                getScheduler().runTask(() -> getOnFail().accept(requesters, exception));
             }
 
             UpdateCheckEvent finalUpdateCheckEvent = updateCheckEvent.setRequesters(requesters);
 
-            Bukkit.getScheduler().runTask(plugin, () -> {
+            getScheduler().runTask(() -> {
 
                 if (finalUpdateCheckEvent.getSuccess() == UpdateCheckSuccess.SUCCESS) {
                     getOnSuccess().accept(requesters, latestVersion);
@@ -616,6 +622,15 @@ protected Plugin getPlugin() {
         return plugin;
     }
 
+    /**
+     *  Gets the TaskScheduler instance used by the UpdateChecker
+     *
+     * @return TaskScheduler instance used by the UpdateChecker
+     */
+    public static TaskScheduler getScheduler() {
+        return scheduler;
+    }
+
     /**
      * Gets the Spigot User ID of the user who downloaded the plugin if it's a premium plugin, otherwise "%%__USER__%%"
      *