Partners refactored a bit