Refactored reporter module