Refactor DTO and mapper usage