PDF and HTML Report Generation added back