Separated out new job class into separate module