Added full, properly-working Vault support.