Updates to relationship handling