Fixed DTO stuff