Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/StochasticSoilModelUpdateDataStrategy.cs
===================================================================
diff -u -r92549be285a5082435e9625732cf33ff50cd60b9 -r501642521ffd0016f8f8c1d1b618395c4898612b
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/StochasticSoilModelUpdateDataStrategy.cs	(.../StochasticSoilModelUpdateDataStrategy.cs)	(revision 92549be285a5082435e9625732cf33ff50cd60b9)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/StochasticSoilModelUpdateDataStrategy.cs	(.../StochasticSoilModelUpdateDataStrategy.cs)	(revision 501642521ffd0016f8f8c1d1b618395c4898612b)
@@ -24,6 +24,7 @@
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Utils;
+using Ringtoets.Common.Data.UpdateDataStrategies;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.IO.Importers;
 using Ringtoets.Piping.Plugin.Properties;
@@ -43,132 +44,71 @@
     /// imported.</item>
     /// </list>
     /// </summary>
-    public class StochasticSoilModelUpdateDataStrategy : IStochasticSoilModelUpdateModelStrategy
+    public class StochasticSoilModelUpdateDataStrategy : UpdateDataStrategyBase<StochasticSoilModel, string, PipingFailureMechanism>,
+                                                         IStochasticSoilModelUpdateModelStrategy
     {
-        private readonly PipingFailureMechanism failureMechanism;
-
         /// <summary>
         /// Creates a new instance of <see cref="StochasticSoilModelUpdateDataStrategy"/>.
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism in which the models are updated.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/> is <c>null</c>.</exception>
         public StochasticSoilModelUpdateDataStrategy(PipingFailureMechanism failureMechanism)
-        {
-            if (failureMechanism == null)
-            {
-                throw new ArgumentNullException(nameof(failureMechanism));
-            }
-            this.failureMechanism = failureMechanism;
-        }
-        
+            : base(failureMechanism, new SoilModelNameEqualityComparer()) {}
+
         public IEnumerable<IObservable> UpdateModelWithImportedData(StochasticSoilModelCollection targetCollection,
                                                                     IEnumerable<StochasticSoilModel> readStochasticSoilModels,
                                                                     string sourceFilePath)
         {
-            if (readStochasticSoilModels == null)
+            try
             {
-                throw new ArgumentNullException(nameof(readStochasticSoilModels));
+                return UpdateTargetCollectionData(targetCollection, readStochasticSoilModels, sourceFilePath);
             }
-            if (targetCollection == null)
+            catch (ArgumentNullException)
             {
-                throw new ArgumentNullException(nameof(targetCollection));
+                throw;
             }
-            if (sourceFilePath == null)
+            catch (ArgumentException e)
             {
-                throw new ArgumentNullException(nameof(sourceFilePath));
+                throw new StochasticSoilModelUpdateException(e.Message, e);
             }
-
-            try
-            {
-                return ModifyModelCollection(readStochasticSoilModels, targetCollection, sourceFilePath);
-            }
             catch (InvalidOperationException e)
             {
-                var message = Resources.StochasticSoilModelUpdateDataStrategy_UpdateModelWithImportedData_Update_of_StochasticSoilModel_failed;
+                string message = Resources.StochasticSoilModelUpdateDataStrategy_UpdateModelWithImportedData_Update_of_StochasticSoilModel_failed;
                 throw new StochasticSoilModelUpdateException(message, e);
             }
         }
 
-        private IEnumerable<IObservable> ModifyModelCollection(IEnumerable<StochasticSoilModel> readStochasticSoilModels,
-                                                               StochasticSoilModelCollection targetCollection,
-                                                               string sourceFilePath)
+        /// <summary>
+        /// Class for comparing <see cref="StochasticSoilModel"/> by just the name.
+        /// </summary>
+        private class SoilModelNameEqualityComparer : IEqualityComparer<StochasticSoilModel>
         {
-            List<StochasticSoilModel> readModelList = readStochasticSoilModels.ToList();
-            List<StochasticSoilModel> addedModels = GetAddedReadModels(targetCollection, readModelList).ToList();
-            List<StochasticSoilModel> updatedModels = GetUpdatedExistingModels(targetCollection, readModelList).ToList();
-            List<StochasticSoilModel> removedModels = GetRemovedExistingModels(targetCollection, readModelList).ToList();
-
-            var affectedObjects = new List<IObservable>();
-            if (addedModels.Any())
+            public bool Equals(StochasticSoilModel x, StochasticSoilModel y)
             {
-                affectedObjects.Add(targetCollection);
+                return x.Name == y.Name;
             }
-            affectedObjects.AddRange(UpdateModels(updatedModels, readModelList));
-            affectedObjects.AddRange(RemoveModels(removedModels));
 
-            targetCollection.Clear();
-
-            try
+            public int GetHashCode(StochasticSoilModel obj)
             {
-                targetCollection.AddRange(addedModels.Union(updatedModels), sourceFilePath);
+                return obj.Name.GetHashCode();
             }
-            catch (ArgumentException e)
-            {
-                throw new StochasticSoilModelUpdateException(e.Message, e);
-            }
-
-            return affectedObjects.Distinct(new ReferenceEqualityComparer<IObservable>());
         }
 
-        private static IEnumerable<StochasticSoilModel> GetAddedReadModels(IEnumerable<StochasticSoilModel> existingCollection, IEnumerable<StochasticSoilModel> readStochasticSoilModels)
-        {
-            var comparer = new SoilModelNameEqualityComparer();
-            foreach (StochasticSoilModel source in readStochasticSoilModels)
-            {
-                if (!existingCollection.Contains(source, comparer))
-                {
-                    yield return source;
-                }
-            }
-        }
+        #region Update Data Functions
 
-        private static IEnumerable<StochasticSoilModel> GetUpdatedExistingModels(IEnumerable<StochasticSoilModel> existingCollection, IEnumerable<StochasticSoilModel> readStochasticSoilModels)
+        protected override IEnumerable<IObservable> UpdateData(IEnumerable<StochasticSoilModel> objectsToUpdate,
+                                                               IEnumerable<StochasticSoilModel> importedDataCollection)
         {
-            return existingCollection.Intersect(readStochasticSoilModels, new SoilModelNameEqualityComparer());
-        }
-
-        private static IEnumerable<StochasticSoilModel> GetRemovedExistingModels(IEnumerable<StochasticSoilModel> existingCollection, IEnumerable<StochasticSoilModel> readStochasticSoilModels)
-        {
-            return existingCollection.Except(readStochasticSoilModels, new SoilModelNameEqualityComparer());
-        }
-
-        private IEnumerable<IObservable> RemoveModels(IEnumerable<StochasticSoilModel> removedModels)
-        {
             var affectedObjects = new List<IObservable>();
-
-            foreach (var model in removedModels)
+            foreach (StochasticSoilModel updatedModel in objectsToUpdate)
             {
-                affectedObjects.AddRange(ClearStochasticSoilModelDependentData(model));
-            }
-            return affectedObjects;
-        }
-
-        private IEnumerable<IObservable> UpdateModels(IList<StochasticSoilModel> updatedModels, IList<StochasticSoilModel> readModels)
-        {
-            var affectedObjects = new List<IObservable>();
-            foreach (StochasticSoilModel updatedModel in updatedModels)
-            {
                 affectedObjects.Add(updatedModel);
-                StochasticSoilModel readModel = readModels.Single(r => r.Name.Equals(updatedModel.Name));
+                StochasticSoilModel readModel = importedDataCollection.Single(r => r.Name.Equals(updatedModel.Name));
                 affectedObjects.AddRange(UpdateStochasticSoilModel(updatedModel, readModel));
             }
             return affectedObjects;
         }
 
-        private IEnumerable<IObservable> ClearStochasticSoilModelDependentData(StochasticSoilModel removedModel)
-        {
-            return PipingDataSynchronizationService.RemoveStochasticSoilModel(failureMechanism, removedModel);
-        }
-
         private IEnumerable<IObservable> UpdateStochasticSoilModel(StochasticSoilModel existingModel, StochasticSoilModel readModel)
         {
             Dictionary<StochasticSoilProfile, PipingSoilProfile> oldProfiles = existingModel
@@ -192,20 +132,26 @@
             return affectedObjects;
         }
 
-        /// <summary>
-        /// Class for comparing <see cref="StochasticSoilModel"/> by just the name.
-        /// </summary>
-        private class SoilModelNameEqualityComparer : IEqualityComparer<StochasticSoilModel>
+        #endregion
+
+        #region Remove Data Functions
+
+        protected override IEnumerable<IObservable> RemoveData(IEnumerable<StochasticSoilModel> removedObjects)
         {
-            public bool Equals(StochasticSoilModel x, StochasticSoilModel y)
-            {
-                return x.Name == y.Name;
-            }
+            var affectedObjects = new List<IObservable>();
 
-            public int GetHashCode(StochasticSoilModel obj)
+            foreach (StochasticSoilModel model in removedObjects)
             {
-                return obj.Name.GetHashCode();
+                affectedObjects.AddRange(ClearStochasticSoilModelDependentData(model));
             }
+            return affectedObjects;
         }
+
+        private IEnumerable<IObservable> ClearStochasticSoilModelDependentData(StochasticSoilModel removedModel)
+        {
+            return PipingDataSynchronizationService.RemoveStochasticSoilModel(failureMechanism, removedModel);
+        }
+
+        #endregion
     }
 }
\ No newline at end of file