Refactor. Moved specific selectors to parent