Refactored some methods to return dtos instead of persisted entities