diff --git a/build.gradle b/build.gradle
index 39be496..5dd384f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'java'
-    id 'maven'
-    id 'com.github.johnrengelman.shadow' version '6.1.0'
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
     id 'maven-publish'
 }
 
@@ -14,6 +13,11 @@ subprojects {
 
     repositories {
         maven { url 'https://repo.bg-software.com/repository/nms/' }
+        maven { url 'https://repo.bg-software.com/repository/common/' }
+    }
+
+    dependencies {
+        compileOnly 'com.bgsoftware.common.reflection:ReflectionUtils:latest'
     }
 
     shadowJar {
@@ -30,6 +34,7 @@ repositories {
     maven { url 'https://repo.bg-software.com/repository/nms/' }
     maven { url 'https://repo.bg-software.com/repository/api/' }
     maven { url 'https://repo.bg-software.com/repository/public-libs/' }
+    maven { url 'https://repo.bg-software.com/repository/common/' }
 
     String mavenUsername = project.hasProperty('mavenUsername') ? project.mavenUsername : System.getenv('mavenUsername');
     String mavenPassword = project.hasProperty('mavenPassword') ? project.mavenPassword : System.getenv('mavenPassword');
@@ -50,6 +55,8 @@ dependencies {
     implementation project(":API")
     implementation fileTree("archive")
 
+    implementation 'com.bgsoftware.common.reflection:ReflectionUtils:latest'
+
     // Spigot jars
     compileOnly "org.spigotmc:v1_7_R3:latest"
     compileOnly 'org.spigotmc:v1_16_R3-Tuinity:latest'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6ce793f..0f80bbf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
index 2cc895b..2f80eff 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -26,3 +26,5 @@ include 'v1_15_R1'
 include 'v1_16_R1'
 include 'v1_16_R2'
 include 'v1_16_R3'
+include 'v1_17_R1'
+
diff --git a/v1_17_R1/build.gradle b/v1_17_R1/build.gradle
new file mode 100644
index 0000000..c8f6fc8
--- /dev/null
+++ b/v1_17_R1/build.gradle
@@ -0,0 +1,13 @@
+group 'v1_17_R1'
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(16))
+    }
+}
+
+dependencies {
+    compileOnly "org.spigotmc:v1_17_R1:latest"
+    compileOnly project(":API")
+    compileOnly parent
+}
\ No newline at end of file