Added tokens on build