refactored reporting infrastructure