Add Batch Size configurable for queries