Updated the ReportFactory class