Added jobId to identify jobs in the cluster