Changed liquids to use an enum.