updated Token helper