update wrt tokens refactoring