Improved selector parsing
Redesign Selector api