add batch and querybuilder