Changed handling of strings to std::string, instead of using char pointers