Changed char* to strings