diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java
index 22e5b4b64..90c5699d0 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java
@@ -4,6 +4,7 @@ import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.RSGui;
 import com.raoulvdberge.refinedstorage.block.info.BlockInfoBuilder;
 import com.raoulvdberge.refinedstorage.render.IModelRegistration;
+import com.raoulvdberge.refinedstorage.render.collision.CollisionGroup;
 import com.raoulvdberge.refinedstorage.render.constants.ConstantsDetector;
 import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright;
 import com.raoulvdberge.refinedstorage.tile.TileDetector;
@@ -17,13 +18,15 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import java.util.Collections;
+import java.util.List;
+
 public class BlockDetector extends BlockNode {
     private static final PropertyBool POWERED = PropertyBool.create("powered");
 
@@ -53,9 +56,8 @@ public class BlockDetector extends BlockNode {
     }
 
     @Override
-    @SuppressWarnings("deprecation")
-    public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) {
-        return ConstantsDetector.DETECTOR_AABB;
+    public List<CollisionGroup> getCollisions(TileEntity tile, IBlockState state) {
+        return Collections.singletonList(ConstantsDetector.COLLISION);
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java
index db77c8be9..6d1963299 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java
@@ -8,6 +8,7 @@ import com.raoulvdberge.refinedstorage.block.info.BlockDirection;
 import com.raoulvdberge.refinedstorage.block.info.BlockInfoBuilder;
 import com.raoulvdberge.refinedstorage.item.itemblock.ItemBlockPortableGrid;
 import com.raoulvdberge.refinedstorage.render.IModelRegistration;
+import com.raoulvdberge.refinedstorage.render.collision.CollisionGroup;
 import com.raoulvdberge.refinedstorage.render.constants.ConstantsPortableGrid;
 import com.raoulvdberge.refinedstorage.render.meshdefinition.ItemMeshDefinitionPortableGrid;
 import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright;
@@ -22,10 +23,10 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.NonNullList;
-import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
@@ -33,6 +34,8 @@ import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import javax.annotation.Nullable;
+import java.util.Collections;
+import java.util.List;
 
 public class BlockPortableGrid extends BlockBase {
     public static final PropertyEnum TYPE = PropertyEnum.create("type", PortableGridType.class);
@@ -67,9 +70,8 @@ public class BlockPortableGrid extends BlockBase {
     }
 
     @Override
-    @SuppressWarnings("deprecation")
-    public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) {
-        return ConstantsPortableGrid.PORTABLE_GRID_AABB;
+    public List<CollisionGroup> getCollisions(TileEntity tile, IBlockState state) {
+        return Collections.singletonList(ConstantsPortableGrid.COLLISION);
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java
index 2ce2af0c0..2035b6884 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java
@@ -4,6 +4,7 @@ import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.RSGui;
 import com.raoulvdberge.refinedstorage.block.info.BlockInfoBuilder;
 import com.raoulvdberge.refinedstorage.render.IModelRegistration;
+import com.raoulvdberge.refinedstorage.render.collision.CollisionGroup;
 import com.raoulvdberge.refinedstorage.render.constants.ConstantsWirelessTransmitter;
 import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright;
 import com.raoulvdberge.refinedstorage.tile.TileWirelessTransmitter;
@@ -15,10 +16,10 @@ import net.minecraft.client.resources.I18n;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.IBlockAccess;
@@ -27,6 +28,7 @@ import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import javax.annotation.Nullable;
+import java.util.Collections;
 import java.util.List;
 
 public class BlockWirelessTransmitter extends BlockNode {
@@ -58,9 +60,8 @@ public class BlockWirelessTransmitter extends BlockNode {
     }
 
     @Override
-    @SuppressWarnings("deprecation")
-    public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) {
-        return ConstantsWirelessTransmitter.WIRELESS_TRANSMITTER_AABB;
+    public List<CollisionGroup> getCollisions(TileEntity tile, IBlockState state) {
+        return Collections.singletonList(ConstantsWirelessTransmitter.COLLISION);
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/constants/ConstantsDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/render/constants/ConstantsDetector.java
index 7802e8f94..2c8bc9766 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/render/constants/ConstantsDetector.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/render/constants/ConstantsDetector.java
@@ -1,7 +1,8 @@
 package com.raoulvdberge.refinedstorage.render.constants;
 
+import com.raoulvdberge.refinedstorage.render.collision.CollisionGroup;
 import net.minecraft.util.math.AxisAlignedBB;
 
 public final class ConstantsDetector {
-    public static final AxisAlignedBB DETECTOR_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 5D / 16D, 1.0D);
+    public static final CollisionGroup COLLISION = new CollisionGroup().addItem(new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 5D / 16D, 1.0D));
 }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/constants/ConstantsPortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/render/constants/ConstantsPortableGrid.java
index c32aa91f6..1a915beb6 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/render/constants/ConstantsPortableGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/render/constants/ConstantsPortableGrid.java
@@ -1,7 +1,8 @@
 package com.raoulvdberge.refinedstorage.render.constants;
 
+import com.raoulvdberge.refinedstorage.render.collision.CollisionGroup;
 import net.minecraft.util.math.AxisAlignedBB;
 
 public final class ConstantsPortableGrid {
-    public static final AxisAlignedBB PORTABLE_GRID_AABB = new AxisAlignedBB(0, 0, 0, 1, 13.2F / 16F, 1);
+    public static final CollisionGroup COLLISION = new CollisionGroup().addItem(new AxisAlignedBB(0, 0, 0, 1, 13.2F / 16F, 1));
 }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/constants/ConstantsWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/render/constants/ConstantsWirelessTransmitter.java
index 675647b6f..a302099a6 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/render/constants/ConstantsWirelessTransmitter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/render/constants/ConstantsWirelessTransmitter.java
@@ -1,8 +1,9 @@
 package com.raoulvdberge.refinedstorage.render.constants;
 
+import com.raoulvdberge.refinedstorage.render.collision.CollisionGroup;
 import net.minecraft.util.math.AxisAlignedBB;
 
 public final class ConstantsWirelessTransmitter {
-    // From BlockTorch
-    public static final AxisAlignedBB WIRELESS_TRANSMITTER_AABB = new AxisAlignedBB(0.4000000059604645D, 0.0D, 0.4000000059604645D, 0.6000000238418579D, 0.6000000238418579D, 0.6000000238418579D);
+    // @Volatile: From BlockTorch
+    public static final CollisionGroup COLLISION = new CollisionGroup().addItem(new AxisAlignedBB(0.4000000059604645D, 0.0D, 0.4000000059604645D, 0.6000000238418579D, 0.6000000238418579D, 0.6000000238418579D));
 }