Added special token cases