Removed char* for std::string