diff --git a/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/TestgeneratorDSL.xtext b/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/TestgeneratorDSL.xtext
index 997e58711bf49a516a4a52a3f3c92ce6d88b1aab..3c7404b5b331bf5a844274f85fea5da7b63ee626 100644
--- a/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/TestgeneratorDSL.xtext
+++ b/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/TestgeneratorDSL.xtext
@@ -90,7 +90,8 @@ BusinessRuleTaskFlowElement:
 	DECLARATION_FINISHED;
 	
 GatewayFlowElement:
-	"FlowElement" name=ID ASSOCIATION "Gateway" DECLARATION_FINISHED;
+	"FlowElement" name=ID ASSOCIATION "Gateway"
+	"(" type=GatewayType ")" DECLARATION_FINISHED;
 	
 SequenceFlowElement:
 	"FlowElement" name=ID ASSOCIATION "SequenceFlow" 
@@ -278,8 +279,13 @@ enum Flag:
 	
 enum ValidationState:
 	REQUIRED = "REQUIRED" |
-	OPTIONAL = "OPTIONAL"
-;
+	OPTIONAL = "OPTIONAL";
+	
+enum GatewayType:
+	NONE = "NONE" |
+	OR = "OR" |
+	XOR = "XOR" |
+	PARALLEL = "PARALLEL";
 
 terminal LIST_OPEN : '[';
 terminal LIST_CLOSED : ']';
diff --git a/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/Main.java b/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/Main.java
index b9b9bb2acf18422daaf517c27e58c3ad8c3c23e4..84b5f13be345d66cb3f5ce469e015644a9ac2424 100644
--- a/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/Main.java
+++ b/de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/Main.java
@@ -8,6 +8,7 @@ import java.util.List;
 import de.fhmuenster.masterthesis.testgeneratorDSL.BPMNDiagram;
 import de.fhmuenster.masterthesis.testgeneratorDSL.Flow;
 import de.fhmuenster.masterthesis.testgeneratorDSL.FlowElement;
+import de.fhmuenster.masterthesis.testgeneratorDSL.GatewayType;
 
 public class Main {