- refactored to IKeyStore