Changed to defined DTO to avoid inproper dateparsing