updated selector support