Added TokenLocation