Adding support for Vault.