C/C++ part added