diff --git a/build.gradle b/build.gradle
index db80811..ed04cf0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,6 +23,13 @@ java {
     withJavadocJar()
 }
 
+configurations {
+    provided
+    implementation.extendsFrom(provided)
+    runtime.extendsFrom(provided)
+    compile.extendsFrom(provided)
+}
+
 
 def determinePatchVersion = {
     // get the name of the last tag
@@ -53,9 +60,38 @@ repositories {
 }
 
 dependencies {
+    provided "org.reflections:reflections:0.10.2"
+}
+
+
+
+jar {
+    manifest {
+        attributes (
+                'Multi-Release': 'true'
+        )
+    }
 
 }
 
+task jarjar(type: Jar) {
+    manifest {
+        attributes (
+                'Multi-Release': 'true'
+        )
+    }
+    archiveClassifier = "AIO"
+    duplicatesStrategy = "exclude"
+    from { configurations.provided.collect { it.isDirectory() ? it : zipTree(it) } }
+
+    exclude 'META-INF/*'
+    exclude 'META-INF/*'
+    exclude 'META-INF/*'
+
+    with jar
+}
+
+jarjar.dependsOn(jar, sourcesJar, javadocJar)
 
 def MAVEN_PASSWORD_PROPERTY = "AriasCreationsMavenPassword"
 publishing {
diff --git a/src/main/java/dev/zontreck/eventsbus/EventDispatcher.java b/src/main/java/dev/zontreck/eventsbus/EventDispatcher.java
index 560c8db..73958e0 100644
--- a/src/main/java/dev/zontreck/eventsbus/EventDispatcher.java
+++ b/src/main/java/dev/zontreck/eventsbus/EventDispatcher.java
@@ -6,6 +6,7 @@ import dev.zontreck.eventsbus.annotations.SingleshotEvent;
 import dev.zontreck.eventsbus.annotations.Subscribe;
 import dev.zontreck.eventsbus.events.EventBusReadyEvent;
 import dev.zontreck.eventsbus.events.ResetEventBusEvent;
+import org.reflections.Reflections;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -13,6 +14,7 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class EventDispatcher
 {
@@ -93,35 +95,26 @@ public class EventDispatcher
      */
     private static void Scan()
     {
-        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
         Package[] packages = Package.getPackages();
 
         List<Class<?>> loaded = new ArrayList<>();
 
         for(Package pkg : packages)
         {
-            try{
-                String packageName = pkg.getName();
 
-                var clField = classLoader.getClass().getDeclaredField("classes");
-                clField.setAccessible(true);
+            String packageName = pkg.getName();
 
-                List<Class<?>> classes = (List<Class<?>>) clField.get(classLoader);
+            Reflections reflections = new Reflections(packageName);
+            var classes = reflections.getSubTypesOf(Object.class).stream().collect(Collectors.toList());
 
-                for(Class<?> clazz : classes)
+            for(Class<?> clazz : classes)
+            {
+                if(clazz.getPackage().getName().equalsIgnoreCase(packageName))
                 {
-                    if(clazz.getPackage().getName().equalsIgnoreCase(packageName))
-                    {
 
-                        if(clazz.isAnnotationPresent(EventSubscriber.class))
-                            loaded.add(clazz);
-                    }
+                    if(clazz.isAnnotationPresent(EventSubscriber.class))
+                        loaded.add(clazz);
                 }
-
-            } catch (NoSuchFieldException e) {
-                throw new RuntimeException(e);
-            } catch (IllegalAccessException e) {
-                throw new RuntimeException(e);
             }
         }