Adding C++ editions