Added return values for string tokens