Updated the ReportGenerator classs