New support for choices in fields