Add full Vault support