Remove 'batchsize' and replace with 'streaming'