MultiChoiceControl support added