Return dto not entity.
Refactor.
Rename.