Update to use Vault