Improve the token creation