refactor and additions for batchuploadjob