Fixing job creation and retrieval