Reporter refactored