modified ReportData, ReportJsonConverter classes