diff --git a/libs/TimoCloud.jar b/libs/TimoCloud.jar
new file mode 100644
index 0000000..ded943c
Binary files /dev/null and b/libs/TimoCloud.jar differ
diff --git a/pom.xml b/pom.xml
index c4875fa..1c353a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>cloud.timo</groupId>
     <artifactId>CloudNotify</artifactId>
-    <version>2.0.4</version>
+    <version>3.0.0</version>
     <build>
         <finalName>${project.name}</finalName>
         <resources>
@@ -65,6 +65,14 @@
             <version>LATEST</version>
             <scope>compile</scope>
         </dependency>
+        <!--TimoCloudAPI-->
+        <dependency>
+            <groupId>cloud.timo.TimoCloud</groupId>
+            <artifactId>TimoCloud-API</artifactId>
+            <version>6.0.0</version>
+            <systemPath>${project.basedir}/libs/TimoCloud.jar</systemPath>
+            <scope>system</scope>
+        </dependency>
     </dependencies>
     
 </project>
\ No newline at end of file
diff --git a/src/main/java/cloud/timo/CloudNotify/listeners/ServerRegisterListener.java b/src/main/java/cloud/timo/CloudNotify/listeners/ServerRegisterListener.java
index fa57720..7c34359 100644
--- a/src/main/java/cloud/timo/CloudNotify/listeners/ServerRegisterListener.java
+++ b/src/main/java/cloud/timo/CloudNotify/listeners/ServerRegisterListener.java
@@ -4,11 +4,8 @@
 import cloud.timo.TimoCloud.api.TimoCloudAPI;
 import cloud.timo.TimoCloud.api.events.EventHandler;
 import cloud.timo.TimoCloud.api.events.Listener;
-import cloud.timo.TimoCloud.api.events.ServerRegisterEvent;
 import cloud.timo.CloudNotify.CloudNotify;
-import cloud.timo.CloudNotify.managers.MessageManager;
-import net.md_5.bungee.api.ChatColor;
-import net.md_5.bungee.api.ProxyServer;
+import cloud.timo.TimoCloud.api.events.server.ServerRegisterEvent;
 
 public class ServerRegisterListener implements Listener {
 
@@ -18,7 +15,7 @@ public ServerRegisterListener(){
 
     @EventHandler
     public void onServerRegister(ServerRegisterEvent event) {
-        CloudNotify.getInstance().getHelper().notify(NotifyType.REGISTER, event.getServerObject());
+        CloudNotify.getInstance().getHelper().notify(NotifyType.REGISTER, event.getServer());
     }
 
 }
diff --git a/src/main/java/cloud/timo/CloudNotify/listeners/ServerUnregisterListener.java b/src/main/java/cloud/timo/CloudNotify/listeners/ServerUnregisterListener.java
index 81a9757..901809d 100644
--- a/src/main/java/cloud/timo/CloudNotify/listeners/ServerUnregisterListener.java
+++ b/src/main/java/cloud/timo/CloudNotify/listeners/ServerUnregisterListener.java
@@ -4,8 +4,8 @@
 import cloud.timo.TimoCloud.api.TimoCloudAPI;
 import cloud.timo.TimoCloud.api.events.EventHandler;
 import cloud.timo.TimoCloud.api.events.Listener;
-import cloud.timo.TimoCloud.api.events.ServerUnregisterEvent;
 import cloud.timo.CloudNotify.CloudNotify;
+import cloud.timo.TimoCloud.api.events.server.ServerUnregisterEvent;
 
 public class ServerUnregisterListener implements Listener {
 
@@ -15,7 +15,7 @@ public ServerUnregisterListener(){
 
     @EventHandler
     public void onServerUnregister(ServerUnregisterEvent event) {
-        CloudNotify.getInstance().getHelper().notify(NotifyType.UNREGISTER, event.getServerObject());
+        CloudNotify.getInstance().getHelper().notify(NotifyType.UNREGISTER, event.getServer());
     }
 
 }
diff --git a/src/main/java/cloud/timo/CloudNotify/utils/Helper.java b/src/main/java/cloud/timo/CloudNotify/utils/Helper.java
index 3d704c8..6b52eb5 100644
--- a/src/main/java/cloud/timo/CloudNotify/utils/Helper.java
+++ b/src/main/java/cloud/timo/CloudNotify/utils/Helper.java
@@ -21,7 +21,7 @@ public void notify(NotifyType notifyType, ServerObject serverObject) {
         }
         MessageManager.sendMessageToTeam(ChatColor.translateAlternateColorCodes('&', mainMessage
                 .replace("{serverName}", serverObject.getName())
-                .replace("{serverBase}", serverObject.getBase())
+                .replace("{serverBase}", serverObject.getBase().getName())
                 .replace("{serverExtra}", serverObject.getExtra())
                 .replace("{serverMap}", serverObject.getMap())
                 .replace("{serverMOTD}", serverObject.getMotd())