improve support for C++ stuff