Start adapting Job to the new file handling
Port Batch to the new interface