Added optional compatibility layer with Vault.