diff --git a/src/main/java/storagecraft/block/BlockBase.java b/src/main/java/storagecraft/block/BlockBase.java
index 595c90db8..31104ab3a 100644
--- a/src/main/java/storagecraft/block/BlockBase.java
+++ b/src/main/java/storagecraft/block/BlockBase.java
@@ -13,7 +13,7 @@ import storagecraft.StorageCraft;
 import storagecraft.tile.TileBase;
 import storagecraft.util.InventoryUtils;
 
-public class BlockBase extends Block {
+public abstract class BlockBase extends Block {
 	private String name;
 
 	public BlockBase(String name) {
diff --git a/src/main/java/storagecraft/container/ContainerBase.java b/src/main/java/storagecraft/container/ContainerBase.java
index bd6d43ba8..db3af9f75 100644
--- a/src/main/java/storagecraft/container/ContainerBase.java
+++ b/src/main/java/storagecraft/container/ContainerBase.java
@@ -6,7 +6,7 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import storagecraft.container.slot.SlotSpecimen;
 
-public class ContainerBase extends Container {
+public abstract class ContainerBase extends Container {
 	private EntityPlayer player;
 
 	public ContainerBase(EntityPlayer player) {
diff --git a/src/main/java/storagecraft/gui/GuiBase.java b/src/main/java/storagecraft/gui/GuiBase.java
index 237eee827..b11de1235 100644
--- a/src/main/java/storagecraft/gui/GuiBase.java
+++ b/src/main/java/storagecraft/gui/GuiBase.java
@@ -49,14 +49,6 @@ public abstract class GuiBase extends GuiContainer {
 		drawForeground(mouseX - guiLeft, mouseY - guiTop);
 	}
 
-	public abstract void init(int x, int y);
-
-	public abstract void update(int x, int y);
-
-	public abstract void drawBackground(int x, int y, int mouseX, int mouseY);
-
-	public abstract void drawForeground(int mouseX, int mouseY);
-
 	protected boolean inBounds(int x, int y, int w, int h, int ox, int oy) {
 		return ox >= x && ox <= x + w && oy >= y && oy <= y + h;
 	}
@@ -204,4 +196,12 @@ public abstract class GuiBase extends GuiContainer {
 	protected String t(String name, Object... format) {
 		return StatCollector.translateToLocalFormatted(name, format);
 	}
+
+	public abstract void init(int x, int y);
+
+	public abstract void update(int x, int y);
+
+	public abstract void drawBackground(int x, int y, int mouseX, int mouseY);
+
+	public abstract void drawForeground(int mouseX, int mouseY);
 }
diff --git a/src/main/java/storagecraft/gui/GuiImporter.java b/src/main/java/storagecraft/gui/GuiImporter.java
index 082baabc6..5fefec2c3 100644
--- a/src/main/java/storagecraft/gui/GuiImporter.java
+++ b/src/main/java/storagecraft/gui/GuiImporter.java
@@ -39,7 +39,7 @@ public class GuiImporter extends GuiMachine {
 		compareDamage.displayString = t("misc.storagecraft:compareDamage") + ": ";
 		compareDamage.displayString += t("misc.storagecraft:" + ((importer.getCompareFlags() & InventoryUtils.COMPARE_DAMAGE) == InventoryUtils.COMPARE_DAMAGE ? "on" : "off"));
 
-		mode.displayString = t("misc.storagecraft:importer.mode." + importer.getMode().id);
+		mode.displayString = t("misc.storagecraft:importer.mode." + importer.getMode());
 	}
 
 	@Override
diff --git a/src/main/java/storagecraft/item/ItemBase.java b/src/main/java/storagecraft/item/ItemBase.java
index 4f459d561..67374a201 100644
--- a/src/main/java/storagecraft/item/ItemBase.java
+++ b/src/main/java/storagecraft/item/ItemBase.java
@@ -4,7 +4,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import storagecraft.StorageCraft;
 
-public class ItemBase extends Item {
+public abstract class ItemBase extends Item {
 	private String name;
 
 	public ItemBase(String name) {
diff --git a/src/main/java/storagecraft/item/ItemBlockBase.java b/src/main/java/storagecraft/item/ItemBlockBase.java
index 3c0d0441b..0e84887bf 100644
--- a/src/main/java/storagecraft/item/ItemBlockBase.java
+++ b/src/main/java/storagecraft/item/ItemBlockBase.java
@@ -4,7 +4,7 @@ import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlockWithMetadata;
 import net.minecraft.item.ItemStack;
 
-public class ItemBlockBase extends ItemBlockWithMetadata {
+public abstract class ItemBlockBase extends ItemBlockWithMetadata {
 	public ItemBlockBase(Block block) {
 		super(block, block);
 	}
diff --git a/src/main/java/storagecraft/network/MessageImporterUpdate.java b/src/main/java/storagecraft/network/MessageImporterUpdate.java
index 73ddcfd37..8a450b9b7 100644
--- a/src/main/java/storagecraft/network/MessageImporterUpdate.java
+++ b/src/main/java/storagecraft/network/MessageImporterUpdate.java
@@ -56,7 +56,7 @@ public class MessageImporterUpdate implements IMessage, IMessageHandler<MessageI
 			importer.setCompareFlags(message.compareFlags);
 
 			if (message.nextMode) {
-				importer.setMode(importer.getMode().next());
+				importer.setMode(importer.getMode() == TileImporter.MODE_WHITELIST ? TileImporter.MODE_BLACKLIST : TileImporter.MODE_WHITELIST);
 			}
 		}
 
diff --git a/src/main/java/storagecraft/tile/ImporterMode.java b/src/main/java/storagecraft/tile/ImporterMode.java
deleted file mode 100644
index 8df12c200..000000000
--- a/src/main/java/storagecraft/tile/ImporterMode.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package storagecraft.tile;
-
-public enum ImporterMode {
-	WHITELIST(0), BLACKLIST(1);
-
-	public final int id;
-
-	ImporterMode(int id) {
-		this.id = id;
-	}
-
-	public ImporterMode next() {
-		ImporterMode next = getById(id + 1);
-
-		if (next == null) {
-			return getById(0);
-		}
-
-		return next;
-	}
-
-	public static ImporterMode getById(int id) {
-		for (ImporterMode mode : values()) {
-			if (mode.id == id) {
-				return mode;
-			}
-		}
-
-		return null;
-	}
-}
diff --git a/src/main/java/storagecraft/tile/TileBase.java b/src/main/java/storagecraft/tile/TileBase.java
index 3e82a46c9..89e649069 100644
--- a/src/main/java/storagecraft/tile/TileBase.java
+++ b/src/main/java/storagecraft/tile/TileBase.java
@@ -10,8 +10,8 @@ import net.minecraftforge.common.util.ForgeDirection;
 import storagecraft.StorageCraft;
 import storagecraft.network.MessageTileUpdate;
 
-public class TileBase extends TileEntity {
-	public static final int UPDATE_RANGE = 64;
+public abstract class TileBase extends TileEntity {
+	public static final int UPDATE_RANGE = 256;
 
 	private ForgeDirection direction = ForgeDirection.UNKNOWN;
 
diff --git a/src/main/java/storagecraft/tile/TileImporter.java b/src/main/java/storagecraft/tile/TileImporter.java
index c626a2e19..17121ffff 100644
--- a/src/main/java/storagecraft/tile/TileImporter.java
+++ b/src/main/java/storagecraft/tile/TileImporter.java
@@ -11,13 +11,16 @@ import storagecraft.inventory.InventorySimple;
 import storagecraft.util.InventoryUtils;
 
 public class TileImporter extends TileMachine implements IInventory, ISidedInventory {
+	public static final int MODE_WHITELIST = 0;
+	public static final int MODE_BLACKLIST = 1;
+
 	public static final String NBT_COMPARE_FLAGS = "CompareFlags";
 	public static final String NBT_MODE = "Mode";
 
 	private InventorySimple inventory = new InventorySimple("importer", 9);
 
 	private int compareFlags = 0;
-	private ImporterMode mode = ImporterMode.WHITELIST;
+	private int mode = MODE_WHITELIST;
 
 	private int currentSlot = 0;
 
@@ -79,16 +82,16 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven
 				slots++;
 
 				if (InventoryUtils.compareStack(stack, slot, compareFlags)) {
-					if (mode == ImporterMode.WHITELIST) {
+					if (mode == MODE_WHITELIST) {
 						return true;
-					} else if (mode == ImporterMode.BLACKLIST) {
+					} else if (mode == MODE_BLACKLIST) {
 						return false;
 					}
 				}
 			}
 		}
 
-		if (mode == ImporterMode.WHITELIST) {
+		if (mode == MODE_WHITELIST) {
 			return slots == 0;
 		}
 
@@ -103,11 +106,11 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven
 		this.compareFlags = flags;
 	}
 
-	public ImporterMode getMode() {
+	public int getMode() {
 		return mode;
 	}
 
-	public void setMode(ImporterMode mode) {
+	public void setMode(int mode) {
 		this.mode = mode;
 	}
 
@@ -195,7 +198,7 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven
 		}
 
 		if (nbt.hasKey(NBT_MODE)) {
-			mode = ImporterMode.getById(nbt.getInteger(NBT_MODE));
+			mode = nbt.getInteger(NBT_MODE);
 		}
 
 		InventoryUtils.restoreInventory(this, nbt);
@@ -206,7 +209,7 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven
 		super.writeToNBT(nbt);
 
 		nbt.setInteger(NBT_COMPARE_FLAGS, compareFlags);
-		nbt.setInteger(NBT_MODE, mode.id);
+		nbt.setInteger(NBT_MODE, mode);
 
 		InventoryUtils.saveInventory(this, nbt);
 	}
@@ -216,7 +219,7 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven
 		super.fromBytes(buf);
 
 		compareFlags = buf.readInt();
-		mode = ImporterMode.getById(buf.readInt());
+		mode = buf.readInt();
 	}
 
 	@Override
@@ -224,6 +227,6 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven
 		super.toBytes(buf);
 
 		buf.writeInt(compareFlags);
-		buf.writeInt(mode.id);
+		buf.writeInt(mode);
 	}
 }