* Add preliminary support for C++