better modulegraph support