Add tokens, machine update