Adding c++ tools