Refactored job creation.