Added new properties to Job and Task Model