Revert "DTO"

This reverts commit 591d63ee8d94f432509adad8c00a0f10dae1f54d.