Added some additional features on the Job Client Side