Added tokenising of strings and chars