Update to use the common "set_relationship" functions.
Merge pull request #2 from adam-vessey/7.x

Update to use the common "set_relationship" functions.