diff --git a/src/com/sekwah/advancedportals/core/api/commands/SubCommand.java b/src/com/sekwah/advancedportals/core/api/commands/SubCommand.java
index 61c9a136..840bb8aa 100644
--- a/src/com/sekwah/advancedportals/core/api/commands/SubCommand.java
+++ b/src/com/sekwah/advancedportals/core/api/commands/SubCommand.java
@@ -1,6 +1,6 @@
 package com.sekwah.advancedportals.core.api.commands;
 
-import org.bukkit.command.CommandSender;
+import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer;
 
 import java.util.List;
 
@@ -16,7 +16,7 @@ public interface SubCommand {
      * @param args arguments including the subcommand that has been specified.
      * @return if the command has worked (if false it will just display a message from the command suggesting to check help)
      */
-    boolean onCommand(CommandSender sender, String[] args);
+    boolean onCommand(CommandSenderContainer sender, String[] args);
 
     /**
      *
@@ -25,7 +25,7 @@ public interface SubCommand {
      * @param args arguments including the subcommand that has been specified.
      * @return tab completion for the subcommand
      */
-    List<String> onTabComplete(CommandSender sender, String[] args);
+    List<String> onTabComplete(CommandSenderContainer sender, String[] args);
 
     /**
      * @return the string to show on the above help menu. (describing the subcommand)
diff --git a/src/com/sekwah/advancedportals/core/api/effect/TestEffect.java b/src/com/sekwah/advancedportals/core/api/effect/TestEffect.java
index 397aac84..d5976645 100644
--- a/src/com/sekwah/advancedportals/core/api/effect/TestEffect.java
+++ b/src/com/sekwah/advancedportals/core/api/effect/TestEffect.java
@@ -1,8 +1,8 @@
 package com.sekwah.advancedportals.core.api.effect;
 
 import com.sekwah.advancedportals.core.api.portal.Portal;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
+import com.sekwah.advancedportals.core.data.PortalLocation;
+import com.sekwah.advancedportals.coreconnector.container.PlayerContainer;
 
 /**
  * @author sekwah41
@@ -10,7 +10,7 @@ import org.bukkit.entity.Player;
 public class TestEffect implements WarpEffect {
 
     @Override
-    public void onWarp(Player player, Location loc, Action action, Portal portal) {
+    public void onWarp(PlayerContainer player, PortalLocation loc, Action action, Portal portal) {
 
     }
 
diff --git a/src/com/sekwah/advancedportals/core/api/effect/WarpEffect.java b/src/com/sekwah/advancedportals/core/api/effect/WarpEffect.java
index 7ddcd8ef..2f3715ca 100644
--- a/src/com/sekwah/advancedportals/core/api/effect/WarpEffect.java
+++ b/src/com/sekwah/advancedportals/core/api/effect/WarpEffect.java
@@ -1,8 +1,8 @@
 package com.sekwah.advancedportals.core.api.effect;
 
 import com.sekwah.advancedportals.core.api.portal.Portal;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
+import com.sekwah.advancedportals.core.data.PortalLocation;
+import com.sekwah.advancedportals.coreconnector.container.PlayerContainer;
 
 /**
  * Effects to be registered to the list.
@@ -15,7 +15,7 @@ import org.bukkit.entity.Player;
  */
 public interface WarpEffect {
 
-    void onWarp(Player player, Location loc, Action action, Portal portal);
+    void onWarp(PlayerContainer player, PortalLocation loc, Action action, Portal portal);
 
     Type getType();
 
diff --git a/src/com/sekwah/advancedportals/core/data/PortalLocation.java b/src/com/sekwah/advancedportals/core/data/PortalLocation.java
new file mode 100644
index 00000000..44dccaf4
--- /dev/null
+++ b/src/com/sekwah/advancedportals/core/data/PortalLocation.java
@@ -0,0 +1,4 @@
+package com.sekwah.advancedportals.core.data;
+
+public class PortalLocation {
+}
diff --git a/src/com/sekwah/advancedportals/coreconnector/container/CommandSenderContainer.java b/src/com/sekwah/advancedportals/coreconnector/container/CommandSenderContainer.java
new file mode 100644
index 00000000..b4b037a9
--- /dev/null
+++ b/src/com/sekwah/advancedportals/coreconnector/container/CommandSenderContainer.java
@@ -0,0 +1,4 @@
+package com.sekwah.advancedportals.coreconnector.container;
+
+public class CommandSenderContainer {
+}