diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/BukkitCommandRegistry.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/BukkitCommandRegistry.java
index c5c7388588..d4bdef12f9 100644
--- a/src/main/java/net/aufdemrand/denizen/scripts/commands/BukkitCommandRegistry.java
+++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/BukkitCommandRegistry.java
@@ -1,7 +1,9 @@
 package net.aufdemrand.denizen.scripts.commands;
 
 import net.aufdemrand.denizen.scripts.commands.core.*;
-import net.aufdemrand.denizencore.scripts.commands.core.*;
+import net.aufdemrand.denizencore.scripts.commands.core.ForeachCommand;
+import net.aufdemrand.denizencore.scripts.commands.core.DetermineCommand;
+import net.aufdemrand.denizencore.scripts.commands.core.DefineCommand;
 import net.aufdemrand.denizen.scripts.commands.entity.*;
 import net.aufdemrand.denizen.scripts.commands.item.*;
 import net.aufdemrand.denizen.scripts.commands.npc.*;
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java
index e78610ed31..086f4aa1b9 100644
--- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java
+++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java
@@ -2,6 +2,8 @@
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
+
 import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Element;
@@ -57,13 +59,13 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
 
         int possibilities = 0;
         ScriptQueue queue = scriptEntry.getResidingQueue();
-        ArrayList<ScriptEntry> bracedCommands = null;
+        List<ScriptEntry> bracedCommands = null;
 
         if (!scriptEntry.hasObject("braces")) {
             possibilities = scriptEntry.getElement("possibilities").asInt();
         }
         else {
-            bracedCommands = ((LinkedHashMap<String, ArrayList<ScriptEntry>>) scriptEntry.getObject("braces")).get("RANDOM");
+            bracedCommands = ((List<BracedData>) scriptEntry.getObject("braces")).get(0).value;
             possibilities = bracedCommands.size();
         }
 
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RepeatCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RepeatCommand.java
index 006da5c13c..b815bf04b6 100644
--- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RepeatCommand.java
+++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RepeatCommand.java
@@ -136,13 +136,13 @@ else if (next != null && next.asBoolean()) {
         else if (callback != null && callback.asBoolean()) {
             if (scriptEntry.getOwner() != null && (scriptEntry.getOwner().getCommandName().equalsIgnoreCase("repeat") ||
                     scriptEntry.getOwner().getBracedSet() == null || scriptEntry.getOwner().getBracedSet().size() == 0 ||
-                    scriptEntry.getBracedSet().get("REPEAT").get(scriptEntry.getBracedSet().get("REPEAT").size() - 1) != scriptEntry)) {
+                    scriptEntry.getBracedSet().get(0).value.get(scriptEntry.getBracedSet().get(0).value.size() - 1) != scriptEntry)) {
                 RepeatData data = (RepeatData)scriptEntry.getOwner().getData();
                 data.index++;
                 if (data.index <= data.target) {
                     dB.echoDebug(scriptEntry, DebugElement.Header, "Repeat loop " + data.index);
                     scriptEntry.getResidingQueue().addDefinition("value", String.valueOf(data.index));
-                    ArrayList<ScriptEntry> bracedCommands = BracedCommand.getBracedCommands(scriptEntry.getOwner()).get("REPEAT");
+                    List<ScriptEntry> bracedCommands = BracedCommand.getBracedCommands(scriptEntry.getOwner()).get(0).value;
                     ScriptEntry callbackEntry = null;
                     try {
                         callbackEntry = new ScriptEntry("REPEAT", new String[] { "\0CALLBACK" },
@@ -169,8 +169,8 @@ else if (callback != null && callback.asBoolean()) {
         else {
 
             // Get objects
-            ArrayList<ScriptEntry> bracedCommandsList =
-                    ((LinkedHashMap<String, ArrayList<ScriptEntry>>) scriptEntry.getObject("braces")).get("REPEAT");
+            List<ScriptEntry> bracedCommandsList =
+                    ((List<BracedData>) scriptEntry.getObject("braces")).get(0).value;
 
             if (bracedCommandsList == null || bracedCommandsList.isEmpty()) {
                 dB.echoError("Empty braces!");
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java
index 784537c450..9d84674a96 100644
--- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java
+++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java
@@ -144,7 +144,7 @@ else if (next != null && next.asBoolean()) {
         else if (callback != null && callback.asBoolean()) {
             if (scriptEntry.getOwner() != null && (scriptEntry.getOwner().getCommandName().equalsIgnoreCase("while") ||
                     scriptEntry.getOwner().getBracedSet() == null || scriptEntry.getOwner().getBracedSet().size() == 0 ||
-                    scriptEntry.getBracedSet().get("WHILE").get(scriptEntry.getBracedSet().get("WHILE").size() - 1) != scriptEntry)) {
+                    scriptEntry.getBracedSet().get(0).value.get(scriptEntry.getBracedSet().get(0).value.size() - 1) != scriptEntry)) {
                 WhileData data = (WhileData)scriptEntry.getOwner().getData();
                 data.index++;
                 if (System.currentTimeMillis() - data.LastChecked < 50) {
@@ -160,7 +160,7 @@ else if (callback != null && callback.asBoolean()) {
                 if (TagManager.tag(data.value, new BukkitTagContext(scriptEntry, false)).equalsIgnoreCase("true")) {
                     dB.echoDebug(scriptEntry, DebugElement.Header, "While loop " + data.index);
                     scriptEntry.getResidingQueue().addDefinition("loop_index", String.valueOf(data.index));
-                    ArrayList<ScriptEntry> bracedCommands = BracedCommand.getBracedCommands(scriptEntry.getOwner()).get("WHILE");
+                    List<ScriptEntry> bracedCommands = BracedCommand.getBracedCommands(scriptEntry.getOwner()).get(0).value;
                     ScriptEntry callbackEntry = null;
                     try {
                         callbackEntry = new ScriptEntry("WHILE", new String[] { "\0CALLBACK" },
@@ -188,8 +188,8 @@ else if (callback != null && callback.asBoolean()) {
 
             // Get objects
             Element value = scriptEntry.getElement("value");
-            ArrayList<ScriptEntry> bracedCommandsList =
-                    ((LinkedHashMap<String, ArrayList<ScriptEntry>>) scriptEntry.getObject("braces")).get("WHILE");
+            List<ScriptEntry> bracedCommandsList =
+                    ((List<BracedData>) scriptEntry.getObject("braces")).get(0).value;
 
             if (bracedCommandsList == null || bracedCommandsList.isEmpty()) {
                 dB.echoError(scriptEntry.getResidingQueue(), "Empty braces!");
@@ -199,7 +199,7 @@ else if (callback != null && callback.asBoolean()) {
             // Report to dB
             dB.report(scriptEntry, getName(), value.debug());
 
-            if (!TagManager.tag(value.asString(), new BukkitTagContext(scriptEntry, false)).equalsIgnoreCase("true")) {
+            if (!TagManager.tag(value.asString(), scriptEntry.entryData.getTagContext()).equalsIgnoreCase("true")) {
                 return;
             }