Refactor/relationship toggle