Add keychain integration and update HPN patch.