KeyStore implementation.
Adapt Key Handling.
Some Changes.