Added TokenInput