diff --git a/bobassembly/prototypes/assembly-burner.lua b/bobassembly/prototypes/assembly-burner.lua
index e10b610b0..b4a1c753b 100644
--- a/bobassembly/prototypes/assembly-burner.lua
+++ b/bobassembly/prototypes/assembly-burner.lua
@@ -16,8 +16,8 @@ if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].valu
       name = "burner-assembling-machine",
       enabled = false,
       ingredients = {
-        { "iron-gear-wheel", 5 },
-        { "iron-plate", 9 },
+        { type = "item", name = "iron-gear-wheel", amount = 5 },
+        { type = "item", name = "iron-plate", amount = 9 },
       },
       results = { { type = "item", name = "burner-assembling-machine", amount = 1 } },
     },
@@ -154,9 +154,9 @@ if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].valu
       name = "steam-assembling-machine",
       enabled = false,
       ingredients = {
-        { "iron-gear-wheel", 10 },
-        { "iron-plate", 10 },
-        { "pipe", 5 },
+        { type = "item", name = "iron-gear-wheel", amount = 10 },
+        { type = "item", name = "iron-plate", amount = 10 },
+        { type = "item", name = "pipe", amount = 5 },
       },
       results = { { type = "item", name = "steam-assembling-machine", amount = 1 } },
     },
diff --git a/bobassembly/prototypes/assembly-electronics.lua b/bobassembly/prototypes/assembly-electronics.lua
index 75be73806..c051a68db 100644
--- a/bobassembly/prototypes/assembly-electronics.lua
+++ b/bobassembly/prototypes/assembly-electronics.lua
@@ -139,9 +139,9 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
       name = "electronics-machine-1",
       enabled = false,
       ingredients = {
-        { "electronic-circuit", 5 },
-        { "iron-plate", 5 },
-        { "iron-gear-wheel", 5 },
+        { type = "item", name = "electronic-circuit", amount = 5 },
+        { type = "item", name = "iron-plate", amount = 5 },
+        { type = "item", name = "iron-gear-wheel", amount = 5 },
       },
       results = { { type = "item", name = "electronics-machine-1", amount = 1 } },
     },
@@ -306,10 +306,10 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
       name = "electronics-machine-2",
       enabled = false,
       ingredients = {
-        { "electronics-machine-1", 1 },
-        { "advanced-circuit", 5 },
-        { "steel-plate", 5 },
-        { "iron-gear-wheel", 5 },
+        { type = "item", name = "electronics-machine-1", amount = 1 },
+        { type = "item", name = "advanced-circuit", amount = 5 },
+        { type = "item", name = "steel-plate", amount = 5 },
+        { type = "item", name = "iron-gear-wheel", amount = 5 },
       },
       results = { { type = "item", name = "electronics-machine-2", amount = 1 } },
     },
@@ -478,10 +478,10 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
       name = "electronics-machine-3",
       enabled = false,
       ingredients = {
-        { "electronics-machine-2", 1 },
-        { "processing-unit", 5 },
-        { "steel-plate", 5 },
-        { "iron-gear-wheel", 5 },
+        { type = "item", name = "electronics-machine-2", amount = 1 },
+        { type = "item", name = "processing-unit", amount = 5 },
+        { type = "item", name = "steel-plate", amount = 5 },
+        { type = "item", name = "iron-gear-wheel", amount = 5 },
       },
       results = { { type = "item", name = "electronics-machine-3", amount = 1 } },
     },
diff --git a/bobassembly/prototypes/assembly-updates.lua b/bobassembly/prototypes/assembly-updates.lua
index af0fd7102..8a0629395 100644
--- a/bobassembly/prototypes/assembly-updates.lua
+++ b/bobassembly/prototypes/assembly-updates.lua
@@ -24,15 +24,15 @@ data.raw["assembling-machine"]["assembling-machine-2"].energy_usage = "135kW"
 data.raw["assembling-machine"]["assembling-machine-3"].energy_usage = "210kW"
 
 data.raw.recipe["assembling-machine-3"].ingredients = {
-  { "assembling-machine-2", 1 },
-  { "steel-plate", 9 },
-  { "advanced-circuit", 3 },
+  { type = "item", name = "assembling-machine-2", amount = 1 },
+  { type = "item", name = "steel-plate", amount = 9 },
+  { type = "item", name = "advanced-circuit", amount = 3 },
 }
 
 if data.raw.item["steel-gear-wheel"] then
-  bobmods.lib.recipe.add_ingredient("assembling-machine-3", { "steel-gear-wheel", 5 })
+  bobmods.lib.recipe.add_ingredient("assembling-machine-3", { type = "item", name = "steel-gear-wheel", amount = 5 })
 else
-  bobmods.lib.recipe.add_ingredient("assembling-machine-3", { "iron-gear-wheel", 5 })
+  bobmods.lib.recipe.add_ingredient("assembling-machine-3", { type = "item", name = "iron-gear-wheel", amount = 5 })
 end
 
 data.raw["assembling-machine"]["assembling-machine-3"].module_specification.module_slots = 3
@@ -47,9 +47,9 @@ elseif data.raw.item["brass-alloy"] then
 end
 
 if data.raw.item["steel-bearing"] then
-  bobmods.lib.recipe.add_ingredient("assembling-machine-4", { "steel-bearing", 5 })
+  bobmods.lib.recipe.add_ingredient("assembling-machine-4", { type = "item", name = "steel-bearing", amount = 5 })
 else
-  bobmods.lib.recipe.add_ingredient("assembling-machine-4", { "iron-gear-wheel", 3 })
+  bobmods.lib.recipe.add_ingredient("assembling-machine-4", { type = "item", name = "iron-gear-wheel", amount = 3 })
 end
 
 if data.raw.item["brass-gear-wheel"] then
@@ -68,9 +68,9 @@ elseif data.raw.item["tungsten-plate"] then
 end
 
 if data.raw.item["titanium-bearing"] then
-  bobmods.lib.recipe.add_ingredient("assembling-machine-5", { "titanium-bearing", 5 })
+  bobmods.lib.recipe.add_ingredient("assembling-machine-5", { type = "item", name = "titanium-bearing", amount = 5 })
 else
-  bobmods.lib.recipe.add_ingredient("assembling-machine-5", { "iron-gear-wheel", 3 })
+  bobmods.lib.recipe.add_ingredient("assembling-machine-5", { type = "item", name = "iron-gear-wheel", amount = 3 })
 end
 
 if data.raw.item["titanium-gear-wheel"] then
@@ -98,11 +98,11 @@ elseif data.raw.item["tungsten-plate"] then
 end
 
 if data.raw.item["nitinol-bearing"] then
-  bobmods.lib.recipe.add_ingredient("assembling-machine-6", { "nitinol-bearing", 5 })
+  bobmods.lib.recipe.add_ingredient("assembling-machine-6", { type = "item", name = "nitinol-bearing", amount = 5 })
 elseif data.raw.item["titanium-bearing"] then
-  bobmods.lib.recipe.add_ingredient("assembling-machine-6", { "titanium-bearing", 5 })
+  bobmods.lib.recipe.add_ingredient("assembling-machine-6", { type = "item", name = "titanium-bearing", amount = 5 })
 else
-  bobmods.lib.recipe.add_ingredient("assembling-machine-6", { "iron-gear-wheel", 3 })
+  bobmods.lib.recipe.add_ingredient("assembling-machine-6", { type = "item", name = "iron-gear-wheel", amount = 3 })
 end
 
 if data.raw.item["nitinol-gear-wheel"] then
diff --git a/bobassembly/prototypes/assembly.lua b/bobassembly/prototypes/assembly.lua
index 0f57d0935..0fa5ae6f6 100644
--- a/bobassembly/prototypes/assembly.lua
+++ b/bobassembly/prototypes/assembly.lua
@@ -111,10 +111,10 @@ data:extend({
     name = "assembling-machine-4",
     enabled = false,
     ingredients = {
-      { "assembling-machine-3", 1 },
-      { "processing-unit", 3 },
-      { "steel-plate", 9 },
-      { "iron-gear-wheel", 5 },
+      { type = "item", name = "assembling-machine-3", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 3 },
+      { type = "item", name = "steel-plate", amount = 9 },
+      { type = "item", name = "iron-gear-wheel", amount = 5 },
     },
     results = { { type = "item", name = "assembling-machine-4", amount = 1 } },
   },
@@ -291,10 +291,10 @@ data:extend({
     name = "assembling-machine-5",
     enabled = false,
     ingredients = {
-      { "assembling-machine-4", 1 },
-      { "processing-unit", 3 },
-      { "steel-plate", 9 },
-      { "iron-gear-wheel", 5 },
+      { type = "item", name = "assembling-machine-4", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 3 },
+      { type = "item", name = "steel-plate", amount = 9 },
+      { type = "item", name = "iron-gear-wheel", amount = 5 },
     },
     results = { { type = "item", name = "assembling-machine-5", amount = 1 } },
   },
@@ -470,11 +470,11 @@ data:extend({
     name = "assembling-machine-6",
     enabled = false,
     ingredients = {
-      { "assembling-machine-5", 1 },
-      { "rocket-control-unit", 3 },
-      { "steel-plate", 5 },
-      { "iron-plate", 5 },
-      { "iron-gear-wheel", 5 },
+      { type = "item", name = "assembling-machine-5", amount = 1 },
+      { type = "item", name = "rocket-control-unit", amount = 3 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "iron-plate", amount = 5 },
+      { type = "item", name = "iron-gear-wheel", amount = 5 },
     },
     results = { { type = "item", name = "assembling-machine-6", amount = 1 } },
   },
diff --git a/bobassembly/prototypes/centrifuge.lua b/bobassembly/prototypes/centrifuge.lua
index c2c2b6729..e7626a557 100644
--- a/bobassembly/prototypes/centrifuge.lua
+++ b/bobassembly/prototypes/centrifuge.lua
@@ -32,11 +32,11 @@ if settings.startup["bobmods-assembly-centrifuge"].value == true then
       energy_required = 4,
       enabled = false,
       ingredients = {
-        { "centrifuge", 1 },
-        { "refined-concrete", 100 },
-        { "steel-plate", 50 },
-        { "processing-unit", 100 },
-        { "iron-gear-wheel", 100 },
+        { type = "item", name = "centrifuge", amount = 1 },
+        { type = "item", name = "refined-concrete", amount = 100 },
+        { type = "item", name = "steel-plate", amount = 50 },
+        { type = "item", name = "processing-unit", amount = 100 },
+        { type = "item", name = "iron-gear-wheel", amount = 100 },
       },
       results = { { type = "item", name = "centrifuge-2", amount = 1 } },
       requester_paste_multiplier = 10,
@@ -47,11 +47,11 @@ if settings.startup["bobmods-assembly-centrifuge"].value == true then
       energy_required = 4,
       enabled = false,
       ingredients = {
-        { "centrifuge-2", 1 },
-        { "refined-concrete", 100 },
-        { "steel-plate", 50 },
-        { "processing-unit", 100 },
-        { "iron-gear-wheel", 100 },
+        { type = "item", name = "centrifuge-2", amount = 1 },
+        { type = "item", name = "refined-concrete", amount = 100 },
+        { type = "item", name = "steel-plate", amount = 50 },
+        { type = "item", name = "processing-unit", amount = 100 },
+        { type = "item", name = "iron-gear-wheel", amount = 100 },
       },
       results = { { type = "item", name = "centrifuge-3", amount = 1 } },
       requester_paste_multiplier = 10,
diff --git a/bobassembly/prototypes/chemical-mixing-furnace.lua b/bobassembly/prototypes/chemical-mixing-furnace.lua
index 74a33c539..06802de44 100644
--- a/bobassembly/prototypes/chemical-mixing-furnace.lua
+++ b/bobassembly/prototypes/chemical-mixing-furnace.lua
@@ -82,11 +82,11 @@ then
       energy_required = 5,
       enabled = false,
       ingredients = {
-        { "electric-chemical-furnace", 1 },
-        { "steel-plate", 10 },
-        { "stone-brick", 10 },
-        { "processing-unit", 5 },
-        { "pipe", 5 },
+        { type = "item", name = "electric-chemical-furnace", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 10 },
+        { type = "item", name = "stone-brick", amount = 10 },
+        { type = "item", name = "processing-unit", amount = 5 },
+        { type = "item", name = "pipe", amount = 5 },
       },
       results = { { type = "item", name = "electric-chemical-mixing-furnace", amount = 1 } },
     },
@@ -97,11 +97,11 @@ then
       energy_required = 5,
       enabled = false,
       ingredients = {
-        { "electric-chemical-mixing-furnace", 1 },
-        { "steel-plate", 10 },
-        { "stone-brick", 10 },
-        { "processing-unit", 5 },
-        { "pipe", 5 },
+        { type = "item", name = "electric-chemical-mixing-furnace", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 10 },
+        { type = "item", name = "stone-brick", amount = 10 },
+        { type = "item", name = "processing-unit", amount = 5 },
+        { type = "item", name = "pipe", amount = 5 },
       },
       results = { { type = "item", name = "electric-chemical-mixing-furnace-2", amount = 1 } },
     },
diff --git a/bobassembly/prototypes/chemical-plant.lua b/bobassembly/prototypes/chemical-plant.lua
index d4523c4f5..979ab7806 100644
--- a/bobassembly/prototypes/chemical-plant.lua
+++ b/bobassembly/prototypes/chemical-plant.lua
@@ -353,11 +353,11 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
       energy_required = 5,
       enabled = false,
       ingredients = {
-        { "chemical-plant", 1 },
-        { "steel-plate", 10 },
-        { "iron-gear-wheel", 5 },
-        { "advanced-circuit", 5 },
-        { "pipe", 5 },
+        { type = "item", name = "chemical-plant", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 10 },
+        { type = "item", name = "iron-gear-wheel", amount = 5 },
+        { type = "item", name = "advanced-circuit", amount = 5 },
+        { type = "item", name = "pipe", amount = 5 },
       },
       results = { { type = "item", name = "chemical-plant-2", amount = 1 } },
     },
@@ -368,11 +368,11 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
       energy_required = 5,
       enabled = false,
       ingredients = {
-        { "chemical-plant-2", 1 },
-        { "steel-plate", 10 },
-        { "iron-gear-wheel", 5 },
-        { "processing-unit", 10 },
-        { "pipe", 5 },
+        { type = "item", name = "chemical-plant-2", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 10 },
+        { type = "item", name = "iron-gear-wheel", amount = 5 },
+        { type = "item", name = "processing-unit", amount = 10 },
+        { type = "item", name = "pipe", amount = 5 },
       },
       results = { { type = "item", name = "chemical-plant-3", amount = 1 } },
     },
@@ -383,11 +383,11 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
       energy_required = 5,
       enabled = false,
       ingredients = {
-        { "chemical-plant-3", 1 },
-        { "steel-plate", 10 },
-        { "iron-gear-wheel", 5 },
-        { "processing-unit", 10 },
-        { "pipe", 5 },
+        { type = "item", name = "chemical-plant-3", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 10 },
+        { type = "item", name = "iron-gear-wheel", amount = 5 },
+        { type = "item", name = "processing-unit", amount = 10 },
+        { type = "item", name = "pipe", amount = 5 },
       },
       results = { { type = "item", name = "chemical-plant-4", amount = 1 } },
     },
diff --git a/bobassembly/prototypes/distillery.lua b/bobassembly/prototypes/distillery.lua
index 12f47677b..7ccbb5ae7 100644
--- a/bobassembly/prototypes/distillery.lua
+++ b/bobassembly/prototypes/distillery.lua
@@ -60,10 +60,10 @@ then
       energy_required = 3,
       enabled = false,
       ingredients = {
-        { "bob-distillery", 1 },
-        { "steel-plate", 3 },
-        { "copper-plate", 3 },
-        { "pipe", 2 },
+        { type = "item", name = "bob-distillery", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 3 },
+        { type = "item", name = "copper-plate", amount = 3 },
+        { type = "item", name = "pipe", amount = 2 },
       },
       results = { { type = "item", name = "bob-distillery-2", amount = 1 } },
     },
@@ -73,10 +73,10 @@ then
       energy_required = 3,
       enabled = false,
       ingredients = {
-        { "bob-distillery-2", 1 },
-        { "steel-plate", 3 },
-        { "copper-plate", 3 },
-        { "pipe", 2 },
+        { type = "item", name = "bob-distillery-2", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 3 },
+        { type = "item", name = "copper-plate", amount = 3 },
+        { type = "item", name = "pipe", amount = 2 },
       },
       results = { { type = "item", name = "bob-distillery-3", amount = 1 } },
     },
@@ -87,10 +87,10 @@ then
       energy_required = 3,
       enabled = false,
       ingredients = {
-        { "bob-distillery-3", 1 },
-        { "steel-plate", 3 },
-        { "copper-plate", 3 },
-        { "pipe", 2 },
+        { type = "item", name = "bob-distillery-3", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 3 },
+        { type = "item", name = "copper-plate", amount = 3 },
+        { type = "item", name = "pipe", amount = 2 },
       },
       results = { { type = "item", name = "bob-distillery-4", amount = 1 } },
     },
@@ -101,10 +101,10 @@ then
       energy_required = 3,
       enabled = false,
       ingredients = {
-        { "bob-distillery-4", 1 },
-        { "steel-plate", 3 },
-        { "copper-plate", 3 },
-        { "pipe", 2 },
+        { type = "item", name = "bob-distillery-4", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 3 },
+        { type = "item", name = "copper-plate", amount = 3 },
+        { type = "item", name = "pipe", amount = 2 },
       },
       results = { { type = "item", name = "bob-distillery-5", amount = 1 } },
     },
diff --git a/bobassembly/prototypes/electric-furnace.lua b/bobassembly/prototypes/electric-furnace.lua
index 68da25304..f7ba35d3e 100644
--- a/bobassembly/prototypes/electric-furnace.lua
+++ b/bobassembly/prototypes/electric-furnace.lua
@@ -198,10 +198,10 @@ if settings.startup["bobmods-assembly-furnaces"].value == true and data.raw.furn
       type = "recipe",
       name = "electric-furnace-2",
       ingredients = {
-        { "electric-furnace", 1 },
-        { "steel-plate", 10 },
-        { "stone-brick", 10 },
-        { "processing-unit", 5 },
+        { type = "item", name = "electric-furnace", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 10 },
+        { type = "item", name = "stone-brick", amount = 10 },
+        { type = "item", name = "processing-unit", amount = 5 },
       },
       results = { { type = "item", name = "electric-furnace-2", amount = 1 } },
       energy_required = 5,
@@ -212,10 +212,10 @@ if settings.startup["bobmods-assembly-furnaces"].value == true and data.raw.furn
       type = "recipe",
       name = "electric-furnace-3",
       ingredients = {
-        { "electric-furnace-2", 1 },
-        { "steel-plate", 10 },
-        { "stone-brick", 10 },
-        { "processing-unit", 5 },
+        { type = "item", name = "electric-furnace-2", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 10 },
+        { type = "item", name = "stone-brick", amount = 10 },
+        { type = "item", name = "processing-unit", amount = 5 },
       },
       results = { { type = "item", name = "electric-furnace-3", amount = 1 } },
       energy_required = 5,
diff --git a/bobassembly/prototypes/electrolyser.lua b/bobassembly/prototypes/electrolyser.lua
index e71d9d148..9a4529e52 100644
--- a/bobassembly/prototypes/electrolyser.lua
+++ b/bobassembly/prototypes/electrolyser.lua
@@ -207,11 +207,11 @@ then
       energy_required = 5,
       enabled = false,
       ingredients = {
-        { "electrolyser", 1 },
-        { "plastic-bar", 10 },
-        { "steel-plate", 10 },
-        { "electronic-circuit", 5 },
-        { "pipe", 5 },
+        { type = "item", name = "electrolyser", amount = 1 },
+        { type = "item", name = "plastic-bar", amount = 10 },
+        { type = "item", name = "steel-plate", amount = 10 },
+        { type = "item", name = "electronic-circuit", amount = 5 },
+        { type = "item", name = "pipe", amount = 5 },
       },
       results = { { type = "item", name = "electrolyser-2", amount = 1 } },
     },
@@ -222,12 +222,12 @@ then
       energy_required = 5,
       enabled = false,
       ingredients = {
-        { "electrolyser-2", 1 },
-        { "plastic-bar", 10 },
-        { "steel-plate", 10 },
-        { "iron-plate", 10 },
-        { "advanced-circuit", 10 },
-        { "pipe", 5 },
+        { type = "item", name = "electrolyser-2", amount = 1 },
+        { type = "item", name = "plastic-bar", amount = 10 },
+        { type = "item", name = "steel-plate", amount = 10 },
+        { type = "item", name = "iron-plate", amount = 10 },
+        { type = "item", name = "advanced-circuit", amount = 10 },
+        { type = "item", name = "pipe", amount = 5 },
       },
       results = { { type = "item", name = "electrolyser-3", amount = 1 } },
     },
@@ -238,12 +238,12 @@ then
       energy_required = 5,
       enabled = false,
       ingredients = {
-        { "electrolyser-3", 1 },
-        { "plastic-bar", 10 },
-        { "steel-plate", 10 },
-        { "iron-plate", 10 },
-        { "processing-unit", 10 },
-        { "pipe", 5 },
+        { type = "item", name = "electrolyser-3", amount = 1 },
+        { type = "item", name = "plastic-bar", amount = 10 },
+        { type = "item", name = "steel-plate", amount = 10 },
+        { type = "item", name = "iron-plate", amount = 10 },
+        { type = "item", name = "processing-unit", amount = 10 },
+        { type = "item", name = "pipe", amount = 5 },
       },
       results = { { type = "item", name = "electrolyser-4", amount = 1 } },
     },
@@ -254,12 +254,12 @@ then
       energy_required = 5,
       enabled = false,
       ingredients = {
-        { "electrolyser-4", 1 },
-        { "plastic-bar", 10 },
-        { "steel-plate", 10 },
-        { "iron-plate", 10 },
-        { "processing-unit", 10 },
-        { "pipe", 5 },
+        { type = "item", name = "electrolyser-4", amount = 1 },
+        { type = "item", name = "plastic-bar", amount = 10 },
+        { type = "item", name = "steel-plate", amount = 10 },
+        { type = "item", name = "iron-plate", amount = 10 },
+        { type = "item", name = "processing-unit", amount = 10 },
+        { type = "item", name = "pipe", amount = 5 },
       },
       results = { { type = "item", name = "electrolyser-5", amount = 1 } },
     },
diff --git a/bobassembly/prototypes/fluid-furnace.lua b/bobassembly/prototypes/fluid-furnace.lua
index 455a81e51..2c8e6f6a9 100644
--- a/bobassembly/prototypes/fluid-furnace.lua
+++ b/bobassembly/prototypes/fluid-furnace.lua
@@ -57,8 +57,8 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then
       energy_required = 2,
       enabled = false,
       ingredients = {
-        { "steel-furnace", 1 },
-        { "pipe", 2 },
+        { type = "item", name = "steel-furnace", amount = 1 },
+        { type = "item", name = "pipe", amount = 2 },
       },
       results = { { type = "item", name = "fluid-furnace", amount = 1 } },
     },
@@ -102,7 +102,7 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then
         energy_required = 0.1,
         enabled = false,
         ingredients = {
-          { "fluid-furnace", 1 },
+          { type = "item", name = "fluid-furnace", amount = 1 },
         },
         results = {
           { type = "item", name = "steel-furnace", amount = 1 },
@@ -138,8 +138,8 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then
         energy_required = 2,
         enabled = false,
         ingredients = {
-          { "pipe", 2 },
-          { "steel-mixing-furnace", 1 },
+          { type = "item", name = "pipe", amount = 2 },
+          { type = "item", name = "steel-mixing-furnace", amount = 1 },
         },
         results = { { type = "item", name = "fluid-mixing-furnace", amount = 1 } },
       },
@@ -205,7 +205,7 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then
           energy_required = 0.1,
           enabled = false,
           ingredients = {
-            { "fluid-mixing-furnace", 1 },
+            { type = "item", name = "fluid-mixing-furnace", amount = 1 },
           },
           results = {
             { type = "item", name = "pipe", amount = 2 },
@@ -221,7 +221,7 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then
           energy_required = 0.1,
           enabled = false,
           ingredients = {
-            { "fluid-furnace", 1 },
+            { type = "item", name = "fluid-furnace", amount = 1 },
           },
           results = { { type = "item", name = "fluid-mixing-furnace", amount = 1 } },
           allow_as_intermediate = false,
@@ -233,7 +233,7 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then
           energy_required = 0.1,
           enabled = false,
           ingredients = {
-            { "fluid-mixing-furnace", 1 },
+            { type = "item", name = "fluid-mixing-furnace", amount = 1 },
           },
           results = { { type = "item", name = "fluid-furnace", amount = 1 } },
           allow_as_intermediate = false,
@@ -272,8 +272,8 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then
         energy_required = 2,
         enabled = false,
         ingredients = {
-          { "pipe", 2 },
-          { "steel-chemical-furnace", 1 },
+          { type = "item", name = "pipe", amount = 2 },
+          { type = "item", name = "steel-chemical-furnace", amount = 1 },
         },
         results = { { type = "item", name = "fluid-chemical-furnace", amount = 1 } },
       },
@@ -345,7 +345,7 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then
           energy_required = 0.1,
           enabled = false,
           ingredients = {
-            { "fluid-chemical-furnace", 1 },
+            { type = "item", name = "fluid-chemical-furnace", amount = 1 },
           },
           results = {
             { type = "item", name = "pipe", amount = 2 },
@@ -361,8 +361,8 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then
           energy_required = 2,
           enabled = false,
           ingredients = {
-            { "fluid-furnace", 1 },
-            { "pipe", 5 },
+            { type = "item", name = "fluid-furnace", amount = 1 },
+            { type = "item", name = "pipe", amount = 5 },
           },
           results = { { type = "item", name = "fluid-chemical-furnace", amount = 1 } },
           allow_as_intermediate = false,
@@ -374,7 +374,7 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then
           energy_required = 0.1,
           enabled = false,
           ingredients = {
-            { "fluid-chemical-furnace", 1 },
+            { type = "item", name = "fluid-chemical-furnace", amount = 1 },
           },
           results = {
             { type = "item", name = "fluid-furnace", amount = 1 },
diff --git a/bobassembly/prototypes/oil-refinery.lua b/bobassembly/prototypes/oil-refinery.lua
index 659228056..bd46af3f1 100644
--- a/bobassembly/prototypes/oil-refinery.lua
+++ b/bobassembly/prototypes/oil-refinery.lua
@@ -30,12 +30,12 @@ if settings.startup["bobmods-assembly-oilrefineries"].value == true then
       name = "oil-refinery-2",
       energy_required = 10,
       ingredients = {
-        { "oil-refinery", 1 },
-        { "steel-plate", 15 },
-        { "iron-gear-wheel", 10 },
-        { "stone-brick", 10 },
-        { "advanced-circuit", 10 },
-        { "pipe", 10 },
+        { type = "item", name = "oil-refinery", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 15 },
+        { type = "item", name = "iron-gear-wheel", amount = 10 },
+        { type = "item", name = "stone-brick", amount = 10 },
+        { type = "item", name = "advanced-circuit", amount = 10 },
+        { type = "item", name = "pipe", amount = 10 },
       },
       results = { { type = "item", name = "oil-refinery-2", amount = 1 } },
       enabled = false,
@@ -106,12 +106,12 @@ if settings.startup["bobmods-assembly-oilrefineries"].value == true then
       name = "oil-refinery-3",
       energy_required = 10,
       ingredients = {
-        { "oil-refinery-2", 1 },
-        { "steel-plate", 15 },
-        { "iron-gear-wheel", 10 },
-        { "stone-brick", 10 },
-        { "processing-unit", 10 },
-        { "pipe", 10 },
+        { type = "item", name = "oil-refinery-2", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 15 },
+        { type = "item", name = "iron-gear-wheel", amount = 10 },
+        { type = "item", name = "stone-brick", amount = 10 },
+        { type = "item", name = "processing-unit", amount = 10 },
+        { type = "item", name = "pipe", amount = 10 },
       },
       results = { { type = "item", name = "oil-refinery-3", amount = 1 } },
       enabled = false,
@@ -183,12 +183,12 @@ if settings.startup["bobmods-assembly-oilrefineries"].value == true then
       name = "oil-refinery-4",
       energy_required = 10,
       ingredients = {
-        { "oil-refinery-3", 1 },
-        { "steel-plate", 15 },
-        { "iron-gear-wheel", 10 },
-        { "stone-brick", 10 },
-        { "processing-unit", 10 },
-        { "pipe", 10 },
+        { type = "item", name = "oil-refinery-3", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 15 },
+        { type = "item", name = "iron-gear-wheel", amount = 10 },
+        { type = "item", name = "stone-brick", amount = 10 },
+        { type = "item", name = "processing-unit", amount = 10 },
+        { type = "item", name = "pipe", amount = 10 },
       },
       results = { { type = "item", name = "oil-refinery-4", amount = 1 } },
       enabled = false,
diff --git a/bobclasses/prototypes/bodies.lua b/bobclasses/prototypes/bodies.lua
index 38a796528..f0260f4ac 100644
--- a/bobclasses/prototypes/bodies.lua
+++ b/bobclasses/prototypes/bodies.lua
@@ -241,8 +241,8 @@ data:extend({
     energy_required = 10,
     enabled = false,
     ingredients = {
-      { "player-frame", 1 },
-      { "assembling-machine-2", 1 },
+      { type = "item", name = "player-frame", amount = 1 },
+      { type = "item", name = "assembling-machine-2", amount = 1 },
     },
     results = { { type = "item", name = "character", amount = 1 } },
   },
@@ -252,9 +252,9 @@ data:extend({
     energy_required = 10,
     enabled = false,
     ingredients = {
-      { "player-frame", 1 },
-      { "assembling-machine-2", 1 },
-      { "electric-furnace", 1 },
+      { type = "item", name = "player-frame", amount = 1 },
+      { type = "item", name = "assembling-machine-2", amount = 1 },
+      { type = "item", name = "electric-furnace", amount = 1 },
     },
     results = { { type = "item", name = "bob-character-miner", amount = 1 } },
   },
@@ -264,9 +264,9 @@ data:extend({
     energy_required = 10,
     enabled = false,
     ingredients = {
-      { "player-frame", 1 },
-      { "assembling-machine-2", 1 },
-      { "exoskeleton-equipment", 1 },
+      { type = "item", name = "player-frame", amount = 1 },
+      { type = "item", name = "assembling-machine-2", amount = 1 },
+      { type = "item", name = "exoskeleton-equipment", amount = 1 },
     },
     results = { { type = "item", name = "bob-character-fighter", amount = 1 } },
   },
@@ -276,8 +276,8 @@ data:extend({
     energy_required = 10,
     enabled = false,
     ingredients = {
-      { "player-frame", 1 },
-      { "assembling-machine-3", 1 },
+      { type = "item", name = "player-frame", amount = 1 },
+      { type = "item", name = "assembling-machine-3", amount = 1 },
     },
     results = { { type = "item", name = "bob-character-builder", amount = 1 } },
   },
@@ -288,8 +288,8 @@ data:extend({
     energy_required = 10,
     enabled = false,
     ingredients = {
-      { "player-frame-2", 1 },
-      { "assembling-machine-2", 1 },
+      { type = "item", name = "player-frame-2", amount = 1 },
+      { type = "item", name = "assembling-machine-2", amount = 1 },
     },
     results = { { type = "item", name = "bob-character-balanced-2", amount = 1 } },
   },
@@ -299,9 +299,9 @@ data:extend({
     energy_required = 10,
     enabled = false,
     ingredients = {
-      { "player-frame-2", 1 },
-      { "assembling-machine-2", 1 },
-      { "electric-furnace", 1 },
+      { type = "item", name = "player-frame-2", amount = 1 },
+      { type = "item", name = "assembling-machine-2", amount = 1 },
+      { type = "item", name = "electric-furnace", amount = 1 },
     },
     results = { { type = "item", name = "bob-character-miner-2", amount = 1 } },
   },
@@ -311,9 +311,9 @@ data:extend({
     energy_required = 10,
     enabled = false,
     ingredients = {
-      { "player-frame-2", 1 },
-      { "assembling-machine-2", 1 },
-      { "exoskeleton-equipment", 1 },
+      { type = "item", name = "player-frame-2", amount = 1 },
+      { type = "item", name = "assembling-machine-2", amount = 1 },
+      { type = "item", name = "exoskeleton-equipment", amount = 1 },
     },
     results = { { type = "item", name = "bob-character-fighter-2", amount = 1 } },
   },
@@ -323,8 +323,8 @@ data:extend({
     energy_required = 10,
     enabled = false,
     ingredients = {
-      { "player-frame-2", 1 },
-      { "assembling-machine-3", 1 },
+      { type = "item", name = "player-frame-2", amount = 1 },
+      { type = "item", name = "assembling-machine-3", amount = 1 },
     },
     results = { { type = "item", name = "bob-character-builder-2", amount = 1 } },
   },
@@ -335,9 +335,9 @@ data:extend({
     energy_required = 10,
     enabled = false,
     ingredients = {
-      { "player-frame-2", 1 },
-      { "assembling-machine-3", 1 },
-      { "electric-furnace", 1 },
+      { type = "item", name = "player-frame-2", amount = 1 },
+      { type = "item", name = "assembling-machine-3", amount = 1 },
+      { type = "item", name = "electric-furnace", amount = 1 },
     },
     results = { { type = "item", name = "bob-character-engineer", amount = 1 } },
   },
@@ -347,10 +347,10 @@ data:extend({
     energy_required = 10,
     enabled = false,
     ingredients = {
-      { "player-frame-2", 1 },
-      { "assembling-machine-2", 1 },
-      { "electric-furnace", 1 },
-      { "exoskeleton-equipment", 1 },
+      { type = "item", name = "player-frame-2", amount = 1 },
+      { type = "item", name = "assembling-machine-2", amount = 1 },
+      { type = "item", name = "electric-furnace", amount = 1 },
+      { type = "item", name = "exoskeleton-equipment", amount = 1 },
     },
     results = { { type = "item", name = "bob-character-prospector", amount = 1 } },
   },
diff --git a/bobclasses/prototypes/parts.lua b/bobclasses/prototypes/parts.lua
index 146f4585d..2f1fc865b 100644
--- a/bobclasses/prototypes/parts.lua
+++ b/bobclasses/prototypes/parts.lua
@@ -60,8 +60,8 @@ data:extend({
     energy_required = 3.5,
     enabled = false,
     ingredients = {
-      { "iron-plate", 5 },
-      { "advanced-circuit", 20 },
+      { type = "item", name = "iron-plate", amount = 5 },
+      { type = "item", name = "advanced-circuit", amount = 20 },
     },
     results = { { type = "item", name = "player-brain", amount = 1 } },
   },
@@ -71,8 +71,8 @@ data:extend({
     energy_required = 3.5,
     enabled = false,
     ingredients = {
-      { "steel-plate", 5 },
-      { "player-brain", 1 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "player-brain", amount = 1 },
     },
     results = { { type = "item", name = "player-head", amount = 1 } },
   },
@@ -82,8 +82,8 @@ data:extend({
     energy_required = 3.5,
     enabled = false,
     ingredients = {
-      { "steel-plate", 5 },
-      { "plastic-bar", 15 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "plastic-bar", amount = 15 },
     },
     results = { { type = "item", name = "player-boots", amount = 1 } },
   },
@@ -93,8 +93,8 @@ data:extend({
     energy_required = 3.5,
     enabled = false,
     ingredients = {
-      { "steel-plate", 5 },
-      { "iron-gear-wheel", 15 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "iron-gear-wheel", amount =15 },
     },
     results = { { type = "item", name = "player-gloves", amount = 1 } },
   },
@@ -104,8 +104,8 @@ data:extend({
     energy_required = 3.5,
     enabled = false,
     ingredients = {
-      { "battery", 15 },
-      { "advanced-circuit", 50 },
+      { type = "item", name = "battery", amount = 15 },
+      { type = "item", name = "advanced-circuit", amount = 50 },
     },
     results = { { type = "item", name = "player-power-core", amount = 1 } },
   },
@@ -115,14 +115,14 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "player-head", 1 },
-      { "player-boots", 1 },
-      { "player-gloves", 1 },
-      { "player-power-core", 1 },
-      { "electric-engine-unit", 8 },
-      { "steel-chest", 1 },
-      { "steel-plate", 5 },
-      { "advanced-circuit", 15 },
+      { type = "item", name = "player-head", amount = 1 },
+      { type = "item", name = "player-boots", amount = 1 },
+      { type = "item", name = "player-gloves", amount = 1 },
+      { type = "item", name = "player-power-core", amount = 1 },
+      { type = "item", name = "electric-engine-unit", amount = 8 },
+      { type = "item", name = "steel-chest", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "advanced-circuit", amount = 15 },
     },
     results = { { type = "item", name = "player-frame", amount = 1 } },
   },
@@ -181,9 +181,9 @@ data:extend({
     energy_required = 4,
     enabled = false,
     ingredients = {
-      { "steel-plate", 5 },
-      { "advanced-circuit", 10 },
-      { "processing-unit", 10 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "advanced-circuit", amount = 10 },
+      { type = "item", name = "processing-unit", amount = 10 },
     },
     results = { { type = "item", name = "player-brain-2", amount = 1 } },
   },
@@ -193,8 +193,8 @@ data:extend({
     energy_required = 4,
     enabled = false,
     ingredients = {
-      { "steel-plate", 5 },
-      { "player-brain-2", 1 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "player-brain-2", amount = 1 },
     },
     results = { { type = "item", name = "player-head-2", amount = 1 } },
   },
@@ -204,8 +204,8 @@ data:extend({
     energy_required = 4,
     enabled = false,
     ingredients = {
-      { "steel-plate", 5 },
-      { "plastic-bar", 15 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "plastic-bar", amount = 15 },
     },
     results = { { type = "item", name = "player-boots-2", amount = 1 } },
   },
@@ -215,8 +215,8 @@ data:extend({
     energy_required = 4,
     enabled = false,
     ingredients = {
-      { "steel-plate", 5 },
-      { "iron-gear-wheel", 15 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "iron-gear-wheel", amount = 15 },
     },
     results = { { type = "item", name = "player-gloves-2", amount = 1 } },
   },
@@ -226,14 +226,14 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "player-head-2", 1 },
-      { "player-boots-2", 1 },
-      { "player-gloves-2", 1 },
-      { "player-power-core", 1 },
-      { "electric-engine-unit", 12 },
-      { "steel-plate", 5 },
-      { "steel-chest", 1 },
-      { "processing-unit", 15 },
+      { type = "item", name = "player-head-2", amount = 1 },
+      { type = "item", name = "player-boots-2", amount = 1 },
+      { type = "item", name = "player-gloves-2", amount = 1 },
+      { type = "item", name = "player-power-core", amount = 1 },
+      { type = "item", name = "electric-engine-unit", amount = 12 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "steel-chest", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 15 },
     },
     results = { { type = "item", name = "player-frame-2", amount = 1 } },
   },
diff --git a/bobelectronics/prototypes/electronics.lua b/bobelectronics/prototypes/electronics.lua
index 325f688f8..05703f234 100644
--- a/bobelectronics/prototypes/electronics.lua
+++ b/bobelectronics/prototypes/electronics.lua
@@ -16,8 +16,8 @@ if data.raw.item["tin-plate"] then
       category = "electronics",
       enabled = false,
       ingredients = {
-        { "copper-cable", 3 },
-        { "tin-plate", 1 },
+        { type = "item", name = "copper-cable", amount = 3 },
+        { type = "item", name = "tin-plate", amount = 1 },
       },
       results = { { type = "item", name = "tinned-copper-cable", amount = 3 } },
       allow_decomposition = false,
@@ -42,8 +42,8 @@ data:extend({
     category = "electronics",
     enabled = false,
     ingredients = {
-      { "copper-cable", 2 },
-      { "rubber", 1 },
+      { type = "item", name = "copper-cable", amount = 2 },
+      { type = "item", name = "rubber", amount = 1 },
     },
     results = { { type = "item", name = "insulated-cable", amount = 2 } },
     allow_decomposition = false,
@@ -68,8 +68,8 @@ if data.raw.item["gold-plate"] then
       category = "electronics-machine",
       enabled = false,
       ingredients = {
-        { "copper-cable", 3 },
-        { "gold-plate", 1 },
+        { type = "item", name = "copper-cable", amount = 3 },
+        { type = "item", name = "gold-plate", amount = 1 },
       },
       results = { { type = "item", name = "gilded-copper-cable", amount = 3 } },
       allow_decomposition = false,
@@ -96,8 +96,8 @@ if data.raw.item["solder-alloy"] then
       energy_required = 2,
       enabled = false,
       ingredients = {
-        { "solder-alloy", 4 },
-        { "resin", 1 },
+        { type = "item", name = "solder-alloy", amount = 4 },
+        { type = "item", name = "resin", amount = 1 },
       },
       results = { { type = "item", name = "solder", amount = 8 } },
       allow_decomposition = false,
@@ -123,8 +123,8 @@ data:extend({
     energy_required = 2,
     enabled = false,
     ingredients = {
-      { "copper-cable", 1 },
-      { "coal", 1 },
+      { type = "item", name = "copper-cable", amount = 1 },
+      { type = "item", name = "coal", amount = 1 },
     },
     results = { { type = "item", name = "basic-electronic-components", amount = 5 } },
     allow_decomposition = false,
@@ -149,8 +149,8 @@ data:extend({
     energy_required = 3.5,
     enabled = false,
     ingredients = {
-      { "copper-cable", 1 },
-      { "plastic-bar", 1 },
+      { type = "item", name = "copper-cable", amount = 1 },
+      { type = "item", name = "plastic-bar", amount = 1 },
     },
     results = { { type = "item", name = "electronic-components", amount = 5 } },
     allow_decomposition = false,
@@ -175,8 +175,8 @@ data:extend({
     energy_required = 5,
     enabled = false,
     ingredients = {
-      { "copper-cable", 1 },
-      { "plastic-bar", 1 },
+      { type = "item", name = "copper-cable", amount = 1 },
+      { type = "item", name = "plastic-bar", amount = 1 },
       { type = "fluid", name = "sulfuric-acid", amount = 5 },
     },
     results = { { type = "item", name = "intergrated-electronics", amount = 5 } },
@@ -202,8 +202,8 @@ data:extend({
     energy_required = 7,
     enabled = false,
     ingredients = {
-      { "copper-cable", 2 },
-      { "plastic-bar", 1 },
+      { type = "item", name = "copper-cable", amount = 2 },
+      { type = "item", name = "plastic-bar", amount = 1 },
       { type = "fluid", name = "sulfuric-acid", amount = 5 },
     },
     results = { { type = "item", name = "processing-electronics", amount = 5 } },
@@ -227,7 +227,7 @@ data:extend({
     name = "wooden-board",
     category = "electronics",
     ingredients = {
-      { "wood", 1 },
+      { type = "item", name = "wood", amount = 1 },
     },
     results = { { type = "item", name = "wooden-board", amount = 2 } },
   },
@@ -250,8 +250,8 @@ data:extend({
     category = "electronics-machine",
     enabled = false,
     ingredients = {
-      { "wood", 1 },
-      { "resin", 1 },
+      { type = "item", name = "wood", amount = 1 },
+      { type = "item", name = "resin", amount = 1 },
     },
     results = { { type = "item", name = "phenolic-board", amount = 2 } },
   },
@@ -274,7 +274,7 @@ data:extend({
     category = "electronics-machine",
     enabled = false,
     ingredients = {
-      { "plastic-bar", 1 },
+      { type = "item", name = "plastic-bar", amount = 1 },
     },
     results = { { type = "item", name = "fibreglass-board", amount = 2 } },
   },
@@ -297,8 +297,8 @@ data:extend({
     category = "electronics",
     energy_required = 1,
     ingredients = {
-      { "wooden-board", 1 },
-      { "copper-cable", 3 },
+      { type = "item", name = "wooden-board", amount = 1 },
+      { type = "item", name = "copper-cable", amount = 3 },
     },
     results = { { type = "item", name = "basic-circuit-board", amount = 1 } },
     allow_decomposition = false,
@@ -323,8 +323,8 @@ data:extend({
     energy_required = 5,
     enabled = false,
     ingredients = {
-      { "phenolic-board", 1 },
-      { "copper-plate", 1 },
+      { type = "item", name = "phenolic-board", amount = 1 },
+      { type = "item", name = "copper-plate", amount = 1 },
       { type = "fluid", name = "ferric-chloride-solution", amount = 5 },
     },
     results = { { type = "item", name = "circuit-board", amount = 1 } },
@@ -350,8 +350,8 @@ data:extend({
     energy_required = 10,
     enabled = false,
     ingredients = {
-      { "fibreglass-board", 1 },
-      { "copper-plate", 1 },
+      { type = "item", name = "fibreglass-board", amount = 1 },
+      { type = "item", name = "copper-plate", amount = 1 },
       { type = "fluid", name = "ferric-chloride-solution", amount = 5 },
     },
     results = { { type = "item", name = "superior-circuit-board", amount = 1 } },
@@ -377,8 +377,8 @@ data:extend({
     energy_required = 15,
     enabled = false,
     ingredients = {
-      { "fibreglass-board", 1 },
-      { "copper-plate", 2 },
+      { type = "item", name = "fibreglass-board", amount = 1 },
+      { type = "item", name = "copper-plate", amount = 2 },
       { type = "fluid", name = "ferric-chloride-solution", amount = 10 },
     },
     results = { { type = "item", name = "multi-layer-circuit-board", amount = 1 } },
@@ -404,8 +404,8 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "basic-circuit-board", 1 },
-      { "basic-electronic-components", 5 },
+      { type = "item", name = "basic-circuit-board", amount = 1 },
+      { type = "item", name = "basic-electronic-components", amount = 5 },
     },
     results = { { type = "item", name = "electronic-circuit", amount = 1 } },
     allow_decomposition = false,
@@ -430,9 +430,9 @@ data:extend({
     energy_required = 5,
     enabled = false,
     ingredients = {
-      { "circuit-board", 1 },
-      { "basic-electronic-components", 4 },
-      { "electronic-components", 4 },
+      { type = "item", name = "circuit-board", amount = 1 },
+      { type = "item", name = "basic-electronic-components", amount = 4 },
+      { type = "item", name = "electronic-components", amount = 4 },
     },
     results = { { type = "item", name = "advanced-circuit", amount = 1 } },
     allow_decomposition = false,
@@ -457,10 +457,10 @@ data:extend({
     energy_required = 10,
     enabled = false,
     ingredients = {
-      { "superior-circuit-board", 1 },
-      { "basic-electronic-components", 2 },
-      { "electronic-components", 4 },
-      { "intergrated-electronics", 2 },
+      { type = "item", name = "superior-circuit-board", amount = 1 },
+      { type = "item", name = "basic-electronic-components", amount = 2 },
+      { type = "item", name = "electronic-components", amount = 4 },
+      { type = "item", name = "intergrated-electronics", amount = 2 },
     },
     results = { { type = "item", name = "processing-unit", amount = 1 } },
     allow_decomposition = false,
@@ -485,11 +485,11 @@ data:extend({
     energy_required = 15,
     enabled = false,
     ingredients = {
-      { "multi-layer-circuit-board", 1 },
-      { "basic-electronic-components", 1 },
-      { "electronic-components", 2 },
-      { "intergrated-electronics", 4 },
-      { "processing-electronics", 1 },
+      { type = "item", name = "multi-layer-circuit-board", amount = 1 },
+      { type = "item", name = "basic-electronic-components", amount = 1 },
+      { type = "item", name = "electronic-components", amount = 2 },
+      { type = "item", name = "intergrated-electronics", amount = 4 },
+      { type = "item", name = "processing-electronics", amount = 1 },
     },
     results = { { type = "item", name = "advanced-processing-unit", amount = 1 } },
     allow_decomposition = false,
diff --git a/bobelectronics/prototypes/recipe-updates.lua b/bobelectronics/prototypes/recipe-updates.lua
index 2bed7bc37..39ad37bcb 100644
--- a/bobelectronics/prototypes/recipe-updates.lua
+++ b/bobelectronics/prototypes/recipe-updates.lua
@@ -15,8 +15,8 @@ for i, recipe in pairs(data.raw.recipe) do
   end
 end
 
-data.raw.recipe["red-wire"].ingredients = { { "insulated-cable", 1 } }
-data.raw.recipe["green-wire"].ingredients = { { "insulated-cable", 1 } }
+data.raw.recipe["red-wire"].ingredients = { { type = "item", name = "insulated-cable", amount = 1 } }
+data.raw.recipe["green-wire"].ingredients = { { type = "item", name = "insulated-cable", amount = 1 } }
 
 if data.raw.fluid["hydrogen-chloride"] then
   bobmods.lib.recipe.replace_ingredient("ferric-chloride-solution", "water", "hydrogen-chloride")
@@ -34,18 +34,18 @@ if data.raw.item["carbon"] then
 end
 
 if data.raw.item["silicon-wafer"] then
-  bobmods.lib.recipe.add_ingredient("electronic-components", { "silicon-wafer", 2 })
-  bobmods.lib.recipe.add_ingredient("intergrated-electronics", { "silicon-wafer", 4 })
-  bobmods.lib.recipe.add_ingredient("processing-electronics", { "silicon-wafer", 6 })
+  bobmods.lib.recipe.add_ingredient("electronic-components", { type = "item", name = "silicon-wafer", amount = 2 })
+  bobmods.lib.recipe.add_ingredient("intergrated-electronics", { type = "item", name = "silicon-wafer", amount = 4 })
+  bobmods.lib.recipe.add_ingredient("processing-electronics", { type = "item", name = "silicon-wafer", amount = 6 })
 else
   if data.raw.item["silicon"] then
-    bobmods.lib.recipe.add_ingredient("electronic-components", { "silicon", 1 })
-    bobmods.lib.recipe.add_ingredient("intergrated-electronics", { "silicon", 2 })
-    bobmods.lib.recipe.add_ingredient("processing-electronics", { "silicon", 3 })
+    bobmods.lib.recipe.add_ingredient("electronic-components", { type = "item", name = "silicon", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("intergrated-electronics", { type = "item", name = "silicon",amount = 2 })
+    bobmods.lib.recipe.add_ingredient("processing-electronics", { type = "item", name = "silicon", amount = 3 })
   else
-    bobmods.lib.recipe.add_ingredient("electronic-components", { "copper-plate", 1 })
-    bobmods.lib.recipe.add_ingredient("intergrated-electronics", { "copper-plate", 2 })
-    bobmods.lib.recipe.add_ingredient("processing-electronics", { "copper-plate", 3 })
+    bobmods.lib.recipe.add_ingredient("electronic-components", { type = "item", name = "copper-plate", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("intergrated-electronics", { type = "item", name = "copper-plate", amount = 2 })
+    bobmods.lib.recipe.add_ingredient("processing-electronics", { type = "item", name = "copper-plate", amount = 3 })
   end
 end
 
@@ -62,33 +62,33 @@ if data.raw.item["silicon-nitride"] then
 end
 
 if data.raw.item["glass"] then
-  bobmods.lib.recipe.add_ingredient("fibreglass-board", { "glass", 1 })
+  bobmods.lib.recipe.add_ingredient("fibreglass-board", { type = "item", name = "glass", amount = 1 })
 else
-  bobmods.lib.recipe.add_ingredient("fibreglass-board", { "plastic-bar", 1 })
+  bobmods.lib.recipe.add_ingredient("fibreglass-board", { type = "item", name = "plastic-bar", amount = 1 })
 end
 
 if data.raw.item["tin-plate"] then
-  bobmods.lib.recipe.add_ingredient("circuit-board", { "tin-plate", 1 })
+  bobmods.lib.recipe.add_ingredient("circuit-board", { type = "item", name = "tin-plate", amount = 1 })
 else
-  bobmods.lib.recipe.add_ingredient("circuit-board", { "copper-plate", 1 })
+  bobmods.lib.recipe.add_ingredient("circuit-board", { type = "item", name = "copper-plate", amount = 1 })
 end
 
 if data.raw.item["gold-plate"] then
-  bobmods.lib.recipe.add_ingredient("superior-circuit-board", { "gold-plate", 1 })
-  bobmods.lib.recipe.add_ingredient("multi-layer-circuit-board", { "gold-plate", 2 })
+  bobmods.lib.recipe.add_ingredient("superior-circuit-board", { type = "item", name = "gold-plate", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("multi-layer-circuit-board", { type = "item", name = "gold-plate", amount = 2 })
 else
   if data.raw.item["tin-plate"] then
-    bobmods.lib.recipe.add_ingredient("superior-circuit-board", { "tin-plate", 1 })
-    bobmods.lib.recipe.add_ingredient("multi-layer-circuit-board", { "tin-plate", 2 })
+    bobmods.lib.recipe.add_ingredient("superior-circuit-board", { type = "item", name = "tin-plate", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("multi-layer-circuit-board", { type = "item", name = "tin-plate", amount = 2 })
   else
-    bobmods.lib.recipe.add_ingredient("superior-circuit-board", { "copper-plate", 1 })
-    bobmods.lib.recipe.add_ingredient("multi-layer-circuit-board", { "copper-plate", 2 })
+    bobmods.lib.recipe.add_ingredient("superior-circuit-board", { type = "item", name = "copper-plate", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("multi-layer-circuit-board", { type = "item", name = "copper-plate", amount = 2 })
   end
 end
 
 if data.raw.item["solder"] then
-  bobmods.lib.recipe.add_ingredient("electronic-circuit", { "solder", 1 })
-  bobmods.lib.recipe.add_ingredient("advanced-circuit", { "solder", 1 })
-  bobmods.lib.recipe.add_ingredient("processing-unit", { "solder", 2 })
-  bobmods.lib.recipe.add_ingredient("advanced-processing-unit", { "solder", 4 })
+  bobmods.lib.recipe.add_ingredient("electronic-circuit", { type = "item", name = "solder", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("advanced-circuit", { type = "item", name = "solder", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("processing-unit", { type = "item", name = "solder", amount = 2 })
+  bobmods.lib.recipe.add_ingredient("advanced-processing-unit", { type = "item", name = "solder", amount = 4 })
 end
diff --git a/bobelectronics/prototypes/resource.lua b/bobelectronics/prototypes/resource.lua
index 16b94d0c9..96732a31c 100644
--- a/bobelectronics/prototypes/resource.lua
+++ b/bobelectronics/prototypes/resource.lua
@@ -17,7 +17,7 @@ data:extend({
     energy_required = 1,
     enabled = false,
     ingredients = {
-      { "wood", 1 },
+      { type = "item", name = "wood", amount = 1 },
     },
     results = { { type = "item", name = "resin", amount = 1 } },
     allow_decomposition = false,
@@ -62,7 +62,7 @@ data:extend({
     energy_required = 3.5,
     enabled = false,
     ingredients = {
-      { "resin", 1 },
+      { type = "item", name = "resin", amount = 1 },
     },
     results = { { type = "item", name = "rubber", amount = 1 } },
     allow_decomposition = false,
@@ -118,9 +118,9 @@ if not data.raw.item["silicon-wafer"] then
     })
 
     if data.raw.item["silicon"] then
-      table.insert(data.raw.recipe["silicon-wafer"].ingredients, { "silicon", 1 })
+      table.insert(data.raw.recipe["silicon-wafer"].ingredients, { "silicon", amount = 1 })
     else
-      table.insert(data.raw.recipe["silicon-wafer"].ingredients, { "silicon-plate", 1 })
+      table.insert(data.raw.recipe["silicon-wafer"].ingredients, { "silicon-plate", amount = 1 })
     end
   end
 end
@@ -144,15 +144,15 @@ if data.raw.item["tin-plate"] then
       enabled = false,
       category = "crafting-machine",
       ingredients = {
-        { "tin-plate", 9 },
-        { "copper-plate", 1 },
+        { type = "item", name = "tin-plate", amount = 9 },
+        { type = "item", name = "copper-plate", amount = 1 },
       },
       results = { { type = "item", name = "solder-alloy", amount = 11 } },
       allow_decomposition = false,
     },
   })
   if data.raw.item["silver-plate"] then
-    table.insert(data.raw.recipe["solder-alloy"].ingredients, { "silver-plate", 1 })
+    table.insert(data.raw.recipe["solder-alloy"].ingredients, { type = "item", name = "silver-plate", amount = 1 })
   end
 
   if data.raw.item["lead-plate"] then
@@ -164,8 +164,8 @@ if data.raw.item["tin-plate"] then
         enabled = false,
         category = "crafting-machine",
         ingredients = {
-          { "tin-plate", 4 },
-          { "lead-plate", 7 },
+          { type = "item", name = "tin-plate", amount = 4 },
+          { type = "item", name = "lead-plate", amount = 7 },
         },
         results = { { type = "item", name = "solder-alloy", amount = 11 } },
         allow_decomposition = false,
diff --git a/bobenemies/prototypes/alien-artifact.lua b/bobenemies/prototypes/alien-artifact.lua
index 05a19dfe1..966e80fb3 100644
--- a/bobenemies/prototypes/alien-artifact.lua
+++ b/bobenemies/prototypes/alien-artifact.lua
@@ -31,7 +31,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then
         name = "alien-artifact-from-small",
         results = { { type = "item", name = "alien-artifact", amount = 1 } },
         ingredients = {
-          { "small-alien-artifact", 25 },
+          { type = "item", name = "small-alien-artifact", amount = 25 },
         },
         energy_required = 1,
         enabled = "true",
@@ -57,8 +57,8 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then
         name = "alien-artifact-red-from-basic",
         results = { { type = "item", name = "alien-artifact-red", amount = 5 } },
         ingredients = {
-          { "alien-artifact-red", 1 },
-          { "alien-artifact", 5 },
+          { type = "item", name = "alien-artifact-red", amount = 1 },
+          { type = "item", name = "alien-artifact", amount = 5 },
         },
         energy_required = 1,
         enabled = "true",
@@ -80,8 +80,8 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then
         name = "alien-artifact-orange-from-basic",
         results = { { type = "item", name = "alien-artifact-orange", amount = 5 } },
         ingredients = {
-          { "alien-artifact-orange", 1 },
-          { "alien-artifact", 5 },
+          { type = "item", name = "alien-artifact-orange", amount = 1 },
+          { type = "item", name = "alien-artifact", amount = 5 },
         },
         energy_required = 1,
         enabled = "true",
@@ -103,8 +103,8 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then
         name = "alien-artifact-yellow-from-basic",
         results = { { type = "item", name = "alien-artifact-yellow", amount = 5 } },
         ingredients = {
-          { "alien-artifact-yellow", 1 },
-          { "alien-artifact", 5 },
+          { type = "item", name = "alien-artifact-yellow", amount = 1 },
+          { type = "item", name = "alien-artifact", amount = 5 },
         },
         energy_required = 1,
         enabled = "true",
@@ -126,8 +126,8 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then
         name = "alien-artifact-green-from-basic",
         results = { { type = "item", name = "alien-artifact-green", amount = 5 } },
         ingredients = {
-          { "alien-artifact-green", 1 },
-          { "alien-artifact", 5 },
+          { type = "item", name = "alien-artifact-green", amount = 1 },
+          { type = "item", name = "alien-artifact", amount = 5 },
         },
         energy_required = 1,
         enabled = "true",
@@ -149,8 +149,8 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then
         name = "alien-artifact-blue-from-basic",
         results = { { type = "item", name = "alien-artifact-blue", amount = 5 } },
         ingredients = {
-          { "alien-artifact-blue", 1 },
-          { "alien-artifact", 5 },
+          { type = "item", name = "alien-artifact-blue", amount = 1 },
+          { type = "item", name = "alien-artifact", amount = 5 },
         },
         energy_required = 1,
         enabled = "true",
@@ -172,8 +172,8 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then
         name = "alien-artifact-purple-from-basic",
         results = { { type = "item", name = "alien-artifact-purple", amount = 5 } },
         ingredients = {
-          { "alien-artifact-purple", 1 },
-          { "alien-artifact", 5 },
+          { type = "item", name = "alien-artifact-purple", amount = 1 },
+          { type = "item", name = "alien-artifact", amount = 5 },
         },
         energy_required = 1,
         enabled = "true",
@@ -198,7 +198,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then
           name = "alien-artifact-red-from-small",
           results = { { type = "item", name = "alien-artifact-red", amount = 1 } },
           ingredients = {
-            { "small-alien-artifact-red", 25 },
+            { type = "item", name = "small-alien-artifact-red", amount = 25 },
           },
           energy_required = 1,
           enabled = "true",
@@ -222,7 +222,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then
           name = "alien-artifact-orange-from-small",
           results = { { type = "item", name = "alien-artifact-orange", amount = 1 } },
           ingredients = {
-            { "small-alien-artifact-orange", 25 },
+            { type = "item", name = "small-alien-artifact-orange", amount = 25 },
           },
           energy_required = 1,
           enabled = "true",
@@ -246,7 +246,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then
           name = "alien-artifact-yellow-from-small",
           results = { { type = "item", name = "alien-artifact-yellow", amount = 1 } },
           ingredients = {
-            { "small-alien-artifact-yellow", 25 },
+            { type = "item", name = "small-alien-artifact-yellow", amount = 25 },
           },
           energy_required = 1,
           enabled = "true",
@@ -270,7 +270,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then
           name = "alien-artifact-green-from-small",
           results = { { type = "item", name = "alien-artifact-green", amount = 1 } },
           ingredients = {
-            { "small-alien-artifact-green", 25 },
+            { type = "item", name = "small-alien-artifact-green", amount = 25 },
           },
           energy_required = 1,
           enabled = "true",
@@ -294,7 +294,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then
           name = "alien-artifact-blue-from-small",
           results = { { type = "item", name = "alien-artifact-blue", amount = 1 } },
           ingredients = {
-            { "small-alien-artifact-blue", 25 },
+            { type = "item", name = "small-alien-artifact-blue", amount = 25 },
           },
           energy_required = 1,
           enabled = "true",
@@ -318,7 +318,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then
           name = "alien-artifact-purple-from-small",
           results = { { type = "item", name = "alien-artifact-purple", amount = 1 } },
           ingredients = {
-            { "small-alien-artifact-purple", 25 },
+            { type = "item", name = "small-alien-artifact-purple", amount = 25 },
           },
           energy_required = 1,
           enabled = "true",
diff --git a/bobequipment/prototypes/personal-roboport.lua b/bobequipment/prototypes/personal-roboport.lua
index e0f1ae572..0e5767e4c 100644
--- a/bobequipment/prototypes/personal-roboport.lua
+++ b/bobequipment/prototypes/personal-roboport.lua
@@ -59,11 +59,11 @@ data:extend({
     enabled = false,
     energy_required = 30,
     ingredients = {
-      { "personal-roboport-mk2-equipment", 1 },
-      { "processing-unit", 20 },
-      { "iron-gear-wheel", 40 },
-      { "steel-plate", 20 },
-      { "battery", 20 },
+      { type = "item", name = "personal-roboport-mk2-equipment", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 20 },
+      { type = "item", name = "iron-gear-wheel", amount = 40 },
+      { type = "item", name = "steel-plate", amount = 20 },
+      { type = "item", name = "battery", amount = 20 },
     },
     results = { { type = "item", name = "personal-roboport-mk3-equipment", amount = 1 } },
   },
@@ -73,11 +73,11 @@ data:extend({
     enabled = false,
     energy_required = 40,
     ingredients = {
-      { "personal-roboport-mk3-equipment", 1 },
-      { "processing-unit", 20 },
-      { "iron-gear-wheel", 40 },
-      { "steel-plate", 20 },
-      { "battery", 20 },
+      { type = "item", name = "personal-roboport-mk3-equipment", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 20 },
+      { type = "item", name = "iron-gear-wheel", amount = 40 },
+      { type = "item", name = "steel-plate", amount = 20 },
+      { type = "item", name = "battery", amount = 20 },
     },
     results = { { type = "item", name = "personal-roboport-mk4-equipment", amount = 1 } },
   },
@@ -980,9 +980,9 @@ data:extend({
     enabled = false,
     energy_required = 4,
     ingredients = {
-      { "advanced-circuit", 5 },
-      { "iron-gear-wheel", 20 },
-      { "steel-plate", 10 },
+      { type = "item", name = "advanced-circuit", amount = 5 },
+      { type = "item", name = "iron-gear-wheel", amount = 20 },
+      { type = "item", name = "steel-plate", amount = 10 },
     },
     results = { { type = "item", name = "personal-roboport-antenna-equipment", amount = 1 } },
   },
@@ -992,10 +992,10 @@ data:extend({
     enabled = false,
     energy_required = 8,
     ingredients = {
-      { "personal-roboport-antenna-equipment", 1 },
-      { "advanced-circuit", 5 },
-      { "iron-gear-wheel", 20 },
-      { "steel-plate", 10 },
+      { type = "item", name = "personal-roboport-antenna-equipment", amount = 1 },
+      { type = "item", name = "advanced-circuit", amount = 5 },
+      { type = "item", name = "iron-gear-wheel", amount = 20 },
+      { type = "item", name = "steel-plate", amount = 10 },
     },
     results = { { type = "item", name = "personal-roboport-antenna-equipment-2", amount = 1 } },
   },
@@ -1005,10 +1005,10 @@ data:extend({
     enabled = false,
     energy_required = 12,
     ingredients = {
-      { "personal-roboport-antenna-equipment-2", 1 },
-      { "processing-unit", 5 },
-      { "iron-gear-wheel", 20 },
-      { "steel-plate", 10 },
+      { type = "item", name = "personal-roboport-antenna-equipment-2", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 5 },
+      { type = "item", name = "iron-gear-wheel", amount = 20 },
+      { type = "item", name = "steel-plate", amount = 10 },
     },
     results = { { type = "item", name = "personal-roboport-antenna-equipment-3", amount = 1 } },
   },
@@ -1018,10 +1018,10 @@ data:extend({
     enabled = false,
     energy_required = 16,
     ingredients = {
-      { "personal-roboport-antenna-equipment-3", 1 },
-      { "processing-unit", 5 },
-      { "iron-gear-wheel", 20 },
-      { "steel-plate", 10 },
+      { type = "item", name = "personal-roboport-antenna-equipment-3", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 5 },
+      { type = "item", name = "iron-gear-wheel", amount = 20 },
+      { type = "item", name = "steel-plate", amount = 10 },
     },
     results = { { type = "item", name = "personal-roboport-antenna-equipment-4", amount = 1 } },
   },
@@ -1032,9 +1032,9 @@ data:extend({
     enabled = false,
     energy_required = 4,
     ingredients = {
-      { "advanced-circuit", 2 },
-      { "steel-plate", 5 },
-      { "battery", 20 },
+      { type = "item", name = "advanced-circuit", amount = 2 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "battery", amount = 20 },
     },
     results = { { type = "item", name = "personal-roboport-chargepad-equipment", amount = 1 } },
   },
@@ -1044,10 +1044,10 @@ data:extend({
     enabled = false,
     energy_required = 8,
     ingredients = {
-      { "personal-roboport-chargepad-equipment", 1 },
-      { "advanced-circuit", 5 },
-      { "steel-plate", 5 },
-      { "battery", 20 },
+      { type = "item", name = "personal-roboport-chargepad-equipment", amount = 1 },
+      { type = "item", name = "advanced-circuit", amount = 5 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "battery", amount = 20 },
     },
     results = { { type = "item", name = "personal-roboport-chargepad-equipment-2", amount = 1 } },
   },
@@ -1057,10 +1057,10 @@ data:extend({
     enabled = false,
     energy_required = 12,
     ingredients = {
-      { "personal-roboport-chargepad-equipment-2", 1 },
-      { "processing-unit", 5 },
-      { "steel-plate", 5 },
-      { "battery", 20 },
+      { type = "item", name = "personal-roboport-chargepad-equipment-2", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 5 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "battery", amount = 20 },
     },
     results = { { type = "item", name = "personal-roboport-chargepad-equipment-3", amount = 1 } },
   },
@@ -1070,10 +1070,10 @@ data:extend({
     enabled = false,
     energy_required = 16,
     ingredients = {
-      { "personal-roboport-chargepad-equipment-3", 1 },
-      { "processing-unit", 5 },
-      { "steel-plate", 5 },
-      { "battery", 20 },
+      { type = "item", name = "personal-roboport-chargepad-equipment-3", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 5 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "battery", amount = 20 },
     },
     results = { { type = "item", name = "personal-roboport-chargepad-equipment-4", amount = 1 } },
   },
@@ -1084,7 +1084,7 @@ data:extend({
     enabled = false,
     energy_required = 2,
     ingredients = {
-      { "electronic-circuit", 10 },
+      { type = "item", name = "electronic-circuit", amount = 10 },
     },
     results = { { type = "item", name = "personal-roboport-robot-equipment", amount = 1 } },
   },
@@ -1094,8 +1094,8 @@ data:extend({
     enabled = false,
     energy_required = 4,
     ingredients = {
-      { "personal-roboport-robot-equipment", 1 },
-      { "advanced-circuit", 10 },
+      { type = "item", name = "personal-roboport-robot-equipment", amount = 1 },
+      { type = "item", name = "advanced-circuit", amount = 10 },
     },
     results = { { type = "item", name = "personal-roboport-robot-equipment-2", amount = 1 } },
   },
@@ -1105,8 +1105,8 @@ data:extend({
     enabled = false,
     energy_required = 6,
     ingredients = {
-      { "personal-roboport-robot-equipment-2", 1 },
-      { "processing-unit", 10 },
+      { type = "item", name = "personal-roboport-robot-equipment-2", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 10 },
     },
     results = { { type = "item", name = "personal-roboport-robot-equipment-3", amount = 1 } },
   },
@@ -1116,8 +1116,8 @@ data:extend({
     enabled = false,
     energy_required = 8,
     ingredients = {
-      { "personal-roboport-robot-equipment-3", 1 },
-      { "processing-unit", 10 },
+      { type = "item", name = "personal-roboport-robot-equipment-3", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 10 },
     },
     results = { { type = "item", name = "personal-roboport-robot-equipment-4", amount = 1 } },
   },
diff --git a/bobequipment/prototypes/recipe/equipment.lua b/bobequipment/prototypes/recipe/equipment.lua
index 3cc1fa2f9..f56a49457 100644
--- a/bobequipment/prototypes/recipe/equipment.lua
+++ b/bobequipment/prototypes/recipe/equipment.lua
@@ -1,8 +1,8 @@
 bobmods.lib.recipe.replace_ingredient("energy-shield-equipment", "advanced-circuit", "electronic-circuit")
 data.raw.recipe["energy-shield-mk2-equipment"].ingredients = {
-  { "energy-shield-equipment", 2 },
-  { "advanced-circuit", 5 },
-  { "productivity-module", 1 },
+  { type = "item", name = "energy-shield-equipment", amount = 2 },
+  { type = "item", name = "advanced-circuit", amount = 5 },
+  { type = "item", name = "productivity-module", amount = 1 },
 }
 
 data:extend({
@@ -12,9 +12,9 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "energy-shield-mk2-equipment", 2 },
-      { "processing-unit", 5 },
-      { "productivity-module-2", 1 },
+      { type = "item", name = "energy-shield-mk2-equipment", amount = 2 },
+      { type = "item", name = "processing-unit", amount = 5 },
+      { type = "item", name = "productivity-module-2", amount = 1 },
     },
     results = { { type = "item", name = "energy-shield-mk3-equipment", amount = 1 } },
   },
@@ -24,12 +24,12 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "energy-shield-mk3-equipment", 2 },
-      { "processing-unit", 5 },
-      { "effectivity-module-3", 1 },
-      { "productivity-module-3", 1 },
+      { type = "item", name = "energy-shield-mk3-equipment", amount = 2 },
+      { type = "item", name = "processing-unit", amount = 5 },
+      { type = "item", name = "effectivity-module-3", amount = 1 },
+      { type = "item", name = "productivity-module-3", amount = 1 },
     },
-    results = { { type = "item", name = "energy-shield-mk4-equipment", amount = 1 } },
+    results = { { type = "item", name = "energy-shield-mk4-equipment", amount = amount = 1 } },
   },
   {
     type = "recipe",
@@ -37,10 +37,10 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "energy-shield-mk4-equipment", 2 },
-      { "processing-unit", 5 },
-      { "effectivity-module-3", 1 },
-      { "productivity-module-3", 1 },
+      { type = "item", name = "energy-shield-mk4-equipment", amount = 2 },
+      { type = "item", name = "processing-unit", amount = 5 },
+      { type = "item", name = "effectivity-module-3", amount = 1 },
+      { type = "item", name = "productivity-module-3", amount = 1 },
     },
     results = { { type = "item", name = "energy-shield-mk5-equipment", amount = 1 } },
   },
@@ -50,21 +50,21 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "energy-shield-mk5-equipment", 2 },
-      { "processing-unit", 5 },
-      { "effectivity-module-3", 1 },
-      { "productivity-module-3", 1 },
+      { type = "item", name = "energy-shield-mk5-equipment", amount = 2 },
+      { type = "item", name = "processing-unit", amount = 5 },
+      { type = "item", name = "effectivity-module-3", amount = 1 },
+      { type = "item", name = "productivity-module-3", amount = 1 },
     },
     results = { { type = "item", name = "energy-shield-mk6-equipment", amount = 1 } },
   },
 })
 
 bobmods.lib.recipe.remove_ingredient("battery-equipment", "steel-plate")
-bobmods.lib.recipe.add_ingredient("battery-equipment", { "electronic-circuit", 5 })
+bobmods.lib.recipe.add_ingredient("battery-equipment", { type = "item", name = "electronic-circuit", amount = 5 })
 
 data.raw.recipe["battery-mk2-equipment"].ingredients = {
-  { "battery-equipment", 2 },
-  { "advanced-circuit", 5 },
+  { type = "item", name = "battery-equipment",amount =  2 },
+  { type = "item", name = "advanced-circuit", amount = 5 },
 }
 
 data:extend({
@@ -74,8 +74,8 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "battery-mk2-equipment", 2 },
-      { "battery", 5 },
+      { type = "item", name = "battery-mk2-equipment", amount = 2 },
+      { type = "item", name = "battery", amount = 5 },
     },
     results = { { type = "item", name = "battery-mk3-equipment", amount = 1 } },
   },
@@ -85,8 +85,8 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "battery-mk3-equipment", 2 },
-      { "processing-unit", 5 },
+      { type = "item", name = "battery-mk3-equipment", amount = 2 },
+      { type = "item", name = "processing-unit", amount = 5 },
     },
     results = { { type = "item", name = "battery-mk4-equipment", amount = 1 } },
   },
@@ -96,8 +96,8 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "battery-mk4-equipment", 2 },
-      { "battery", 5 },
+      { type = "item", name = "battery-mk4-equipment", amount = 2 },
+      { type = "item", name = "battery", amount = 5 },
     },
     results = { { type = "item", name = "battery-mk5-equipment", amount = 1 } },
   },
@@ -107,8 +107,8 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "battery-mk5-equipment", 2 },
-      { "processing-unit", 5 },
+      { type = "item", name = "battery-mk5-equipment", amount = 2 },
+      { type = "item", name = "processing-unit", amount = 5 },
     },
     results = { { type = "item", name = "battery-mk6-equipment", amount = 1 } },
   },
@@ -121,11 +121,11 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "fusion-reactor-equipment", 1 },
-      { "processing-unit", 50 },
-      { "effectivity-module-3", 2 },
-      { "speed-module-3", 2 },
-      { "productivity-module-3", 2 },
+      { type = "item", name = "fusion-reactor-equipment", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 50 },
+      { type = "item", name = "effectivity-module-3", amount = 2 },
+      { type = "item", name = "speed-module-3", amount = 2 },
+      { type = "item", name = "productivity-module-3", amount = 2 },
     },
     results = { { type = "item", name = "fusion-reactor-equipment-2", amount = 1 } },
   },
@@ -135,11 +135,11 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "fusion-reactor-equipment-2", 1 },
-      { "processing-unit", 50 },
-      { "effectivity-module-3", 2 },
-      { "speed-module-3", 2 },
-      { "productivity-module-3", 2 },
+      { type = "item", name = "fusion-reactor-equipment-2", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 50 },
+      { type = "item", name = "effectivity-module-3", amount = 2 },
+      { type = "item", name = "speed-module-3", amount = 2 },
+      { type = "item", name = "productivity-module-3", amount = 2 },
     },
     results = { { type = "item", name = "fusion-reactor-equipment-3", amount = 1 } },
   },
@@ -149,11 +149,11 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "fusion-reactor-equipment-3", 1 },
-      { "processing-unit", 50 },
-      { "effectivity-module-3", 2 },
-      { "speed-module-3", 2 },
-      { "productivity-module-3", 2 },
+      { type = "item", name = "fusion-reactor-equipment-3", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 50 },
+      { type = "item", name = "effectivity-module-3", amount = 2 },
+      { type = "item", name = "speed-module-3", amount = 2 },
+      { type = "item", name = "productivity-module-3", amount = 2 },
     },
     results = { { type = "item", name = "fusion-reactor-equipment-4", amount = 1 } },
   },
@@ -167,9 +167,9 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "night-vision-equipment", 1 },
-      { "advanced-circuit", 5 },
-      { "plastic-bar", 2 },
+      { type = "item", name = "night-vision-equipment", amount = 1 },
+      { type = "item", name = "advanced-circuit", amount = 5 },
+      { type = "item", name = "plastic-bar", amount = 2 },
     },
     results = { { type = "item", name = "night-vision-equipment-2", amount = 1 } },
   },
@@ -179,16 +179,19 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "night-vision-equipment-2", 1 },
-      { "processing-unit", 5 },
-      { "plastic-bar", 2 },
+      { type = "item", name = "night-vision-equipment-2", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 5 },
+      { type = "item", name = "plastic-bar", amount = 2 },
     },
     results = { { type = "item", name = "night-vision-equipment-3", amount = 1 } },
   },
 })
 
-data.raw.recipe["solar-panel-equipment"].ingredients =
-  { { "steel-plate", 2 }, { "electronic-circuit", 5 }, { "copper-cable", 4 } }
+data.raw.recipe["solar-panel-equipment"].ingredients = {
+  { type = "item", name = "steel-plate", amount = 2 },
+  { type = "item", name = "electronic-circuit", amount = 5 },
+  { type = "item", name = "copper-cable", amount = 4 }
+}
 
 data:extend({
   {
@@ -197,10 +200,10 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "solar-panel-equipment", 1 },
-      { "steel-plate", 2 },
-      { "advanced-circuit", 5 },
-      { "copper-plate", 2 },
+      { type = "item", name = "solar-panel-equipment", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 2 },
+      { type = "item", name = "advanced-circuit", amount = 5 },
+      { type = "item", name = "copper-plate", amount = 2 },
     },
     results = { { type = "item", name = "solar-panel-equipment-2", amount = 1 } },
   },
@@ -210,10 +213,10 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "solar-panel-equipment-2", 1 },
-      { "steel-plate", 2 },
-      { "processing-unit", 5 },
-      { "copper-plate", 2 },
+      { type = "item", name = "solar-panel-equipment-2", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 2 },
+      { type = "item", name = "processing-unit", amount = 5 },
+      { type = "item", name = "copper-plate", amount = 2 },
     },
     results = { { type = "item", name = "solar-panel-equipment-3", amount = 1 } },
   },
@@ -223,19 +226,19 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "solar-panel-equipment-3", 1 },
-      { "steel-plate", 2 },
-      { "processing-unit", 5 },
-      { "copper-cable", 5 },
+      { type = "item", name = "solar-panel-equipment-3", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 2 },
+      { type = "item", name = "processing-unit", amount = 5 },
+      { type = "item", name = "copper-cable", amount = 5 },
     },
     results = { { type = "item", name = "solar-panel-equipment-4", amount = 1 } },
   },
 })
 
 data.raw.recipe["personal-laser-defense-equipment"].ingredients = {
-  { "steel-plate", 5 },
-  { "advanced-circuit", 5 },
-  { "battery", 3 },
+  { type = "item", name = "steel-plate", amount = 5 },
+  { type = "item", name = "advanced-circuit", amount = 5 },
+  { type = "item", name = "battery", amount = 3 },
 }
 
 data:extend({
@@ -245,10 +248,10 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "personal-laser-defense-equipment", 1 },
-      { "steel-plate", 5 },
-      { "advanced-circuit", 5 },
-      { "battery", 3 },
+      { type = "item", name = "personal-laser-defense-equipment", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "advanced-circuit", amount = 5 },
+      { type = "item", name = "battery", amount = 3 },
     },
     results = { { type = "item", name = "personal-laser-defense-equipment-2", amount = 1 } },
   },
@@ -258,10 +261,10 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "personal-laser-defense-equipment-2", 1 },
-      { "steel-plate", 5 },
-      { "processing-unit", 5 },
-      { "battery", 3 },
+      { type = "item", name = "personal-laser-defense-equipment-2", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "processing-unit", amount = 5 },
+      { type = "item", name = "battery", amount = 3 },
     },
     results = { { type = "item", name = "personal-laser-defense-equipment-3", amount = 1 } },
   },
@@ -271,10 +274,10 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "personal-laser-defense-equipment-3", 1 },
-      { "steel-plate", 5 },
-      { "processing-unit", 5 },
-      { "battery", 3 },
+      { type = "item", name = "personal-laser-defense-equipment-3", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "processing-unit", amount = 5 },
+      { type = "item", name = "battery", amount = 3 },
     },
     results = { { type = "item", name = "personal-laser-defense-equipment-4", amount = 1 } },
   },
@@ -284,10 +287,10 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "personal-laser-defense-equipment-4", 1 },
-      { "steel-plate", 5 },
-      { "processing-unit", 5 },
-      { "battery", 3 },
+      { type = "item", name = "personal-laser-defense-equipment-4", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "processing-unit", amount = 5 },
+      { type = "item", name = "battery", amount = 3 },
     },
     results = { { type = "item", name = "personal-laser-defense-equipment-5", amount = 1 } },
   },
@@ -297,10 +300,10 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "personal-laser-defense-equipment-5", 1 },
-      { "steel-plate", 5 },
-      { "processing-unit", 5 },
-      { "battery", 3 },
+      { type = "item", name = "personal-laser-defense-equipment-5", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "processing-unit", amount = 5 },
+      { type = "item", name = "battery", amount = 3 },
     },
     results = { { type = "item", name = "personal-laser-defense-equipment-6", amount = 1 } },
   },
@@ -314,10 +317,10 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "exoskeleton-equipment", 1 },
-      { "processing-unit", 10 },
-      { "iron-gear-wheel", 30 },
-      { "steel-plate", 20 },
+      { type = "item", name = "exoskeleton-equipment", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 10 },
+      { type = "item", name = "iron-gear-wheel", amount = 30 },
+      { type = "item", name = "steel-plate", amount = 20 },
     },
     results = { { type = "item", name = "exoskeleton-equipment-2", amount = 1 } },
   },
@@ -327,10 +330,10 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { "exoskeleton-equipment-2", 1 },
-      { "processing-unit", 10 },
-      { "iron-gear-wheel", 30 },
-      { "steel-plate", 20 },
+      { type = "item", name = "exoskeleton-equipment-2", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 10 },
+      { type = "item", name = "iron-gear-wheel", amount = 30 },
+      { type = "item", name = "steel-plate", amount = 20 },
     },
     results = { { type = "item", name = "exoskeleton-equipment-3", amount = 1 } },
   },
diff --git a/bobequipment/prototypes/recipe/updates.lua b/bobequipment/prototypes/recipe/updates.lua
index cca752fbe..2b489aa26 100644
--- a/bobequipment/prototypes/recipe/updates.lua
+++ b/bobequipment/prototypes/recipe/updates.lua
@@ -4,19 +4,19 @@ if
   and data.raw.item["roboport-door-1"]
 then
   data.raw.recipe["personal-roboport-equipment"].ingredients = {
-    { "roboport-antenna-1", 2 },
-    { "roboport-chargepad-1", 2 },
-    { "roboport-door-1", 1 },
-    { "steel-plate", 5 },
+    { type = "item", name = "roboport-antenna-1", amount = 2 },
+    { type = "item", name = "roboport-chargepad-1", amount = 2 },
+    { type = "item", name = "roboport-door-1", amount = 1 },
+    { type = "item", name = "steel-plate", amount = 5 },
   }
 
   data.raw.recipe["personal-roboport-antenna-equipment"].ingredients = {
-    { "roboport-antenna-1", 2 },
-    { "roboport-door-1", 1 },
+    { type = "item", name = "roboport-antenna-1", amount = 2 },
+    { type = "item", name = "roboport-door-1", amount = 1 },
   }
 
   data.raw.recipe["personal-roboport-chargepad-equipment"].ingredients = {
-    { "roboport-chargepad-1", 2 },
+    { type = "item", name = "roboport-chargepad-1", amount = 2 },
   }
 
   bobmods.lib.tech.add_recipe_unlock("personal-roboport-equipment", "roboport-antenna-1")
@@ -24,7 +24,7 @@ then
   bobmods.lib.tech.add_recipe_unlock("personal-roboport-equipment", "roboport-door-1")
 else
   bobmods.lib.recipe.remove_ingredient("personal-roboport-equipment", "battery")
-  bobmods.lib.recipe.add_ingredient("personal-roboport-equipment", { "battery", 20 })
+  bobmods.lib.recipe.add_ingredient("personal-roboport-equipment", { type = "item", name = "battery", amount = 20 })
 end
 
 if
@@ -33,22 +33,22 @@ if
   and data.raw.item["roboport-door-2"]
 then
   data.raw.recipe["personal-roboport-mk2-equipment"].ingredients = {
-    { "personal-roboport-equipment", 1 },
-    { "roboport-antenna-2", 2 },
-    { "roboport-chargepad-2", 2 },
-    { "roboport-door-2", 1 },
-    { "steel-plate", 5 },
+    { type = "item", name = "personal-roboport-equipment", amount = 1 },
+    { type = "item", name = "roboport-antenna-2", amount = 2 },
+    { type = "item", name = "roboport-chargepad-2", amount = 2 },
+    { type = "item", name = "roboport-door-2", amount = 1 },
+    { type = "item", name = "steel-plate", amount = 5 },
   }
 
   data.raw.recipe["personal-roboport-antenna-equipment-2"].ingredients = {
-    { "personal-roboport-antenna-equipment", 1 },
-    { "roboport-antenna-2", 2 },
-    { "roboport-door-2", 1 },
+    { type = "item", name = "personal-roboport-antenna-equipment", amount = 1 },
+    { type = "item", name = "roboport-antenna-2", amount = 2 },
+    { type = "item", name = "roboport-door-2", amount = 1 },
   }
 
   data.raw.recipe["personal-roboport-chargepad-equipment-2"].ingredients = {
-    { "personal-roboport-chargepad-equipment", 1 },
-    { "roboport-chargepad-2", 2 },
+    { type = "item", name = "personal-roboport-chargepad-equipment", amount = 1 },
+    { type = "item", name = "roboport-chargepad-2", amount = 2 },
   }
 
   bobmods.lib.tech.add_recipe_unlock("personal-roboport-mk2-equipment", "roboport-antenna-2")
@@ -60,11 +60,11 @@ then
   end
 else
   data.raw.recipe["personal-roboport-mk2-equipment"].ingredients = {
-    { "personal-roboport-equipment", 1 },
-    { "advanced-circuit", 20 },
-    { "iron-gear-wheel", 40 },
-    { "steel-plate", 20 },
-    { "battery", 20 },
+    { type = "item", name = "personal-roboport-equipment", amount = 1 },
+    { type = "item", name = "advanced-circuit", amount = 20 },
+    { type = "item", name = "iron-gear-wheel", amount = 40 },
+    { type = "item", name = "steel-plate", amount = 20 },
+    { type = "item", name = "battery", amount = 20 },
   }
 
   if data.raw.item["aluminium-plate"] then
@@ -76,8 +76,8 @@ else
   end
 
   if data.raw.item["steel-bearing"] then
-    bobmods.lib.recipe.add_ingredient("personal-roboport-mk2-equipment", { "steel-bearing", 5 })
-    bobmods.lib.recipe.add_ingredient("personal-roboport-antenna-equipment-2", { "steel-bearing", 5 })
+    bobmods.lib.recipe.add_ingredient("personal-roboport-mk2-equipment", { type = "item", name = "steel-bearing", amount = 5 })
+    bobmods.lib.recipe.add_ingredient("personal-roboport-antenna-equipment-2", { type = "item", name = "steel-bearing", amount = 5 })
   end
 
   if data.raw.item["steel-gear-wheel"] then
@@ -105,22 +105,22 @@ if
   and data.raw.item["roboport-door-3"]
 then
   data.raw.recipe["personal-roboport-mk3-equipment"].ingredients = {
-    { "personal-roboport-mk2-equipment", 1 },
-    { "roboport-antenna-3", 2 },
-    { "roboport-chargepad-3", 2 },
-    { "roboport-door-3", 1 },
-    { "steel-plate", 5 },
+    { type = "item", name = "personal-roboport-mk2-equipment", amount = 1 },
+    { type = "item", name = "roboport-antenna-3", amount = 2 },
+    { type = "item", name = "roboport-chargepad-3", amount = 2 },
+    { type = "item", name = "roboport-door-3", amount = 1 },
+    { type = "item", name = "steel-plate", amount = 5 },
   }
 
   data.raw.recipe["personal-roboport-antenna-equipment-3"].ingredients = {
-    { "personal-roboport-antenna-equipment-2", 1 },
-    { "roboport-antenna-3", 2 },
-    { "roboport-door-3", 1 },
+    { type = "item", name = "personal-roboport-antenna-equipment-2", amount = 1 },
+    { type = "item", name = "roboport-antenna-3", amount = 2 },
+    { type = "item", name = "roboport-door-3", amount = 1 },
   }
 
   data.raw.recipe["personal-roboport-chargepad-equipment-3"].ingredients = {
-    { "personal-roboport-chargepad-equipment-2", 1 },
-    { "roboport-chargepad-3", 2 },
+    { type = "item", name = "personal-roboport-chargepad-equipment-2", amount = 1 },
+    { type = "item", name = "roboport-chargepad-3", amount = 2 },
   }
 
   bobmods.lib.tech.add_recipe_unlock("personal-roboport-mk3-equipment", "roboport-antenna-3")
@@ -138,8 +138,8 @@ else
   end
 
   if data.raw.item["titanium-bearing"] then
-    bobmods.lib.recipe.add_ingredient("personal-roboport-mk3-equipment", { "titanium-bearing", 5 })
-    bobmods.lib.recipe.add_ingredient("personal-roboport-antenna-equipment-3", { "titanium-bearing", 5 })
+    bobmods.lib.recipe.add_ingredient("personal-roboport-mk3-equipment", { type = "item", name = "titanium-bearing", amount = 5 })
+    bobmods.lib.recipe.add_ingredient("personal-roboport-antenna-equipment-3", { type = "item", name = "titanium-bearing", amount = 5 })
   end
 
   if data.raw.item["titanium-gear-wheel"] then
@@ -167,22 +167,22 @@ if
   and data.raw.item["roboport-door-4"]
 then
   data.raw.recipe["personal-roboport-mk4-equipment"].ingredients = {
-    { "personal-roboport-mk3-equipment", 1 },
-    { "roboport-antenna-4", 2 },
-    { "roboport-chargepad-4", 2 },
-    { "roboport-door-4", 1 },
-    { "steel-plate", 5 },
+    { type = "item", name = "personal-roboport-mk3-equipment", amount = 1 },
+    { type = "item", name = "roboport-antenna-4", amount = 2 },
+    { type = "item", name = "roboport-chargepad-4", amount = 2 },
+    { type = "item", name = "roboport-door-4", amount = 1 },
+    { type = "item", name = "steel-plate", amount = 5 },
   }
 
   data.raw.recipe["personal-roboport-antenna-equipment-4"].ingredients = {
-    { "personal-roboport-antenna-equipment-3", 1 },
-    { "roboport-antenna-4", 2 },
-    { "roboport-door-4", 1 },
+    { type = "item", name = "personal-roboport-antenna-equipment-3", amount = 1 },
+    { type = "item", name = "roboport-antenna-4", amount = 2 },
+    { type = "item", name = "roboport-door-4", amount = 1 },
   }
 
   data.raw.recipe["personal-roboport-chargepad-equipment-4"].ingredients = {
-    { "personal-roboport-chargepad-equipment-3", 1 },
-    { "roboport-chargepad-4", 2 },
+    { type = "item", name = "personal-roboport-chargepad-equipment-3", amount = 1 },
+    { type = "item", name = "roboport-chargepad-4", amount = 2 },
   }
 
   bobmods.lib.tech.add_recipe_unlock("personal-roboport-mk4-equipment", "roboport-antenna-4")
@@ -218,8 +218,8 @@ else
   end
 
   if data.raw.item["nitinol-bearing"] then
-    bobmods.lib.recipe.add_ingredient("personal-roboport-mk4-equipment", { "nitinol-bearing", 5 })
-    bobmods.lib.recipe.add_ingredient("personal-roboport-antenna-equipment-4", { "nitinol-bearing", 5 })
+    bobmods.lib.recipe.add_ingredient("personal-roboport-mk4-equipment", { type = "item", name = "nitinol-bearing", amount = 5 })
+    bobmods.lib.recipe.add_ingredient("personal-roboport-antenna-equipment-4", { type = "item", name = "nitinol-bearing", amount = 5 })
   end
 
   if data.raw.item["nitinol-gear-wheel"] then
@@ -255,18 +255,18 @@ if data.raw.item["advanced-processing-unit"] then
 end
 
 if data.raw.item["solder"] then
-  bobmods.lib.recipe.add_ingredient("personal-roboport-robot-equipment", { "solder", 2 })
-  bobmods.lib.recipe.add_ingredient("personal-roboport-robot-equipment-2", { "solder", 3 })
-  bobmods.lib.recipe.add_ingredient("personal-roboport-robot-equipment-3", { "solder", 4 })
-  bobmods.lib.recipe.add_ingredient("personal-roboport-robot-equipment-4", { "solder", 6 })
+  bobmods.lib.recipe.add_ingredient("personal-roboport-robot-equipment", { type = "item", name = "solder", amount = 2 })
+  bobmods.lib.recipe.add_ingredient("personal-roboport-robot-equipment-2", { type = "item", name = "solder", amount = 3 })
+  bobmods.lib.recipe.add_ingredient("personal-roboport-robot-equipment-3", { type = "item", name = "solder", amount = 4 })
+  bobmods.lib.recipe.add_ingredient("personal-roboport-robot-equipment-4", { type = "item", name = "solder", amount = 6 })
 end
 
 if data.raw.tool["module-case"] or data.raw.item["module-case"] then
   bobmods.lib.tech.add_recipe_unlock("robotics", "module-case")
-  bobmods.lib.recipe.add_ingredient("personal-roboport-robot-equipment", { "module-case", 1 })
-  bobmods.lib.recipe.add_ingredient("personal-roboport-robot-equipment-2", { "module-case", 1 })
-  bobmods.lib.recipe.add_ingredient("personal-roboport-robot-equipment-3", { "module-case", 1 })
-  bobmods.lib.recipe.add_ingredient("personal-roboport-robot-equipment-4", { "module-case", 1 })
+  bobmods.lib.recipe.add_ingredient("personal-roboport-robot-equipment", { type = "item", name = "module-case", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("personal-roboport-robot-equipment-2", { type = "item", name = "module-case", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("personal-roboport-robot-equipment-3", { type = "item", name = "module-case", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("personal-roboport-robot-equipment-4", { type = "item", name = "module-case", amount = 1 })
 end
 
 if data.raw.item["glass"] then
@@ -291,7 +291,7 @@ if data.raw.item["cobalt-steel-gear-wheel"] then
 end
 
 if data.raw.item["cobalt-steel-bearing"] then
-  bobmods.lib.recipe.add_ingredient("exoskeleton-equipment-2", { "cobalt-steel-bearing", 30 })
+  bobmods.lib.recipe.add_ingredient("exoskeleton-equipment-2", { type = "item", name = "cobalt-steel-bearing", amount = 30 })
 end
 
 if data.raw.item["gold-plate"] then
@@ -307,7 +307,7 @@ if data.raw.item["lithium-ion-battery"] then
 end
 
 if data.raw.item["silicon-wafer"] then
-  bobmods.lib.recipe.add_ingredient("solar-panel-equipment-3", { "silicon-wafer", 8 })
+  bobmods.lib.recipe.add_ingredient("solar-panel-equipment-3", { type = "item", name = "silicon-wafer", amount = 8 })
 end
 
 if data.raw.item["advanced-processing-unit"] then
@@ -355,7 +355,7 @@ if data.raw.item["titanium-gear-wheel"] then
 end
 
 if data.raw.item["titanium-bearing"] then
-  bobmods.lib.recipe.add_ingredient("exoskeleton-equipment-3", { "titanium-bearing", 30 })
+  bobmods.lib.recipe.add_ingredient("exoskeleton-equipment-3", { type = "item", name = "titanium-bearing", amount = 30 })
 end
 
 if data.raw.item["silver-zinc-battery"] then
@@ -375,28 +375,28 @@ if data.raw.item["nitinol-alloy"] then
 end
 
 if data.raw.item["sapphire-5"] then
-  bobmods.lib.recipe.add_ingredient("personal-laser-defense-equipment-2", { "sapphire-5", 1 })
+  bobmods.lib.recipe.add_ingredient("personal-laser-defense-equipment-2", { type = "item", name = "sapphire-5", amount = 1 })
   bobmods.lib.recipe.remove_ingredient("personal-laser-defense-equipment-2", "battery")
   bobmods.lib.tech.add_prerequisite("personal-laser-defense-equipment-2", "gem-processing-3")
 end
 
 if data.raw.item["emerald-5"] then
-  bobmods.lib.recipe.add_ingredient("personal-laser-defense-equipment-3", { "emerald-5", 1 })
+  bobmods.lib.recipe.add_ingredient("personal-laser-defense-equipment-3", { type = "item", name = "emerald-5", amount = 1 })
   bobmods.lib.recipe.remove_ingredient("personal-laser-defense-equipment-3", "advanced-circuit")
 end
 
 if data.raw.item["amethyst-5"] then
-  bobmods.lib.recipe.add_ingredient("personal-laser-defense-equipment-4", { "amethyst-5", 1 })
+  bobmods.lib.recipe.add_ingredient("personal-laser-defense-equipment-4", { type = "item", name = "amethyst-5", amount = 1 })
 end
 
 if data.raw.item["topaz-5"] then
-  bobmods.lib.recipe.add_ingredient("personal-laser-defense-equipment-5", { "topaz-5", 1 })
+  bobmods.lib.recipe.add_ingredient("personal-laser-defense-equipment-5", { type = "item", name = "topaz-5", amount = 1 })
 end
 
 if data.raw.item["diamond-5"] then
   bobmods.lib.recipe.replace_ingredient("night-vision-equipment-3", "plastic-bar", "diamond-5")
   bobmods.lib.tech.add_prerequisite("night-vision-equipment-3", "gem-processing-3")
-  bobmods.lib.recipe.add_ingredient("personal-laser-defense-equipment-6", { "diamond-5", 1 })
+  bobmods.lib.recipe.add_ingredient("personal-laser-defense-equipment-6", { type = "item", name = "diamond-5", amount = 1 })
 end
 
 if data.raw.item["gilded-copper-cable"] then
@@ -446,62 +446,62 @@ if data.raw.module["productivity-module-8"] then
 end
 
 if data.raw.item["alien-artifact"] then
-  bobmods.lib.recipe.add_new_ingredient("energy-shield-mk3-equipment", { "alien-artifact", 10 })
-  bobmods.lib.recipe.add_new_ingredient("night-vision-equipment-3", { "alien-artifact", 10 })
-  bobmods.lib.recipe.add_new_ingredient("solar-panel-equipment-4", { "alien-artifact", 10 })
+  bobmods.lib.recipe.add_new_ingredient("energy-shield-mk3-equipment", { type = "item", name = "alien-artifact", amount = 10 })
+  bobmods.lib.recipe.add_new_ingredient("night-vision-equipment-3", { type = "item", name = "alien-artifact", amount = 10 })
+  bobmods.lib.recipe.add_new_ingredient("solar-panel-equipment-4", { type = "item", name = "alien-artifact", amount = 10 })
 else
-  bobmods.lib.recipe.add_new_ingredient("night-vision-equipment-3", { "processing-unit", 10 })
-  bobmods.lib.recipe.add_new_ingredient("solar-panel-equipment-4", { "processing-unit", 10 })
+  bobmods.lib.recipe.add_new_ingredient("night-vision-equipment-3", { type = "item", name = "processing-unit", amount = 10 })
+  bobmods.lib.recipe.add_new_ingredient("solar-panel-equipment-4", { type = "item", name = "processing-unit", amount = 10 })
 end
 
 if data.raw.item["alien-artifact-orange"] and data.raw.item["alien-artifact-blue"] then
-  bobmods.lib.recipe.add_new_ingredient("energy-shield-mk4-equipment", { "alien-artifact-orange", 5 })
-  bobmods.lib.recipe.add_new_ingredient("battery-mk4-equipment", { "alien-artifact-orange", 5 })
-  bobmods.lib.recipe.add_new_ingredient("fusion-reactor-equipment-2", { "alien-artifact-orange", 15 })
+  bobmods.lib.recipe.add_new_ingredient("energy-shield-mk4-equipment", { type = "item", name = "alien-artifact-orange", amount = 5 })
+  bobmods.lib.recipe.add_new_ingredient("battery-mk4-equipment", { type = "item", name = "alien-artifact-orange", amount = 5 })
+  bobmods.lib.recipe.add_new_ingredient("fusion-reactor-equipment-2", { type = "item", name = "alien-artifact-orange", amount = 15 })
 
-  bobmods.lib.recipe.add_new_ingredient("energy-shield-mk4-equipment", { "alien-artifact-blue", 5 })
-  bobmods.lib.recipe.add_new_ingredient("battery-mk4-equipment", { "alien-artifact-blue", 5 })
-  bobmods.lib.recipe.add_new_ingredient("fusion-reactor-equipment-2", { "alien-artifact-blue", 15 })
+  bobmods.lib.recipe.add_new_ingredient("energy-shield-mk4-equipment", { type = "item", name = "alien-artifact-blue", amount = 5 })
+  bobmods.lib.recipe.add_new_ingredient("battery-mk4-equipment", { type = "item", name = "alien-artifact-blue", amount = 5 })
+  bobmods.lib.recipe.add_new_ingredient("fusion-reactor-equipment-2", { type = "item", name = "alien-artifact-blue", amount = 15 })
 elseif data.raw.item["alien-artifact"] then
-  bobmods.lib.recipe.add_new_ingredient("energy-shield-mk4-equipment", { "alien-artifact", 15 })
-  bobmods.lib.recipe.add_new_ingredient("battery-mk4-equipment", { "alien-artifact", 15 })
-  bobmods.lib.recipe.add_new_ingredient("fusion-reactor-equipment-2", { "alien-artifact", 40 })
+  bobmods.lib.recipe.add_new_ingredient("energy-shield-mk4-equipment", { type = "item", name = "alien-artifact", amount = 15 })
+  bobmods.lib.recipe.add_new_ingredient("battery-mk4-equipment", { type = "item", name = "alien-artifact", amount = 15 })
+  bobmods.lib.recipe.add_new_ingredient("fusion-reactor-equipment-2", { type = "item", name = "alien-artifact", amount = 40 })
 else
-  bobmods.lib.recipe.add_ingredient("fusion-reactor-equipment-2", { "processing-unit", 40 })
+  bobmods.lib.recipe.add_ingredient("fusion-reactor-equipment-2", { type = "item", name = "processing-unit", amount = 40 })
 end
 
 if data.raw.item["alien-artifact-yellow"] and data.raw.item["alien-artifact-purple"] then
-  bobmods.lib.recipe.add_new_ingredient("energy-shield-mk5-equipment", { "alien-artifact-yellow", 5 })
-  bobmods.lib.recipe.add_new_ingredient("battery-mk5-equipment", { "alien-artifact-yellow", 5 })
-  bobmods.lib.recipe.add_new_ingredient("fusion-reactor-equipment-3", { "alien-artifact-yellow", 15 })
+  bobmods.lib.recipe.add_new_ingredient("energy-shield-mk5-equipment", { type = "item", name = "alien-artifact-yellow", amount = 5 })
+  bobmods.lib.recipe.add_new_ingredient("battery-mk5-equipment", { type = "item", name = "alien-artifact-yellow", amount = 5 })
+  bobmods.lib.recipe.add_new_ingredient("fusion-reactor-equipment-3", { type = "item", name = "alien-artifact-yellow", amount = 15 })
 
-  bobmods.lib.recipe.add_new_ingredient("energy-shield-mk5-equipment", { "alien-artifact-purple", 5 })
-  bobmods.lib.recipe.add_new_ingredient("battery-mk5-equipment", { "alien-artifact-purple", 5 })
-  bobmods.lib.recipe.add_new_ingredient("fusion-reactor-equipment-3", { "alien-artifact-purple", 15 })
+  bobmods.lib.recipe.add_new_ingredient("energy-shield-mk5-equipment", { type = "item", name = "alien-artifact-purple", amount = 5 })
+  bobmods.lib.recipe.add_new_ingredient("battery-mk5-equipment", { type = "item", name = "alien-artifact-purple", amount = 5 })
+  bobmods.lib.recipe.add_new_ingredient("fusion-reactor-equipment-3", { type = "item", name = "alien-artifact-purple", amount = 15 })
 elseif data.raw.item["alien-artifact"] then
-  bobmods.lib.recipe.add_new_ingredient("energy-shield-mk5-equipment", { "alien-artifact", 20 })
-  bobmods.lib.recipe.add_new_ingredient("battery-mk5-equipment", { "alien-artifact", 20 })
-  bobmods.lib.recipe.add_new_ingredient("fusion-reactor-equipment-3", { "alien-artifact", 60 })
+  bobmods.lib.recipe.add_new_ingredient("energy-shield-mk5-equipment", { type = "item", name = "alien-artifact", amount = 20 })
+  bobmods.lib.recipe.add_new_ingredient("battery-mk5-equipment", { type = "item", name = "alien-artifact", amount = 20 })
+  bobmods.lib.recipe.add_new_ingredient("fusion-reactor-equipment-3", { type = "item", name = "alien-artifact", amount = 60 })
 else
-  bobmods.lib.recipe.add_ingredient("fusion-reactor-equipment-3", { "processing-unit", 60 })
+  bobmods.lib.recipe.add_ingredient("fusion-reactor-equipment-3", { type = "item", name = "processing-unit", amount = 60 })
 end
 
 if data.raw.item["alien-artifact-red"] and data.raw.item["alien-artifact-green"] then
-  bobmods.lib.recipe.add_new_ingredient("energy-shield-mk6-equipment", { "alien-artifact-red", 5 })
-  bobmods.lib.recipe.add_new_ingredient("battery-mk6-equipment", { "alien-artifact-red", 5 })
-  bobmods.lib.recipe.add_new_ingredient("fusion-reactor-equipment-4", { "alien-artifact-red", 15 })
-  bobmods.lib.recipe.add_new_ingredient("personal-laser-defense-equipment-6", { "alien-artifact-red", 5 })
-
-  bobmods.lib.recipe.add_new_ingredient("energy-shield-mk6-equipment", { "alien-artifact-green", 5 })
-  bobmods.lib.recipe.add_new_ingredient("battery-mk6-equipment", { "alien-artifact-green", 5 })
-  bobmods.lib.recipe.add_new_ingredient("fusion-reactor-equipment-4", { "alien-artifact-green", 15 })
-  bobmods.lib.recipe.add_new_ingredient("personal-laser-defense-equipment-6", { "alien-artifact-green", 5 })
+  bobmods.lib.recipe.add_new_ingredient("energy-shield-mk6-equipment", { type = "item", name = "alien-artifact-red", amount = 5 })
+  bobmods.lib.recipe.add_new_ingredient("battery-mk6-equipment", { type = "item", name = "alien-artifact-red", amount = 5 })
+  bobmods.lib.recipe.add_new_ingredient("fusion-reactor-equipment-4", { type = "item", name = "alien-artifact-red", amount = 15 })
+  bobmods.lib.recipe.add_new_ingredient("personal-laser-defense-equipment-6", { type = "item", name = "alien-artifact-red", amount = 5 })
+
+  bobmods.lib.recipe.add_new_ingredient("energy-shield-mk6-equipment", { type = "item", name = "alien-artifact-green", amount = 5 })
+  bobmods.lib.recipe.add_new_ingredient("battery-mk6-equipment", { type = "item", name = "alien-artifact-green", amount = 5 })
+  bobmods.lib.recipe.add_new_ingredient("fusion-reactor-equipment-4", { type = "item", name = "alien-artifact-green", amount = 15 })
+  bobmods.lib.recipe.add_new_ingredient("personal-laser-defense-equipment-6", { type = "item", name = "alien-artifact-green", amount = 5 })
 elseif data.raw.item["alien-artifact"] then
-  bobmods.lib.recipe.add_new_ingredient("energy-shield-mk6-equipment", { "alien-artifact", 30 })
-  bobmods.lib.recipe.add_new_ingredient("battery-mk6-equipment", { "alien-artifact", 30 })
-  bobmods.lib.recipe.add_new_ingredient("fusion-reactor-equipment-4", { "alien-artifact", 80 })
-  bobmods.lib.recipe.add_new_ingredient("personal-laser-defense-equipment-6", { "alien-artifact", 10 })
+  bobmods.lib.recipe.add_new_ingredient("energy-shield-mk6-equipment", { type = "item", name = "alien-artifact", amount = 30 })
+  bobmods.lib.recipe.add_new_ingredient("battery-mk6-equipment", { type = "item", name = "alien-artifact", amount = 30 })
+  bobmods.lib.recipe.add_new_ingredient("fusion-reactor-equipment-4", { type = "item", name = "alien-artifact", amount = 80 })
+  bobmods.lib.recipe.add_new_ingredient("personal-laser-defense-equipment-6", { type = "item", name = "alien-artifact", amount = 10 })
 else
-  bobmods.lib.recipe.add_ingredient("fusion-reactor-equipment-4", { "processing-unit", 80 })
-  bobmods.lib.recipe.add_ingredient("personal-laser-defense-equipment-6", { "processing-unit", 10 })
+  bobmods.lib.recipe.add_ingredient("fusion-reactor-equipment-4", { type = "item", name = "processing-unit", amount = 80 })
+  bobmods.lib.recipe.add_ingredient("personal-laser-defense-equipment-6", { type = "item", name = "processing-unit", amount = 10 })
 end
diff --git a/bobgreenhouse/prototypes/recipes.lua b/bobgreenhouse/prototypes/recipes.lua
index 046635b32..c8795e188 100644
--- a/bobgreenhouse/prototypes/recipes.lua
+++ b/bobgreenhouse/prototypes/recipes.lua
@@ -83,7 +83,7 @@ data:extend({
     type = "recipe",
     name = "wood-pellets",
     ingredients = {
-      { "wood", 5 },
+      { type = "item", name = "wood", amount = 5 },
     },
     results = { { type = "item", name = "wood-pellets", amount = 1 } },
   },
diff --git a/bobgreenhouse/prototypes/updates.lua b/bobgreenhouse/prototypes/updates.lua
index 9e2d7151c..98031d146 100644
--- a/bobgreenhouse/prototypes/updates.lua
+++ b/bobgreenhouse/prototypes/updates.lua
@@ -13,11 +13,15 @@ if data.raw.item.glass then
 end
 
 if data.raw.fluid.ammonia and data.raw.fluid["nitric-acid"] then
-  data.raw.recipe["bob-fertiliser"].ingredients =
-    { { type = "fluid", name = "nitric-acid", amount = 10 }, { type = "fluid", name = "ammonia", amount = 10 } }
+  data.raw.recipe["bob-fertiliser"].ingredients = {
+    { type = "fluid", name = "nitric-acid", amount = 10 }, 
+    { type = "fluid", name = "ammonia", amount = 10 }
+  }
 elseif data.raw.fluid.nitrogen then
-  data.raw.recipe["bob-fertiliser"].ingredients =
-    { { type = "fluid", name = "petroleum-gas", amount = 10 }, { type = "fluid", name = "nitrogen", amount = 10 } }
+  data.raw.recipe["bob-fertiliser"].ingredients = {
+    { type = "fluid", name = "petroleum-gas", amount = 10 },
+    { type = "fluid", name = "nitrogen", amount = 10 }
+  }
 end
 
 if data.raw.technology["nitrogen-processing"] then
diff --git a/boblibrary/error-functions.lua b/boblibrary/error-functions.lua
index 640b83c56..860daf5e1 100644
--- a/boblibrary/error-functions.lua
+++ b/boblibrary/error-functions.lua
@@ -146,6 +146,6 @@ function bobmods.lib.error.result(result, name)
     end
   end
   if not (result.type == "item" or result.type == "fluid") then
-    log(name .. ".type not a valid ingredient item type")
+    log(name .. ".type not a valid result item type")
   end
 end
diff --git a/boblibrary/item-functions.lua b/boblibrary/item-functions.lua
index c328e2780..ae62f468b 100644
--- a/boblibrary/item-functions.lua
+++ b/boblibrary/item-functions.lua
@@ -60,20 +60,16 @@ function bobmods.lib.item.ingredient_simple(inputs) --doesn't care if the item a
   local item = {}
 
   if type(inputs) == "table" then
-    if inputs.name then
+    if inputs.name and type(inputs.name) == "string" then
       item.name = inputs.name
-    elseif inputs[1] and type(inputs[1]) == "string" then
-      item.name = inputs[1]
     else
       log(debug.traceback())
       log("Unable to determine an ingredient name")
       return nil
     end
 
-    if inputs.amount then
+    if inputs.amount and type(inputs.amount) == "number" then
       item.amount = inputs.amount
-    elseif inputs[2] and type(inputs[2]) == "number" then
-      item.amount = inputs[2]
     else
       item.amount = 1
     end
@@ -139,20 +135,16 @@ function bobmods.lib.item.result_simple(inputs)
   local item = {}
 
   if type(inputs) == "table" then
-    if inputs.name then
+    if inputs.name and type(inputs.name) == "string" then
       item.name = inputs.name
-    elseif inputs[1] and type(inputs[1]) == "string" then
-      item.name = inputs[1]
     else
       log(debug.traceback())
       log("Unable to determine a result name")
       return nil
     end
 
-    if inputs.amount then
+    if inputs.amount and type(inputs.amount) == "number" then
       item.amount = inputs.amount
-    elseif inputs[2] and type(inputs[2]) == "number" then
-      item.amount = inputs[2]
     elseif inputs.amount_min and inputs.amount_max then
       item.amount_min = inputs.amount_min
       item.amount_max = inputs.amount_max
@@ -289,7 +281,7 @@ function bobmods.lib.item.add(list, item_in) --increments amount if exists
   if type(list) == "table" and item then
     local addit = true
     for i, object in pairs(list) do
-      if object[1] == item.name or object.name == item.name then
+      if object.name == item.name then
         addit = false
         list[i] = bobmods.lib.item.combine(object, item)
       end
@@ -319,7 +311,7 @@ end
 function bobmods.lib.item.remove(list, item)
   if type(list) == "table" and type(item) == "string" then
     for i, object in ipairs(list) do
-      if object[1] == item or object.name == item then
+      if object.name == item then
         table.remove(list, i)
       end
     end
@@ -334,7 +326,7 @@ function bobmods.lib.item.set(list, item_in)
   if type(list) == "table" and item then
     local addit = true
     for i, object in pairs(list) do
-      if object[1] == item.name or object.name == item.name then
+      if object.name == item.name then
         list[i] = item
         addit = false
       end
diff --git a/boblibrary/technology-functions.lua b/boblibrary/technology-functions.lua
index 87e86f60a..688e3d569 100644
--- a/boblibrary/technology-functions.lua
+++ b/boblibrary/technology-functions.lua
@@ -6,7 +6,7 @@ local function add_new_science_pack(technology, pack, amount)
   if technology.unit and technology.unit.ingredients then
     local addit = true
     for i, ingredient in pairs(technology.unit.ingredients) do
-      if ingredient[1] == pack or ingredient.name == pack then
+      if ingredient[1] == pack then
         addit = false
       end
     end
@@ -24,10 +24,6 @@ local function add_science_pack(technology, pack, amount)
         addit = false
         ingredient[2] = ingredient[2] + amount
       end
-      if ingredient.name == pack then
-        addit = false
-        ingredient.amount = ingredient.amount + amount
-      end
     end
     if addit then
       table.insert(technology.unit.ingredients, { pack, amount })
@@ -38,7 +34,7 @@ end
 local function remove_science_pack(technology, pack)
   if technology.unit and technology.unit.ingredients then
     for i, ingredient in pairs(technology.unit.ingredients) do
-      if ingredient[1] == pack or ingredient.name == pack then
+      if ingredient[1] == pack then
         table.remove(technology.unit.ingredients, i)
       end
     end
@@ -54,10 +50,6 @@ local function replace_science_pack(technology, old, new)
         doit = true
         amount = ingredient[2] + amount
       end
-      if ingredient.name == old then
-        doit = true
-        amount = ingredient.amount + amount
-      end
     end
     if doit then
       remove_science_pack(technology, old)
diff --git a/boblogistics/prototypes/chests.lua b/boblogistics/prototypes/chests.lua
index 6b4d37c6e..7f73c5f79 100644
--- a/boblogistics/prototypes/chests.lua
+++ b/boblogistics/prototypes/chests.lua
@@ -8,7 +8,7 @@ if data.raw.item["brass-alloy"] then
       type = "recipe",
       name = "brass-chest",
       enabled = false,
-      ingredients = { { "brass-alloy", 8 } },
+      ingredients = { { type = "item", name = "brass-alloy", amount = 8 } },
       results = { { type = "item", name = "brass-chest", amount = 1 } },
     },
     {
@@ -68,7 +68,7 @@ if data.raw.item["titanium-plate"] then
       type = "recipe",
       name = "titanium-chest",
       enabled = false,
-      ingredients = { { "titanium-plate", 8 } },
+      ingredients = { { type = "item", name = "titanium-plate", amount = 8 } },
       results = { { type = "item", name = "titanium-chest", amount = 1 } },
     },
     {
diff --git a/boblogistics/prototypes/entity/pipes.lua b/boblogistics/prototypes/entity/pipes.lua
index 6fb26f67c..d1fe3c31c 100644
--- a/boblogistics/prototypes/entity/pipes.lua
+++ b/boblogistics/prototypes/entity/pipes.lua
@@ -1508,7 +1508,7 @@ if data.raw.item["se-iridium-plate"] and mods["b-se-k2-integration"] then
       name = "iridium-pipe",
       enabled = false,
       ingredients = {
-        { "se-iridium-plate", 1 },
+        { type = "item", name = "se-iridium-plate", amount = 1 },
       },
       results = { { type = "item", name = "iridium-pipe", amount = 1 } },
     },
@@ -1518,8 +1518,8 @@ if data.raw.item["se-iridium-plate"] and mods["b-se-k2-integration"] then
       name = "iridium-pipe-to-ground",
       enabled = false,
       ingredients = {
-        { "iridium-pipe", 16 },
-        { "se-iridium-plate", 5 },
+        { type = "item", name = "iridium-pipe", amount = 16 },
+        { type = "item", name = "se-iridium-plate", amount = 5 },
       },
       results = { { type = "item", name = "iridium-pipe-to-ground", amount = 2 } },
     },
diff --git a/boblogistics/prototypes/recipe/belt-recipe.lua b/boblogistics/prototypes/recipe/belt-recipe.lua
index 44b4c2e5d..483a3a1e0 100644
--- a/boblogistics/prototypes/recipe/belt-recipe.lua
+++ b/boblogistics/prototypes/recipe/belt-recipe.lua
@@ -4,8 +4,8 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
       type = "recipe",
       name = "basic-transport-belt",
       ingredients = {
-        { "iron-plate", 1 },
-        { "iron-gear-wheel", 1 },
+        { type = "item", name = "iron-plate", amount = 1 },
+        { type = "item", name = "iron-gear-wheel", amount = 1 },
       },
       results = { { type = "item", name = "basic-transport-belt", amount = 2 } },
     },
@@ -14,8 +14,8 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
       name = "transport-belt",
       enabled = false,
       ingredients = {
-        { "iron-plate", 2 },
-        { "iron-gear-wheel", 2 },
+        { type = "item", name = "iron-plate", amount = 2 },
+        { type = "item", name = "iron-gear-wheel", amount = 2 },
       },
       results = { { type = "item", name = "transport-belt", amount = 1 } },
     },
@@ -24,8 +24,8 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
       name = "fast-transport-belt",
       enabled = false,
       ingredients = {
-        { "steel-plate", 2 },
-        { "iron-gear-wheel", 4 },
+        { type = "item", name = "steel-plate", amount = 2 },
+        { type = "item", name = "iron-gear-wheel", amount = 4 },
       },
       results = { { type = "item", name = "fast-transport-belt", amount = 1 } },
     },
@@ -34,8 +34,8 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
       name = "express-transport-belt",
       enabled = false,
       ingredients = {
-        { "steel-plate", 2 },
-        { "iron-gear-wheel", 4 },
+        { type = "item", name = "steel-plate", amount = 2 },
+        { type = "item", name = "iron-gear-wheel", amount = 4 },
       },
       results = { { type = "item", name = "express-transport-belt", amount = 1 } },
     },
@@ -44,8 +44,8 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
       name = "turbo-transport-belt",
       enabled = false,
       ingredients = {
-        { "steel-plate", 2 },
-        { "iron-gear-wheel", 4 },
+        { type = "item", name = "steel-plate", amount = 2 },
+        { type = "item", name = "iron-gear-wheel", amount = 4 },
       },
       results = { { type = "item", name = "turbo-transport-belt", amount = 1 } },
     },
@@ -54,8 +54,8 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
       name = "ultimate-transport-belt",
       enabled = false,
       ingredients = {
-        { "steel-plate", 2 },
-        { "iron-gear-wheel", 4 },
+        { type = "item", name = "steel-plate", amount = 2 },
+        { type = "item", name = "iron-gear-wheel", amount = 4 },
       },
       results = { { type = "item", name = "ultimate-transport-belt", amount = 1 } },
     },
@@ -68,9 +68,9 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
       enabled = false,
       energy_required = 1,
       ingredients = {
-        { "basic-transport-belt", 5 },
-        { "stone", 2 },
-        { "wood", 2 },
+        { type = "item", name = "basic-transport-belt", amount = 5 },
+        { type = "item", name = "stone", amount = 2 },
+        { type = "item", name = "wood", amount = 2 },
       },
       results = { { type = "item", name = "basic-underground-belt", amount = 2 } },
     },
@@ -80,21 +80,21 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
       enabled = false,
       energy_required = 1,
       ingredients = {
-        { "basic-transport-belt", 5 },
-        { "wood", 4 },
-        { "iron-gear-wheel", 2 },
-        { "copper-cable", 4 },
+        { type = "item", name = "basic-transport-belt", amount = 5 },
+        { type = "item", name = "wood", amount = 4 },
+        { type = "item", name = "iron-gear-wheel", amount = 2 },
+        { type = "item", name = "copper-cable", amount = 4 },
       },
       results = { { type = "item", name = "basic-splitter", amount = 1 } },
     },
   })
 
   if settings.startup["bobmods-logistics-beltrequireprevious"].value == true then
-    bobmods.lib.recipe.add_ingredient("fast-transport-belt", { "transport-belt", 1 })
-    bobmods.lib.recipe.add_ingredient("express-transport-belt", { "fast-transport-belt", 1 })
-    bobmods.lib.recipe.add_ingredient("turbo-transport-belt", { "express-transport-belt" })
-    bobmods.lib.recipe.add_ingredient("ultimate-transport-belt", { "turbo-transport-belt" })
-    bobmods.lib.recipe.add_ingredient("transport-belt", { "basic-transport-belt", 1 })
+    bobmods.lib.recipe.add_ingredient("fast-transport-belt", { type = "item", name = "transport-belt", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("express-transport-belt", { type = "item", name = "fast-transport-belt", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("turbo-transport-belt", { type = "item", name = "express-transport-belt", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("ultimate-transport-belt", { type = "item", name = "turbo-transport-belt", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("transport-belt", { type = "item", name = "basic-transport-belt", amount = 1 })
 
     data:extend({
       {
@@ -103,9 +103,9 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
         enabled = false,
         energy_required = 1,
         ingredients = {
-          { "basic-underground-belt", 2 },
-          { "iron-plate", 14 },
-          { "iron-gear-wheel", 20 },
+          { type = "item", name = "basic-underground-belt", amount = 2 },
+          { type = "item", name = "iron-plate", amount = 14 },
+          { type = "item", name = "iron-gear-wheel", amount = 20 },
         },
         results = { { type = "item", name = "underground-belt", amount = 2 } },
       },
@@ -115,9 +115,9 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
         energy_required = 2,
         enabled = false,
         ingredients = {
-          { "underground-belt", 2 },
-          { "steel-plate", 14 },
-          { "iron-gear-wheel", 20 },
+          { type = "item", name = "underground-belt", amount = 2 },
+          { type = "item", name = "steel-plate", amount = 14 },
+          { type = "item", name = "iron-gear-wheel", amount = 20 },
         },
         results = { { type = "item", name = "fast-underground-belt", amount = 2 } },
       },
@@ -127,9 +127,9 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
         energy_required = 2,
         enabled = false,
         ingredients = {
-          { "fast-underground-belt", 2 },
-          { "steel-plate", 14 },
-          { "iron-gear-wheel", 20 },
+          { type = "item", name = "fast-underground-belt", amount = 2 },
+          { type = "item", name = "steel-plate", amount = 14 },
+          { type = "item", name = "iron-gear-wheel", amount = 20 },
         },
         results = { { type = "item", name = "express-underground-belt", amount = 2 } },
       },
@@ -138,9 +138,9 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
         name = "turbo-underground-belt",
         enabled = false,
         ingredients = {
-          { "express-underground-belt", 2 },
-          { "steel-plate", 14 },
-          { "iron-gear-wheel", 20 },
+          { type = "item", name = "express-underground-belt", amount = 2 },
+          { type = "item", name = "steel-plate", amount = 14 },
+          { type = "item", name = "iron-gear-wheel", amount = 20 },
         },
         results = { { type = "item", name = "turbo-underground-belt", amount = 2 } },
       },
@@ -149,9 +149,9 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
         name = "ultimate-underground-belt",
         enabled = false,
         ingredients = {
-          { "turbo-underground-belt", 2 },
-          { "steel-plate", 14 },
-          { "iron-gear-wheel", 20 },
+          { type = "item", name = "turbo-underground-belt", amount = 2 },
+          { type = "item", name = "steel-plate", amount = 14 },
+          { type = "item", name = "iron-gear-wheel", amount = 20 },
         },
         results = { { type = "item", name = "ultimate-underground-belt", amount = 2 } },
       },
@@ -162,10 +162,10 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
         enabled = false,
         energy_required = 1,
         ingredients = {
-          { "basic-splitter", 1 },
-          { "iron-plate", 8 },
-          { "iron-gear-wheel", 14 },
-          { "electronic-circuit", 5 },
+          { type = "item", name = "basic-splitter", amount = 1 },
+          { type = "item", name = "iron-plate", amount = 8 },
+          { type = "item", name = "iron-gear-wheel", amount = 14 },
+          { type = "item", name = "electronic-circuit", amount = 5 },
         },
         results = { { type = "item", name = "splitter", amount = 1 } },
       },
@@ -175,10 +175,10 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
         enabled = false,
         energy_required = 2,
         ingredients = {
-          { "splitter", 1 },
-          { "steel-plate", 8 },
-          { "iron-gear-wheel", 14 },
-          { "electronic-circuit", 5 },
+          { type = "item", name = "splitter", amount = 1 },
+          { type = "item", name = "steel-plate", amount = 8 },
+          { type = "item", name = "iron-gear-wheel", amount = 14 },
+          { type = "item", name = "electronic-circuit", amount = 5 },
         },
         results = { { type = "item", name = "fast-splitter", amount = 1 } },
       },
@@ -188,10 +188,10 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
         enabled = false,
         energy_required = 2,
         ingredients = {
-          { "fast-splitter", 1 },
-          { "steel-plate", 8 },
-          { "iron-gear-wheel", 14 },
-          { "advanced-circuit", 5 },
+          { type = "item", name = "fast-splitter", amount = 1 },
+          { type = "item", name = "steel-plate", amount = 8 },
+          { type = "item", name = "iron-gear-wheel", amount = 14 },
+          { type = "item", name = "advanced-circuit", amount = 5 },
         },
         results = { { type = "item", name = "express-splitter", amount = 1 } },
       },
@@ -201,10 +201,10 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
         enabled = false,
         energy_required = 2,
         ingredients = {
-          { "express-splitter", 1 },
-          { "steel-plate", 8 },
-          { "iron-gear-wheel", 14 },
-          { "processing-unit", 5 },
+          { type = "item", name = "express-splitter", amount = 1 },
+          { type = "item", name = "steel-plate", amount = 8 },
+          { type = "item", name = "iron-gear-wheel", amount = 14 },
+          { type = "item", name = "processing-unit", amount = 5 },
         },
         results = { { type = "item", name = "turbo-splitter", amount = 1 } },
       },
@@ -214,10 +214,10 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
         enabled = false,
         energy_required = 2,
         ingredients = {
-          { "turbo-splitter", 1 },
-          { "steel-plate", 8 },
-          { "iron-gear-wheel", 14 },
-          { "processing-unit", 5 },
+          { type = "item", name = "turbo-splitter", amount = 1 },
+          { type = "item", name = "steel-plate", amount = 8 },
+          { type = "item", name = "iron-gear-wheel", amount = 14 },
+          { type = "item", name = "processing-unit", amount = 5 },
         },
         results = { { type = "item", name = "ultimate-splitter", amount = 1 } },
       },
@@ -230,8 +230,8 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
         enabled = false,
         energy_required = 1,
         ingredients = {
-          { "transport-belt", 5 },
-          { "iron-plate", 4 },
+          { type = "item", name = "transport-belt", amount = 5 },
+          { type = "item", name = "iron-plate", amount = 4 },
         },
         results = { { type = "item", name = "underground-belt", amount = 2 } },
       },
@@ -241,8 +241,8 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
         energy_required = 2,
         enabled = false,
         ingredients = {
-          { "fast-transport-belt", 5 },
-          { "steel-plate", 4 },
+          { type = "item", name = "fast-transport-belt", amount = 5 },
+          { type = "item", name = "steel-plate", amount = 4 },
         },
         results = { { type = "item", name = "fast-underground-belt", amount = 2 } },
       },
@@ -252,8 +252,8 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
         energy_required = 2,
         enabled = false,
         ingredients = {
-          { "express-transport-belt", 5 },
-          { "steel-plate", 4 },
+          { type = "item", name = "express-transport-belt", amount = 5 },
+          { type = "item", name = "steel-plate", amount = 4 },
         },
         results = { { type = "item", name = "express-underground-belt", amount = 2 } },
       },
@@ -262,8 +262,8 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
         name = "turbo-underground-belt",
         enabled = false,
         ingredients = {
-          { "turbo-transport-belt", 5 },
-          { "steel-plate", 4 },
+          { type = "item", name = "turbo-transport-belt", amount = 5 },
+          { type = "item", name = "steel-plate", amount = 4 },
         },
         results = { { type = "item", name = "turbo-underground-belt", amount = 2 } },
       },
@@ -272,8 +272,8 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
         name = "ultimate-underground-belt",
         enabled = false,
         ingredients = {
-          { "ultimate-transport-belt", 5 },
-          { "steel-plate", 4 },
+          { type = "item", name = "ultimate-transport-belt", amount = 5 },
+          { type = "item", name = "steel-plate", amount = 4 },
         },
         results = { { type = "item", name = "ultimate-underground-belt", amount = 2 } },
       },
@@ -284,10 +284,10 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
         enabled = false,
         energy_required = 1,
         ingredients = {
-          { "transport-belt", 2 },
-          { "iron-plate", 4 },
-          { "iron-gear-wheel", 4 },
-          { "electronic-circuit", 5 },
+          { type = "item", name = "transport-belt", amount = 2 },
+          { type = "item", name = "iron-plate", amount = 4 },
+          { type = "item", name = "iron-gear-wheel", amount = 4 },
+          { type = "item", name = "electronic-circuit", amount = 5 },
         },
         results = { { type = "item", name = "splitter", amount = 1 } },
       },
@@ -297,10 +297,10 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
         enabled = false,
         energy_required = 2,
         ingredients = {
-          { "fast-transport-belt", 2 },
-          { "steel-plate", 4 },
-          { "iron-gear-wheel", 4 },
-          { "electronic-circuit", 5 },
+          { type = "item", name = "fast-transport-belt", amount = 2 },
+          { type = "item", name = "steel-plate", amount = 4 },
+          { type = "item", name = "iron-gear-wheel", amount = 4 },
+          { type = "item", name = "electronic-circuit", amount = 5 },
         },
         results = { { type = "item", name = "fast-splitter", amount = 1 } },
       },
@@ -310,10 +310,10 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
         enabled = false,
         energy_required = 2,
         ingredients = {
-          { "express-transport-belt", 2 },
-          { "steel-plate", 4 },
-          { "iron-gear-wheel", 4 },
-          { "advanced-circuit", 5 },
+          { type = "item", name = "express-transport-belt", amount = 2 },
+          { type = "item", name = "steel-plate", amount = 4 },
+          { type = "item", name = "iron-gear-wheel", amount = 4 },
+          { type = "item", name = "advanced-circuit", amount = 5 },
         },
         results = { { type = "item", name = "express-splitter", amount = 1 } },
       },
@@ -323,10 +323,10 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
         enabled = false,
         energy_required = 2,
         ingredients = {
-          { "turbo-transport-belt", 2 },
-          { "steel-plate", 4 },
-          { "iron-gear-wheel", 4 },
-          { "processing-unit", 5 },
+          { type = "item", name = "turbo-transport-belt", amount = 2 },
+          { type = "item", name = "steel-plate", amount = 4 },
+          { type = "item", name = "iron-gear-wheel", amount = 4 },
+          { type = "item", name = "processing-unit", amount = 5 },
         },
         results = { { type = "item", name = "turbo-splitter", amount = 1 } },
       },
@@ -336,10 +336,10 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
         enabled = false,
         energy_required = 2,
         ingredients = {
-          { "ultimate-transport-belt", 2 },
-          { "steel-plate", 4 },
-          { "iron-gear-wheel", 4 },
-          { "processing-unit", 5 },
+          { type = "item", name = "ultimate-transport-belt", amount = 2 },
+          { type = "item", name = "steel-plate", amount = 4 },
+          { type = "item", name = "iron-gear-wheel", amount = 4 },
+          { type = "item", name = "processing-unit", amount = 5 },
         },
         results = { { type = "item", name = "ultimate-splitter", amount = 1 } },
       },
@@ -352,8 +352,8 @@ else
       name = "turbo-transport-belt",
       enabled = false,
       ingredients = {
-        { "express-transport-belt", 1 },
-        { "iron-gear-wheel", 20 },
+        { type = "item", name = "express-transport-belt", amount = 1 },
+        { type = "item", name = "iron-gear-wheel", amount = 20 },
       },
       results = { { type = "item", name = "turbo-transport-belt", amount = 1 } },
     },
@@ -362,8 +362,8 @@ else
       name = "turbo-underground-belt",
       enabled = false,
       ingredients = {
-        { "express-underground-belt", 2 },
-        { "iron-gear-wheel", 100 },
+        { type = "item", name = "express-underground-belt", amount = 2 },
+        { type = "item", name = "iron-gear-wheel", amount = 100 },
       },
       results = { { type = "item", name = "turbo-underground-belt", amount = 2 } },
     },
@@ -373,9 +373,9 @@ else
       enabled = false,
       energy_required = 2,
       ingredients = {
-        { "express-splitter", 1 },
-        { "processing-unit", 10 },
-        { "iron-gear-wheel", 10 },
+        { type = "item", name = "express-splitter", amount = 1 },
+        { type = "item", name = "processing-unit", amount = 10 },
+        { type = "item", name = "iron-gear-wheel", amount = 10 },
       },
       results = { { type = "item", name = "turbo-splitter", amount = 2 } },
     },
@@ -385,8 +385,8 @@ else
       name = "ultimate-transport-belt",
       enabled = false,
       ingredients = {
-        { "turbo-transport-belt", 1 },
-        { "iron-gear-wheel", 20 },
+        { type = "item", name = "turbo-transport-belt", amount = 1 },
+        { type = "item", name = "iron-gear-wheel", amount = 20 },
       },
       results = { { type = "item", name = "ultimate-transport-belt", amount = 2 } },
     },
@@ -395,8 +395,8 @@ else
       name = "ultimate-underground-belt",
       enabled = false,
       ingredients = {
-        { "turbo-underground-belt", 2 },
-        { "iron-gear-wheel", 120 },
+        { type = "item", name = "turbo-underground-belt", amount = 2 },
+        { type = "item", name = "iron-gear-wheel", amount = 120 },
       },
       results = { { type = "item", name = "ultimate-underground-belt", amount = 2 } },
     },
@@ -406,9 +406,9 @@ else
       enabled = false,
       energy_required = 2,
       ingredients = {
-        { "turbo-splitter", 1 },
-        { "processing-unit", 10 },
-        { "iron-gear-wheel", 10 },
+        { type = "item", name = "turbo-splitter", amount = 1 },
+        { type = "item", name = "processing-unit", amount = 10 },
+        { type = "item", name = "iron-gear-wheel", amount = 10 },
       },
       results = { { type = "item", name = "ultimate-splitter", amount = 1 } },
     },
diff --git a/boblogistics/prototypes/recipe/inserter-recipe.lua b/boblogistics/prototypes/recipe/inserter-recipe.lua
index 71e5cefc5..4cd33d511 100644
--- a/boblogistics/prototypes/recipe/inserter-recipe.lua
+++ b/boblogistics/prototypes/recipe/inserter-recipe.lua
@@ -3,8 +3,8 @@ data:extend({
     type = "recipe",
     name = "steam-inserter",
     ingredients = {
-      { "burner-inserter", 1 },
-      { "pipe", 1 },
+      { type = "item", name = "burner-inserter", amount = 1 },
+      { type = "item", name = "pipe", amount = 1 },
     },
     results = { { type = "item", name = "steam-inserter", amount = 1 } },
     requester_paste_multiplier = 4,
@@ -14,9 +14,9 @@ data:extend({
     name = "express-inserter",
     enabled = false,
     ingredients = {
-      { "fast-inserter", 1 },
-      { "iron-gear-wheel", 2 },
-      { "advanced-circuit", 2 },
+      { type = "item", name = "fast-inserter", amount = 1 },
+      { type = "item", name = "iron-gear-wheel", amount = 2 },
+      { type = "item", name = "advanced-circuit", amount = 2 },
     },
     results = { { type = "item", name = "express-inserter", amount = 1 } },
     requester_paste_multiplier = 4,
@@ -26,9 +26,9 @@ data:extend({
     name = "express-filter-inserter",
     enabled = false,
     ingredients = {
-      { "filter-inserter", 1 },
-      { "iron-gear-wheel", 2 },
-      { "advanced-circuit", 4 },
+      { type = "item", name = "filter-inserter", amount = 1 },
+      { type = "item", name = "iron-gear-wheel", amount = 2 },
+      { type = "item", name = "advanced-circuit", amount = 4 },
     },
     results = { { type = "item", name = "express-filter-inserter", amount = 1 } },
     requester_paste_multiplier = 4,
@@ -38,9 +38,9 @@ data:extend({
     name = "express-stack-inserter",
     enabled = false,
     ingredients = {
-      { "stack-inserter", 1 },
-      { "iron-gear-wheel", 15 },
-      { "advanced-circuit", 5 },
+      { type = "item", name = "stack-inserter", amount = 1 },
+      { type = "item", name = "iron-gear-wheel", amount = 15 },
+      { type = "item", name = "advanced-circuit", amount = 5 },
     },
     results = { { type = "item", name = "express-stack-inserter", amount = 1 } },
     requester_paste_multiplier = 4,
@@ -50,9 +50,9 @@ data:extend({
     name = "express-stack-filter-inserter",
     enabled = false,
     ingredients = {
-      { "stack-filter-inserter", 1 },
-      { "iron-gear-wheel", 15 },
-      { "advanced-circuit", 5 },
+      { type = "item", name = "stack-filter-inserter", amount = 1 },
+      { type = "item", name = "iron-gear-wheel", amount = 15 },
+      { type = "item", name = "advanced-circuit", amount = 5 },
     },
     results = { { type = "item", name = "express-stack-filter-inserter", amount = 1 } },
     requester_paste_multiplier = 4,
@@ -66,8 +66,8 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
       name = "yellow-filter-inserter", --standard
       enabled = false,
       ingredients = {
-        { "inserter", 1 },
-        { "electronic-circuit", 4 },
+        { type = "item", name = "inserter", amount = 1 },
+        { type = "item", name = "electronic-circuit", amount = 4 },
       },
       results = { { type = "item", name = "yellow-filter-inserter", amount = 1 } },
     },
@@ -76,9 +76,9 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
       name = "red-stack-inserter", --fast
       enabled = false,
       ingredients = {
-        { "long-handed-inserter", 1 },
-        { "steel-plate", 3 },
-        { "iron-gear-wheel", 5 }, -- replace brass -- add in steel bearings if they and brass exist
+        { type = "item", name = "long-handed-inserter", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 3 },
+        { type = "item", name = "iron-gear-wheel", amount = 5 }, -- replace brass -- add in steel bearings if they and brass exist
       },
       results = { { type = "item", name = "red-stack-inserter", amount = 1 } },
     },
@@ -87,8 +87,8 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
       name = "red-stack-filter-inserter", --fast
       enabled = false,
       ingredients = {
-        { "red-stack-inserter", 1 },
-        { "electronic-circuit", 5 },
+        { type = "item", name = "red-stack-inserter", amount = 1 },
+        { type = "item", name = "electronic-circuit", amount = 5 },
       },
       results = { { type = "item", name = "red-stack-filter-inserter", amount = 1 } },
     },
@@ -101,10 +101,10 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "long-handed-inserter", --fast inserter
         enabled = false,
         ingredients = {
-          { "inserter", 1 }, --optional
-          { "steel-plate", 1 },
-          { "iron-gear-wheel", 1 }, -- replace steel gear wheel -- add in steel bearings if they and brass exist
-          { "electronic-circuit", 1 },
+          { type = "item", name = "inserter", amount = 1 }, --optional
+          { type = "item", name = "steel-plate", amount = 1 },
+          { type = "item", name = "iron-gear-wheel", amount = 1 }, -- replace steel gear wheel -- add in steel bearings if they and brass exist
+          { type = "item", name = "electronic-circuit", amount = 1 },
         },
         results = { { type = "item", name = "long-handed-inserter", amount = 1 } },
       },
@@ -113,10 +113,10 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "red-filter-inserter", --fast
         enabled = false,
         ingredients = {
-          { "yellow-filter-inserter", 1 },
-          { "steel-plate", 1 },
-          { "iron-gear-wheel", 1 }, -- replace steel gear wheel -- add in steel bearings if they and brass exist
-          { "electronic-circuit", 1 },
+          { type = "item", name = "yellow-filter-inserter", amount = 1 },
+          { type = "item", name = "steel-plate", amount = 1 },
+          { type = "item", name = "iron-gear-wheel", amount = 1 }, -- replace steel gear wheel -- add in steel bearings if they and brass exist
+          { type = "item", name = "electronic-circuit", amount = 1 },
         },
         results = { { type = "item", name = "red-filter-inserter", amount = 1 } },
       },
@@ -126,10 +126,10 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "fast-inserter", --express
         enabled = false,
         ingredients = {
-          { "long-handed-inserter", 1 }, --optional
-          { "steel-plate", 1 }, -- replace aluminium
-          { "iron-gear-wheel", 1 }, -- replace brass -- add steel bearings, or brass if it exists.
-          { "advanced-circuit", 1 },
+          { type = "item", name = "long-handed-inserter", amount = 1 }, --optional
+          { type = "item", name = "steel-plate", amount = 1 }, -- replace aluminium
+          { type = "item", name = "iron-gear-wheel", amount = 1 }, -- replace brass -- add steel bearings, or brass if it exists.
+          { type = "item", name = "advanced-circuit", amount = 1 },
         },
         results = { { type = "item", name = "fast-inserter", amount = 1 } },
       },
@@ -138,10 +138,10 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "filter-inserter", --express
         enabled = false,
         ingredients = {
-          { "red-filter-inserter", 1 },
-          { "steel-plate", 1 }, -- replace aluminium
-          { "iron-gear-wheel", 1 }, -- replace brass -- add steel bearings, or brass if it exists.
-          { "advanced-circuit", 5 },
+          { type = "item", name = "red-filter-inserter", amount = 1 },
+          { type = "item", name = "steel-plate", amount = 1 }, -- replace aluminium
+          { type = "item", name = "iron-gear-wheel", amount = 1 }, -- replace brass -- add steel bearings, or brass if it exists.
+          { type = "item", name = "advanced-circuit", amount = 5 },
         },
         results = { { type = "item", name = "filter-inserter", amount = 1 } },
       },
@@ -150,10 +150,10 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "stack-inserter", --express
         enabled = false,
         ingredients = {
-          { "red-stack-inserter", 1 },
-          { "steel-plate", 4 }, -- replace aluminium
-          { "iron-gear-wheel", 6 }, -- replace brass -- add steel bearings, or brass if it exists.
-          { "advanced-circuit", 1 },
+          { type = "item", name = "red-stack-inserter", amount = 1 },
+          { type = "item", name = "steel-plate", amount = 4 }, -- replace aluminium
+          { type = "item", name = "iron-gear-wheel", amount = 6 }, -- replace brass -- add steel bearings, or brass if it exists.
+          { type = "item", name = "advanced-circuit", amount = 1 },
         },
         results = { { type = "item", name = "stack-inserter", amount = 1 } },
       },
@@ -162,10 +162,10 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "stack-filter-inserter", --express
         enabled = false,
         ingredients = {
-          { "red-stack-filter-inserter", 1 },
-          { "steel-plate", 4 }, -- replace aluminium
-          { "iron-gear-wheel", 6 }, -- replace brass -- add steel bearings, or brass if it exists.
-          { "advanced-circuit", 6 },
+          { type = "item", name = "red-stack-filter-inserter", amount = 1 },
+          { type = "item", name = "steel-plate", amount = 4 }, -- replace aluminium
+          { type = "item", name = "iron-gear-wheel", amount = 6 }, -- replace brass -- add steel bearings, or brass if it exists.
+          { type = "item", name = "advanced-circuit", amount = 6 },
         },
         results = { { type = "item", name = "stack-filter-inserter", amount = 1 } },
       },
@@ -175,10 +175,10 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "turbo-inserter", --turbo
         enabled = false,
         ingredients = {
-          { "fast-inserter", 1 }, --optional
-          { "steel-plate", 1 }, -- replace titanium
-          { "iron-gear-wheel", 1 }, --replace titanium -- add titanium bearing
-          { "processing-unit", 1 },
+          { type = "item", name = "fast-inserter", amount = 1 }, --optional
+          { type = "item", name = "steel-plate", amount = 1 }, -- replace titanium
+          { type = "item", name = "iron-gear-wheel", amount = 1 }, --replace titanium -- add titanium bearing
+          { type = "item", name = "processing-unit", amount = 1 },
         },
         results = { { type = "item", name = "turbo-inserter", amount = 1 } },
         requester_paste_multiplier = 4,
@@ -188,10 +188,10 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "turbo-filter-inserter", --turbo
         enabled = false,
         ingredients = {
-          { "filter-inserter", 1 },
-          { "steel-plate", 1 }, -- replace titanium
-          { "iron-gear-wheel", 1 }, -- replace titanium -- add titanium bearing
-          { "processing-unit", 5 },
+          { type = "item", name = "filter-inserter", amount = 1 },
+          { type = "item", name = "steel-plate", amount = 1 }, -- replace titanium
+          { type = "item", name = "iron-gear-wheel", amount = 1 }, -- replace titanium -- add titanium bearing
+          { type = "item", name = "processing-unit", amount = 5 },
         },
         results = { { type = "item", name = "turbo-filter-inserter", amount = 1 } },
         requester_paste_multiplier = 4,
@@ -202,10 +202,10 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "turbo-stack-inserter", --turbo
         enabled = false,
         ingredients = {
-          { "stack-inserter", 1 },
-          { "steel-plate", 4 }, -- replace titanium
-          { "iron-gear-wheel", 6 }, -- replace titanium--add titanium bearing
-          { "processing-unit", 1 },
+          { type = "item", name = "stack-inserter", amount = 1 },
+          { type = "item", name = "steel-plate", amount = 4 }, -- replace titanium
+          { type = "item", name = "iron-gear-wheel", amount = 6 }, -- replace titanium--add titanium bearing
+          { type = "item", name = "processing-unit", amount = 1 },
         },
         results = { { type = "item", name = "turbo-stack-inserter", amount = 1 } },
         requester_paste_multiplier = 4,
@@ -215,10 +215,10 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "turbo-stack-filter-inserter", --turbo
         enabled = false,
         ingredients = {
-          { "stack-filter-inserter", 1 },
-          { "steel-plate", 4 }, -- replace titanium
-          { "iron-gear-wheel", 6 }, -- replace titanium--add titanium bearing
-          { "processing-unit", 6 },
+          { type = "item", name = "stack-filter-inserter", amount = 1 },
+          { type = "item", name = "steel-plate", amount = 4 }, -- replace titanium
+          { type = "item", name = "iron-gear-wheel", amount = 6 }, -- replace titanium--add titanium bearing
+          { type = "item", name = "processing-unit", amount = 6 },
         },
         results = { { type = "item", name = "turbo-stack-filter-inserter", amount = 1 } },
         requester_paste_multiplier = 4,
@@ -229,10 +229,10 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "express-inserter", --ultimate
         enabled = false,
         ingredients = {
-          { "turbo-inserter", 1 }, --optional
-          { "steel-plate", 1 }, -- replace nitinol
-          { "iron-gear-wheel", 1 }, --replace nitinol -- add nitinol bearing
-          { "processing-unit", 1 }, --replace advanced processing unit
+          { type = "item", name = "turbo-inserter", amount = 1 }, --optional
+          { type = "item", name = "steel-plate", amount = 1 }, -- replace nitinol
+          { type = "item", name = "iron-gear-wheel", amount = 1 }, --replace nitinol -- add nitinol bearing
+          { type = "item", name = "processing-unit", amount = 1 }, --replace advanced processing unit
         },
         results = { { type = "item", name = "express-inserter", amount = 1 } },
         requester_paste_multiplier = 4,
@@ -242,10 +242,10 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "express-filter-inserter", --ultimate
         enabled = false,
         ingredients = {
-          { "turbo-filter-inserter", 1 },
-          { "steel-plate", 1 }, -- replace nitinol
-          { "iron-gear-wheel", 1 }, -- replace nitinol -- add nitinol bearing
-          { "processing-unit", 5 }, --replace advanced processing unit
+          { type = "item", name = "turbo-filter-inserter", amount = 1 },
+          { type = "item", name = "steel-plate", amount = 1 }, -- replace nitinol
+          { type = "item", name = "iron-gear-wheel", amount = 1 }, -- replace nitinol -- add nitinol bearing
+          { type = "item", name = "processing-unit", amount = 5 }, --replace advanced processing unit
         },
         results = { { type = "item", name = "express-filter-inserter", amount = 1 } },
         requester_paste_multiplier = 4,
@@ -256,10 +256,10 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "express-stack-inserter", --ultimate
         enabled = false,
         ingredients = {
-          { "turbo-stack-inserter", 1 },
-          { "steel-plate", 4 }, -- replace nitinol
-          { "iron-gear-wheel", 6 }, -- replace nitinol -- add nitinol bearing
-          { "processing-unit", 1 }, --replace advanced processing unit
+          { type = "item", name = "turbo-stack-inserter", amount = 1 },
+          { type = "item", name = "steel-plate", amount = 4 }, -- replace nitinol
+          { type = "item", name = "iron-gear-wheel", amount = 6 }, -- replace nitinol -- add nitinol bearing
+          { type = "item", name = "processing-unit", amount = 1 }, --replace advanced processing unit
         },
         results = { { type = "item", name = "express-stack-inserter", amount = 1 } },
         requester_paste_multiplier = 4,
@@ -269,10 +269,10 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "express-stack-filter-inserter", --ultimate
         enabled = false,
         ingredients = {
-          { "turbo-stack-filter-inserter", 1 },
-          { "steel-plate", 4 }, -- replace nitinol
-          { "iron-gear-wheel", 6 }, -- replace nitinol -- add nitinol bearing
-          { "processing-unit", 6 }, --replace advanced processing unit
+          { type = "item", name = "turbo-stack-filter-inserter", amount = 1 },
+          { type = "item", name = "steel-plate", amount = 4 }, -- replace nitinol
+          { type = "item", name = "iron-gear-wheel", amount = 6 }, -- replace nitinol -- add nitinol bearing
+          { type = "item", name = "processing-unit", amount = 6 }, --replace advanced processing unit
         },
         results = { { type = "item", name = "express-stack-filter-inserter", amount = 1 } },
         requester_paste_multiplier = 4,
@@ -285,9 +285,9 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "long-handed-inserter", --fast inserter
         enabled = false,
         ingredients = {
-          { "steel-plate", 1 },
-          { "iron-gear-wheel", 1 }, -- replace steel gear wheel -- add in steel bearings if they and brass exist
-          { "electronic-circuit", 1 },
+          { type = "item", name = "steel-plate", amount = 1 },
+          { type = "item", name = "iron-gear-wheel", amount = 1 }, -- replace steel gear wheel -- add in steel bearings if they and brass exist
+          { type = "item", name = "electronic-circuit", amount = 1 },
         },
         results = { { type = "item", name = "long-handed-inserter", amount = 1 } },
       },
@@ -296,8 +296,8 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "red-filter-inserter", --fast
         enabled = false,
         ingredients = {
-          { "long-handed-inserter", 1 },
-          { "electronic-circuit", 4 },
+          { type = "item", name = "long-handed-inserter", amount = 1 },
+          { type = "item", name = "electronic-circuit", amount = 4 },
         },
         results = { { type = "item", name = "red-filter-inserter", amount = 1 } },
       },
@@ -307,9 +307,9 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "fast-inserter", --express
         enabled = false,
         ingredients = {
-          { "steel-plate", 1 }, -- replace aluminium
-          { "iron-gear-wheel", 1 }, -- replace brass -- add steel bearings, or brass if it exists.
-          { "advanced-circuit", 1 },
+          { type = "item", name = "steel-plate", amount = 1 }, -- replace aluminium
+          { type = "item", name = "iron-gear-wheel", amount = 1 }, -- replace brass -- add steel bearings, or brass if it exists.
+          { type = "item", name = "advanced-circuit", amount = 1 },
         },
         results = { { type = "item", name = "fast-inserter", amount = 1 } },
       },
@@ -318,8 +318,8 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "filter-inserter", --express
         enabled = false,
         ingredients = {
-          { "fast-inserter", 1 },
-          { "advanced-circuit", 4 },
+          { type = "item", name = "fast-inserter", amount = 1 },
+          { type = "item", name = "advanced-circuit", amount = 4 },
         },
         results = { { type = "item", name = "filter-inserter", amount = 1 } },
       },
@@ -328,9 +328,9 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "stack-inserter", --express
         enabled = false,
         ingredients = {
-          { "fast-inserter", 1 },
-          { "steel-plate", 3 }, -- replace aluminium
-          { "iron-gear-wheel", 5 }, -- replace brass -- add steel bearings, or brass if it exists.
+          { type = "item", name = "fast-inserter", amount = 1 },
+          { type = "item", name = "steel-plate", amount = 3 }, -- replace aluminium
+          { type = "item", name = "iron-gear-wheel", amount = 5 }, -- replace brass -- add steel bearings, or brass if it exists.
         },
         results = { { type = "item", name = "stack-inserter", amount = 1 } },
       },
@@ -339,8 +339,8 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "stack-filter-inserter", --express
         enabled = false,
         ingredients = {
-          { "stack-inserter", 1 },
-          { "advanced-circuit", 5 },
+          { type = "item", name = "stack-inserter", amount = 1 },
+          { type = "item", name = "advanced-circuit", amount = 5 },
         },
         results = { { type = "item", name = "stack-filter-inserter", amount = 1 } },
       },
@@ -350,9 +350,9 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "turbo-inserter", --turbo
         enabled = false,
         ingredients = {
-          { "steel-plate", 1 }, -- replace titanium
-          { "iron-gear-wheel", 1 }, --replace titanium -- add titanium bearing
-          { "processing-unit", 1 },
+          { type = "item", name = "steel-plate", amount = 1 }, -- replace titanium
+          { type = "item", name = "iron-gear-wheel", amount = 1 }, --replace titanium -- add titanium bearing
+          { type = "item", name = "processing-unit", amount = 1 },
         },
         results = { { type = "item", name = "turbo-inserter", amount = 1 } },
         requester_paste_multiplier = 4,
@@ -362,8 +362,8 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "turbo-filter-inserter", --turbo
         enabled = false,
         ingredients = {
-          { "turbo-inserter", 1 },
-          { "processing-unit", 4 },
+          { type = "item", name = "turbo-inserter", amount = 1 },
+          { type = "item", name = "processing-unit", amount = 4 },
         },
         results = { { type = "item", name = "turbo-filter-inserter", amount = 1 } },
         requester_paste_multiplier = 4,
@@ -374,9 +374,9 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "turbo-stack-inserter", --turbo
         enabled = false,
         ingredients = {
-          { "turbo-inserter", 1 },
-          { "steel-plate", 3 }, -- replace titanium
-          { "iron-gear-wheel", 5 }, -- replace titanium--add titanium bearing
+          { type = "item", name = "turbo-inserter", amount = 1 },
+          { type = "item", name = "steel-plate", amount = 3 }, -- replace titanium
+          { type = "item", name = "iron-gear-wheel", amount = 5 }, -- replace titanium--add titanium bearing
         },
         results = { { type = "item", name = "turbo-stack-inserter", amount = 1 } },
         requester_paste_multiplier = 4,
@@ -386,8 +386,8 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "turbo-stack-filter-inserter", --turbo
         enabled = false,
         ingredients = {
-          { "turbo-stack-inserter", 1 },
-          { "processing-unit", 5 },
+          { type = "item", name = "turbo-stack-inserter", amount = 1 },
+          { type = "item", name = "processing-unit", amount = 5 },
         },
         results = { { type = "item", name = "turbo-stack-filter-inserter", amount = 1 } },
         requester_paste_multiplier = 4,
@@ -398,9 +398,9 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "express-inserter", --ultimate
         enabled = false,
         ingredients = {
-          { "steel-plate", 1 }, -- replace nitinol
-          { "iron-gear-wheel", 1 }, --replace nitinol -- add nitinol bearing
-          { "processing-unit", 1 }, --replace advanced processing unit
+          { type = "item", name = "steel-plate", amount = 1 }, -- replace nitinol
+          { type = "item", name = "iron-gear-wheel", amount = 1 }, --replace nitinol -- add nitinol bearing
+          { type = "item", name = "processing-unit", amount = 1 }, --replace advanced processing unit
         },
         results = { { type = "item", name = "express-inserter", amount = 1 } },
         requester_paste_multiplier = 4,
@@ -410,8 +410,8 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "express-filter-inserter", --ultimate
         enabled = false,
         ingredients = {
-          { "express-inserter", 1 },
-          { "processing-unit", 4 }, --replace advanced processing unit
+          { type = "item", name = "express-inserter", amount = 1 },
+          { type = "item", name = "processing-unit", amount = 4 }, --replace advanced processing unit
         },
         results = { { type = "item", name = "express-filter-inserter", amount = 1 } },
         requester_paste_multiplier = 4,
@@ -422,9 +422,9 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "express-stack-inserter", --ultimate
         enabled = false,
         ingredients = {
-          { "express-inserter", 1 },
-          { "steel-plate", 3 }, -- replace nitinol
-          { "iron-gear-wheel", 5 }, -- replace nitinol -- add nitinol bearing
+          { type = "item", name = "express-inserter", amount = 1 },
+          { type = "item", name = "steel-plate", amount = 3 }, -- replace nitinol
+          { type = "item", name = "iron-gear-wheel", amount = 5 }, -- replace nitinol -- add nitinol bearing
         },
         results = { { type = "item", name = "express-stack-inserter", amount = 1 } },
         requester_paste_multiplier = 4,
@@ -434,8 +434,8 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
         name = "express-stack-filter-inserter", --ultimate
         enabled = false,
         ingredients = {
-          { "express-stack-inserter", 1 },
-          { "processing-unit", 5 }, --replace advanced processing unit
+          { type = "item", name = "express-stack-inserter", amount = 1 },
+          { type = "item", name = "processing-unit", amount = 5 }, --replace advanced processing unit
         },
         results = { { type = "item", name = "express-stack-filter-inserter", amount = 1 } },
         requester_paste_multiplier = 4,
diff --git a/boblogistics/prototypes/recipe/logistic-container-recipe.lua b/boblogistics/prototypes/recipe/logistic-container-recipe.lua
index 1be979fd0..6e7a04f4a 100644
--- a/boblogistics/prototypes/recipe/logistic-container-recipe.lua
+++ b/boblogistics/prototypes/recipe/logistic-container-recipe.lua
@@ -4,8 +4,8 @@ data:extend({
     name = "logistic-chest-passive-provider-2",
     enabled = false,
     ingredients = {
-      { "logistic-chest-passive-provider", 1 },
-      { "processing-unit", 1 },
+      { type = "item", name = "logistic-chest-passive-provider", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 1 },
     },
     results = { { type = "item", name = "logistic-chest-passive-provider-2", amount = 1 } },
   },
@@ -14,8 +14,8 @@ data:extend({
     name = "logistic-chest-active-provider-2",
     enabled = false,
     ingredients = {
-      { "logistic-chest-active-provider", 1 },
-      { "processing-unit", 1 },
+      { type = "item", name = "logistic-chest-active-provider", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 1 },
     },
     results = { { type = "item", name = "logistic-chest-active-provider-2", amount = 1 } },
   },
@@ -24,8 +24,8 @@ data:extend({
     name = "logistic-chest-storage-2",
     enabled = false,
     ingredients = {
-      { "logistic-chest-storage", 1 },
-      { "processing-unit", 1 },
+      { type = "item", name = "logistic-chest-storage", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 1 },
     },
     results = { { type = "item", name = "logistic-chest-storage-2", amount = 1 } },
   },
@@ -34,8 +34,8 @@ data:extend({
     name = "logistic-chest-buffer-2",
     enabled = false,
     ingredients = {
-      { "logistic-chest-buffer", 1 },
-      { "processing-unit", 1 },
+      { type = "item", name = "logistic-chest-buffer", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 1 },
     },
     results = { { type = "item", name = "logistic-chest-buffer-2", amount = 1 } },
   },
@@ -44,8 +44,8 @@ data:extend({
     name = "logistic-chest-requester-2",
     enabled = false,
     ingredients = {
-      { "logistic-chest-requester", 1 },
-      { "processing-unit", 1 },
+      { type = "item", name = "logistic-chest-requester", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 1 },
     },
     results = { { type = "item", name = "logistic-chest-requester-2", amount = 1 } },
   },
@@ -55,8 +55,8 @@ data:extend({
     name = "logistic-chest-passive-provider-3",
     enabled = false,
     ingredients = {
-      { "logistic-chest-passive-provider-2", 1 },
-      { "processing-unit", 1 },
+      { type = "item", name = "logistic-chest-passive-provider-2", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 1 },
     },
     results = { { type = "item", name = "logistic-chest-passive-provider-3", amount = 1 } },
   },
@@ -65,8 +65,8 @@ data:extend({
     name = "logistic-chest-active-provider-3",
     enabled = false,
     ingredients = {
-      { "logistic-chest-active-provider-2", 1 },
-      { "processing-unit", 1 },
+      { type = "item", name = "logistic-chest-active-provider-2", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 1 },
     },
     results = { { type = "item", name = "logistic-chest-active-provider-3", amount = 1 } },
   },
@@ -75,8 +75,8 @@ data:extend({
     name = "logistic-chest-storage-3",
     enabled = false,
     ingredients = {
-      { "logistic-chest-storage-2", 1 },
-      { "processing-unit", 1 },
+      { type = "item", name = "logistic-chest-storage-2", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 1 },
     },
     results = { { type = "item", name = "logistic-chest-storage-3", amount = 1 } },
   },
@@ -85,8 +85,8 @@ data:extend({
     name = "logistic-chest-buffer-3",
     enabled = false,
     ingredients = {
-      { "logistic-chest-buffer-2", 1 },
-      { "processing-unit", 1 },
+      { type = "item", name = "logistic-chest-buffer-2", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 1 },
     },
     results = { { type = "item", name = "logistic-chest-buffer-3", amount = 1 } },
   },
@@ -95,8 +95,8 @@ data:extend({
     name = "logistic-chest-requester-3",
     enabled = false,
     ingredients = {
-      { "logistic-chest-requester-2", 1 },
-      { "processing-unit", 1 },
+      { type = "item", name = "logistic-chest-requester-2", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 1 },
     },
     results = { { type = "item", name = "logistic-chest-requester-3", amount = 1 } },
   },
diff --git a/boblogistics/prototypes/recipe/pipes-recipe.lua b/boblogistics/prototypes/recipe/pipes-recipe.lua
index 81a3e7115..3b9e95c46 100644
--- a/boblogistics/prototypes/recipe/pipes-recipe.lua
+++ b/boblogistics/prototypes/recipe/pipes-recipe.lua
@@ -3,7 +3,7 @@ data:extend({
     type = "recipe",
     name = "stone-pipe",
     ingredients = {
-      { "stone-brick", 1 },
+      { type = "item", name = "stone-brick", amount = 1 },
     },
     results = { { type = "item", name = "stone-pipe", amount = 1 } },
   },
@@ -12,8 +12,8 @@ data:extend({
     type = "recipe",
     name = "stone-pipe-to-ground",
     ingredients = {
-      { "stone-pipe", 10 },
-      { "stone-brick", 5 },
+      { type = "item", name = "stone-pipe", amount = 10 },
+      { type = "item", name = "stone-brick", amount = 5 },
     },
     results = { { type = "item", name = "stone-pipe-to-ground", amount = 2 } },
   },
@@ -22,7 +22,7 @@ data:extend({
     type = "recipe",
     name = "copper-pipe",
     ingredients = {
-      { "copper-plate", 1 },
+      { type = "item", name = "copper-plate", amount = 1 },
     },
     results = { { type = "item", name = "copper-pipe", amount = 1 } },
   },
@@ -31,8 +31,8 @@ data:extend({
     type = "recipe",
     name = "copper-pipe-to-ground",
     ingredients = {
-      { "copper-pipe", 10 },
-      { "copper-plate", 5 },
+      { type = "item", name = "copper-pipe", amount = 10 },
+      { type = "item", name = "copper-plate", amount = 5 },
     },
     results = { { type = "item", name = "copper-pipe-to-ground", amount = 2 } },
   },
@@ -42,7 +42,7 @@ data:extend({
     name = "steel-pipe",
     enabled = false,
     ingredients = {
-      { "steel-plate", 1 },
+      { type = "item", name = "steel-plate", amount = 1 },
     },
     results = { { type = "item", name = "steel-pipe", amount = 1 } },
   },
@@ -52,8 +52,8 @@ data:extend({
     name = "steel-pipe-to-ground",
     enabled = false,
     ingredients = {
-      { "steel-pipe", 12 },
-      { "steel-plate", 5 },
+      { type = "item", name = "steel-pipe", amount = 12 },
+      { type = "item", name = "steel-plate", amount = 5 },
     },
     results = { { type = "item", name = "steel-pipe-to-ground", amount = 2 } },
   },
@@ -63,7 +63,7 @@ data:extend({
     name = "plastic-pipe",
     enabled = false,
     ingredients = {
-      { "plastic-bar", 1 },
+      { type = "item", name = "plastic-bar", amount = 1 },
     },
     results = { { type = "item", name = "plastic-pipe", amount = 1 } },
   },
@@ -73,8 +73,8 @@ data:extend({
     name = "plastic-pipe-to-ground",
     enabled = false,
     ingredients = {
-      { "plastic-pipe", 14 },
-      { "plastic-bar", 5 },
+      { type = "item", name = "plastic-pipe", amount = 14 },
+      { type = "item", name = "plastic-bar", amount = 5 },
     },
     results = { { type = "item", name = "plastic-pipe-to-ground", amount = 2 } },
   },
@@ -87,7 +87,7 @@ if data.raw.item["bronze-alloy"] then
       name = "bronze-pipe",
       enabled = false,
       ingredients = {
-        { "bronze-alloy", 1 },
+        { type = "item", name = "bronze-alloy", amount = 1 },
       },
       results = { { type = "item", name = "bronze-pipe", amount = 1 } },
     },
@@ -97,8 +97,8 @@ if data.raw.item["bronze-alloy"] then
       name = "bronze-pipe-to-ground",
       enabled = false,
       ingredients = {
-        { "bronze-pipe", 12 },
-        { "bronze-alloy", 5 },
+        { type = "item", name = "bronze-pipe", amount = 12 },
+        { type = "item", name = "bronze-alloy", amount = 5 },
       },
       results = { { type = "item", name = "bronze-pipe-to-ground", amount = 2 } },
     },
@@ -112,7 +112,7 @@ if data.raw.item["brass-alloy"] then
       name = "brass-pipe",
       enabled = false,
       ingredients = {
-        { "brass-alloy", 1 },
+        { type = "item", name = "brass-alloy", amount = 1 },
       },
       results = { { type = "item", name = "brass-pipe", amount = 1 } },
     },
@@ -122,8 +122,8 @@ if data.raw.item["brass-alloy"] then
       name = "brass-pipe-to-ground",
       enabled = false,
       ingredients = {
-        { "brass-pipe", 14 },
-        { "brass-alloy", 5 },
+        { type = "item", name = "brass-pipe", amount = 14 },
+        { type = "item", name = "brass-alloy", amount = 5 },
       },
       results = { { type = "item", name = "brass-pipe-to-ground", amount = 2 } },
     },
@@ -137,7 +137,7 @@ if data.raw.item["silicon-nitride"] then
       name = "ceramic-pipe",
       enabled = false,
       ingredients = {
-        { "silicon-nitride", 1 },
+        { type = "item", name = "silicon-nitride", amount = 1 },
       },
       results = { { type = "item", name = "ceramic-pipe", amount = 1 } },
     },
@@ -147,8 +147,8 @@ if data.raw.item["silicon-nitride"] then
       name = "ceramic-pipe-to-ground",
       enabled = false,
       ingredients = {
-        { "ceramic-pipe", 16 },
-        { "silicon-nitride", 5 },
+        { type = "item", name = "ceramic-pipe", amount = 16 },
+        { type = "item", name = "silicon-nitride", amount = 5 },
       },
       results = { { type = "item", name = "ceramic-pipe-to-ground", amount = 2 } },
     },
@@ -162,7 +162,7 @@ if data.raw.item["titanium-plate"] then
       name = "titanium-pipe",
       enabled = false,
       ingredients = {
-        { "titanium-plate", 1 },
+        { type = "item", name = "titanium-plate", amount = 1 },
       },
       results = { { type = "item", name = "titanium-pipe", amount = 1 } },
     },
@@ -172,8 +172,8 @@ if data.raw.item["titanium-plate"] then
       name = "titanium-pipe-to-ground",
       enabled = false,
       ingredients = {
-        { "titanium-pipe", 16 },
-        { "titanium-plate", 5 },
+        { type = "item", name = "titanium-pipe", amount = 16 },
+        { type = "item", name = "titanium-plate", amount = 5 },
       },
       results = { { type = "item", name = "titanium-pipe-to-ground", amount = 2 } },
     },
@@ -187,7 +187,7 @@ if data.raw.item["tungsten-plate"] then
       name = "tungsten-pipe",
       enabled = false,
       ingredients = {
-        { "tungsten-plate", 1 },
+        { type = "item", name = "tungsten-plate", amount = 1 },
       },
       results = { { type = "item", name = "tungsten-pipe", amount = 1 } },
     },
@@ -197,8 +197,8 @@ if data.raw.item["tungsten-plate"] then
       name = "tungsten-pipe-to-ground",
       enabled = false,
       ingredients = {
-        { "tungsten-pipe", 16 },
-        { "tungsten-plate", 5 },
+        { type = "item", name = "tungsten-pipe", amount = 16 },
+        { type = "item", name = "tungsten-plate", amount = 5 },
       },
       results = { { type = "item", name = "tungsten-pipe-to-ground", amount = 2 } },
     },
@@ -212,7 +212,7 @@ if data.raw.item["nitinol-alloy"] then
       name = "nitinol-pipe",
       enabled = false,
       ingredients = {
-        { "nitinol-alloy", 1 },
+        { type = "item", name = "nitinol-alloy", amount = 1 },
       },
       results = { { type = "item", name = "nitinol-pipe", amount = 1 } },
     },
@@ -222,8 +222,8 @@ if data.raw.item["nitinol-alloy"] then
       name = "nitinol-pipe-to-ground",
       enabled = false,
       ingredients = {
-        { "nitinol-pipe", 18 },
-        { "nitinol-alloy", 5 },
+        { type = "item", name = "nitinol-pipe", amount = 18 },
+        { type = "item", name = "nitinol-alloy", amount = 5 },
       },
       results = { { type = "item", name = "nitinol-pipe-to-ground", amount = 2 } },
     },
@@ -237,7 +237,7 @@ if data.raw.item["copper-tungsten-alloy"] then
       name = "copper-tungsten-pipe",
       enabled = false,
       ingredients = {
-        { "copper-tungsten-alloy", 1 },
+        { type = "item", name = "copper-tungsten-alloy", amount = 1 },
       },
       results = { { type = "item", name = "copper-tungsten-pipe", amount = 1 } },
     },
@@ -247,8 +247,8 @@ if data.raw.item["copper-tungsten-alloy"] then
       name = "copper-tungsten-pipe-to-ground",
       enabled = false,
       ingredients = {
-        { "copper-tungsten-pipe", 18 },
-        { "copper-tungsten-alloy", 5 },
+        { type = "item", name = "copper-tungsten-pipe", amount = 18 },
+        { type = "item", name = "copper-tungsten-alloy", amount = 5 },
       },
       results = { { type = "item", name = "copper-tungsten-pipe-to-ground", amount = 2 } },
     },
diff --git a/boblogistics/prototypes/recipe/pump-recipe.lua b/boblogistics/prototypes/recipe/pump-recipe.lua
index 52310f32b..929cc6014 100644
--- a/boblogistics/prototypes/recipe/pump-recipe.lua
+++ b/boblogistics/prototypes/recipe/pump-recipe.lua
@@ -5,9 +5,9 @@ data:extend({
     energy_required = 2,
     enabled = false,
     ingredients = {
-      { "pump", 1 },
-      { "steel-plate", 1 },
-      { "copper-pipe", 1 },
+      { type = "item", name = "pump", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 1 },
+      { type = "item", name = "copper-pipe", amount = 1 },
     },
     results = { { type = "item", name = "bob-pump-2", amount = 1 } },
   },
@@ -17,9 +17,9 @@ data:extend({
     energy_required = 2,
     enabled = false,
     ingredients = {
-      { "bob-pump-2", 1 },
-      { "steel-plate", 1 },
-      { "copper-pipe", 1 },
+      { type = "item", name = "bob-pump-2", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 1 },
+      { type = "item", name = "copper-pipe", amount = 1 },
     },
     results = { { type = "item", name = "bob-pump-3", amount = 1 } },
   },
@@ -29,9 +29,9 @@ data:extend({
     energy_required = 2,
     enabled = false,
     ingredients = {
-      { "bob-pump-3", 1 },
-      { "steel-plate", 1 },
-      { "copper-pipe", 1 },
+      { type = "item", name = "bob-pump-3", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 1 },
+      { type = "item", name = "copper-pipe", amount = 1 },
     },
     results = { { type = "item", name = "bob-pump-4", amount = 1 } },
   },
diff --git a/boblogistics/prototypes/recipe/roboport-parts-recipe.lua b/boblogistics/prototypes/recipe/roboport-parts-recipe.lua
index 553a2a876..f81b5e52d 100644
--- a/boblogistics/prototypes/recipe/roboport-parts-recipe.lua
+++ b/boblogistics/prototypes/recipe/roboport-parts-recipe.lua
@@ -4,9 +4,9 @@ data:extend({
     name = "roboport-antenna-1",
     enabled = false,
     ingredients = {
-      { "steel-plate", 1 },
-      { "copper-cable", 2 },
-      { "electronic-circuit", 5 },
+      { type = "item", name = "steel-plate", amount = 1 },
+      { type = "item", name = "copper-cable", amount = 2 },
+      { type = "item", name = "electronic-circuit", amount = 5 },
     },
     results = { { type = "item", name = "roboport-antenna-1", amount = 1 } },
     energy_required = 0.2,
@@ -16,9 +16,9 @@ data:extend({
     name = "roboport-antenna-2",
     enabled = false,
     ingredients = {
-      { "steel-plate", 1 },
-      { "copper-cable", 2 },
-      { "advanced-circuit", 5 },
+      { type = "item", name = "steel-plate", amount = 1 },
+      { type = "item", name = "copper-cable", amount = 2 },
+      { type = "item", name = "advanced-circuit", amount = 5 },
     },
     results = { { type = "item", name = "roboport-antenna-2", amount = 1 } },
     energy_required = 0.2,
@@ -28,9 +28,9 @@ data:extend({
     name = "roboport-antenna-3",
     enabled = false,
     ingredients = {
-      { "steel-plate", 1 },
-      { "copper-cable", 2 },
-      { "processing-unit", 5 },
+      { type = "item", name = "steel-plate", amount = 1 },
+      { type = "item", name = "copper-cable", amount = 2 },
+      { type = "item", name = "processing-unit", amount = 5 },
     },
     results = { { type = "item", name = "roboport-antenna-3", amount = 1 } },
     energy_required = 0.2,
@@ -40,10 +40,10 @@ data:extend({
     name = "roboport-antenna-4",
     enabled = false,
     ingredients = {
-      { "steel-plate", 1 },
-      { "copper-plate", 1 },
-      { "copper-cable", 2 },
-      { "processing-unit", 5 },
+      { type = "item", name = "steel-plate", amount = 1 },
+      { type = "item", name = "copper-plate", amount = 1 },
+      { type = "item", name = "copper-cable", amount = 2 },
+      { type = "item", name = "processing-unit", amount = 5 },
     },
     results = { { type = "item", name = "roboport-antenna-4", amount = 1 } },
     energy_required = 0.2,
@@ -56,9 +56,9 @@ data:extend({
     name = "roboport-chargepad-1",
     enabled = false,
     ingredients = {
-      { "steel-plate", 2 },
-      { "electronic-circuit", 5 },
-      { "battery", 2 },
+      { type = "item", name = "steel-plate", amount = 2 },
+      { type = "item", name = "electronic-circuit", amount = 5 },
+      { type = "item", name = "battery", amount = 2 },
     },
     results = { { type = "item", name = "roboport-chargepad-1", amount = 1 } },
     energy_required = 1,
@@ -68,9 +68,9 @@ data:extend({
     name = "roboport-chargepad-2",
     enabled = false,
     ingredients = {
-      { "steel-plate", 2 },
-      { "advanced-circuit", 5 },
-      { "battery", 2 },
+      { type = "item", name = "steel-plate", amount = 2 },
+      { type = "item", name = "advanced-circuit", amount = 5 },
+      { type = "item", name = "battery", amount = 2 },
     },
     results = { { type = "item", name = "roboport-chargepad-2", amount = 1 } },
     energy_required = 1,
@@ -80,9 +80,9 @@ data:extend({
     name = "roboport-chargepad-3",
     enabled = false,
     ingredients = {
-      { "steel-plate", 2 },
-      { "processing-unit", 5 },
-      { "battery", 2 },
+      { type = "item", name = "steel-plate", amount = 2 },
+      { type = "item", name = "processing-unit", amount = 5 },
+      { type = "item", name = "battery", amount = 2 },
     },
     results = { { type = "item", name = "roboport-chargepad-3", amount = 1 } },
     energy_required = 1,
@@ -92,9 +92,9 @@ data:extend({
     name = "roboport-chargepad-4",
     enabled = false,
     ingredients = {
-      { "steel-plate", 2 },
-      { "processing-unit", 5 },
-      { "battery", 2 },
+      { type = "item", name = "steel-plate", amount = 2 },
+      { type = "item", name = "processing-unit", amount = 5 },
+      { type = "item", name = "battery", amount = 2 },
     },
     results = { { type = "item", name = "roboport-chargepad-4", amount = 1 } },
     energy_required = 1,
@@ -107,8 +107,8 @@ data:extend({
     name = "roboport-door-1",
     enabled = false,
     ingredients = {
-      { "steel-plate", 15 },
-      { "iron-gear-wheel", 20 },
+      { type = "item", name = "steel-plate", amount = 15 },
+      { type = "item", name = "iron-gear-wheel", amount = 20 },
     },
     results = { { type = "item", name = "roboport-door-1", amount = 1 } },
     energy_required = 1,
@@ -118,8 +118,8 @@ data:extend({
     name = "roboport-door-2",
     enabled = false,
     ingredients = {
-      { "steel-plate", 15 },
-      { "iron-gear-wheel", 20 },
+      { type = "item", name = "steel-plate", amount = 15 },
+      { type = "item", name = "iron-gear-wheel", amount = 20 },
     },
     results = { { type = "item", name = "roboport-door-2", amount = 1 } },
     energy_required = 1,
@@ -129,8 +129,8 @@ data:extend({
     name = "roboport-door-3",
     enabled = false,
     ingredients = {
-      { "steel-plate", 15 },
-      { "iron-gear-wheel", 20 },
+      { type = "item", name = "steel-plate", amount = 15 },
+      { type = "item", name = "iron-gear-wheel", amount = 20 },
     },
     results = { { type = "item", name = "roboport-door-3", amount = 1 } },
     energy_required = 1,
@@ -140,8 +140,8 @@ data:extend({
     name = "roboport-door-4",
     enabled = false,
     ingredients = {
-      { "steel-plate", 15 },
-      { "iron-gear-wheel", 20 },
+      { type = "item", name = "steel-plate", amount = 15 },
+      { type = "item", name = "iron-gear-wheel", amount = 20 },
     },
     results = { { type = "item", name = "roboport-door-4", amount = 1 } },
     energy_required = 1,
diff --git a/boblogistics/prototypes/recipe/roboport-recipe.lua b/boblogistics/prototypes/recipe/roboport-recipe.lua
index 4ad2c4523..524cf9755 100644
--- a/boblogistics/prototypes/recipe/roboport-recipe.lua
+++ b/boblogistics/prototypes/recipe/roboport-recipe.lua
@@ -5,11 +5,11 @@ if settings.startup["bobmods-logistics-disableroboports"].value == false then
       name = "bob-roboport-2",
       enabled = false,
       ingredients = {
-        { "roboport", 1 },
-        { "steel-plate", 15 },
-        { "roboport-antenna-2", 5 },
-        { "roboport-chargepad-2", 4 },
-        { "roboport-door-2", 1 },
+        { type = "item", name = "roboport", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 15 },
+        { type = "item", name = "roboport-antenna-2", amount = 5 },
+        { type = "item", name = "roboport-chargepad-2", amount = 4 },
+        { type = "item", name = "roboport-door-2", amount = 1 },
       },
       results = { { type = "item", name = "bob-roboport-2", amount = 1 } },
       energy_required = 10,
@@ -20,11 +20,11 @@ if settings.startup["bobmods-logistics-disableroboports"].value == false then
       name = "bob-roboport-3",
       enabled = false,
       ingredients = {
-        { "bob-roboport-2", 1 },
-        { "steel-plate", 15 },
-        { "roboport-antenna-3", 5 },
-        { "roboport-chargepad-3", 4 },
-        { "roboport-door-3", 1 },
+        { type = "item", name = "bob-roboport-2", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 15 },
+        { type = "item", name = "roboport-antenna-3", amount = 5 },
+        { type = "item", name = "roboport-chargepad-3", amount = 4 },
+        { type = "item", name = "roboport-door-3", amount = 1 },
       },
       results = { { type = "item", name = "bob-roboport-3", amount = 1 } },
       energy_required = 10,
@@ -35,11 +35,11 @@ if settings.startup["bobmods-logistics-disableroboports"].value == false then
       name = "bob-roboport-4",
       enabled = false,
       ingredients = {
-        { "bob-roboport-3", 1 },
-        { "steel-plate", 15 },
-        { "roboport-antenna-4", 5 },
-        { "roboport-chargepad-4", 4 },
-        { "roboport-door-4", 1 },
+        { type = "item", name = "bob-roboport-3", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 15 },
+        { type = "item", name = "roboport-antenna-4", amount = 5 },
+        { type = "item", name = "roboport-chargepad-4", amount = 4 },
+        { type = "item", name = "roboport-door-4", amount = 1 },
       },
       results = { { type = "item", name = "bob-roboport-4", amount = 1 } },
       energy_required = 10,
@@ -53,10 +53,10 @@ data:extend({
     name = "bob-robochest",
     enabled = false,
     ingredients = {
-      { "steel-chest", 1 },
-      { "roboport-antenna-1", 1 },
-      { "roboport-chargepad-1", 1 },
-      { "roboport-door-1", 1 },
+      { type = "item", name = "steel-chest", amount = 1 },
+      { type = "item", name = "roboport-antenna-1", amount = 1 },
+      { type = "item", name = "roboport-chargepad-1", amount = 1 },
+      { type = "item", name = "roboport-door-1", amount = 1 },
     },
     results = { { type = "item", name = "bob-robochest", amount = 1 } },
     energy_required = 5,
@@ -67,10 +67,10 @@ data:extend({
     name = "bob-robochest-2",
     enabled = false,
     ingredients = {
-      { "bob-robochest", 1 },
-      { "steel-plate", 8 },
-      { "roboport-chargepad-2", 1 },
-      { "roboport-door-2", 1 },
+      { type = "item", name = "bob-robochest", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 8 },
+      { type = "item", name = "roboport-chargepad-2", amount = 1 },
+      { type = "item", name = "roboport-door-2", amount = 1 },
     },
     results = { { type = "item", name = "bob-robochest-2", amount = 1 } },
     energy_required = 5,
@@ -81,10 +81,10 @@ data:extend({
     name = "bob-robochest-3",
     enabled = false,
     ingredients = {
-      { "bob-robochest-2", 1 },
-      { "steel-plate", 8 },
-      { "roboport-chargepad-3", 1 },
-      { "roboport-door-3", 1 },
+      { type = "item", name = "bob-robochest-2", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 8 },
+      { type = "item", name = "roboport-chargepad-3", amount = 1 },
+      { type = "item", name = "roboport-door-3", amount = 1 },
     },
     results = { { type = "item", name = "bob-robochest-3", amount = 1 } },
     energy_required = 5,
@@ -95,10 +95,10 @@ data:extend({
     name = "bob-robochest-4",
     enabled = false,
     ingredients = {
-      { "bob-robochest-3", 1 },
-      { "steel-plate", 8 },
-      { "roboport-chargepad-4", 1 },
-      { "roboport-door-4", 1 },
+      { type = "item", name = "bob-robochest-3", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 8 },
+      { type = "item", name = "roboport-chargepad-4", amount = 1 },
+      { type = "item", name = "roboport-door-4", amount = 1 },
     },
     results = { { type = "item", name = "bob-robochest-4", amount = 1 } },
     energy_required = 5,
@@ -111,8 +111,8 @@ data:extend({
     name = "bob-logistic-zone-expander",
     enabled = false,
     ingredients = {
-      { "steel-plate", 5 },
-      { "roboport-antenna-1", 3 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "roboport-antenna-1", amount = 3 },
     },
     results = { { type = "item", name = "bob-logistic-zone-expander", amount = 1 } },
     energy_required = 5,
@@ -123,9 +123,9 @@ data:extend({
     name = "bob-logistic-zone-expander-2",
     enabled = false,
     ingredients = {
-      { "bob-logistic-zone-expander", 1 },
-      { "steel-plate", 5 },
-      { "roboport-antenna-2", 3 },
+      { type = "item", name = "bob-logistic-zone-expander", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "roboport-antenna-2", amount = 3 },
     },
     results = { { type = "item", name = "bob-logistic-zone-expander-2", amount = 1 } },
     energy_required = 5,
@@ -136,9 +136,9 @@ data:extend({
     name = "bob-logistic-zone-expander-3",
     enabled = false,
     ingredients = {
-      { "bob-logistic-zone-expander-2", 1 },
-      { "steel-plate", 5 },
-      { "roboport-antenna-3", 3 },
+      { type = "item", name = "bob-logistic-zone-expander-2", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "roboport-antenna-3", amount = 3 },
     },
     results = { { type = "item", name = "bob-logistic-zone-expander-3", amount = 1 } },
     energy_required = 5,
@@ -149,9 +149,9 @@ data:extend({
     name = "bob-logistic-zone-expander-4",
     enabled = false,
     ingredients = {
-      { "bob-logistic-zone-expander-3", 1 },
-      { "steel-plate", 5 },
-      { "roboport-antenna-4", 3 },
+      { type = "item", name = "bob-logistic-zone-expander-3", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "roboport-antenna-4", amount = 3 },
     },
     results = { { type = "item", name = "bob-logistic-zone-expander-4", amount = 1 } },
     energy_required = 5,
@@ -164,9 +164,9 @@ data:extend({
     name = "bob-robo-charge-port",
     enabled = false,
     ingredients = {
-      { "steel-plate", 10 },
-      { "roboport-antenna-1", 1 },
-      { "roboport-chargepad-1", 4 },
+      { type = "item", name = "steel-plate", amount = 10 },
+      { type = "item", name = "roboport-antenna-1", amount = 1 },
+      { type = "item", name = "roboport-chargepad-1", amount = 4 },
     },
     results = { { type = "item", name = "bob-robo-charge-port", amount = 1 } },
     energy_required = 5,
@@ -177,9 +177,9 @@ data:extend({
     name = "bob-robo-charge-port-2",
     enabled = false,
     ingredients = {
-      { "bob-robo-charge-port", 1 },
-      { "steel-plate", 10 },
-      { "roboport-chargepad-2", 4 },
+      { type = "item", name = "bob-robo-charge-port", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 10 },
+      { type = "item", name = "roboport-chargepad-2", amount = 4 },
     },
     results = { { type = "item", name = "bob-robo-charge-port-2", amount = 1 } },
     energy_required = 5,
@@ -190,9 +190,9 @@ data:extend({
     name = "bob-robo-charge-port-3",
     enabled = false,
     ingredients = {
-      { "bob-robo-charge-port-2", 1 },
-      { "steel-plate", 10 },
-      { "roboport-chargepad-3", 4 },
+      { type = "item", name = "bob-robo-charge-port-2", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 10 },
+      { type = "item", name = "roboport-chargepad-3", amount = 4 },
     },
     results = { { type = "item", name = "bob-robo-charge-port-3", amount = 1 } },
     energy_required = 5,
@@ -203,9 +203,9 @@ data:extend({
     name = "bob-robo-charge-port-4",
     enabled = false,
     ingredients = {
-      { "bob-robo-charge-port-3", 1 },
-      { "steel-plate", 10 },
-      { "roboport-chargepad-4", 4 },
+      { type = "item", name = "bob-robo-charge-port-3",amount =  1 },
+      { type = "item", name = "steel-plate", amount = 10 },
+      { type = "item", name = "roboport-chargepad-4", amount = 4 },
     },
     results = { { type = "item", name = "bob-robo-charge-port-4", amount = 1 } },
     energy_required = 5,
@@ -216,9 +216,9 @@ data:extend({
     name = "bob-robo-charge-port-large",
     enabled = false,
     ingredients = {
-      { "steel-plate", 15 },
-      { "roboport-antenna-1", 1 },
-      { "roboport-chargepad-1", 9 },
+      { type = "item", name = "steel-plate", amount = 15 },
+      { type = "item", name = "roboport-antenna-1", amount = 1 },
+      { type = "item", name = "roboport-chargepad-1", amount = 9 },
     },
     results = { { type = "item", name = "bob-robo-charge-port-large", amount = 1 } },
     energy_required = 5,
@@ -229,9 +229,9 @@ data:extend({
     name = "bob-robo-charge-port-large-2",
     enabled = false,
     ingredients = {
-      { "bob-robo-charge-port-large", 1 },
-      { "steel-plate", 15 },
-      { "roboport-chargepad-2", 9 },
+      { type = "item", name = "bob-robo-charge-port-large", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 15 },
+      { type = "item", name = "roboport-chargepad-2", amount = 9 },
     },
     results = { { type = "item", name = "bob-robo-charge-port-large-2", amount = 1 } },
     energy_required = 5,
@@ -242,9 +242,9 @@ data:extend({
     name = "bob-robo-charge-port-large-3",
     enabled = false,
     ingredients = {
-      { "bob-robo-charge-port-large-2", 1 },
-      { "steel-plate", 15 },
-      { "roboport-chargepad-3", 9 },
+      { type = "item", name = "bob-robo-charge-port-large-2", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 15 },
+      { type = "item", name = "roboport-chargepad-3", amount = 9 },
     },
     results = { { type = "item", name = "bob-robo-charge-port-large-3", amount = 1 } },
     energy_required = 5,
@@ -255,9 +255,9 @@ data:extend({
     name = "bob-robo-charge-port-large-4",
     enabled = false,
     ingredients = {
-      { "bob-robo-charge-port-large-3", 1 },
-      { "steel-plate", 15 },
-      { "roboport-chargepad-4", 9 },
+      { type = "item", name = "bob-robo-charge-port-large-3", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 15 },
+      { type = "item", name = "roboport-chargepad-4", amount = 9 },
     },
     results = { { type = "item", name = "bob-robo-charge-port-large-4", amount = 1 } },
     energy_required = 5,
@@ -270,9 +270,9 @@ data:extend({
     name = "bob-logistic-zone-interface",
     enabled = false,
     ingredients = {
-      { "steel-plate", 5 },
-      { "roboport-antenna-1", 1 },
-      { "electronic-circuit", 2 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "roboport-antenna-1", amount = 1 },
+      { type = "item", name = "electronic-circuit", amount = 2 },
     },
     results = { { type = "item", name = "bob-logistic-zone-interface", amount = 1 } },
     energy_required = 2,
diff --git a/boblogistics/prototypes/recipe/robots-recipe-updates.lua b/boblogistics/prototypes/recipe/robots-recipe-updates.lua
index a5b138312..8631a2889 100644
--- a/boblogistics/prototypes/recipe/robots-recipe-updates.lua
+++ b/boblogistics/prototypes/recipe/robots-recipe-updates.lua
@@ -2,21 +2,21 @@ bobmods.lib.recipe.remove_ingredient("logistic-chest-passive-provider", "advance
 bobmods.lib.recipe.remove_ingredient("logistic-chest-storage", "advanced-circuit")
 
 if settings.startup["bobmods-logistics-robotrequireprevious"].value == true then
-  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-2", { "logistic-robot", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-construction-robot-2", { "construction-robot", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-3", { "bob-logistic-robot-2", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-construction-robot-3", { "bob-construction-robot-2", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-4", { "bob-logistic-robot-3", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-construction-robot-4", { "bob-construction-robot-3", 1 })
+  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-2", { type = "item", name = "logistic-robot", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-construction-robot-2", { type = "item", name = "construction-robot", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-3", { type = "item", name = "bob-logistic-robot-2", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-construction-robot-3", { type = "item", name = "bob-construction-robot-2", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-4", { type = "item", name = "bob-logistic-robot-3", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-construction-robot-4", { type = "item", name = "bob-construction-robot-3", amount = 1 })
 end
 
 if data.raw.tool["module-case"] or data.raw.item["module-case"] then
   if data.raw.recipe["bob-robot-brain"] then
     bobmods.lib.tech.add_recipe_unlock("robotics", "module-case")
-    bobmods.lib.recipe.add_ingredient("bob-robot-brain", { "module-case", 1 })
-    bobmods.lib.recipe.add_ingredient("bob-robot-brain-2", { "module-case", 1 })
-    bobmods.lib.recipe.add_ingredient("bob-robot-brain-3", { "module-case", 1 })
-    bobmods.lib.recipe.add_ingredient("bob-robot-brain-4", { "module-case", 1 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-brain", { type = "item", name = "module-case", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-brain-2", { type = "item", name = "module-case", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-brain-3", { type = "item", name = "module-case", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-brain-4", { type = "item", name = "module-case", amount = 1 })
   end
 end
 
@@ -25,7 +25,7 @@ if data.raw.recipe["bob-robot-brain"] then
     data.raw.recipe["bob-robot-brain"].category = "electronics"
   end
   if data.raw.item["solder"] then
-    bobmods.lib.recipe.add_ingredient("bob-robot-brain", { "solder", 5 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-brain", { type = "item", name = "solder", amount = 5 })
   end
 end
 
@@ -34,7 +34,7 @@ if data.raw.recipe["bob-robot-brain-2"] then
     data.raw.recipe["bob-robot-brain-2"].category = "electronics"
   end
   if data.raw.item["solder"] then
-    bobmods.lib.recipe.add_ingredient("bob-robot-brain-2", { "solder", 5 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-brain-2", { type = "item", name = "solder", amount = 5 })
   end
 end
 
@@ -43,7 +43,7 @@ if data.raw.recipe["bob-robot-brain-3"] then
     data.raw.recipe["bob-robot-brain-3"].category = "electronics"
   end
   if data.raw.item["solder"] then
-    bobmods.lib.recipe.add_ingredient("bob-robot-brain-3", { "solder", 5 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-brain-3", { type = "item", name = "solder", amount = 5 })
   end
 end
 
@@ -52,73 +52,73 @@ if data.raw.recipe["bob-robot-brain-4"] then
     data.raw.recipe["bob-robot-brain-4"].category = "electronics"
   end
   if data.raw.item["solder"] then
-    bobmods.lib.recipe.add_ingredient("bob-robot-brain-4", { "solder", 5 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-brain-4", { type = "item", name = "solder", amount = 5 })
   end
   if data.raw.item["advanced-processing-unit"] then
-    bobmods.lib.recipe.set_ingredient("bob-robot-brain-4", { "processing-unit", 2 })
-    bobmods.lib.recipe.add_ingredient("bob-robot-brain-4", { "advanced-processing-unit", 2 })
+    bobmods.lib.recipe.set_ingredient("bob-robot-brain-4", { type = "item", name = "processing-unit", amount = 2 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-brain-4", { type = "item", name = "advanced-processing-unit", amount = 2 })
   end
 end
 
 if data.raw.recipe["bob-robot-tool"] then
-  bobmods.lib.recipe.add_ingredient("bob-robot-tool", { "steel-plate", 1 })
+  bobmods.lib.recipe.add_ingredient("bob-robot-tool", { type = "item", name = "steel-plate", amount = 1 })
   if data.raw.item["steel-gear-wheel"] then
-    bobmods.lib.recipe.add_ingredient("bob-robot-tool", { "steel-gear-wheel", 2 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-tool", { type = "item", name = "steel-gear-wheel", amount = 2 })
   else
-    bobmods.lib.recipe.add_ingredient("bob-robot-tool", { "iron-gear-wheel", 2 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-tool", { type = "item", name = "iron-gear-wheel", amount = 2 })
   end
 end
 
 if data.raw.recipe["bob-robot-tool-2"] then
   if data.raw.item["aluminium-plate"] then
-    bobmods.lib.recipe.add_ingredient("bob-robot-tool-2", { "aluminium-plate", 1 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-tool-2", { type = "item", name = "aluminium-plate", amount = 1 })
   else
-    bobmods.lib.recipe.add_ingredient("bob-robot-tool-2", { "steel-plate", 1 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-tool-2", { type = "item", name = "steel-plate", amount = 1 })
   end
   if data.raw.item["brass-gear-wheel"] then
-    bobmods.lib.recipe.add_ingredient("bob-robot-tool-2", { "brass-gear-wheel", 2 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-tool-2", { type = "item", name = "brass-gear-wheel", amount = 2 })
     bobmods.lib.tech.add_prerequisite("bob-robots-1", "zinc-processing")
   else
-    bobmods.lib.recipe.add_ingredient("bob-robot-tool-2", { "iron-gear-wheel", 2 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-tool-2", { type = "item", name = "iron-gear-wheel", amount = 2 })
   end
   if data.raw.item["steel-bearing"] then
-    bobmods.lib.recipe.add_ingredient("bob-robot-tool-2", { "steel-bearing", 2 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-tool-2", { type = "item", name = "steel-bearing", amount = 2 })
   end
 end
 
 if data.raw.recipe["bob-robot-tool-3"] then
   if data.raw.item["titanium-plate"] then
-    bobmods.lib.recipe.add_ingredient("bob-robot-tool-3", { "titanium-plate", 1 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-tool-3", { type = "item", name = "titanium-plate", amount = 1 })
   else
-    bobmods.lib.recipe.add_ingredient("bob-robot-tool-3", { "steel-plate", 1 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-tool-3", { type = "item", name = "steel-plate", amount = 1 })
   end
   if data.raw.item["titanium-gear-wheel"] then
-    bobmods.lib.recipe.add_ingredient("bob-robot-tool-3", { "titanium-gear-wheel", 2 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-tool-3", { type = "item", name = "titanium-gear-wheel", amount = 2 })
   else
-    bobmods.lib.recipe.add_ingredient("bob-robot-tool-3", { "iron-gear-wheel", 2 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-tool-3", { type = "item", name = "iron-gear-wheel", amount = 2 })
   end
   if data.raw.item["titanium-bearing"] then
-    bobmods.lib.recipe.add_ingredient("bob-robot-tool-3", { "titanium-bearing", 2 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-tool-3", { type = "item", name = "titanium-bearing", amount = 2 })
   end
 end
 
 if data.raw.recipe["bob-robot-tool-4"] then
   if data.raw.item["silicon-nitride"] then
-    bobmods.lib.recipe.add_ingredient("bob-robot-tool-4", { "silicon-nitride", 1 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-tool-4", { type = "item", name = "silicon-nitride", amount = 1 })
   else
-    bobmods.lib.recipe.add_ingredient("bob-robot-tool-4", { "steel-plate", 1 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-tool-4", { type = "item", name = "steel-plate", amount = 1 })
   end
   if data.raw.item["nitinol-gear-wheel"] then
-    bobmods.lib.recipe.add_ingredient("bob-robot-tool-4", { "nitinol-gear-wheel", 2 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-tool-4", { type = "item", name = "nitinol-gear-wheel", amount = 2 })
     bobmods.lib.tech.add_prerequisite("bob-robots-3", "nitinol-processing")
   else
-    bobmods.lib.recipe.add_ingredient("bob-robot-tool-4", { "iron-gear-wheel", 2 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-tool-4", { type = "item", name = "iron-gear-wheel", amount = 2 })
   end
   if data.raw.item["ceramic-bearing"] then
-    bobmods.lib.recipe.add_ingredient("bob-robot-tool-4", { "ceramic-bearing", 2 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-tool-4", { type = "item", name = "ceramic-bearing", amount = 2 })
   end
   if data.raw.item["tungsten-carbide"] then
-    bobmods.lib.recipe.add_ingredient("bob-robot-tool-4", { "tungsten-carbide", 1 })
+    bobmods.lib.recipe.add_ingredient("bob-robot-tool-4", { type = "item", name = "tungsten-carbide", amount = 1 })
     bobmods.lib.tech.add_prerequisite("bob-robots-3", "tungsten-alloy-processing")
   end
 end
@@ -127,24 +127,24 @@ if data.raw.item["flying-robot-frame-2"] then
   if data.raw.item["aluminium-plate"] then
     bobmods.lib.recipe.replace_ingredient("flying-robot-frame-2", "steel-plate", "aluminium-plate")
   end
-  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-2", { "flying-robot-frame-2", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-construction-robot-2", { "flying-robot-frame-2", 1 })
+  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-2", { type = "item", name = "flying-robot-frame-2", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-construction-robot-2", { type = "item", name = "flying-robot-frame-2", amount = 1 })
 else
   for i, robot in ipairs({ "bob-logistic-robot-2", "bob-construction-robot-2" }) do
     data.raw.recipe[robot].energy_required = 20
 
     if settings.startup["bobmods-logistics-robotrequireprevious"].value == false then
-      bobmods.lib.recipe.add_ingredient(robot, { "electric-engine-unit", 1 })
-      bobmods.lib.recipe.add_ingredient(robot, { "battery", 2 })
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "electric-engine-unit", amount = 1 })
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "battery", amount = 2 })
     end
 
     if data.raw.item["aluminium-plate"] then
-      bobmods.lib.recipe.add_ingredient(robot, { "aluminium-plate", 1 })
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "aluminium-plate", amount = 1 })
     else
-      bobmods.lib.recipe.add_ingredient(robot, { "steel-plate", 1 })
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "steel-plate", amount = 1 })
     end
 
-    bobmods.lib.recipe.add_ingredient(robot, { "advanced-circuit", 3 })
+    bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "advanced-circuit", amount = 3 })
   end
 end
 
@@ -157,29 +157,29 @@ if data.raw.item["flying-robot-frame-3"] then
     bobmods.lib.recipe.replace_ingredient("flying-robot-frame-3", "steel-plate", "titanium-plate")
   end
 
-  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-3", { "flying-robot-frame-3", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-construction-robot-3", { "flying-robot-frame-3", 1 })
+  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-3", { type = "item", name = "flying-robot-frame-3", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-construction-robot-3", { type = "item", name = "flying-robot-frame-3", amount = 1 })
 else
   for i, robot in ipairs({ "bob-logistic-robot-3", "bob-construction-robot-3" }) do
     data.raw.recipe[robot].energy_required = 20
 
     if settings.startup["bobmods-logistics-robotrequireprevious"].value == false then
-      bobmods.lib.recipe.add_ingredient(robot, { "electric-engine-unit", 1 })
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "electric-engine-unit", amount = 1 })
     end
 
     if data.raw.item["lithium-ion-battery"] then
-      bobmods.lib.recipe.add_ingredient(robot, { "lithium-ion-battery", 2 })
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "lithium-ion-battery", amount = 2 })
     else
-      bobmods.lib.recipe.add_ingredient(robot, { "battery", 2 })
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "battery", amount = 2 })
     end
 
     if data.raw.item["titanium-plate"] then
-      bobmods.lib.recipe.add_ingredient(robot, { "titanium-plate", 1 })
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "titanium-plate", amount = 1 })
     else
-      bobmods.lib.recipe.add_ingredient(robot, { "steel-plate", 1 })
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "steel-plate", amount = 1 })
     end
 
-    bobmods.lib.recipe.add_ingredient(robot, { "processing-unit", 3 })
+    bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "processing-unit", amount = 3 })
   end
 end
 
@@ -200,35 +200,35 @@ if data.raw.item["flying-robot-frame-4"] then
     bobmods.lib.recipe.replace_ingredient("flying-robot-frame-4", "processing-unit", "advanced-processing-unit")
   end
 
-  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-4", { "flying-robot-frame-4", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-construction-robot-4", { "flying-robot-frame-4", 1 })
+  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-4", { type = "item", name = "flying-robot-frame-4", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-construction-robot-4", { type = "item", name = "flying-robot-frame-4", amount = 1 })
 else
   for i, robot in ipairs({ "bob-logistic-robot-4", "bob-construction-robot-4" }) do
     data.raw.recipe[robot].energy_required = 20
     if settings.startup["bobmods-logistics-robotrequireprevious"].value == false then
-      bobmods.lib.recipe.add_ingredient(robot, { "electric-engine-unit", 1 })
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "electric-engine-unit", amount = 1 })
     end
 
     if data.raw.item["silver-zinc-battery"] then
-      bobmods.lib.recipe.add_ingredient(robot, { "silver-zinc-battery", 2 })
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "silver-zinc-battery", amount = 2 })
     else
       if data.raw.item["lithium-ion-battery"] then
-        bobmods.lib.recipe.add_ingredient(robot, { "lithium-ion-battery", 2 })
+        bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "lithium-ion-battery", amount = 2 })
       else
-        bobmods.lib.recipe.add_ingredient(robot, { "battery", 2 })
+        bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "battery", amount = 2 })
       end
     end
 
     if data.raw.item["silicon-nitride"] then
-      bobmods.lib.recipe.add_ingredient(robot, { "silicon-nitride", 1 })
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "silicon-nitride", amount = 1 })
     else
-      bobmods.lib.recipe.add_ingredient(robot, { "steel-plate", 1 })
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "steel-plate", amount = 1 })
     end
 
     if data.raw.item["advanced-processing-unit"] then
-      bobmods.lib.recipe.add_ingredient(robot, { "advanced-processing-unit", 3 })
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "advanced-processing-unit", amount = 3 })
     else
-      bobmods.lib.recipe.add_ingredient(robot, { "processing-unit", 3 })
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "processing-unit", amount = 3 })
     end
   end
 end
@@ -236,100 +236,108 @@ end
 if data.raw.item["bob-robot-brain"] and data.raw.item["bob-robot-tool"] then
   bobmods.lib.recipe.set_ingredients(
     "logistic-robot",
-    { { "flying-robot-frame", 1 }, { "bob-robot-brain", 1 }, { "bob-robot-tool", 1 } }
+    {
+      { type = "item", name = "flying-robot-frame", amount = 1 },
+      { type = "item", name = "bob-robot-brain", amount = 1 },
+      { type = "item", name = "bob-robot-tool", amount = 1 },
+    }
   )
   bobmods.lib.recipe.set_ingredients(
     "construction-robot",
-    { { "flying-robot-frame", 1 }, { "bob-robot-brain", 1 }, { "bob-robot-tool", 1 } }
+    { 
+      { type = "item", name = "flying-robot-frame", amount = 1 },
+      { type = "item", name = "bob-robot-brain", amount = 1 },
+      { type = "item", name = "bob-robot-tool", amount = 1 },
+    }
   )
 end
 
 if data.raw.item["bob-robot-brain-2"] and data.raw.item["bob-robot-tool-2"] then
-  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-2", { "bob-robot-brain-2", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-2", { "bob-robot-tool-2", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-construction-robot-2", { "bob-robot-brain-2", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-construction-robot-2", { "bob-robot-tool-2", 1 })
+  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-2", { type = "item", name = "bob-robot-brain-2", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-2", { type = "item", name = "bob-robot-tool-2", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-construction-robot-2", { type = "item", name = "bob-robot-brain-2", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-construction-robot-2", { type = "item", name = "bob-robot-tool-2", amount = 1 })
 else
-  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-2", { "advanced-circuit", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-construction-robot-2", { "advanced-circuit", 1 })
+  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-2", { type = "item", name = "advanced-circuit", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-construction-robot-2", { type = "item", name = "advanced-circuit", amount = 1 })
 end
 
 if data.raw.item["bob-robot-brain-3"] and data.raw.item["bob-robot-tool-3"] then
-  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-3", { "bob-robot-brain-3", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-3", { "bob-robot-tool-3", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-construction-robot-3", { "bob-robot-brain-3", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-construction-robot-3", { "bob-robot-tool-3", 1 })
+  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-3", { type = "item", name = "bob-robot-brain-3", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-3", { type = "item", name = "bob-robot-tool-3", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-construction-robot-3", { type = "item", name = "bob-robot-brain-3", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-construction-robot-3", { type = "item", name = "bob-robot-tool-3", amount = 1 })
 else
-  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-3", { "processing-unit", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-construction-robot-3", { "processing-unit", 1 })
+  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-3", { type = "item", name = "processing-unit", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-construction-robot-3", { type = "item", name = "processing-unit", amount = 1 })
 end
 
 if data.raw.item["bob-robot-brain-4"] and data.raw.item["bob-robot-tool-4"] then
-  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-4", { "bob-robot-brain-4", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-4", { "bob-robot-tool-4", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-construction-robot-4", { "bob-robot-brain-4", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-construction-robot-4", { "bob-robot-tool-4", 1 })
+  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-4", { type = "item", name = "bob-robot-brain-4", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-4", { type = "item", name = "bob-robot-tool-4", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-construction-robot-4", { type = "item", name = "bob-robot-brain-4", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-construction-robot-4", { type = "item", name = "bob-robot-tool-4", amount = 1 })
 else
   if data.raw.item["advanced-processing-unit"] then
-    bobmods.lib.recipe.add_ingredient("bob-logistic-robot-4", { "advanced-processing-unit", 1 })
-    bobmods.lib.recipe.add_ingredient("bob-construction-robot-4", { "advanced-processing-unit", 1 })
+    bobmods.lib.recipe.add_ingredient("bob-logistic-robot-4", { type = "item", name = "advanced-processing-unit", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("bob-construction-robot-4", { type = "item", name = "advanced-processing-unit", amount = 1 })
   else
-    bobmods.lib.recipe.add_ingredient("bob-logistic-robot-4", { "processing-unit", 1 })
-    bobmods.lib.recipe.add_ingredient("bob-construction-robot-4", { "processing-unit", 1 })
+    bobmods.lib.recipe.add_ingredient("bob-logistic-robot-4", { type = "item", name = "processing-unit", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("bob-construction-robot-4", { type = "item", name = "processing-unit", amount = 1 })
   end
 end
 
 for i, robot in ipairs({ "bob-logistic-robot-5", "bob-construction-robot-5" }) do
   if data.raw.item["rtg"] and data.raw.technology["rtg"] then
-    bobmods.lib.recipe.add_ingredient(robot, { "rtg", 1 })
+    bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "rtg", amount = 1 })
     bobmods.lib.tech.add_prerequisite("bob-robots-4", "rtg")
   elseif data.raw.item["vehicle-fusion-cell-1"] and data.raw.technology["vehicle-fusion-cell-equipment-1"] then
-    bobmods.lib.recipe.add_ingredient(robot, { "vehicle-fusion-cell-1", 1 })
+    bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "vehicle-fusion-cell-1", amount = 1 })
     bobmods.lib.tech.add_prerequisite("bob-robots-4", "vehicle-fusion-cell-equipment-1")
   else
-    bobmods.lib.recipe.add_ingredient(robot, { "fusion-reactor-equipment", 1 })
+    bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "fusion-reactor-equipment", amount = 1 })
     bobmods.lib.tech.add_prerequisite("bob-robots-4", "fusion-reactor-equipment")
   end
 end
 
 if settings.startup["bobmods-logistics-robotrequireprevious"].value == true then
-  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-5", { "bob-logistic-robot-4", 1 })
-  bobmods.lib.recipe.add_ingredient("bob-construction-robot-5", { "bob-construction-robot-4", 1 })
+  bobmods.lib.recipe.add_ingredient("bob-logistic-robot-5", { type = "item", name = "bob-logistic-robot-4", amount = 1 })
+  bobmods.lib.recipe.add_ingredient("bob-construction-robot-5", { "bob-construction-robot-4", amount = 1 })
 else
   if data.raw.item["flying-robot-frame-4"] then
-    bobmods.lib.recipe.add_ingredient("bob-logistic-robot-5", { "flying-robot-frame-4", 1 })
-    bobmods.lib.recipe.add_ingredient("bob-construction-robot-5", { "flying-robot-frame-4", 1 })
+    bobmods.lib.recipe.add_ingredient("bob-logistic-robot-5", { type = "item", name = "flying-robot-frame-4", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("bob-construction-robot-5", { "flying-robot-frame-4", amount = 1 })
   else
     for i, robot in ipairs({ "bob-logistic-robot-5", "bob-construction-robot-5" }) do
       data.raw.recipe[robot].energy_required = 20
-      bobmods.lib.recipe.add_ingredient(robot, { "electric-engine-unit", 1 })
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "electric-engine-unit", amount = 1 })
 
       if data.raw.item["silicon-nitride"] then
-        bobmods.lib.recipe.add_ingredient(robot, { "silicon-nitride", 1 })
+        bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "silicon-nitride", amount = 1 })
       else
-        bobmods.lib.recipe.add_ingredient(robot, { "steel-plate", 1 })
+        bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "steel-plate", amount = 1 })
       end
 
       if data.raw.item["advanced-processing-unit"] then
-        bobmods.lib.recipe.add_ingredient(robot, { "advanced-processing-unit", 3 })
+        bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "advanced-processing-unit", amount = 3 })
       else
-        bobmods.lib.recipe.add_ingredient(robot, { "processing-unit", 3 })
+        bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "processing-unit", amount = 3 })
       end
     end
   end
 
   if data.raw.item["bob-robot-brain-4"] and data.raw.item["bob-robot-tool-4"] then
-    bobmods.lib.recipe.add_ingredient("bob-logistic-robot-5", { "bob-robot-brain-4", 1 })
-    bobmods.lib.recipe.add_ingredient("bob-logistic-robot-5", { "bob-robot-tool-4", 1 })
-    bobmods.lib.recipe.add_ingredient("bob-construction-robot-5", { "bob-robot-brain-4", 1 })
-    bobmods.lib.recipe.add_ingredient("bob-construction-robot-5", { "bob-robot-tool-4", 1 })
+    bobmods.lib.recipe.add_ingredient("bob-logistic-robot-5", { type = "item", name = "bob-robot-brain-4", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("bob-logistic-robot-5", { type = "item", name = "bob-robot-tool-4", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("bob-construction-robot-5", { type = "item", name = "bob-robot-brain-4", amount = 1 })
+    bobmods.lib.recipe.add_ingredient("bob-construction-robot-5", { type = "item", name = "bob-robot-tool-4", amount = 1 })
   else
     if data.raw.item["advanced-processing-unit"] then
-      bobmods.lib.recipe.add_ingredient("bob-logistic-robot-5", { "advanced-processing-unit", 1 })
-      bobmods.lib.recipe.add_ingredient("bob-construction-robot-5", { "advanced-processing-unit", 1 })
+      bobmods.lib.recipe.add_ingredient("bob-logistic-robot-5", { type = "item", name = "advanced-processing-unit", amount = 1 })
+      bobmods.lib.recipe.add_ingredient("bob-construction-robot-5", { type = "item", name = "advanced-processing-unit", amount = 1 })
     else
-      bobmods.lib.recipe.add_ingredient("bob-logistic-robot-5", { "processing-unit", 1 })
-      bobmods.lib.recipe.add_ingredient("bob-construction-robot-5", { "processing-unit", 1 })
+      bobmods.lib.recipe.add_ingredient("bob-logistic-robot-5", { type = "item", name = "processing-unit", amount = 1 })
+      bobmods.lib.recipe.add_ingredient("bob-construction-robot-5", { type = "item", name = "processing-unit", amount = 1 })
     end
   end
 end
diff --git a/boblogistics/prototypes/recipe/storage-tank-recipe.lua b/boblogistics/prototypes/recipe/storage-tank-recipe.lua
index 1682cf762..31af3a8ab 100644
--- a/boblogistics/prototypes/recipe/storage-tank-recipe.lua
+++ b/boblogistics/prototypes/recipe/storage-tank-recipe.lua
@@ -5,8 +5,8 @@ data:extend({
     energy_required = 4,
     enabled = false,
     ingredients = {
-      { "storage-tank", 1 },
-      { "steel-plate", 20 },
+      { type = "item", name = "storage-tank", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 20 },
     },
     results = { { type = "item", name = "storage-tank-2", amount = 1 } },
   },
@@ -17,8 +17,8 @@ data:extend({
     energy_required = 5,
     enabled = false,
     ingredients = {
-      { "storage-tank-2", 1 },
-      { "steel-plate", 20 },
+      { type = "item", name = "storage-tank-2", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 20 },
     },
     results = { { type = "item", name = "storage-tank-3", amount = 1 } },
   },
@@ -29,8 +29,8 @@ data:extend({
     energy_required = 6,
     enabled = false,
     ingredients = {
-      { "storage-tank-3", 1 },
-      { "steel-plate", 20 },
+      { type = "item", name = "storage-tank-3", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 20 },
     },
     results = { { type = "item", name = "storage-tank-4", amount = 1 } },
   },
@@ -43,9 +43,9 @@ data:extend({
     energy_required = 3,
     enabled = false,
     ingredients = {
-      { "iron-plate", 20 },
-      { "steel-plate", 5 },
-      { "pipe", 4 },
+      { type = "item", name = "iron-plate", amount = 20 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "pipe", amount = 4 },
     },
     results = { { type = "item", name = "bob-storage-tank-all-corners", amount = 1 } },
   },
@@ -55,9 +55,9 @@ data:extend({
     energy_required = 4,
     enabled = false,
     ingredients = {
-      { "bob-storage-tank-all-corners", 1 },
-      { "steel-plate", 20 },
-      { "pipe", 4 },
+      { type = "item", name = "bob-storage-tank-all-corners", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 20 },
+      { type = "item", name = "pipe", amount = 4 },
     },
     results = { { type = "item", name = "bob-storage-tank-all-corners-2", amount = 1 } },
   },
@@ -67,9 +67,9 @@ data:extend({
     energy_required = 5,
     enabled = false,
     ingredients = {
-      { "bob-storage-tank-all-corners-2", 1 },
-      { "steel-plate", 20 },
-      { "pipe", 4 },
+      { type = "item", name = "bob-storage-tank-all-corners-2", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 20 },
+      { type = "item", name = "pipe", amount = 4 },
     },
     results = { { type = "item", name = "bob-storage-tank-all-corners-3", amount = 1 } },
   },
@@ -79,9 +79,9 @@ data:extend({
     energy_required = 6,
     enabled = false,
     ingredients = {
-      { "bob-storage-tank-all-corners-3", 1 },
-      { "steel-plate", 20 },
-      { "pipe", 4 },
+      { type = "item", name = "bob-storage-tank-all-corners-3", amount = 1 },
+      { type = "item", name = "steel-plate", amount = 20 },
+      { type = "item", name = "pipe", amount = 4 },
     },
     results = { { type = "item", name = "bob-storage-tank-all-corners-4", amount = 1 } },
   },
diff --git a/boblogistics/prototypes/recipe/train-recipe.lua b/boblogistics/prototypes/recipe/train-recipe.lua
index f187cd37b..c8fc6eff9 100644
--- a/boblogistics/prototypes/recipe/train-recipe.lua
+++ b/boblogistics/prototypes/recipe/train-recipe.lua
@@ -5,10 +5,10 @@ if settings.startup["bobmods-logistics-trains"].value == true then
       name = "bob-locomotive-2",
       enabled = false,
       ingredients = {
-        { "locomotive", 1 },
-        { "advanced-circuit", 5 },
-        { "steel-plate", 10 },
-        { "iron-gear-wheel", 20 },
+        { type = "item", name = "locomotive", amount = 1 },
+        { type = "item", name = "advanced-circuit", amount = 5 },
+        { type = "item", name = "steel-plate", amount = 10 },
+        { type = "item", name = "iron-gear-wheel", amount = 20 },
       },
       results = { { type = "item", name = "bob-locomotive-2", amount = 1 } },
     },
@@ -18,10 +18,10 @@ if settings.startup["bobmods-logistics-trains"].value == true then
       name = "bob-locomotive-3",
       enabled = false,
       ingredients = {
-        { "bob-locomotive-2", 1 },
-        { "processing-unit", 5 },
-        { "steel-plate", 10 },
-        { "iron-gear-wheel", 20 },
+        { type = "item", name = "bob-locomotive-2", amount = 1 },
+        { type = "item", name = "processing-unit", amount = 5 },
+        { type = "item", name = "steel-plate", amount = 10 },
+        { type = "item", name = "iron-gear-wheel", amount = 20 },
       },
       results = { { type = "item", name = "bob-locomotive-3", amount = 1 } },
     },
@@ -31,8 +31,8 @@ if settings.startup["bobmods-logistics-trains"].value == true then
       name = "bob-armoured-locomotive",
       enabled = false,
       ingredients = {
-        { "locomotive", 1 },
-        { "steel-plate", 25 },
+        { type = "item", name = "locomotive", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 25 },
       },
       results = { { type = "item", name = "bob-armoured-locomotive", amount = 1 } },
     },
@@ -42,10 +42,10 @@ if settings.startup["bobmods-logistics-trains"].value == true then
       name = "bob-armoured-locomotive-2",
       enabled = false,
       ingredients = {
-        { "bob-armoured-locomotive", 1 },
-        { "steel-plate", 25 },
-        { "processing-unit", 5 },
-        { "iron-gear-wheel", 20 },
+        { type = "item", name = "bob-armoured-locomotive", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 25 },
+        { type = "item", name = "processing-unit", amount = 5 },
+        { type = "item", name = "iron-gear-wheel", amount = 20 },
       },
       results = { { type = "item", name = "bob-armoured-locomotive-2", amount = 1 } },
     },
@@ -55,9 +55,9 @@ if settings.startup["bobmods-logistics-trains"].value == true then
       name = "bob-cargo-wagon-2",
       enabled = false,
       ingredients = {
-        { "cargo-wagon", 1 },
-        { "steel-plate", 20 },
-        { "iron-gear-wheel", 12 },
+        { type = "item", name = "cargo-wagon", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 20 },
+        { type = "item", name = "iron-gear-wheel", amount = 12 },
       },
       results = { { type = "item", name = "bob-cargo-wagon-2", amount = 1 } },
     },
@@ -67,9 +67,9 @@ if settings.startup["bobmods-logistics-trains"].value == true then
       name = "bob-cargo-wagon-3",
       enabled = false,
       ingredients = {
-        { "bob-cargo-wagon-2", 1 },
-        { "steel-plate", 20 },
-        { "iron-gear-wheel", 12 },
+        { type = "item", name = "bob-cargo-wagon-2", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 20 },
+        { type = "item", name = "iron-gear-wheel", amount = 12 },
       },
       results = { { type = "item", name = "bob-cargo-wagon-3", amount = 1 } },
     },
@@ -79,8 +79,8 @@ if settings.startup["bobmods-logistics-trains"].value == true then
       name = "bob-armoured-cargo-wagon",
       enabled = false,
       ingredients = {
-        { "cargo-wagon", 1 },
-        { "steel-plate", 25 },
+        { type = "item", name = "cargo-wagon", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 25 },
       },
       results = { { type = "item", name = "bob-armoured-cargo-wagon", amount = 1 } },
     },
@@ -90,9 +90,9 @@ if settings.startup["bobmods-logistics-trains"].value == true then
       name = "bob-armoured-cargo-wagon-2",
       enabled = false,
       ingredients = {
-        { "bob-armoured-cargo-wagon", 1 },
-        { "steel-plate", 25 },
-        { "iron-gear-wheel", 12 },
+        { type = "item", name = "bob-armoured-cargo-wagon", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 25 },
+        { type = "item", name = "iron-gear-wheel", amount = 12 },
       },
       results = { { type = "item", name = "bob-armoured-cargo-wagon-2", amount = 1 } },
     },
@@ -103,10 +103,10 @@ if settings.startup["bobmods-logistics-trains"].value == true then
       enabled = false,
       energy_required = 1.5,
       ingredients = {
-        { "fluid-wagon", 1 },
-        { "iron-gear-wheel", 12 },
-        { "steel-plate", 16 },
-        { "storage-tank-2", 1 },
+        { type = "item", name = "fluid-wagon", amount = 1 },
+        { type = "item", name = "iron-gear-wheel", amount = 12 },
+        { type = "item", name = "steel-plate", amount = 16 },
+        { type = "item", name = "storage-tank-2", amount = 1 },
       },
       results = { { type = "item", name = "bob-fluid-wagon-2", amount = 1 } },
     },
@@ -117,10 +117,10 @@ if settings.startup["bobmods-logistics-trains"].value == true then
       enabled = false,
       energy_required = 1.5,
       ingredients = {
-        { "bob-fluid-wagon-2", 1 },
-        { "iron-gear-wheel", 12 },
-        { "steel-plate", 16 },
-        { "storage-tank-3", 1 },
+        { type = "item", name = "bob-fluid-wagon-2", amount = 1 },
+        { type = "item", name = "iron-gear-wheel", amount = 12 },
+        { type = "item", name = "steel-plate", amount = 16 },
+        { type = "item", name = "storage-tank-3", amount = 1 },
       },
       results = { { type = "item", name = "bob-fluid-wagon-3", amount = 1 } },
     },
@@ -131,8 +131,8 @@ if settings.startup["bobmods-logistics-trains"].value == true then
       enabled = false,
       energy_required = 1.5,
       ingredients = {
-        { "fluid-wagon", 1 },
-        { "steel-plate", 25 },
+        { type = "item", name = "fluid-wagon", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 25 },
       },
       results = { { type = "item", name = "bob-armoured-fluid-wagon", amount = 1 } },
     },
@@ -143,10 +143,10 @@ if settings.startup["bobmods-logistics-trains"].value == true then
       enabled = false,
       energy_required = 1.5,
       ingredients = {
-        { "bob-armoured-fluid-wagon", 1 },
-        { "iron-gear-wheel", 12 },
-        { "steel-plate", 25 },
-        { "storage-tank-3", 1 },
+        { type = "item", name = "bob-armoured-fluid-wagon", amount = 1 },
+        { type = "item", name = "iron-gear-wheel", amount = 12 },
+        { type = "item", name = "steel-plate", amount = 25 },
+        { type = "item", name = "storage-tank-3", amount = 1 },
       },
       results = { { type = "item", name = "bob-armoured-fluid-wagon-2", amount = 1 } },
     },