Updated token recognition