Code Changes for job scheduler