Refactor report creator base