Add batch_delete support