Finished converting to job-based configuration