Added c++ mode.