Updated the reporting framework a little