Refactored selectors