Use new BatchBundle namespace