Refactor JobQueue