Final tweaks to relationship field