Use values not list for consistency