Vault integration

Vault integration & some other few changes.