better batch support