Further work on VaultManager.