Move more relationship handling into central locations