Refactor - add reporting