Refactor partnership model