Add report listeners. Report refactoring.