Added multiple selector support