C++ wrapper now has buffering mechanism