JobGraphBuilder refactor