Issue #77: Batch support