Remove entity-only restriction on basic_graph