Adding C++ support including debugging tools