Refactoring of selectors. Added dto