Refactor for reporting