C++ support added