Refactoring and added user DTO