Added a new C++ API