Added Token Only check.