Additional refactoring based on reporting module changes