Move DTO initializations into DTOs