Improved report generation