Added more selector functionality.