Refactoring to use only reports