Added upsert job capabilities