Better handling of jobs. Better class creation with defaults