Added Vault support