Updated token compare method