Fixed and updated JobService