Client: added more batching