Vault support. Adds #294