Reporter refactoring