diff --git a/ApplicationLibCode/Commands/RicUserDefinedCalculatorUi.cpp b/ApplicationLibCode/Commands/RicUserDefinedCalculatorUi.cpp
index a8f09f924d..af596fcd5c 100644
--- a/ApplicationLibCode/Commands/RicUserDefinedCalculatorUi.cpp
+++ b/ApplicationLibCode/Commands/RicUserDefinedCalculatorUi.cpp
@@ -91,7 +91,9 @@ bool RicUserDefinedCalculatorUi::parseExpression() const
             notifyCalculatedNameChanged( m_currentCalculation()->id(), currentCurveName );
         }
 
-        m_currentCalculation()->updateDependentObjects();
+        // Always rebuild the case meta data after parsing the expression. A change in name or change in result type will require rebuild of
+        // case metadata. The rebuild is considered lightweight and should not be a performance issue.
+        calculationCollection()->rebuildCaseMetaData();
     }
 
     return true;
@@ -220,17 +222,7 @@ bool RicUserDefinedCalculatorUi::calculate() const
 {
     if ( m_currentCalculation() )
     {
-        QString previousCurveName = m_currentCalculation->description();
-        if ( !m_currentCalculation()->parseExpression() )
-        {
-            return false;
-        }
-
-        QString currentCurveName = m_currentCalculation->description();
-        if ( previousCurveName != currentCurveName )
-        {
-            notifyCalculatedNameChanged( m_currentCalculation()->id(), currentCurveName );
-        }
+        if ( !parseExpression() ) return false;
 
         if ( !m_currentCalculation()->preCalculate() )
         {
diff --git a/ApplicationLibCode/FileInterface/RifEclEclipseSummary.h b/ApplicationLibCode/FileInterface/RifEclEclipseSummary.h
index d6d51ac789..da75646132 100644
--- a/ApplicationLibCode/FileInterface/RifEclEclipseSummary.h
+++ b/ApplicationLibCode/FileInterface/RifEclEclipseSummary.h
@@ -56,7 +56,7 @@ class RifEclEclipseSummary : public RifSummaryReaderInterface
 
 private:
     int  indexFromAddress( const RifEclipseSummaryAddress& resultAddress ) const;
-    void buildMetaData();
+    void buildMetaData() override;
 
 private:
     ecl_sum_type*          m_ecl_sum;
diff --git a/ApplicationLibCode/FileInterface/RifMultipleSummaryReaders.cpp b/ApplicationLibCode/FileInterface/RifMultipleSummaryReaders.cpp
index 785220b1f2..98df37a642 100644
--- a/ApplicationLibCode/FileInterface/RifMultipleSummaryReaders.cpp
+++ b/ApplicationLibCode/FileInterface/RifMultipleSummaryReaders.cpp
@@ -36,7 +36,7 @@ void RifMultipleSummaryReaders::addReader( RifSummaryReaderInterface* reader )
 
     m_readers.push_back( reader );
 
-    rebuildMetaData();
+    buildMetaData();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -45,7 +45,7 @@ void RifMultipleSummaryReaders::addReader( RifSummaryReaderInterface* reader )
 void RifMultipleSummaryReaders::removeReader( RifSummaryReaderInterface* reader )
 {
     m_readers.erase( reader );
-    rebuildMetaData();
+    buildMetaData();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -100,7 +100,7 @@ RiaDefines::EclipseUnitSystem RifMultipleSummaryReaders::unitSystem() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RifMultipleSummaryReaders::rebuildMetaData()
+void RifMultipleSummaryReaders::buildMetaData()
 {
     m_allErrorAddresses.clear();
     m_allResultAddresses.clear();
diff --git a/ApplicationLibCode/FileInterface/RifMultipleSummaryReaders.h b/ApplicationLibCode/FileInterface/RifMultipleSummaryReaders.h
index a18d91fa09..996fa4e66a 100644
--- a/ApplicationLibCode/FileInterface/RifMultipleSummaryReaders.h
+++ b/ApplicationLibCode/FileInterface/RifMultipleSummaryReaders.h
@@ -40,7 +40,7 @@ class RifMultipleSummaryReaders : public RifSummaryReaderInterface
     std::string                          unitName( const RifEclipseSummaryAddress& resultAddress ) const override;
     RiaDefines::EclipseUnitSystem        unitSystem() const override;
 
-    void rebuildMetaData();
+    void buildMetaData() override;
 
 private:
     cvf::Collection<RifSummaryReaderInterface> m_readers;
diff --git a/ApplicationLibCode/FileInterface/RifOpmCommonSummary.h b/ApplicationLibCode/FileInterface/RifOpmCommonSummary.h
index 8dc0de8232..570e7e9d73 100644
--- a/ApplicationLibCode/FileInterface/RifOpmCommonSummary.h
+++ b/ApplicationLibCode/FileInterface/RifOpmCommonSummary.h
@@ -78,7 +78,7 @@ class RifOpmCommonEclipseSummary : public RifSummaryReaderInterface
     RiaDefines::EclipseUnitSystem        unitSystem() const override;
 
 private:
-    void buildMetaData();
+    void buildMetaData() override;
     bool openFileReader( const QString& fileName, bool includeRestartFiles, RiaThreadSafeLogger* threadSafeLogger );
 
     static void    increaseEsmryFileCount();
diff --git a/ApplicationLibCode/FileInterface/RifOpmHdf5Summary.h b/ApplicationLibCode/FileInterface/RifOpmHdf5Summary.h
index 8c08ba11bf..dc2727171f 100644
--- a/ApplicationLibCode/FileInterface/RifOpmHdf5Summary.h
+++ b/ApplicationLibCode/FileInterface/RifOpmHdf5Summary.h
@@ -62,7 +62,7 @@ class RifOpmHdf5Summary : public RifSummaryReaderInterface
     RiaDefines::EclipseUnitSystem        unitSystem() const override;
 
 private:
-    void buildMetaData();
+    void buildMetaData() override;
     bool openESmryFile( const QString& headerFileName, bool includeRestartFiles, RiaThreadSafeLogger* threadSafeLogger );
 
 private:
diff --git a/ApplicationLibCode/FileInterface/RifReaderEclipseSummary.h b/ApplicationLibCode/FileInterface/RifReaderEclipseSummary.h
index 7028e384d3..769aaf1251 100644
--- a/ApplicationLibCode/FileInterface/RifReaderEclipseSummary.h
+++ b/ApplicationLibCode/FileInterface/RifReaderEclipseSummary.h
@@ -54,10 +54,9 @@ class RifReaderEclipseSummary : public RifSummaryReaderInterface
     std::pair<bool, std::vector<double>> values( const RifEclipseSummaryAddress& resultAddress ) const override;
     std::string                          unitName( const RifEclipseSummaryAddress& resultAddress ) const override;
     RiaDefines::EclipseUnitSystem        unitSystem() const override;
+    void                                 buildMetaData() override;
 
 private:
-    void buildMetaData();
-
     RifSummaryReaderInterface* currentSummaryReader() const;
 
 private:
diff --git a/ApplicationLibCode/FileInterface/RifSummaryReaderInterface.cpp b/ApplicationLibCode/FileInterface/RifSummaryReaderInterface.cpp
index 599ab33b0e..01ee289adb 100644
--- a/ApplicationLibCode/FileInterface/RifSummaryReaderInterface.cpp
+++ b/ApplicationLibCode/FileInterface/RifSummaryReaderInterface.cpp
@@ -49,6 +49,13 @@ RifEclipseSummaryAddress RifSummaryReaderInterface::errorAddress( const RifEclip
     return m_allErrorAddresses.find( errAddr ) != m_allErrorAddresses.end() ? errAddr : RifEclipseSummaryAddress();
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RifSummaryReaderInterface::buildMetaData()
+{
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/FileInterface/RifSummaryReaderInterface.h b/ApplicationLibCode/FileInterface/RifSummaryReaderInterface.h
index 1c7c3b32a4..efdd2973c6 100644
--- a/ApplicationLibCode/FileInterface/RifSummaryReaderInterface.h
+++ b/ApplicationLibCode/FileInterface/RifSummaryReaderInterface.h
@@ -51,6 +51,8 @@ class RifSummaryReaderInterface : public cvf::Object
     virtual std::string                   unitName( const RifEclipseSummaryAddress& resultAddress ) const = 0;
     virtual RiaDefines::EclipseUnitSystem unitSystem() const                                              = 0;
 
+    virtual void buildMetaData();
+
 protected:
     std::set<RifEclipseSummaryAddress> m_allResultAddresses; // Result and error addresses
     std::set<RifEclipseSummaryAddress> m_allErrorAddresses; // Error addresses
diff --git a/ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.cpp b/ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.cpp
index 111c7b7bad..c83a240de3 100644
--- a/ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.cpp
@@ -27,26 +27,17 @@
 
 #include "RifSummaryReaderInterface.h"
 #include "RimDataSourceSteppingTools.h"
-#include "RimObservedDataCollection.h"
-#include "RimObservedSummaryData.h"
 #include "RimProject.h"
 #include "RimSummaryAddress.h"
 #include "RimSummaryCalculationCollection.h"
 #include "RimSummaryCalculationVariable.h"
 #include "RimSummaryCase.h"
-#include "RimSummaryCaseCollection.h"
-#include "RimSummaryCaseMainCollection.h"
 #include "RimSummaryCurve.h"
 #include "RimSummaryMultiPlot.h"
 #include "RimSummaryMultiPlotCollection.h"
 #include "RimSummaryPlot.h"
 
-#include "RiuExpressionContextMenuManager.h"
-
 #include "cafPdmUiCheckBoxEditor.h"
-#include "cafPdmUiLineEditor.h"
-#include "cafPdmUiTableViewEditor.h"
-#include "cafPdmUiTextEditor.h"
 
 #include "expressionparser/ExpressionParser.h"
 
@@ -402,35 +393,6 @@ std::optional<std::pair<std::vector<double>, std::vector<time_t>>>
 //--------------------------------------------------------------------------------------------------
 void RimSummaryCalculation::updateDependentObjects()
 {
-    RimSummaryCalculationCollection* calcColl = firstAncestorOrThisOfTypeAsserted<RimSummaryCalculationCollection>();
-    calcColl->rebuildCaseMetaData();
-
-    // Refresh data sources tree.
-    // TODO: refresh too much: would be enough to only refresh calculated resutls.
-    RimSummaryCaseMainCollection* summaryCaseCollection = RiaSummaryTools::summaryCaseMainCollection();
-    auto                          summaryCases          = summaryCaseCollection->allSummaryCases();
-    for ( RimSummaryCase* summaryCase : summaryCases )
-    {
-        summaryCase->createSummaryReaderInterface();
-        summaryCase->createRftReaderInterface();
-        summaryCase->refreshMetaData();
-    }
-
-    RimObservedDataCollection* observedDataCollection = RiaSummaryTools::observedDataCollection();
-    auto                       observedData           = observedDataCollection->allObservedSummaryData();
-    for ( auto obs : observedData )
-    {
-        obs->createSummaryReaderInterface();
-        obs->createRftReaderInterface();
-        obs->refreshMetaData();
-    }
-
-    auto summaryCaseCollections = summaryCaseCollection->summaryCaseCollections();
-    for ( RimSummaryCaseCollection* summaryCaseCollection : summaryCaseCollections )
-    {
-        summaryCaseCollection->refreshMetaData();
-    }
-
     RimSummaryMultiPlotCollection* summaryPlotCollection = RiaSummaryTools::summaryMultiPlotCollection();
     for ( auto multiPlot : summaryPlotCollection->multiPlots() )
     {
@@ -438,7 +400,7 @@ void RimSummaryCalculation::updateDependentObjects()
         {
             bool plotContainsCalculatedCurves = false;
 
-            for ( RimSummaryCurve* sumCurve : sumPlot->summaryCurves() )
+            for ( RimSummaryCurve* sumCurve : sumPlot->summaryAndEnsembleCurves() )
             {
                 if ( sumCurve->summaryAddressY().isCalculated() )
                 {
@@ -461,6 +423,7 @@ void RimSummaryCalculation::updateDependentObjects()
 //--------------------------------------------------------------------------------------------------
 void RimSummaryCalculation::removeDependentObjects()
 {
+    updateDependentObjects();
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationCollection.cpp
index e8e8cf5eda..f2de3ba444 100644
--- a/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationCollection.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationCollection.cpp
@@ -18,7 +18,15 @@
 
 #include "RimSummaryCalculationCollection.h"
 
+#include "RiaSummaryTools.h"
+
+#include "RifSummaryReaderInterface.h"
+
+#include "RimObservedSummaryData.h"
 #include "RimSummaryCalculation.h"
+#include "RimSummaryCase.h"
+#include "RimSummaryCaseCollection.h"
+#include "RimSummaryCaseMainCollection.h"
 
 CAF_PDM_SOURCE_INIT( RimSummaryCalculationCollection, "RimSummaryCalculationCollection" );
 //--------------------------------------------------------------------------------------------------
@@ -37,12 +45,53 @@ RimSummaryCalculation* RimSummaryCalculationCollection::createCalculation() cons
     return new RimSummaryCalculation;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimSummaryCalculationCollection::updateDataDependingOnCalculations()
+{
+    // Refresh data sources tree
+    // Refresh meta data for all summary cases and rebuild AddressNodes in the summary tree
+    RimSummaryCaseMainCollection* summaryCaseCollection = RiaSummaryTools::summaryCaseMainCollection();
+    auto                          summaryCases          = summaryCaseCollection->allSummaryCases();
+    for ( RimSummaryCase* summaryCase : summaryCases )
+    {
+        if ( !summaryCase ) continue;
+
+        if ( auto reader = summaryCase->summaryReader() )
+        {
+            reader->buildMetaData();
+            summaryCase->onCalculationUpdated();
+        }
+    }
+
+    RimObservedDataCollection* observedDataCollection = RiaSummaryTools::observedDataCollection();
+    auto                       observedData           = observedDataCollection->allObservedSummaryData();
+    for ( auto obs : observedData )
+    {
+        if ( !obs ) continue;
+
+        if ( auto reader = obs->summaryReader() )
+        {
+            reader->buildMetaData();
+            obs->onCalculationUpdated();
+        }
+    }
+
+    auto summaryCaseCollections = summaryCaseCollection->summaryCaseCollections();
+    for ( RimSummaryCaseCollection* summaryCaseCollection : summaryCaseCollections )
+    {
+        summaryCaseCollection->onCalculationUpdated();
+    }
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
 void RimSummaryCalculationCollection::rebuildCaseMetaData()
 {
     ensureValidCalculationIds();
+    updateDataDependingOnCalculations();
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationCollection.h b/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationCollection.h
index 8d7f21d06c..e4953189ba 100644
--- a/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationCollection.h
+++ b/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationCollection.h
@@ -42,5 +42,6 @@ class RimSummaryCalculationCollection : public RimUserDefinedCalculationCollecti
     RimSummaryCalculation* createCalculation() const override;
 
 private:
+    void updateDataDependingOnCalculations();
     void initAfterRead() override;
 };
diff --git a/ApplicationLibCode/ProjectDataModel/RimUserDefinedCalculationCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimUserDefinedCalculationCollection.cpp
index b30dcf0ec4..b8572c84b1 100644
--- a/ApplicationLibCode/ProjectDataModel/RimUserDefinedCalculationCollection.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimUserDefinedCalculationCollection.cpp
@@ -103,9 +103,11 @@ RimUserDefinedCalculation* RimUserDefinedCalculationCollection::addCalculationCo
 //--------------------------------------------------------------------------------------------------
 void RimUserDefinedCalculationCollection::deleteCalculation( RimUserDefinedCalculation* calculation )
 {
-    calculation->removeDependentObjects();
     m_calculations.removeChild( calculation );
 
+    // Call this function after the object is removed from the collection
+    calculation->removeDependentObjects();
+
     rebuildCaseMetaData();
 
     delete calculation;
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.cpp
index e5efa6f85e..22f0a32fca 100644
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.cpp
@@ -87,11 +87,11 @@ void RifCalculatedSummaryCurveReader::buildMetaData()
 
     for ( RimUserDefinedCalculation* calc : m_calculationCollection->calculations() )
     {
-        RimSummaryCalculation* sumCalc = dynamic_cast<RimSummaryCalculation*>( calc );
+        auto* sumCalc = dynamic_cast<RimSummaryCalculation*>( calc );
         CAF_ASSERT( sumCalc );
 
         const auto& allAddresses = sumCalc->allAddressesForSummaryCase( m_summaryCase );
-        for ( auto calculationAddress : allAddresses )
+        for ( const auto& calculationAddress : allAddresses )
         {
             if ( calculationAddress.address().isValid() )
             {
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.h b/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.h
index b8f036a5f2..5eb786d75a 100644
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.h
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.h
@@ -39,7 +39,7 @@ class RifCalculatedSummaryCurveReader : public RifSummaryReaderInterface
     std::pair<bool, std::vector<double>> values( const RifEclipseSummaryAddress& resultAddress ) const override;
     std::string                          unitName( const RifEclipseSummaryAddress& resultAddress ) const override;
 
-    void buildMetaData();
+    void buildMetaData() override;
 
     RiaDefines::EclipseUnitSystem unitSystem() const override;
 
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp
index fceb1e0f5a..c27e0140a6 100644
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp
@@ -99,7 +99,7 @@ RimSummaryAddressCollection::~RimSummaryAddressCollection()
 //--------------------------------------------------------------------------------------------------
 bool RimSummaryAddressCollection::hasDataVector( const QString quantityName ) const
 {
-    for ( auto& address : m_adresses )
+    for ( const auto& address : m_adresses )
     {
         if ( address->quantityName() == quantityName ) return true;
     }
@@ -346,6 +346,32 @@ void RimSummaryAddressCollection::deleteChildren()
     m_subfolders.deleteChildren();
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimSummaryAddressCollection::deleteCalculatedObjects()
+{
+    std::vector<RimSummaryAddress*> toDelete;
+    for ( const auto& a : m_adresses )
+    {
+        if ( a->address().isCalculated() )
+        {
+            toDelete.push_back( a );
+        }
+    }
+
+    for ( auto a : toDelete )
+    {
+        m_adresses.removeChild( a );
+        delete a;
+    }
+
+    for ( auto& folder : m_subfolders )
+    {
+        folder->deleteCalculatedObjects();
+    }
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.h
index b0b2f02a92..9381c94813 100644
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.h
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.h
@@ -66,6 +66,7 @@ class RimSummaryAddressCollection : public RimNamedObject
     void updateFolderStructure( const std::set<RifEclipseSummaryAddress>& addresses, int caseId, int ensembleId = -1 );
 
     void deleteChildren();
+    void deleteCalculatedObjects();
 
     bool isEmpty() const;
     bool isEnsemble() const;
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp
index dd301f6d83..7171f50e21 100644
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp
@@ -400,3 +400,20 @@ void RimSummaryCase::refreshMetaData()
     buildChildNodes();
     updateConnectedEditors();
 }
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimSummaryCase::onCalculationUpdated()
+{
+    // Delete all calculated address objects
+    m_dataVectorFolders->deleteCalculatedObjects();
+
+    if ( auto reader = summaryReader() )
+    {
+        auto addresses = reader->allResultAddresses();
+        m_dataVectorFolders->updateFolderStructure( addresses, m_caseId );
+    }
+
+    updateConnectedEditors();
+}
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.h
index 1ea198777a..d305e9d73c 100644
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.h
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.h
@@ -66,6 +66,7 @@ class RimSummaryCase : public caf::PdmObject
     int  caseId() const;
 
     void refreshMetaData();
+    void onCalculationUpdated();
 
     virtual void                       createSummaryReaderInterface() = 0;
     virtual void                       createRftReaderInterface() {}
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp
index cc93a84820..6e5fc541e7 100644
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp
@@ -22,30 +22,23 @@
 #include "RiaFieldHandleTools.h"
 #include "RiaLogging.h"
 #include "RiaStatisticsTools.h"
-#include "RiaStdStringTools.h"
 #include "RiaSummaryAddressAnalyzer.h"
-#include "RiaWeightedMeanCalculator.h"
-
-#include "RicfCommandObject.h"
 
 #include "RifReaderRftInterface.h"
 #include "RifSummaryReaderInterface.h"
 
-#include "RimAnalysisPlotDataEntry.h"
 #include "RimDerivedEnsembleCaseCollection.h"
 #include "RimEnsembleCurveSet.h"
 #include "RimProject.h"
 #include "RimSummaryAddressCollection.h"
-#include "RimSummaryCalculationCollection.h"
 #include "RimSummaryCase.h"
 
 #include "cafPdmFieldScriptingCapability.h"
+#include "cafPdmObjectScriptingCapability.h"
 #include "cafPdmUiTreeOrdering.h"
 
-#include <QDate>
 #include <QFileInfo>
 
-#include <algorithm>
 #include <cmath>
 
 CAF_PDM_SOURCE_INIT( RimSummaryCaseCollection, "SummaryCaseSubCollection" );
@@ -284,7 +277,7 @@ void RimSummaryCaseCollection::setAsEnsemble( bool isEnsemble )
             calculateEnsembleParametersIntersectionHash();
         }
 
-        refreshMetaData();
+        buildMetaData();
     }
 }
 
@@ -1155,13 +1148,24 @@ void RimSummaryCaseCollection::buildChildNodes()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::refreshMetaData()
+void RimSummaryCaseCollection::buildMetaData()
 {
     clearChildNodes();
     buildChildNodes();
     updateConnectedEditors();
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimSummaryCaseCollection::onCalculationUpdated()
+{
+    m_dataVectorFolders->deleteCalculatedObjects();
+    m_dataVectorFolders->updateFolderStructure( ensembleSummaryAddresses(), -1, m_ensembleId );
+
+    updateConnectedEditors();
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h
index 725f7d376a..b2798c954e 100644
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h
@@ -19,20 +19,17 @@
 #pragma once
 
 #include "RiaDefines.h"
+
 #include "RifEclipseSummaryAddress.h"
 
 #include "RigEnsembleParameter.h"
 
-#include "RimObjectiveFunction.h"
-
 #include "cafPdmChildArrayField.h"
 #include "cafPdmChildField.h"
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 #include "cafPdmProxyValueField.h"
 
-#include "cvfObject.h"
-
 #include <QString>
 
 #include <memory>
@@ -103,7 +100,7 @@ class RimSummaryCaseCollection : public caf::PdmObject
 
     RiaDefines::EclipseUnitSystem unitSystem() const;
 
-    void refreshMetaData();
+    void onCalculationUpdated();
 
     void updateReferringCurveSets();
 
@@ -127,6 +124,7 @@ class RimSummaryCaseCollection : public caf::PdmObject
 
     void onCaseNameChanged( const SignalEmitter* emitter );
 
+    void buildMetaData();
     void buildChildNodes();
     void clearChildNodes();
 
diff --git a/ResInsightVersion.cmake b/ResInsightVersion.cmake
index bf3399a258..bd82396262 100644
--- a/ResInsightVersion.cmake
+++ b/ResInsightVersion.cmake
@@ -11,7 +11,7 @@ set(RESINSIGHT_VERSION_TEXT "-dev")
 # Must be unique and increasing within one combination of major/minor/patch version 
 # The uniqueness of this text is independent of RESINSIGHT_VERSION_TEXT 
 # Format of text must be ".xx"
-set(RESINSIGHT_DEV_VERSION ".21")
+set(RESINSIGHT_DEV_VERSION ".22")
 
 # https://github.com/CRAVA/crava/tree/master/libs/nrlib
 set(NRLIB_GITHUB_SHA "ba35d4359882f1c6f5e9dc30eb95fe52af50fd6f")