Extended another report, refactoring