Added multi-selection support