Changed: Use VaultAPI instead of Vault