diff --git a/src/main/java/com/hbm/handler/ae2/MSUExternalStorageHandler.java b/src/main/java/com/hbm/handler/ae2/MSUExternalStorageHandler.java
index ca83534b9..be5dadbfa 100644
--- a/src/main/java/com/hbm/handler/ae2/MSUExternalStorageHandler.java
+++ b/src/main/java/com/hbm/handler/ae2/MSUExternalStorageHandler.java
@@ -2,6 +2,7 @@ package com.hbm.handler.ae2;
 
 import com.hbm.tileentity.machine.storage.TileEntityMassStorage;
 import com.hbm.util.ItemStackUtil;
+import cpw.mods.fml.common.Optional;
 
 import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.IExternalStorageHandler;
@@ -14,6 +15,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
+@Optional.Interface(iface = "appeng.api.storage.IExternalStorageHandler", modid = "appliedenergistics2")
 public class MSUExternalStorageHandler implements IExternalStorageHandler {
 
     public MSUExternalStorageHandler() {}
diff --git a/src/main/java/com/hbm/handler/ae2/MassStorageMEInventory.java b/src/main/java/com/hbm/handler/ae2/MassStorageMEInventory.java
index a2fe88c77..4728043ff 100644
--- a/src/main/java/com/hbm/handler/ae2/MassStorageMEInventory.java
+++ b/src/main/java/com/hbm/handler/ae2/MassStorageMEInventory.java
@@ -1,10 +1,10 @@
 package com.hbm.handler.ae2;
 
-import static com.hbm.inventory.OreDictManager.I;
-
 import com.hbm.tileentity.machine.storage.TileEntityMassStorage;
 import com.hbm.util.ItemStackUtil;
 
+import cpw.mods.fml.common.Optional;
+
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.networking.security.BaseActionSource;
@@ -14,6 +14,7 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
 import net.minecraft.item.ItemStack;
 
+@Optional.Interface(iface = "appeng.api.storage.IMEInventory", modid = "appliedenergistics2")
 public class MassStorageMEInventory implements IMEInventory<IAEItemStack> {
 
     private TileEntityMassStorage tile;