Added Ingredient and Tool scaffolds