Add/improve current work on selectors from 2.0.0 branch