Added support for multiple selection