Add support for C++