diff --git a/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/generators/plantuml/PlantUMLValueImpactMapDiagramCreatorTest.java b/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/generators/plantuml/PlantUMLValueImpactMapDiagramCreatorTest.java
index 61ff2577..b6dcd251 100644
--- a/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/generators/plantuml/PlantUMLValueImpactMapDiagramCreatorTest.java
+++ b/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/generators/plantuml/PlantUMLValueImpactMapDiagramCreatorTest.java
@@ -66,9 +66,6 @@ public void canCreateValueImpactMapDiagramDiagramWithoutBoundedContext() throws
 				+ "<b>System of Interest (SOI)</b>;" + System.lineSeparator()
 				+ "** <b>Drivers</b>" + System.lineSeparator()
 				+ "***:<b>WorkLifeBalance</b>" + System.lineSeparator()
-				+ "----" + System.lineSeparator()
-				+ "Priority HIGH" + System.lineSeparator()
-				+ "Impact HIGH" + System.lineSeparator()
 				+ "; <<yellow>>" + System.lineSeparator()
 				+ "@endmindmap" + System.lineSeparator(), valueImpactMapDiagram);
 	}
diff --git a/org.contextmapper.dsl.ui/samples/freemarker/csv-files/stakeholders.csv.ftl b/org.contextmapper.dsl.ui/samples/freemarker/csv-files/stakeholders.csv.ftl
index 441e736d..13e60d65 100644
--- a/org.contextmapper.dsl.ui/samples/freemarker/csv-files/stakeholders.csv.ftl
+++ b/org.contextmapper.dsl.ui/samples/freemarker/csv-files/stakeholders.csv.ftl
@@ -2,13 +2,13 @@ Context,Stakeholder Group,Stakeholder,description,influence,interest
 <#list stakeholders as stakeholderContainer>
 <#assign stakeholderGroups = stakeholderContainer.stakeholders?filter(s -> instanceOf(s, StakeholderGroup))>
 <#assign singleStakeholders = stakeholderContainer.stakeholders?filter(s -> instanceOf(s, Stakeholder))>
-<#if stakeholderContainer.contexts?has_content><#assign contextDescription = stakeholderContainer.contexts?map(c -> c.name)?join("; ")><#else><#assign contextDescription = ""></#if>
+<#if stakeholderContainer.contexts?has_content><#assign contextDescription = stakeholderContainer.contexts?map(c -> c.name)?join("; ")><#else><#assign contextDescription = "none"></#if>
 <#list stakeholderGroups as sg>
 <#list sg.stakeholders as stakeholder>
 ${contextDescription},${sg.name},${stakeholder.name},${stakeholder.description!""},${stakeholder.influence!""},${stakeholder.interest!""}
 </#list>
 </#list>
 <#list singleStakeholders as stakeholder>
-${contextDescription},,${stakeholder.name},${stakeholder.description!""},${stakeholder.influence!""},${stakeholder.interest!""}
+${contextDescription},none,${stakeholder.name},${stakeholder.description!""},${stakeholder.influence!""},${stakeholder.interest!""}
 </#list>
 </#list>
\ No newline at end of file
diff --git a/org.contextmapper.dsl/src/org/contextmapper/dsl/ContextMappingDSL.xtext b/org.contextmapper.dsl/src/org/contextmapper/dsl/ContextMappingDSL.xtext
index cebd031b..3800465d 100644
--- a/org.contextmapper.dsl/src/org/contextmapper/dsl/ContextMappingDSL.xtext
+++ b/org.contextmapper.dsl/src/org/contextmapper/dsl/ContextMappingDSL.xtext
@@ -532,19 +532,19 @@ enum Evolution :
 ;
 
 enum INFLUENCE :
-     HIGH | MEDIUM | LOW
+     UNDEFINED | HIGH | MEDIUM | LOW
 ;
 
 enum INTEREST :
-     HIGH | MEDIUM | LOW
+     UNDEFINED | HIGH | MEDIUM | LOW
 ;
 
 enum PRIORITY:
-	HIGH | MEDIUM | LOW 
+	UNDEFINED | HIGH | MEDIUM | LOW 
 ;
 
 enum IMPACT:
-	HIGH | MEDIUM | LOW 
+	UNDEFINED | HIGH | MEDIUM | LOW 
 ;
 
 enum CoreValue:
diff --git a/org.contextmapper.dsl/src/org/contextmapper/dsl/generator/plantuml/value_impact_mapping/value-impact-map-puml.ftl b/org.contextmapper.dsl/src/org/contextmapper/dsl/generator/plantuml/value_impact_mapping/value-impact-map-puml.ftl
index def5df58..e5d3de01 100644
--- a/org.contextmapper.dsl/src/org/contextmapper/dsl/generator/plantuml/value_impact_mapping/value-impact-map-puml.ftl
+++ b/org.contextmapper.dsl/src/org/contextmapper/dsl/generator/plantuml/value_impact_mapping/value-impact-map-puml.ftl
@@ -31,12 +31,12 @@ ${stakeholder.description};
   </#if>
   <#list stakeholder.values as value>
 ***:<b>${value.name}</b>
-    <#if value.priority?has_content || value.impact?has_content>
+    <#if (value.priority?has_content && value.priority != "UNDEFINED") || (value.impact?has_content && value.impact != "UNDEFINED")>
 ----
-      <#if value.priority?has_content>
+      <#if value.priority?has_content && value.priority != "UNDEFINED">
 Priority ${value.priority}
       </#if>
-      <#if value.impact?has_content>
+      <#if value.impact?has_content && value.impact != "UNDEFINED">
 Impact ${value.impact}
       </#if>
     </#if>