PLINK-130 refactored relationship management