Merge "Add logic to persist jobs in separate files."