Added Vault support (untested!)