diff --git a/api/build.gradle.kts b/api/build.gradle.kts
index e16dfdf..80b7779 100644
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -4,13 +4,25 @@ plugins {
     id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
-val versionVar = version.toString()
+val versionVar = version
 val groupIdVar = "com.undefined"
 val artifactIdVar = "stellar"
 
 group = groupIdVar
 version = versionVar
 
+publishing {
+    publications {
+        register<MavenPublication>("maven") {
+            groupId = groupIdVar
+            artifactId = artifactIdVar
+            version = versionVar.toString()
+
+            from(components["java"])
+        }
+    }
+}
+
 dependencies {
     compileOnly("org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT")
     implementation(project(":common"))
@@ -30,7 +42,7 @@ dependencies {
     implementation(project(":v1_16_4"))
     implementation(project(":v1_16_5"))
     implementation(project(":v1_17"))
-    implementation(project(":v1_17_1", "reobf"))
+    implementation(project(":v1_17_1"))
     implementation(project(":v1_18_1"))
     implementation(project(":v1_18_2"))
     implementation(project(":v1_19_2"))
@@ -49,6 +61,11 @@ dependencies {
 }
 
 tasks {
+    shadowJar {
+        dependencyFilter.exclude { element ->
+            Regex("^v\\d+").matches(element.moduleName)
+        }
+    }
     compileKotlin {
         kotlinOptions.jvmTarget = "1.8"
     }
diff --git a/build.gradle.kts b/build.gradle.kts
index 87effa7..9181a1d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
     java
     kotlin("jvm") version "1.9.22"
@@ -8,7 +10,7 @@ plugins {
 
 apply(plugin = "maven-publish")
 val projectGroupId = "com.undefined"
-val projectVersion = "0.0.14"
+val projectVersion = "0.0.30"
 val projectArtifactId = "stellar"
 
 group = projectGroupId
@@ -41,6 +43,16 @@ publishing {
             }
         }
     }
+
+    publications {
+        register<MavenPublication>("maven") {
+            groupId = projectGroupId
+            artifactId = projectArtifactId
+            version = projectVersion
+
+            from(components["java"])
+        }
+    }
 }
 
 allprojects {
@@ -55,18 +67,6 @@ allprojects {
         maven("https://repo.papermc.io/repository/maven-public/")
     }
 
-    publishing {
-        publications {
-            register<MavenPublication>("maven") {
-                groupId = projectGroupId
-                artifactId = projectArtifactId
-                version = projectVersion
-
-                from(components["java"])
-            }
-        }
-    }
-
     dependencies {
         implementation("org.jetbrains.kotlin:kotlin-stdlib")
         implementation("net.kyori:adventure-api:4.17.0")
@@ -79,41 +79,45 @@ allprojects {
 dependencies {
     implementation(project(":api"))
     implementation(project(":common"))
-    implementation(project(":v1_13"))
-    implementation(project(":v1_13_1"))
-    implementation(project(":v1_13_2"))
-    implementation(project(":v1_14_1"))
-    implementation(project(":v1_14_2"))
-    implementation(project(":v1_14_3"))
-    implementation(project(":v1_14_4"))
-    implementation(project(":v1_15"))
-    implementation(project(":v1_15_1"))
-    implementation(project(":v1_15_2"))
-    implementation(project(":v1_16_1"))
-    implementation(project(":v1_16_2"))
-    implementation(project(":v1_16_3"))
-    implementation(project(":v1_16_4"))
-    implementation(project(":v1_16_5"))
-    implementation(project(":v1_17"))
-    implementation(project(":v1_17"))
-    implementation(project(":v1_17_1:", "reobf"))
-    implementation(project(":v1_18_1:", "reobf"))
-    implementation(project(":v1_18_2:", "reobf"))
-    implementation(project(":v1_19_2:", "reobf"))
-    implementation(project(":v1_19_3:", "reobf"))
-    implementation(project(":v1_19_4:", "reobf"))
-    implementation(project(":v1_20", "reobf"))
-    implementation(project(":v1_20_1", "reobf"))
-    implementation(project(":v1_20_2", "reobf"))
-    implementation(project(":v1_20_4", "reobf"))
-    implementation(project(":v1_20_6", "reobf"))
-    implementation(project(":v1_21", "reobf"))
-    implementation(project(":v1_21_1", "reobf"))
-    implementation(project(":v1_21_3", "reobf"))
-    implementation(project(":v1_21_4", "reobf"))
+//    implementation(project(":v1_13"))
+//    implementation(project(":v1_13_1"))
+//    implementation(project(":v1_13_2"))
+//    implementation(project(":v1_14_1"))
+//    implementation(project(":v1_14_2"))
+//    implementation(project(":v1_14_3"))
+//    implementation(project(":v1_14_4"))
+//    implementation(project(":v1_15"))
+//    implementation(project(":v1_15_1"))
+//    implementation(project(":v1_15_2"))
+//    implementation(project(":v1_16_1"))
+//    implementation(project(":v1_16_2"))
+//    implementation(project(":v1_16_3"))
+//    implementation(project(":v1_16_4"))
+//    implementation(project(":v1_16_5"))
+//    implementation(project(":v1_17"))
+//    implementation(project(":v1_17"))
+//    implementation(project(":v1_17_1:", "reobf"))
+//    implementation(project(":v1_18_1:", "reobf"))
+//    implementation(project(":v1_18_2:", "reobf"))
+//    implementation(project(":v1_19_2:", "reobf"))
+//    implementation(project(":v1_19_3:", "reobf"))
+//    implementation(project(":v1_19_4:", "reobf"))
+//    implementation(project(":v1_20", "reobf"))
+//    implementation(project(":v1_20_1", "reobf"))
+//    implementation(project(":v1_20_2", "reobf"))
+//    implementation(project(":v1_20_4", "reobf"))
+//    implementation(project(":v1_20_6", "reobf"))
+//    implementation(project(":v1_21", "reobf"))
+//    implementation(project(":v1_21_1", "reobf"))
+//    implementation(project(":v1_21_3", "reobf"))
+//    implementation(project(":v1_21_4", "reobf"))
 }
 
 tasks {
+    withType<ShadowJar> {
+        archiveFileName.set("${project.name}-${project.version}.jar")
+        archiveClassifier.set("mapped")
+    }
     compileKotlin {
         kotlinOptions.jvmTarget = "1.8"
     }
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 7c184ed..90f2da4 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -2,10 +2,22 @@ plugins {
     kotlin("jvm") version "1.9.22"
 }
 
-val versionVar = version.toString()
+val versionVar = version
 val groupIdVar = "com.undefined"
 val artifactIdVar = "stellar"
 
+publishing {
+    publications {
+        register<MavenPublication>("maven") {
+            groupId = groupIdVar
+            artifactId = artifactIdVar
+            version = versionVar.toString()
+
+            from(components["java"])
+        }
+    }
+}
+
 dependencies {
     compileOnly("org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT")
     api("com.mojang:authlib:1.5.21")
diff --git a/common/src/main/kotlin/com/undefined/stellar/argument/ArgumentHandler.kt b/common/src/main/kotlin/com/undefined/stellar/argument/ArgumentHandler.kt
index cd95de9..60760c3 100644
--- a/common/src/main/kotlin/com/undefined/stellar/argument/ArgumentHandler.kt
+++ b/common/src/main/kotlin/com/undefined/stellar/argument/ArgumentHandler.kt
@@ -88,28 +88,28 @@ open class ArgumentHandler {
     fun addBooleanArgument(name: String): BooleanArgument =
         addArgument { BooleanArgument(base, name) }
 
-    fun <T, U : AbstractStellarArgument<*>> addListArgument(
+    fun <T> addListArgument(
         name: String,
         list: List<T>,
         stringifier: (T) -> Suggestion,
         parse: (Any?) -> T
     ): ListArgument<T> = addArgument { ListArgument(base, StringArgument(base, name, StringType.WORD), list, stringifier, parse) }
 
-    fun <T, U : AbstractStellarArgument<*>> addListArgument(
+    fun <T> addListArgument(
         type: AbstractStellarArgument<*>,
         list: List<T>,
         stringifier: (T) -> Suggestion,
         parse: (Any?) -> T
     ): ListArgument<T> = addArgument { ListArgument(base, type, list, stringifier, parse) }
 
-    fun <T, U : AbstractStellarArgument<*>> addListArgument(
+    fun <T> addListArgument(
         name: String,
         list: () -> List<T>,
         stringifier: (T) -> Suggestion,
         parse: (Any?) -> T
     ): ListArgument<T> = addArgument { ListArgument(base, StringArgument(base, name, StringType.WORD), list, stringifier, parse) }
 
-    fun <T, U : AbstractStellarArgument<*>> addListArgument(
+    fun <T> addListArgument(
         type: AbstractStellarArgument<*>,
         list: () -> List<T>,
         stringifier: (T) -> Suggestion,