Added support for C++