Tokens and Keys updated