diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java
index 5216f6df6..6432982b8 100644
--- a/src/main/java/forestry/plugins/PluginApiculture.java
+++ b/src/main/java/forestry/plugins/PluginApiculture.java
@@ -437,6 +437,13 @@ public class PluginApiculture extends ForestryPlugin {
 		crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 3), "cratedStringyCombs");
 		crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 4), "cratedFrozenCombs");
 		crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 5), "cratedDrippingCombs");
+		crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 6), "cratedSilkyCombs");
+		crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 7), "cratedParchedCombs");
+		crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 8), "cratedMysteriousCombs");
+		crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 10), "cratedPowderyCombs");
+		crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 14), "cratedWheatenCombs");
+		crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 15), "cratedMossyCombs");
+		crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 16), "cratedMellowCombs");
 
 		crateRegistry.registerCrate(ForestryItem.refractoryWax.getItemStack(), "cratedRefractoryWax");
 	}
diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java
index 372d0d398..cca72fc87 100644
--- a/src/main/java/forestry/plugins/PluginArboriculture.java
+++ b/src/main/java/forestry/plugins/PluginArboriculture.java
@@ -45,6 +45,8 @@ import forestry.api.genetics.IClassification.EnumClassLevel;
 import forestry.api.genetics.IFruitFamily;
 import forestry.api.recipes.RecipeManagers;
 import forestry.api.storage.BackpackManager;
+import forestry.api.storage.ICrateRegistry;
+import forestry.api.storage.StorageManager;
 import forestry.arboriculture.EventHandlerArboriculture;
 import forestry.arboriculture.FruitProviderNone;
 import forestry.arboriculture.FruitProviderPod;
@@ -336,6 +338,16 @@ public class PluginArboriculture extends ForestryPlugin {
 			Proxies.render.registerVillagerSkin(Defaults.ID_VILLAGER_LUMBERJACK, Defaults.TEXTURE_SKIN_LUMBERJACK);
 			VillagerRegistry.instance().registerVillageTradeHandler(Defaults.ID_VILLAGER_LUMBERJACK, new VillageHandlerArboriculture());
 		}
+		if (PluginManager.Module.FACTORY.isEnabled()) {
+			ICrateRegistry crateRegistry = StorageManager.crateRegistry;
+			crateRegistry.registerCrate(EnumFruit.CHERRY.getStack(), "cratedCherry");
+			crateRegistry.registerCrate(EnumFruit.WALNUT.getStack(), "cratedWalnut");
+			crateRegistry.registerCrate(EnumFruit.CHESTNUT.getStack(), "cratedChestnut");
+			crateRegistry.registerCrate(EnumFruit.LEMON.getStack(), "cratedLemon");
+			crateRegistry.registerCrate(EnumFruit.PLUM.getStack(), "cratedPlum");
+			crateRegistry.registerCrate(EnumFruit.PAPAYA.getStack(), "cratedPapaya");
+			crateRegistry.registerCrate(EnumFruit.DATES.getStack(), "cratedDates");
+		}
 	}
 
 	@Override
diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java
index f55715778..33b76cd26 100755
--- a/src/main/java/forestry/plugins/PluginCore.java
+++ b/src/main/java/forestry/plugins/PluginCore.java
@@ -272,13 +272,20 @@ public class PluginCore extends ForestryPlugin {
 	@Override
 	protected void registerCrates() {
 		ICrateRegistry crateRegistry = StorageManager.crateRegistry;
-		crateRegistry.registerCrate(Blocks.log, "cratedWood");
+		crateRegistry.registerCrate(new ItemStack(Blocks.log, 1, 0), "cratedWood");
+		crateRegistry.registerCrate(new ItemStack(Blocks.log, 1, 1), "cratedSpruceWood");
+		crateRegistry.registerCrate(new ItemStack(Blocks.log, 1, 2), "cratedBirchWood");
+		crateRegistry.registerCrate(new ItemStack(Blocks.log, 1, 3), "cratedJungleWood");
+		crateRegistry.registerCrate(new ItemStack(Blocks.log2, 1, 0), "cratedAcaciaWood");
+		crateRegistry.registerCrate(new ItemStack(Blocks.log2, 1, 1), "cratedDarkOakWood");
 		crateRegistry.registerCrate(Blocks.cobblestone, "cratedCobblestone");
-		crateRegistry.registerCrate(Blocks.dirt, "cratedDirt");
+		crateRegistry.registerCrate(new ItemStack(Blocks.dirt, 1, 0), "cratedDirt");
+		crateRegistry.registerCrate(new ItemStack(Blocks.dirt, 1, 2), "cratedPodzol");
 		crateRegistry.registerCrate(Blocks.stone, "cratedStone");
 		crateRegistry.registerCrate(Blocks.brick_block, "cratedBrick");
 		crateRegistry.registerCrate(Blocks.cactus, "cratedCacti");
-		crateRegistry.registerCrate(Blocks.sand, "cratedSand");
+		crateRegistry.registerCrate(new ItemStack(Blocks.sand, 1, 0), "cratedSand");
+		crateRegistry.registerCrate(new ItemStack(Blocks.sand, 1, 1), "cratedRedSand");
 		crateRegistry.registerCrate(Blocks.obsidian, "cratedObsidian");
 		crateRegistry.registerCrate(Blocks.netherrack, "cratedNetherrack");
 		crateRegistry.registerCrate(Blocks.soul_sand, "cratedSoulsand");
@@ -306,7 +313,12 @@ public class PluginCore extends ForestryPlugin {
 		crateRegistry.registerCrate(new ItemStack(Items.coal, 1, 0), "cratedCoal");
 		crateRegistry.registerCrate(Blocks.gravel, "cratedGravel");
 		crateRegistry.registerCrate(Items.wheat_seeds, "cratedSeeds");
-		crateRegistry.registerCrate(Blocks.sapling, "cratedSaplings");
+		crateRegistry.registerCrate(new ItemStack(Blocks.sapling, 1, 0), "cratedSaplings");
+		crateRegistry.registerCrate(new ItemStack(Blocks.sapling, 1, 1), "cratedSpruceSapling");
+		crateRegistry.registerCrate(new ItemStack(Blocks.sapling, 1, 2), "cratedBirchSapling");
+		crateRegistry.registerCrate(new ItemStack(Blocks.sapling, 1, 3), "cratedJungleSapling");
+		crateRegistry.registerCrate(new ItemStack(Blocks.sapling, 1, 4), "cratedAcaciaSapling");
+		crateRegistry.registerCrate(new ItemStack(Blocks.sapling, 1, 5), "cratedDarkOakSapling");
 		crateRegistry.registerCrate(Items.potato, "cratedPotatoes");
 		crateRegistry.registerCrate(Items.carrot, "cratedCarrots");