Updated String parsing