some changes for job queue