Changed doc for choices to return array of choice objects