Improved the JobDispatcher