Add choices validation to Fields