Added index to token results