Updated string parsing.