Update for changes in Data.String