partner and reportcontroller refactoring