Use new Vault API