Further reduce client requirements for handling batch