Refactoring BMReport