[Relationship] Track destination entities
[Relationship]  Use correct entity class name