Refactored selectors structure