diff --git a/src/examplemod/Config.java b/src/examplemod/Config.java
index ed96e38..6f11c53 100644
--- a/src/examplemod/Config.java
+++ b/src/examplemod/Config.java
@@ -1,5 +1,6 @@
 package examplemod;
 
+import java.io.File;
 import java.util.List;
 
 import net.minecraft.item.crafting.CraftingManager;
@@ -56,8 +57,8 @@ public class Config {
 	@BlockId(description = "The id of the block a TESR")
 	public static int blockWithTESRId = 1927;
 
-	public static void readConfig(Configuration configFile) {
-		ConfigProcessing.processAnnotations(configFile, Config.class);
+	public static void readConfig(File configFile, Configuration config) {
+		ConfigProcessing.processAnnotations(configFile, "ExampleMod", config, Config.class);
 	}
 
 	/***
@@ -112,4 +113,4 @@ public static void register() {
 		ConfigProcessing.registerBlocks(ExampleMod.Blocks.class, ModInfo.ID);
 
 	}
-}
\ No newline at end of file
+}
diff --git a/src/examplemod/ExampleMod.java b/src/examplemod/ExampleMod.java
index 03c4b57..e36d974 100644
--- a/src/examplemod/ExampleMod.java
+++ b/src/examplemod/ExampleMod.java
@@ -1,5 +1,7 @@
 package examplemod;
 
+import java.io.File;
+
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -101,10 +103,11 @@ public ItemStack getIconItemStack() {
 
 	@EventHandler
 	public void preInit(FMLPreInitializationEvent evt) {
-		Configuration configFile = new Configuration(evt.getSuggestedConfigurationFile());
-		Config.readConfig(configFile);
-		if (configFile.hasChanged()) {
-			configFile.save();
+		File configFile = evt.getSuggestedConfigurationFile();
+		Configuration config = new Configuration(configFile);
+		Config.readConfig(configFile, config);
+		if (config.hasChanged()) {
+			config.save();
 		}
 		Config.register();
 
@@ -123,4 +126,4 @@ public void init(FMLInitializationEvent evt) {
 	public void postInit(FMLPostInitializationEvent evt) {
 
 	}
-}
\ No newline at end of file
+}
diff --git a/src/examplemod/common/container/ContainerExample.java b/src/examplemod/common/container/ContainerExample.java
index 84124ab..b3f3d23 100644
--- a/src/examplemod/common/container/ContainerExample.java
+++ b/src/examplemod/common/container/ContainerExample.java
@@ -1,15 +1,15 @@
 package examplemod.common.container;
 
 import net.minecraft.inventory.IInventory;
-import openmods.container.ContainerInventory;
+import openmods.container.ContainerInventoryProvider;
 import examplemod.common.tileentity.TileEntityWithGui;
 
-public class ContainerExample extends ContainerInventory<TileEntityWithGui> {
+public class ContainerExample extends ContainerInventoryProvider<TileEntityWithGui> {
 
 	public ContainerExample(IInventory playerInventory, TileEntityWithGui tile) {
 		super(playerInventory, tile);
-		addSlotToContainer(new RestrictedSlot(tile, 0, 62, 30));
-		addSlotToContainer(new RestrictedSlot(tile, 1, 100, 30));
+		addSlotToContainer(new RestrictedSlot(tile.getInventory(), 0, 62, 30));
+		addSlotToContainer(new RestrictedSlot(tile.getInventory(), 1, 100, 30));
 		addPlayerInventorySlots(93);
 	}
 
diff --git a/src/examplemod/common/tileentity/TileEntityWithGui.java b/src/examplemod/common/tileentity/TileEntityWithGui.java
index 88321fe..f572216 100644
--- a/src/examplemod/common/tileentity/TileEntityWithGui.java
+++ b/src/examplemod/common/tileentity/TileEntityWithGui.java
@@ -6,6 +6,7 @@
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import openmods.GenericInventory;
+import openmods.IInventoryProvider;
 import openmods.api.IHasGui;
 import openmods.sync.ISyncableObject;
 import openmods.sync.SyncableInt;
@@ -13,14 +14,10 @@
 import examplemod.client.gui.GuiExample;
 import examplemod.common.container.ContainerExample;
 
-public class TileEntityWithGui extends SyncedTileEntity implements IHasGui, IInventory {
+public class TileEntityWithGui extends SyncedTileEntity implements IHasGui, IInventoryProvider {
 
 	private SyncableInt sliderValue;
 
-	public TileEntityWithGui() {
-		setInventory(new GenericInventory("example", true, 2));
-	}
-
 	public SyncableInt getSliderValueObject() {
 		return sliderValue;
 	}
@@ -57,63 +54,11 @@ protected void createSyncedFields() {
 	public void onSynced(Set<ISyncableObject> changes) {}
 
 	/*******************************************************
-	 * Implemented from IInventory
+	 * Implemented from IInventoryProvider
 	 *******************************************************/
 
 	@Override
-	public int getSizeInventory() {
-		return inventory.getSizeInventory();
-	}
-
-	@Override
-	public ItemStack getStackInSlot(int i) {
-		return inventory.getStackInSlot(i);
-	}
-
-	@Override
-	public ItemStack decrStackSize(int i, int j) {
-		return inventory.decrStackSize(i, j);
-	}
-
-	@Override
-	public ItemStack getStackInSlotOnClosing(int i) {
-		return inventory.getStackInSlotOnClosing(i);
-	}
-
-	@Override
-	public void setInventorySlotContents(int i, ItemStack itemstack) {
-		inventory.setInventorySlotContents(i, itemstack);
-	}
-
-	@Override
-	public String getInvName() {
-		return inventory.getInvName();
+	public IInventory getInventory() {
+		return new GenericInventory("example", true, 2);
 	}
-
-	@Override
-	public boolean isInvNameLocalized() {
-		return inventory.isInvNameLocalized();
-	}
-
-	@Override
-	public int getInventoryStackLimit() {
-		return inventory.getInventoryStackLimit();
-	}
-
-	@Override
-	public boolean isUseableByPlayer(EntityPlayer entityplayer) {
-		return inventory.isUseableByPlayer(entityplayer);
-	}
-
-	@Override
-	public void openChest() {}
-
-	@Override
-	public void closeChest() {}
-
-	@Override
-	public boolean isItemValidForSlot(int i, ItemStack itemstack) {
-		return inventory.isItemValidForSlot(i, itemstack);
-	}
-
 }