Refactor DTO