Updated for C++ driver changes