Changed from c strings (char *) to c++ std::string