Scoped selector

Added scoped selector support.