diff --git a/src/main/java/refinedstorage/tile/TileConstructor.java b/src/main/java/refinedstorage/tile/TileConstructor.java
index ef4eb160f..5b80e653a 100755
--- a/src/main/java/refinedstorage/tile/TileConstructor.java
+++ b/src/main/java/refinedstorage/tile/TileConstructor.java
@@ -20,7 +20,7 @@ import refinedstorage.tile.config.IComparable;
 import refinedstorage.tile.data.TileDataParameter;
 
 public class TileConstructor extends TileNode implements IComparable {
-    public static final TileDataParameter COMPARE = IComparable.createParameter();
+    public static final TileDataParameter<Integer> COMPARE = IComparable.createParameter();
 
     private static final String NBT_COMPARE = "Compare";
 
diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java
index 0ecf5f05a..5dd6de136 100755
--- a/src/main/java/refinedstorage/tile/TileController.java
+++ b/src/main/java/refinedstorage/tile/TileController.java
@@ -52,7 +52,7 @@ import refinedstorage.tile.externalstorage.ExternalStorage;
 import java.util.*;
 
 public class TileController extends TileBase implements INetworkMaster, IEnergyReceiver, IRedstoneConfigurable {
-    public static final TileDataParameter REDSTONE_MODE = RedstoneMode.createParameter();
+    public static final TileDataParameter<Integer> REDSTONE_MODE = RedstoneMode.createParameter();
 
     public static final TileDataParameter<Integer> ENERGY_USAGE = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer<Integer, TileController>() {
         @Override
diff --git a/src/main/java/refinedstorage/tile/TileDestructor.java b/src/main/java/refinedstorage/tile/TileDestructor.java
index 890398ec9..2dfc3023b 100755
--- a/src/main/java/refinedstorage/tile/TileDestructor.java
+++ b/src/main/java/refinedstorage/tile/TileDestructor.java
@@ -21,8 +21,8 @@ import refinedstorage.tile.data.TileDataParameter;
 import java.util.List;
 
 public class TileDestructor extends TileNode implements IComparable, IFilterable {
-    public static final TileDataParameter COMPARE = IComparable.createParameter();
-    public static final TileDataParameter MODE = IFilterable.createParameter();
+    public static final TileDataParameter<Integer> COMPARE = IComparable.createParameter();
+    public static final TileDataParameter<Integer> MODE = IFilterable.createParameter();
 
     private static final String NBT_COMPARE = "Compare";
     private static final String NBT_MODE = "Mode";
diff --git a/src/main/java/refinedstorage/tile/TileDetector.java b/src/main/java/refinedstorage/tile/TileDetector.java
index 9c65a1992..7b90ce4fc 100755
--- a/src/main/java/refinedstorage/tile/TileDetector.java
+++ b/src/main/java/refinedstorage/tile/TileDetector.java
@@ -15,10 +15,13 @@ import refinedstorage.gui.GuiDetector;
 import refinedstorage.inventory.ItemHandlerBasic;
 import refinedstorage.tile.config.IComparable;
 import refinedstorage.tile.config.RedstoneMode;
-import refinedstorage.tile.data.*;
+import refinedstorage.tile.data.ITileDataConsumer;
+import refinedstorage.tile.data.ITileDataProducer;
+import refinedstorage.tile.data.TileDataManager;
+import refinedstorage.tile.data.TileDataParameter;
 
 public class TileDetector extends TileNode implements IComparable {
-    public static final TileDataParameter COMPARE = IComparable.createParameter();
+    public static final TileDataParameter<Integer> COMPARE = IComparable.createParameter();
 
     public static final TileDataParameter<Integer> MODE = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer<Integer, TileDetector>() {
         @Override
@@ -48,15 +51,12 @@ public class TileDetector extends TileNode implements IComparable {
 
             tile.markDirty();
         }
-    }, new ITileDataListener<Integer>() {
-        @Override
-        public void onChanged(TileDataParameter<Integer> parameter) {
-            if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
-                GuiScreen gui = Minecraft.getMinecraft().currentScreen;
+    }, parameter -> {
+        if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
+            GuiScreen gui = Minecraft.getMinecraft().currentScreen;
 
-                if (gui instanceof GuiDetector) {
-                    ((GuiDetector) gui).AMOUNT.setText(String.valueOf(parameter.getValue()));
-                }
+            if (gui instanceof GuiDetector) {
+                ((GuiDetector) gui).AMOUNT.setText(String.valueOf(parameter.getValue()));
             }
         }
     });
diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java
index e4ab58459..c387ec04e 100755
--- a/src/main/java/refinedstorage/tile/TileDiskDrive.java
+++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java
@@ -26,9 +26,9 @@ import refinedstorage.tile.data.TileDataParameter;
 import java.util.List;
 
 public class TileDiskDrive extends TileNode implements IStorageProvider, IStorageGui, IComparable, IFilterable, IPrioritizable {
-    public static final TileDataParameter PRIORITY = IPrioritizable.createParameter();
-    public static final TileDataParameter COMPARE = IComparable.createParameter();
-    public static final TileDataParameter MODE = IFilterable.createParameter();
+    public static final TileDataParameter<Integer> PRIORITY = IPrioritizable.createParameter();
+    public static final TileDataParameter<Integer> COMPARE = IComparable.createParameter();
+    public static final TileDataParameter<Integer> MODE = IFilterable.createParameter();
 
     public class Storage extends NBTStorage {
         public Storage(ItemStack disk) {
diff --git a/src/main/java/refinedstorage/tile/TileExporter.java b/src/main/java/refinedstorage/tile/TileExporter.java
index b6ccf906f..882de9d76 100755
--- a/src/main/java/refinedstorage/tile/TileExporter.java
+++ b/src/main/java/refinedstorage/tile/TileExporter.java
@@ -16,7 +16,7 @@ import refinedstorage.tile.config.IComparable;
 import refinedstorage.tile.data.TileDataParameter;
 
 public class TileExporter extends TileNode implements IComparable {
-    public static final TileDataParameter COMPARE = IComparable.createParameter();
+    public static final TileDataParameter<Integer> COMPARE = IComparable.createParameter();
 
     private static final String NBT_COMPARE = "Compare";
 
diff --git a/src/main/java/refinedstorage/tile/TileImporter.java b/src/main/java/refinedstorage/tile/TileImporter.java
index 15a2c3129..11d33b94a 100755
--- a/src/main/java/refinedstorage/tile/TileImporter.java
+++ b/src/main/java/refinedstorage/tile/TileImporter.java
@@ -15,8 +15,8 @@ import refinedstorage.tile.config.IFilterable;
 import refinedstorage.tile.data.TileDataParameter;
 
 public class TileImporter extends TileNode implements IComparable, IFilterable {
-    public static final TileDataParameter COMPARE = IComparable.createParameter();
-    public static final TileDataParameter MODE = IFilterable.createParameter();
+    public static final TileDataParameter<Integer> COMPARE = IComparable.createParameter();
+    public static final TileDataParameter<Integer> MODE = IFilterable.createParameter();
 
     private static final String NBT_COMPARE = "Compare";
     private static final String NBT_MODE = "Mode";
diff --git a/src/main/java/refinedstorage/tile/TileInterface.java b/src/main/java/refinedstorage/tile/TileInterface.java
index 3476c3330..642fac8fc 100755
--- a/src/main/java/refinedstorage/tile/TileInterface.java
+++ b/src/main/java/refinedstorage/tile/TileInterface.java
@@ -15,7 +15,7 @@ import refinedstorage.tile.config.IComparable;
 import refinedstorage.tile.data.TileDataParameter;
 
 public class TileInterface extends TileNode implements IComparable {
-    public static final TileDataParameter COMPARE = IComparable.createParameter();
+    public static final TileDataParameter<Integer> COMPARE = IComparable.createParameter();
 
     private static final String NBT_COMPARE = "Compare";
 
diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java
index 69fb060d3..43fa7a0c8 100755
--- a/src/main/java/refinedstorage/tile/TileStorage.java
+++ b/src/main/java/refinedstorage/tile/TileStorage.java
@@ -24,10 +24,10 @@ import refinedstorage.tile.data.TileDataParameter;
 import java.util.List;
 
 public class TileStorage extends TileNode implements IStorageProvider, IStorageGui, IComparable, IFilterable, IPrioritizable {
-    public static final TileDataParameter PRIORITY = IPrioritizable.createParameter();
-    public static final TileDataParameter COMPARE = IComparable.createParameter();
-    public static final TileDataParameter MODE = IFilterable.createParameter();
-    public static final TileDataParameter STORED = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer<Integer, TileStorage>() {
+    public static final TileDataParameter<Integer> PRIORITY = IPrioritizable.createParameter();
+    public static final TileDataParameter<Integer> COMPARE = IComparable.createParameter();
+    public static final TileDataParameter<Integer> MODE = IFilterable.createParameter();
+    public static final TileDataParameter<Integer> STORED = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer<Integer, TileStorage>() {
         @Override
         public Integer getValue(TileStorage tile) {
             return NBTStorage.getStoredFromNBT(tile.storageTag);
diff --git a/src/main/java/refinedstorage/tile/config/IComparable.java b/src/main/java/refinedstorage/tile/config/IComparable.java
index 509845221..4b5790915 100755
--- a/src/main/java/refinedstorage/tile/config/IComparable.java
+++ b/src/main/java/refinedstorage/tile/config/IComparable.java
@@ -8,7 +8,7 @@ import refinedstorage.tile.data.TileDataManager;
 import refinedstorage.tile.data.TileDataParameter;
 
 public interface IComparable {
-    static <T extends TileEntity> TileDataParameter createParameter() {
+    static <T extends TileEntity> TileDataParameter<Integer> createParameter() {
         return TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer<Integer, T>() {
             @Override
             public Integer getValue(T tile) {
diff --git a/src/main/java/refinedstorage/tile/config/IFilterable.java b/src/main/java/refinedstorage/tile/config/IFilterable.java
index 230d8b490..a60351b17 100755
--- a/src/main/java/refinedstorage/tile/config/IFilterable.java
+++ b/src/main/java/refinedstorage/tile/config/IFilterable.java
@@ -14,7 +14,7 @@ public interface IFilterable {
     int WHITELIST = 0;
     int BLACKLIST = 1;
 
-    static <T extends TileEntity> TileDataParameter createParameter() {
+    static <T extends TileEntity> TileDataParameter<Integer> createParameter() {
         return TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer<Integer, T>() {
             @Override
             public Integer getValue(T tile) {
diff --git a/src/main/java/refinedstorage/tile/config/RedstoneMode.java b/src/main/java/refinedstorage/tile/config/RedstoneMode.java
index c2b212a72..3710bd9f7 100755
--- a/src/main/java/refinedstorage/tile/config/RedstoneMode.java
+++ b/src/main/java/refinedstorage/tile/config/RedstoneMode.java
@@ -31,7 +31,7 @@ public enum RedstoneMode {
         return id < 0 || id >= values().length ? IGNORE : values()[id];
     }
 
-    public static <T extends TileEntity> TileDataParameter createParameter() {
+    public static <T extends TileEntity> TileDataParameter<Integer> createParameter() {
         return TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer<Integer, T>() {
             @Override
             public Integer getValue(T tile) {
diff --git a/src/main/java/refinedstorage/tile/data/TileDataManager.java b/src/main/java/refinedstorage/tile/data/TileDataManager.java
index 3a6c140f8..af3186f9d 100755
--- a/src/main/java/refinedstorage/tile/data/TileDataManager.java
+++ b/src/main/java/refinedstorage/tile/data/TileDataManager.java
@@ -24,16 +24,16 @@ public class TileDataManager {
     private List<TileDataParameter> watchedParameters = new ArrayList<TileDataParameter>();
     private List<Object> watchedParametersCache = new ArrayList<Object>();
 
-    public static TileDataParameter createParameter(DataSerializer serializer, ITileDataProducer producer) {
+    public static <T> TileDataParameter<T> createParameter(DataSerializer<T> serializer, ITileDataProducer producer) {
         return createParameter(serializer, producer, null);
     }
 
-    public static TileDataParameter createParameter(DataSerializer serializer, ITileDataProducer producer, ITileDataConsumer consumer) {
+    public static <T> TileDataParameter<T> createParameter(DataSerializer<T> serializer, ITileDataProducer producer, ITileDataConsumer consumer) {
         return createParameter(serializer, producer, consumer, null);
     }
 
-    public static TileDataParameter createParameter(DataSerializer serializer, ITileDataProducer producer, ITileDataConsumer consumer, ITileDataListener listener) {
-        TileDataParameter parameter = new TileDataParameter(PARAMETER_ID++, serializer, producer, consumer, listener);
+    public static <T> TileDataParameter<T> createParameter(DataSerializer<T> serializer, ITileDataProducer producer, ITileDataConsumer consumer, ITileDataListener<T> listener) {
+        TileDataParameter<T> parameter = new TileDataParameter<>(PARAMETER_ID++, serializer, producer, consumer, listener);
 
         PARAMETER_MAP.put(parameter.getId(), parameter);
 
diff --git a/src/main/java/refinedstorage/tile/data/TileDataParameter.java b/src/main/java/refinedstorage/tile/data/TileDataParameter.java
index bc63ca651..c1a1abd92 100755
--- a/src/main/java/refinedstorage/tile/data/TileDataParameter.java
+++ b/src/main/java/refinedstorage/tile/data/TileDataParameter.java
@@ -2,7 +2,6 @@ package refinedstorage.tile.data;
 
 import net.minecraft.network.datasync.DataSerializer;
 
-// @TODO: Annotate me better!
 public class TileDataParameter<T> {
     private int id;
     private DataSerializer<T> serializer;
diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java
index d3199fac5..087b76787 100755
--- a/src/main/java/refinedstorage/tile/grid/TileGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java
@@ -29,7 +29,10 @@ import refinedstorage.inventory.ItemHandlerGridFilterInGrid;
 import refinedstorage.inventory.ItemValidatorBasic;
 import refinedstorage.item.ItemPattern;
 import refinedstorage.tile.TileNode;
-import refinedstorage.tile.data.*;
+import refinedstorage.tile.data.ITileDataConsumer;
+import refinedstorage.tile.data.ITileDataProducer;
+import refinedstorage.tile.data.TileDataManager;
+import refinedstorage.tile.data.TileDataParameter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -97,12 +100,9 @@ public class TileGrid extends TileNode implements IGrid {
                 tile.markDirty();
             }
         }
-    }, new ITileDataListener<Integer>() {
-        @Override
-        public void onChanged(TileDataParameter<Integer> parameter) {
-            if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
-                GuiGrid.updateSearchFieldFocus(parameter.getValue());
-            }
+    }, parameter -> {
+        if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
+            GuiGrid.updateSearchFieldFocus(parameter.getValue());
         }
     });