Change API according to the new architecture

[Avvrik]

There will be 2 steps in the changes, made to KeyChain API:

1. The API should be changed after the improvement are made to the KeyChain arhitecture.

2. The second step of the API changes should be made after the plug-in architecture is created.