Model relationship improvements