diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityController.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityController.java
index 63d1879..9a49593 100644
--- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityController.java
+++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityController.java
@@ -34,7 +34,12 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.IFractionalDrawer;
 import com.jaquadro.minecraft.storagedrawers.api.storage.INetworked;
 import com.jaquadro.minecraft.storagedrawers.api.storage.IPriorityGroup;
 import com.jaquadro.minecraft.storagedrawers.api.storage.ISmartGroup;
-import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.*;
+import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.ILockable;
+import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IProtectable;
+import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IQuantifiable;
+import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IShroudable;
+import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IVoidable;
+import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute;
 import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers;
 import com.jaquadro.minecraft.storagedrawers.block.BlockSlave;
 import com.jaquadro.minecraft.storagedrawers.security.SecurityManager;
diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java
index 0fa5d1e..1d9c7c0 100644
--- a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java
+++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java
@@ -6,7 +6,11 @@ import net.minecraft.nbt.NBTTagCompound;
 
 import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer;
 import com.jaquadro.minecraft.storagedrawers.api.storage.IFractionalDrawer;
-import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.*;
+import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.ILockable;
+import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IQuantifiable;
+import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IShroudable;
+import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IVoidable;
+import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute;
 
 public class CompDrawerData extends BaseDrawerData
         implements IFractionalDrawer, IVoidable, IShroudable, ILockable, IQuantifiable {
diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java
index f7858e3..62e8d40 100644
--- a/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java
+++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java
@@ -7,7 +7,11 @@ import net.minecraftforge.common.MinecraftForge;
 
 import com.jaquadro.minecraft.storagedrawers.api.event.DrawerPopulatedEvent;
 import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer;
-import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.*;
+import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.ILockable;
+import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IQuantifiable;
+import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IShroudable;
+import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IVoidable;
+import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute;
 
 public class DrawerData extends BaseDrawerData implements IVoidable, IShroudable, ILockable, IQuantifiable {