Complete (but untested) diffusion support in graph-build