* Work on support for C++