Start refactoring to support other jjob types