Added package batch as optional