Added ChoiceSelector