add batch query support