Improvements / Keystore