Still trying to beef up the reporting engine