Refactor Transfer Objects