Extended the Report Engine to better support own reports