diff --git a/src/com/garbagemule/MobArena/util/ItemParser.java b/src/com/garbagemule/MobArena/util/ItemParser.java
index 663f9bf..0bc278b 100644
--- a/src/com/garbagemule/MobArena/util/ItemParser.java
+++ b/src/com/garbagemule/MobArena/util/ItemParser.java
@@ -16,6 +16,9 @@ import com.garbagemule.MobArena.MobArena;
 
 public class ItemParser
 {
+    private static final int WOOL_ID = Material.WOOL.getId();
+    private static final int DYE_ID  = Material.INK_SACK.getId();
+    
     public static String parseString(ItemStack... stacks) {
         String result = "";
         
@@ -152,38 +155,43 @@ public class ItemParser
             int amount = Integer.parseInt(item.substring(1));
             return new ItemStack(MobArena.ECONOMY_MONEY_ID, amount);
         }
-        Material m = getMaterial(item);
-        return m == null ? null : new ItemStack(m,1);
+        int id = getTypeId(item);
+        return new ItemStack(id);
     }
     
     private static ItemStack withAmount(String item, String amount) {
-        Material m = getMaterial(item);
-        int      a = getAmount(amount);
-        return m == null ? null : new ItemStack(m,a);
+        int id = getTypeId(item);
+        int a  = getAmount(amount);
+        return new ItemStack(id,a);
     }
     
     private static ItemStack withDataAndAmount(String item, String data, String amount) {
-        Material m = getMaterial(item);
-        short    d = getData(data, m);
-        int      a = getAmount(amount);
-        
-        if (m == null) {
-            return null;
-        }
-        
-        if (m.getId() == 35) {
-            d = (byte) (15-d);
-        }
-        
-        return new ItemStack(m,a,d);
+        int   id = getTypeId(item);
+        short d  = getData(data, id);
+        int   a  = getAmount(amount);
+        return new ItemStack(id,a,d);
     }
     
-    private static Material getMaterial(String item) {
-        if (item.matches("[0-9]*")) {
-            return Material.getMaterial(Integer.parseInt(item));
+    private static int getTypeId(String item) {
+        if (item.matches("(-)?[0-9]*")) {
+            return Integer.parseInt(item);
         }
-        
-        return Material.getMaterial(item.toUpperCase());
+        Material m = Enums.getEnumFromString(Material.class, item);
+        return (m != null ? m.getId() : 0);
+    }
+    
+    private static short getData(String data, int id) {
+        // Wool and ink are special
+        if (id == WOOL_ID) {
+            DyeColor dye = Enums.getEnumFromString(DyeColor.class, data);
+            if (dye == null) dye = DyeColor.getByWoolData(Byte.parseByte(data));
+            return dye.getWoolData();
+        } else if (id == DYE_ID) {
+            DyeColor dye = Enums.getEnumFromString(DyeColor.class, data);
+            if (dye == null) dye = DyeColor.getByDyeData(Byte.parseByte(data));
+            return dye.getDyeData();
+        }
+        return (data.matches("(-)?[0-9]+") ? Short.parseShort(data) : 0);
     }
     
     private static int getAmount(String amount) {
@@ -194,22 +202,6 @@ public class ItemParser
         return 1;
     }
     
-    private static short getData(String data, Material m) {
-        // If ink sack or wool, parse wisely.
-        if (m == Material.INK_SACK || m == Material.WOOL) {
-            // Ink sacks must be offset.
-            byte offset = (m == Material.INK_SACK ? (byte) 15 : (byte) 0);
-            
-            DyeColor dye = (data.matches("[0-9]+")) ?
-                DyeColor.getByData((byte) Math.abs(offset - Integer.parseInt(data))) :
-                DyeColor.valueOf(data.toUpperCase());
-            
-            return (short) Math.abs(offset - dye.getData());
-        }
-        
-        return Short.parseShort(data);
-    }
-    
     private static void addEnchantments(ItemStack stack, String list) {
         String[] parts = list.split(";");