diff --git a/BungeeCord b/BungeeCord
index 6e175173..8a88ce46 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit 6e1751733f6b3dafe824dcd7f00d5ed86572ba37
+Subproject commit 8a88ce464e0b107b15523109afd7810096e635ca
diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch
index f571e925..4d57c5d3 100644
--- a/BungeeCord-Patches/0001-POM-Changes.patch
+++ b/BungeeCord-Patches/0001-POM-Changes.patch
@@ -16,10 +16,10 @@ index 4f520c31..d125f700 100644
      <parent>
 -        <groupId>net.md-5</groupId>
 -        <artifactId>bungeecord-parent</artifactId>
--        <version>1.20-R0.3-SNAPSHOT</version>
+-        <version>1.21-R0.1-SNAPSHOT</version>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-+    <version>1.20-R0.3-SNAPSHOT</version>
++    <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -27,7 +27,7 @@ index 4f520c31..d125f700 100644
 -    <artifactId>bungeecord-api</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-api</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-API</name>
@@ -79,7 +79,7 @@ index 4dbf5e29..15546f07 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -87,7 +87,7 @@ index 4dbf5e29..15546f07 100644
 -    <artifactId>bungeecord-bootstrap</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-bootstrap</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Bootstrap</name>
@@ -157,7 +157,7 @@ index 4239d5a1..3cfa8ac3 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -165,7 +165,7 @@ index 4239d5a1..3cfa8ac3 100644
 -    <artifactId>bungeecord-chat</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-chat</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Chat</name>
@@ -187,7 +187,7 @@ index e7a474c6..13b2481d 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -195,7 +195,7 @@ index e7a474c6..13b2481d 100644
 -    <artifactId>bungeecord-config</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-config</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Config</name>
@@ -217,7 +217,7 @@ index 1f36ab90..120d21b2 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -225,7 +225,7 @@ index 1f36ab90..120d21b2 100644
 -    <artifactId>bungeecord-event</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-event</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Event</name>
@@ -245,7 +245,7 @@ index 1e2f2e96..09b75466 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -253,7 +253,7 @@ index 1e2f2e96..09b75466 100644
 -    <artifactId>bungeecord-log</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-log</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Log</name>
@@ -286,7 +286,7 @@ index 62e1f137..095368b4 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -294,7 +294,7 @@ index 62e1f137..095368b4 100644
 -    <artifactId>bungeecord-module-cmd-alert</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-alert</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
@@ -309,7 +309,7 @@ index 5ca1b4c3..6bf9bdcf 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -317,7 +317,7 @@ index 5ca1b4c3..6bf9bdcf 100644
 -    <artifactId>bungeecord-module-cmd-find</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-find</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/cmd-kick/pom.xml b/module/cmd-kick/pom.xml
@@ -332,7 +332,7 @@ index 2a498c05..5e5cab83 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -340,7 +340,7 @@ index 2a498c05..5e5cab83 100644
 -    <artifactId>bungeecord-module-cmd-kick</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-kick</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
@@ -355,7 +355,7 @@ index 99090af7..670a55f4 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -363,7 +363,7 @@ index 99090af7..670a55f4 100644
 -    <artifactId>bungeecord-module-cmd-list</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-list</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
@@ -378,7 +378,7 @@ index 5aee8173..6c65d8f4 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -386,7 +386,7 @@ index 5aee8173..6c65d8f4 100644
 -    <artifactId>bungeecord-module-cmd-send</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-send</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
@@ -401,7 +401,7 @@ index d33200e2..dc3af35e 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -409,7 +409,7 @@ index d33200e2..dc3af35e 100644
 -    <artifactId>bungeecord-module-cmd-server</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-server</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/pom.xml b/module/pom.xml
@@ -424,7 +424,7 @@ index 21ba8f2b..baa24b7d 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -432,7 +432,7 @@ index 21ba8f2b..baa24b7d 100644
 -    <artifactId>bungeecord-module</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>pom</packaging>
  
 -    <name>BungeeCord Modules</name>
@@ -473,7 +473,7 @@ index e3a077f3..7d8cf5c4 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -481,7 +481,7 @@ index e3a077f3..7d8cf5c4 100644
 -    <artifactId>bungeecord-module-reconnect-yaml</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-reconnect-yaml</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/native/pom.xml b/native/pom.xml
@@ -496,7 +496,7 @@ index 56d505ab..f7bae2fe 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -504,7 +504,7 @@ index 56d505ab..f7bae2fe 100644
 -    <artifactId>bungeecord-native</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-native</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Native</name>
@@ -533,7 +533,7 @@ index 5ceacdd8..58367c45 100644
 +
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-parent</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>pom</packaging>
  
 -    <name>BungeeCord-Parent</name>
@@ -678,7 +678,7 @@ index 6f5acbc2..db62c340 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -686,7 +686,7 @@ index 6f5acbc2..db62c340 100644
 -    <artifactId>bungeecord-protocol</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-protocol</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Protocol</name>
@@ -719,7 +719,7 @@ index 574e36c9..63bc0b32 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -727,7 +727,7 @@ index 574e36c9..63bc0b32 100644
 -    <artifactId>bungeecord-proxy</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-proxy</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Proxy</name>
@@ -798,7 +798,7 @@ index e07828dd..4b6fdfc2 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -806,7 +806,7 @@ index e07828dd..4b6fdfc2 100644
 -    <artifactId>bungeecord-query</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-query</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Query</name>
@@ -837,7 +837,7 @@ index 3b944b85..6d30d554 100644
      <parent>
 -        <groupId>net.md-5</groupId>
 -        <artifactId>bungeecord-parent</artifactId>
--        <version>1.20-R0.3-SNAPSHOT</version>
+-        <version>1.21-R0.1-SNAPSHOT</version>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-super</artifactId>
 +        <version>dev-SNAPSHOT</version>
@@ -848,7 +848,7 @@ index 3b944b85..6d30d554 100644
 -    <artifactId>bungeecord-slf4j</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-slf4j</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-SLF4J</name>