C++ driver updates