Updated token checks