Changed returned strings to be wrapped ValueStrings