Job Supervisor modifications