Added Data class, disabled ChoiceManagement