Change Relationship to use standard polymorphic pattern

* Previously it was done differently than all the other Mapping objects.