diff --git a/src/api b/src/api
index 30ba1bafa..dd3d8c552 160000
--- a/src/api
+++ b/src/api
@@ -1 +1 @@
-Subproject commit 30ba1bafac147bc34cab98fadb38cff0dbab7b90
+Subproject commit dd3d8c552c515b48901f4c8d443b8c7cb85c0a20
diff --git a/src/main/java/kamkeel/npcs/command/profile/CommandProfileAdmin.java b/src/main/java/kamkeel/npcs/command/profile/CommandProfileAdmin.java
index 3affe65ad..4bc21da09 100644
--- a/src/main/java/kamkeel/npcs/command/profile/CommandProfileAdmin.java
+++ b/src/main/java/kamkeel/npcs/command/profile/CommandProfileAdmin.java
@@ -2,7 +2,7 @@ package kamkeel.npcs.command.profile;
 
 import kamkeel.npcs.controllers.ProfileController;
 import kamkeel.npcs.controllers.data.EnumProfileOperation;
-import kamkeel.npcs.controllers.data.ISlot;
+import noppes.npcs.api.handler.data.ISlot;
 import kamkeel.npcs.controllers.data.Profile;
 import kamkeel.npcs.controllers.data.ProfileOperation;
 import net.minecraft.command.CommandException;
diff --git a/src/main/java/kamkeel/npcs/command/profile/CommandProfileList.java b/src/main/java/kamkeel/npcs/command/profile/CommandProfileList.java
index 7c15bc548..17e82fcce 100644
--- a/src/main/java/kamkeel/npcs/command/profile/CommandProfileList.java
+++ b/src/main/java/kamkeel/npcs/command/profile/CommandProfileList.java
@@ -1,7 +1,7 @@
 package kamkeel.npcs.command.profile;
 
 import kamkeel.npcs.controllers.ProfileController;
-import kamkeel.npcs.controllers.data.ISlot;
+import noppes.npcs.api.handler.data.ISlot;
 import kamkeel.npcs.controllers.data.Profile;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
diff --git a/src/main/java/kamkeel/npcs/controllers/ProfileController.java b/src/main/java/kamkeel/npcs/controllers/ProfileController.java
index 2f02a68a2..6c2808e1b 100644
--- a/src/main/java/kamkeel/npcs/controllers/ProfileController.java
+++ b/src/main/java/kamkeel/npcs/controllers/ProfileController.java
@@ -2,23 +2,21 @@ package kamkeel.npcs.controllers;
 
 import kamkeel.npcs.controllers.data.*;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.server.MinecraftServer;
 import noppes.npcs.CustomNpcs;
 import noppes.npcs.CustomNpcsPermissions;
 import noppes.npcs.LogWriter;
 import noppes.npcs.NoppesUtilServer;
 import noppes.npcs.api.entity.IPlayer;
 import noppes.npcs.api.handler.IPlayerData;
-import noppes.npcs.api.handler.data.IQuest;
+import noppes.npcs.api.handler.data.IProfile;
+import noppes.npcs.api.handler.IProfileHandler;
+import noppes.npcs.api.handler.data.ISlot;
 import noppes.npcs.config.ConfigMain;
-import noppes.npcs.constants.EnumProfileSync;
 import noppes.npcs.controllers.QuestController;
 import noppes.npcs.controllers.data.PlayerData;
 import noppes.npcs.controllers.data.PlayerQuestData;
-import noppes.npcs.controllers.data.Quest;
 import noppes.npcs.util.CustomNPCsThreader;
 import noppes.npcs.util.NBTJsonUtil;
 
@@ -31,7 +29,7 @@ import java.util.*;
 import static noppes.npcs.CustomNpcsPermissions.PROFILE_REGION_BYPASS;
 import static noppes.npcs.CustomNpcsPermissions.hasPermission;
 
-public class ProfileController implements IProfileController {
+public class ProfileController implements IProfileHandler {
 
     // Message constants
     private static final String MSG_PLAYER_NOT_FOUND       = "Player not found.";
diff --git a/src/main/java/kamkeel/npcs/controllers/data/IProfile.java b/src/main/java/kamkeel/npcs/controllers/data/IProfile.java
deleted file mode 100644
index a82c724bb..000000000
--- a/src/main/java/kamkeel/npcs/controllers/data/IProfile.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package kamkeel.npcs.controllers.data;
-
-import net.minecraft.nbt.NBTTagCompound;
-import noppes.npcs.api.entity.IPlayer;
-
-import java.util.Map;
-
-public interface IProfile {
-
-
-    /**
-     * @return the IPlayer attached to the Profile
-     */
-    IPlayer getPlayer();
-
-
-    /**
-     * @return The profiles current Slot ID
-     */
-    int getCurrentSlotId();
-
-
-    /**
-     * @return Map of all Slot IDs
-     */
-    Map<Integer, ISlot> getSlots();
-
-
-    /**
-     * @return FULL NBT of the Profile
-     */
-    NBTTagCompound writeToNBT();
-}
diff --git a/src/main/java/kamkeel/npcs/controllers/data/IProfileController.java b/src/main/java/kamkeel/npcs/controllers/data/IProfileController.java
deleted file mode 100644
index 960662ff8..000000000
--- a/src/main/java/kamkeel/npcs/controllers/data/IProfileController.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package kamkeel.npcs.controllers.data;
-
-import noppes.npcs.api.entity.IPlayer;
-import noppes.npcs.api.handler.IPlayerData;
-
-public interface IProfileController {
-
-    IProfile getProfile(IPlayer player);
-
-    boolean changeSlot(IPlayer player, int slotID);
-
-    boolean hasSlot(IPlayer player, int slotID);
-
-    boolean removeSlot(IPlayer player, int slotID);
-
-    IPlayerData getSlotPlayerData(IPlayer player, int slotID);
-
-    void saveSlotData(IPlayer player);
-}
diff --git a/src/main/java/kamkeel/npcs/controllers/data/ISlot.java b/src/main/java/kamkeel/npcs/controllers/data/ISlot.java
deleted file mode 100644
index e41f2e60b..000000000
--- a/src/main/java/kamkeel/npcs/controllers/data/ISlot.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package kamkeel.npcs.controllers.data;
-
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.Map;
-
-public interface ISlot {
-    /**
-     * @return id of slot
-     */
-    int getId();
-
-    /**
-     * @return Name of Slot
-     */
-    String getName();
-
-
-    /**
-     * @param name - New name of slot
-     */
-    void setName(String name);
-
-    /**
-     * @return Last time Slot was Saved
-     */
-    long getLastLoaded();
-
-    /**
-     * @param time - Long time for when it was last saved
-     */
-    void setLastLoaded(long time);
-
-    /**
-     * @return if the slot is temporary
-     */
-    boolean isTemporary();
-
-    /**
-     * @param temporary - Setting a slot to temporary won't save it to Profile
-     */
-    void setTemporary(boolean temporary);
-
-    /**
-     * @return A map of all the NBTs within a slot
-     */
-    Map<String, NBTTagCompound> getComponents();
-
-    void setComponentData(String key, NBTTagCompound data);
-
-    /**
-     * @param key - The KEY of the NBT for the Slot: [CNPC+, DBC... etc]
-     * @return NBT for that that key
-     */
-    NBTTagCompound getComponentData(String key);
-
-    /**
-     * @return The full NBT of the Slot
-     */
-    NBTTagCompound toNBT();
-}
diff --git a/src/main/java/kamkeel/npcs/controllers/data/Profile.java b/src/main/java/kamkeel/npcs/controllers/data/Profile.java
index 03f91ad0c..d1be4fd40 100644
--- a/src/main/java/kamkeel/npcs/controllers/data/Profile.java
+++ b/src/main/java/kamkeel/npcs/controllers/data/Profile.java
@@ -4,6 +4,8 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import noppes.npcs.NoppesUtilServer;
 import noppes.npcs.api.entity.IPlayer;
+import noppes.npcs.api.handler.data.IProfile;
+import noppes.npcs.api.handler.data.ISlot;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/kamkeel/npcs/controllers/data/Slot.java b/src/main/java/kamkeel/npcs/controllers/data/Slot.java
index cfdc8fcbf..6c74b47c3 100644
--- a/src/main/java/kamkeel/npcs/controllers/data/Slot.java
+++ b/src/main/java/kamkeel/npcs/controllers/data/Slot.java
@@ -1,6 +1,7 @@
 package kamkeel.npcs.controllers.data;
 
 import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.api.handler.data.ISlot;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileGetInfoPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileGetInfoPacket.java
index 43b2885a6..e83109ac3 100644
--- a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileGetInfoPacket.java
+++ b/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileGetInfoPacket.java
@@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import kamkeel.npcs.controllers.ProfileController;
-import kamkeel.npcs.controllers.data.ISlot;
+import noppes.npcs.api.handler.data.ISlot;
 import kamkeel.npcs.controllers.data.InfoEntry;
 import kamkeel.npcs.controllers.data.Profile;
 import kamkeel.npcs.network.AbstractPacket;
diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java
index fe3b884a5..c4a805a68 100644
--- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java
+++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java
@@ -1,6 +1,6 @@
 package noppes.npcs.client.gui.player.inventory;
 
-import kamkeel.npcs.controllers.data.ISlot;
+import noppes.npcs.api.handler.data.ISlot;
 import kamkeel.npcs.controllers.data.InfoEntry;
 import kamkeel.npcs.controllers.data.Profile;
 import kamkeel.npcs.controllers.data.Slot;
diff --git a/src/main/java/noppes/npcs/controllers/data/Quest.java b/src/main/java/noppes/npcs/controllers/data/Quest.java
index 2a8f5c462..aab2d65b9 100644
--- a/src/main/java/noppes/npcs/controllers/data/Quest.java
+++ b/src/main/java/noppes/npcs/controllers/data/Quest.java
@@ -1,9 +1,8 @@
 package noppes.npcs.controllers.data;
 
 import kamkeel.npcs.controllers.ProfileController;
-import kamkeel.npcs.controllers.data.ISlot;
+import noppes.npcs.api.handler.data.ISlot;
 import kamkeel.npcs.controllers.data.Profile;
-import kamkeel.npcs.controllers.data.Slot;
 import kamkeel.npcs.network.packets.data.QuestCompletionPacket;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java
index bda38006c..1b5df256e 100644
--- a/src/main/java/noppes/npcs/scripted/NpcAPI.java
+++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java
@@ -2,6 +2,7 @@ package noppes.npcs.scripted;
 
 import cpw.mods.fml.common.eventhandler.EventBus;
 import foxz.command.ScriptedCommand;
+import kamkeel.npcs.controllers.ProfileController;
 import net.minecraft.block.Block;
 import net.minecraft.command.CommandHandler;
 import net.minecraft.entity.Entity;
@@ -241,6 +242,10 @@ public class NpcAPI extends AbstractNpcAPI {
 
     public INaturalSpawnsHandler getNaturalSpawns() { return SpawnController.Instance; }
 
+    public IProfileHandler getProfileHandler() { return ProfileController.Instance; }
+
+    public ICustomEffectHandler getCustomEffectHandler() { return CustomEffectController.Instance; }
+
     public ITransportHandler getLocations() {
         return TransportController.getInstance();
     }