Changing token to reflect tpe.
Add token type.