Removed Vault dependency for now.