Support singular units in Ingredients