Changing EntityRelationship to get rid of extraneous methods