Change ChoiceOption back to StringOption