Target split up into TargetRelation (target_relation) and TargetNode (target_node).
Additional nodes now within Entity.
EntityResolver class created.