diff --git a/ee3_common/com/pahimar/ee3/emc/DynEMC.java b/ee3_common/com/pahimar/ee3/emc/DynEMC.java
index 0a22867b..e787c39d 100644
--- a/ee3_common/com/pahimar/ee3/emc/DynEMC.java
+++ b/ee3_common/com/pahimar/ee3/emc/DynEMC.java
@@ -75,6 +75,11 @@ public class DynEMC {
             }
         }
     }
+    
+    public List<CustomWrappedStack> getCriticalNodes() {
+        
+        return graph.getCriticalNodes();
+    }
 
     public int size() {
 
diff --git a/ee3_common/com/pahimar/ee3/emc/EmcDefaultValues.java b/ee3_common/com/pahimar/ee3/emc/EmcDefaultValues.java
new file mode 100644
index 00000000..cac65ca2
--- /dev/null
+++ b/ee3_common/com/pahimar/ee3/emc/EmcDefaultValues.java
@@ -0,0 +1,15 @@
+package com.pahimar.ee3.emc;
+
+import java.util.HashMap;
+import java.util.List;
+
+import com.pahimar.ee3.item.CustomWrappedStack;
+
+public class EmcDefaultValues {
+
+    private static HashMap<CustomWrappedStack, List<CustomWrappedStack>> defaultEmcValues = new HashMap<CustomWrappedStack, List<CustomWrappedStack>>();
+
+    public static void init() {
+
+    }
+}
diff --git a/ee3_common/com/pahimar/ee3/item/CustomWrappedStack.java b/ee3_common/com/pahimar/ee3/item/CustomWrappedStack.java
index 6ab5c941..32b72133 100644
--- a/ee3_common/com/pahimar/ee3/item/CustomWrappedStack.java
+++ b/ee3_common/com/pahimar/ee3/item/CustomWrappedStack.java
@@ -229,6 +229,23 @@ public class CustomWrappedStack {
 
         return stringBuilder.toString();
     }
+    
+    public String encodeAsPropertyKey() {
+        
+        StringBuilder stringBuilder = new StringBuilder();
+
+        if (itemStack != null) {
+            stringBuilder.append(String.format("%sxitemStack[%s:%s:%s:%s]", this.stackSize, itemStack.itemID, itemStack.getItemDamage(), itemStack.getItemName(), itemStack.getItem().getClass().getCanonicalName()));
+        }
+        else if (oreStack != null) {
+            stringBuilder.append(String.format("%dxoreDictionary.%s", stackSize, oreStack.oreName));
+        }
+        else if (energyStack != null) {
+            stringBuilder.append(String.format("%dxenergyStack.%s", stackSize, energyStack.energyName));
+        }
+
+        return stringBuilder.toString();
+    }
 
     @Override
     public int hashCode() {
diff --git a/ee3_common/com/pahimar/ee3/lib/Strings.java b/ee3_common/com/pahimar/ee3/lib/Strings.java
index 2080f792..2ee765b5 100644
--- a/ee3_common/com/pahimar/ee3/lib/Strings.java
+++ b/ee3_common/com/pahimar/ee3/lib/Strings.java
@@ -14,7 +14,7 @@ public class Strings {
     /* General keys */
     public static final String TRUE = "true";
     public static final String FALSE = "false";
-    public static final String TOKEN_DELIMITER = ",";
+    public static final String TOKEN_DELIMITER = ".";
 
     /* Fingerprint check related constants */
     public static final String INVALID_FINGERPRINT_MESSAGE = "The copy of Equivalent Exchange 3 that you are running has been modified from the original, and unpredictable things may happen. Please consider re-downloading the original version of the mod.";