Refactor transfer objects.
Refactor transfer objects.