Further updates to VaultManager.