Add data standardization
Add a batch buffer