Added support for MultiSelect