Completed basic entity-as-graph support