Added report generation as well