Add very basic subgraph support