Migrated Keychain to unified api
Migrated KeyValueObserving to unified api