Added token management using keychain