Refactor parent linkage