Add batch support for the client side. #10