Changes to RelationMixin