Refactor reporter delegate