Added additional check for C++ support