Refactored reporting