diff --git a/src/com/sekwah/advancedportals/core/api/registry/TagRegistry.java b/src/com/sekwah/advancedportals/core/api/registry/TagRegistry.java
index 6079cf4..4aac4b7 100644
--- a/src/com/sekwah/advancedportals/core/api/registry/TagRegistry.java
+++ b/src/com/sekwah/advancedportals/core/api/registry/TagRegistry.java
@@ -1,6 +1,6 @@
-package com.sekwah.advancedportals.api.registry;
+package com.sekwah.advancedportals.core.api.registry;
 
-import com.sekwah.advancedportals.api.warphandler.TagHandler;
+import com.sekwah.advancedportals.core.api.warphandler.TagHandler;
 import com.sekwah.advancedportals.core.AdvancedPortalsCore;
 
 import java.util.ArrayList;
diff --git a/src/com/sekwah/advancedportals/core/api/warphandler/ActivationData.java b/src/com/sekwah/advancedportals/core/api/warphandler/ActivationData.java
index b6e42bc..eac2b22 100644
--- a/src/com/sekwah/advancedportals/core/api/warphandler/ActivationData.java
+++ b/src/com/sekwah/advancedportals/core/api/warphandler/ActivationData.java
@@ -1,4 +1,4 @@
-package com.sekwah.advancedportals.api.warphandler;
+package com.sekwah.advancedportals.core.api.warphandler;
 
 
 /**
diff --git a/src/com/sekwah/advancedportals/core/api/warphandler/TagHandler.java b/src/com/sekwah/advancedportals/core/api/warphandler/TagHandler.java
index 6ec4eb8..a00c770 100644
--- a/src/com/sekwah/advancedportals/core/api/warphandler/TagHandler.java
+++ b/src/com/sekwah/advancedportals/core/api/warphandler/TagHandler.java
@@ -1,8 +1,6 @@
-package com.sekwah.advancedportals.api.warphandler;
+package com.sekwah.advancedportals.core.api.warphandler;
 
-import org.bukkit.entity.Player;
-
-import javax.annotation.Nullable;
+import com.sekwah.advancedportals.coreconnector.container.PlayerContainer;
 
 /**
  * Created by on 30/07/2016.
@@ -31,7 +29,7 @@ public class TagHandler {
          * @param argData
          * @return if the portal can be created.
          */
-        boolean portalCreated(@Nullable Player player, ActivationData activeData, String argData);
+        boolean portalCreated(PlayerContainer player, ActivationData activeData, String argData);
 
         /**
          * Example if the player does not have access to remove the portal.
@@ -41,7 +39,7 @@ public class TagHandler {
          * @param argData
          * @return if the portal can be destroyed.
          */
-        boolean portalDestroyed(@Nullable Player player, ActivationData activeData, String argData);
+        boolean portalDestroyed(PlayerContainer player, ActivationData activeData, String argData);
 
     }
 
@@ -54,7 +52,7 @@ public class TagHandler {
          * @param activeData
          * @param argData
          */
-        void portalPreActivated(Player player, ActivationData activeData, String argData);
+        void portalPreActivated(PlayerContainer player, ActivationData activeData, String argData);
 
         /**
          * Activates after portal activation
@@ -63,7 +61,7 @@ public class TagHandler {
          * @param activeData
          * @param argData
          */
-        void portalPostActivated(Player player, ActivationData activeData, String argData);
+        void portalPostActivated(PlayerContainer player, ActivationData activeData, String argData);
 
         /**
          * Activates if the portal is allowed from pre
@@ -72,7 +70,7 @@ public class TagHandler {
          * @param activeData
          * @param argData
          */
-        void portalActivated(Player player, ActivationData activeData, String argData);
+        void portalActivated(PlayerContainer player, ActivationData activeData, String argData);
 
     }
 
@@ -86,7 +84,7 @@ public class TagHandler {
          * @param argData
          * @return if the tag will be added.
          */
-        boolean tagAdded(@Nullable Player player, ActivationData activeData, String argData);
+        boolean tagAdded(PlayerContainer player, ActivationData activeData, String argData);
 
         /**
          * If the user has access to remove the tag
@@ -96,7 +94,7 @@ public class TagHandler {
          * @param argData
          * @return if the tag will be removed.
          */
-        boolean tagRemoved(@Nullable Player player, ActivationData activeData, String argData);
+        boolean tagRemoved(PlayerContainer player, ActivationData activeData, String argData);
 
     }
 
diff --git a/src/com/sekwah/advancedportals/coreconnector/container/PlayerContainer.java b/src/com/sekwah/advancedportals/coreconnector/container/PlayerContainer.java
new file mode 100644
index 0000000..044dc80
--- /dev/null
+++ b/src/com/sekwah/advancedportals/coreconnector/container/PlayerContainer.java
@@ -0,0 +1,4 @@
+package com.sekwah.advancedportals.coreconnector.container;
+
+public class PlayerContainer {
+}