Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs
===================================================================
diff -u -r962 -r992
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 962)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 992)
@@ -56,6 +56,8 @@
         /// </value>
         public List<LogMessage> CalculationMessages { get; set; } = null;
         private SensorData sensorData;
+        private string calculationMap = "";
+        private string projectPath = "";
 
         /// <summary>
         /// Constructor
@@ -68,8 +70,6 @@
             segments = new List<Segment>();
         }
 
-        public static string ProjectMap = "";
-
         // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
         public static string MStabExePath
         {
@@ -425,9 +425,32 @@
             get { return programType; }
         }
 
-        public string ProjectWorkingPath { get; set; } = "";
+        /// <summary>
+        /// Gets or sets the project path.
+        /// </summary>
+        /// <value>
+        /// The project path.
+        /// </value>
+        public string ProjectPath
+        {
+            get { return projectPath; }
+            set { projectPath = value ?? ""; }
+        }
 
         /// <summary>
+        /// Gets or sets the calculation map.
+        /// This does not include a full path but can include a relative path
+        /// </summary>
+        /// <value>
+        /// The calculation map.
+        /// </value>
+        public string CalculationMap
+        {
+            get { return calculationMap; }
+            set { calculationMap = value?? ""; }
+        }
+
+        /// <summary>
         /// Gets or sets the sensor data.
         /// </summary>
         /// <value>