Changed liquids to an enum.