Add batch support