Added an optional object return on token passing.