String parsing added