Changes on report generation