Updated DTOs to meet the GUI requests