Adding batch support