Updated JobManager