Added functionality for batch-jobs