Added TokenValidator