- Refactored reporting.