Further heavy reworking of VaultManager.