Switched from handling const char*'s to c++ strings