Updated for next C++ driver