Reorganized job templates