Renamed class KeyStore