Updated token handler