Add buffering