Refactor BatchReport