Refactor of Supplier and Ingredient models