Tokens functionality added.