diff --git a/src/main/lombok/nl/sbdeveloper/themeparkplus/commands/TPPCMD.java b/src/main/lombok/nl/sbdeveloper/themeparkplus/commands/TPPCMD.java
index 5f831fb..c123b66 100644
--- a/src/main/lombok/nl/sbdeveloper/themeparkplus/commands/TPPCMD.java
+++ b/src/main/lombok/nl/sbdeveloper/themeparkplus/commands/TPPCMD.java
@@ -204,12 +204,12 @@ public class TPPCMD implements CommandExecutor {
             return true;
         }
 
-        if (!nl.iobyte.themepark.api.API.isAttraction(args[1])) {
+        if (!nl.iobyte.themepark.ThemePark.getInstance().getAPI().getAttractionService().hasAttraction(args[1])) {
             sender.sendMessage(ConfigUtil.getMessage("Fastpass.UnknownRide", Collections.singletonMap("%ridename%", args[1])));
             return true;
         }
 
-        nl.iobyte.themepark.api.attraction.Attraction att = nl.iobyte.themepark.api.API.getAttraction(args[1]);
+        nl.iobyte.themepark.api.attraction.objects.Attraction att = nl.iobyte.themepark.ThemePark.getInstance().getAPI().getAttractionService().getAttraction(args[1]);
 
         Player target;
         if (args.length == 3) {
diff --git a/src/main/lombok/nl/sbdeveloper/themeparkplus/listeners/SignListeners.java b/src/main/lombok/nl/sbdeveloper/themeparkplus/listeners/SignListeners.java
index fec1219..1d9f1c2 100644
--- a/src/main/lombok/nl/sbdeveloper/themeparkplus/listeners/SignListeners.java
+++ b/src/main/lombok/nl/sbdeveloper/themeparkplus/listeners/SignListeners.java
@@ -45,7 +45,7 @@ public class SignListeners implements Listener {
             return;
         }
 
-        if (!nl.iobyte.themepark.api.API.isAttraction(lines[2])) {
+        if (!nl.iobyte.themepark.ThemePark.getInstance().getAPI().getAttractionService().hasAttraction(lines[2])) {
             p.sendMessage(ConfigUtil.getMessage("Fastpass.UnknownRide", Collections.singletonMap("ridename", e.getLine(2))));
             return;
         }
@@ -80,7 +80,7 @@ public class SignListeners implements Listener {
 
             e.setLine(0, wrLineOne);
             e.setLine(1, wrLineTwo);
-            e.setLine(2, ConfigUtil.makecolored(nl.iobyte.themepark.api.API.getAttraction(lines[2]).getName()));
+            e.setLine(2, ConfigUtil.makecolored(nl.iobyte.themepark.ThemePark.getInstance().getAPI().getAttractionService().getAttraction(lines[2]).getName()));
             e.setLine(3, "0 min.");
 
             p.sendMessage(ConfigUtil.getMessage("WaitingRow.SignCreated"));