Update to use Relation.