Added string parsing support