update async to provide async tokens