Keystore simplified