Added C++ interface (to be tested)