Add extra options to job definition
Merge branch 'job'