Updated job class