Updated token passing feature