Massive batching improvement