Added strings to some tokens