Adding C++ wrapper