Partnership handling improvements