Refactored reporter data