Improved String parsing