DTO and mapping fixes