oops, finishing C++ support