More refactoring
Fixed a small bug with Reporting.