Add Report Packs and more refactoring