Fixed Vault. added scoping.