Refactor to use JobList