Partner data refactoring