Adding proper choices to fields.