Better dependency graph and no more warnings for unavailable modules