Added support for multiple selections