Updated to add multiple selection