C++ api changes.