Made job network setup more flexible