Add choices to custom data fields

Waiting on QA
@twymer