Replaced ingredient types with an enumerator