Updates to C++ port: