Keychain update

Consuming new keychain API.