Added string parsing