C++ version added