Refactoring & add report utils