Refactoring Report Module changes
Refactoring Report module