Upgraded PdfReportGenerator