Changed the templates so they match with the tokens