Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs
===================================================================
diff -u -r4214 -r4215
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs	(.../DataPluginImporter.cs)	(revision 4214)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs	(.../DataPluginImporter.cs)	(revision 4215)
@@ -156,6 +156,8 @@
         }
     }
 
+    public WaterBoard WaterBoard => waterBoard;
+
     /// <summary>
     /// Gets the data folder.
     /// </summary>
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs
===================================================================
diff -u -r4205 -r4215
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs	(.../Dike.cs)	(revision 4205)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs	(.../Dike.cs)	(revision 4215)
@@ -261,9 +261,10 @@
     /// <summary>
     ///     Adapt data so it is consistent
     /// </summary>
-    public List<LogMessage> MakeDataConsistent()
+    /// <param name="importedCsvSoils">The soils as imported from the csv file</param>
+    public IEnumerable<LogMessage> MakeDataConsistent(List<Soil> importedCsvSoils)
     {
-        List<Soil> errorSoils = TryToMakeSoilDataConsistent();
+        List<Soil> errorSoils = TryToMakeSoilDataConsistent(importedCsvSoils);
         var logMessages = new List<LogMessage>();
         // Delete all locations without surfaceline
         logMessages.AddRange(DeleteLocationsWithoutSurfaceLines());
@@ -333,23 +334,24 @@
         }
     }
 
-    internal List<Soil> ImportedCsvSoils { get; private set; } = new();
+    internal List<Soil> ImportedCsvSoils { get; } = new();
 
     /// <summary>
     ///     Tries to make the soil data as read for 1D profiles consistent with the data in the soil database.
     ///     In the end we have a neat soil list with parameters for every soil as read from the database.
     ///     We might have a list with errors (soils that were not to be found in the database so soils for which
     ///     no parameters could be found).
     /// </summary>
+    /// <param name="importedCsvSoils">The soils as imported from the csv file</param>
     /// <returns></returns>
-    private List<Soil> TryToMakeSoilDataConsistent()
+    private List<Soil> TryToMakeSoilDataConsistent(List<Soil> importedCsvSoils)
     {
         var errorSoils = new List<Soil>();
         // Fill the list of errorSoils with soils that are in the current soillist (as result of importing
         // 1D profiles) but that are not found in the soil database because that are errors
         foreach (Soil soil in soilList.Soils)
         {
-            Soil fs = ImportedCsvSoils.Find(t => string.Equals(t.Name, soil.Name, StringComparison.CurrentCultureIgnoreCase));
+            Soil fs = importedCsvSoils.Find(t => string.Equals(t.Name, soil.Name, StringComparison.CurrentCultureIgnoreCase));
             if (fs == null)
             {
                 errorSoils.Add(soil);
@@ -364,7 +366,7 @@
 
         // Get the parameters for every soil in the now proper soil list from the database. Add soils
         // that are in the database but not yet in the soil list.
-        foreach (Soil soil in ImportedCsvSoils)
+        foreach (Soil soil in importedCsvSoils)
         {
             Soil existingSoil = soilList.GetSoilByName(soil.Name);
             if (existingSoil == null)
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardImporter.cs
===================================================================
diff -u -r4214 -r4215
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardImporter.cs	(.../WaterBoardImporter.cs)	(revision 4214)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardImporter.cs	(.../WaterBoardImporter.cs)	(revision 4215)
@@ -22,9 +22,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Linq;
-using Deltares.Dam.Data.CsvImporters;
 using Deltares.Dam.Data.DataPlugins;
 using Deltares.Dam.Data.DataPlugins.Configuration;
 using Deltares.Geometry;
@@ -58,22 +56,14 @@
 
     private readonly WaterBoard waterBoard = new ();
 
-    private readonly DamProjectType damProjectType;
-
     /// <summary>
     /// Initializes a new instance of the <see cref="WaterBoardImporter"/> class.
     /// </summary>
-    public WaterBoardImporter() {}
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="WaterBoardImporter"/> class.
-    /// </summary>
     /// <param name="dataFolder">The data folder.</param>
     /// <param name="dataSourceContainer">The data source container.</param>
     /// <param name="damProjectType">Type of the dam project.</param>
     private WaterBoardImporter(string dataFolder, DataSourceContainer dataSourceContainer, DamProjectType damProjectType)
     {
-        this.damProjectType = damProjectType;
         importer = CreateDataPlugin(dataFolder, dataSourceContainer);
         importer.DamProjectType = damProjectType;
     }
@@ -84,7 +74,7 @@
     /// <value>
     /// The import CSV log messages.
     /// </value>
-    public List<LogMessage> ImportCsvLogMessages { get; } = new List<LogMessage>();
+    private List<LogMessage> ImportCsvLogMessages { get; } = new ();
 
     /// <summary>
     /// Imports the dike ring ids.
@@ -146,12 +136,7 @@
         var waterBoard = new WaterBoard();
         try
         {
-            string dataLocation = "";
-            foreach (DataSource dataSource in dataSourceContainer.DataSourceList.Where(dataSource => dataSource.DataSourceType == DataSourceType.CsvFiles))
-            {
-                dataLocation = GetDataLocation(dataSource, importer.DataFolder);
-            }
-            waterBoard = importer.ImportDataForDikeRings(damProjectFolder, dataLocation, dikeRingIds, progress);
+            waterBoard = importer.ImportDataForDikeRings(damProjectFolder, dikeRingIds, progress);
             foreach (Dike dike in waterBoard.Dikes)
             {
                 if (string.IsNullOrEmpty(dike.MapForSoilGeometries2D) && !string.IsNullOrEmpty(dataSourceContainer.MapSoilProfile2D))
@@ -196,46 +181,6 @@
     }
 
     /// <summary>
-    /// Gets the data source list.
-    /// </summary>
-    /// <value>
-    /// The data source list.
-    /// </value>
-    private IEnumerable<DataSource> DataSourceList
-    {
-        get
-        {
-            return importer.DataSources;
-        }
-    }
-
-    /// <summary>
-    /// Gets the data folder.
-    /// </summary>
-    /// <value>
-    /// The data folder.
-    /// </value>
-    private string DataFolder
-    {
-        get
-        {
-            return importer.DataFolder;
-        }
-    }
-
-    private static string GetDataLocation(DataSource dataSource, string dataFolder)
-    {
-        string dataLocation = dataSource.DataLocation;
-        if (!string.IsNullOrEmpty(dataFolder)
-            && (!Directory.Exists(dataLocation) || !File.Exists(dataLocation)))
-        {
-            dataLocation = Path.Combine(dataFolder, dataLocation);
-        }
-    
-        return dataLocation;
-    }
-
-    /// <summary>
     /// Creates the data plugin.
     /// </summary>
     /// <param name="dataFolder">The data folder.</param>
@@ -254,11 +199,10 @@
     /// Imports the data for dike rings.
     /// </summary>
     /// <param name="damProjectFolder">The dam project folder.</param>
-    /// <param name="dataLocation">The location of the csv files.</param>
     /// <param name="dikeRingIds">The dike ring ids.</param>
     /// <param name="progress">The progress.</param>
     /// <returns></returns>
-    private WaterBoard ImportDataForDikeRings(string damProjectFolder, string dataLocation, IEnumerable<string> dikeRingIds, ProgressDelegate progress)
+    private WaterBoard ImportDataForDikeRings(string damProjectFolder, IEnumerable<string> dikeRingIds, ProgressDelegate progress)
     {
         List<string> dikeRingList = ValidateDikeRingIDs(dikeRingIds);
 
@@ -276,7 +220,8 @@
         foreach (string dikeRingId in dikeRingList)
         {
             // Add dikes to waterboard
-            Dike dike = ImportDataForDikeRing(dikeRingId, dataLocation);
+            List<Soil> importedCsvSoils = importer.WaterBoard.Dikes.First(d => d.Name == dikeRingId).ImportedCsvSoils;
+            Dike dike = ImportDataForDikeRing(importedCsvSoils, dikeRingId);
             waterBoard.Dikes.Add(dike);
         }
 
@@ -301,16 +246,10 @@
     /// Imports the soils.
     /// </summary>
     /// <param name="dikeRingID">The dike ring identifier.</param>
-    /// <param name="dataLocation">The location of the csv files.</param>
     /// <param name="dike">The dike.</param>
-    private void ImportSoils(string dikeRingID, string dataLocation, Dike dike)
+    private void ImportSoils(string dikeRingID, Dike dike)
     {
         dike.SoilList = GetSoils(dikeRingID);
-        var csvImporter = new CsvImporter();
-        DataSourceManager.CurrentSource = DataSourceSystemType.Csv;
-        csvImporter.ImportCsvDataFromDirectory(dataLocation, false, null, damProjectType);
-            
-        dike.FillImportedCsvSoilsFromCsvFile(csvImporter.SoilsRecords);
     }
 
     /// <summary>
@@ -355,16 +294,16 @@
     /// <summary>
     /// Imports the data for dike ring.
     /// </summary>
+    /// <param name="importedCsvSoils">The soils as imported from the csv file</param>
     /// <param name="dikeRingId">The dike ring identifier.</param>
-    /// <param name="dataLocation">The location of the csv files.</param>
     /// <returns></returns>
-    private Dike ImportDataForDikeRing(string dikeRingId, string dataLocation)
+    private Dike ImportDataForDikeRing(List<Soil> importedCsvSoils, string dikeRingId)
     {
         var dike = new Dike
         {
             Name = dikeRingId
         };
-        ImportSoils(dikeRingId, dataLocation, dike);
+        ImportSoils(dikeRingId, dike);
 
         ImportSoilProfiles1D(dikeRingId, dike);
 
@@ -381,7 +320,7 @@
         //ImportScenarios(importer, dikeRingId, dike, waterBoard);
         ImportScenarios(dikeRingId, dike);
 
-        // Use InvokeWithoutPublishingEvents for performance reasons after introducint SurfaceLine2
+        // Use InvokeWithoutPublishingEvents for performance reasons after introducing SurfaceLine2
         DataEventPublisher.InvokeWithoutPublishingEvents(() =>
         {
             var dikeCoordinateSystemConverter = new DikeCoordinateSystemConverter();
@@ -391,7 +330,7 @@
             }
         });
 
-        ImportCsvLogMessages.AddRange(dike.MakeDataConsistent());
+        ImportCsvLogMessages.AddRange(dike.MakeDataConsistent(importedCsvSoils));
 
         DisposeImportedItem(dikeRingId);
 
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/IDataPlugin.cs
===================================================================
diff -u -r4214 -r4215
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/IDataPlugin.cs	(.../IDataPlugin.cs)	(revision 4214)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/IDataPlugin.cs	(.../IDataPlugin.cs)	(revision 4215)
@@ -70,6 +70,8 @@
 
     Info WaterBoardInfo { get; }
 
+    WaterBoard WaterBoard { get; }
+
     string DataFolder { get; }
     string DamProjectFolder { get; set; }
     List<LogMessage> ImportLogMessages { get; }