This is more accurate to how we are submitting the jobs. This will require backwards compatibility fixes