Add version which uses C++ wrapper, which does the same.