Updated for use with CMSSWBatch repository