Updated: More Vault stuff