Improved selectors.