More work on job management