Further updates to VaultManager and ClientInterface.