Extract component fault tree model

169 files changed, 21868 insertions, 6973 deletions

diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/contentassist/antlr/CftLanguageParser.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/contentassist/antlr/CftLanguageParser.java
index 579a30af..b524557f 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/contentassist/antlr/CftLanguageParser.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/contentassist/antlr/CftLanguageParser.java
@@ -32,12 +32,15 @@ public class CftLanguageParser extends AbstractContentAssistParser {
                 
                 private static void init(ImmutableMap.Builder<AbstractElement, String> builder, CftLanguageGrammarAccess grammarAccess) {
                         builder.put(grammarAccess.getCftModelAccess().getAlternatives_4(), "rule__CftModel__Alternatives_4");
-                        builder.put(grammarAccess.getEventDeclarationAccess().getAlternatives(), "rule__EventDeclaration__Alternatives");
                         builder.put(grammarAccess.getEventDefinitionAccess().getAlternatives(), "rule__EventDefinition__Alternatives");
+                        builder.put(grammarAccess.getDistributionAccess().getAlternatives(), "rule__Distribution__Alternatives");
                         builder.put(grammarAccess.getGateDefinitionAccess().getAlternatives(), "rule__GateDefinition__Alternatives");
+                        builder.put(grammarAccess.getKOfMGateDefinitionAccess().getAlternatives_2(), "rule__KOfMGateDefinition__Alternatives_2");
                         builder.put(grammarAccess.getMappingDefinitionAccess().getAlternatives_8_1_0(), "rule__MappingDefinition__Alternatives_8_1_0");
                         builder.put(grammarAccess.getVariableAccess().getAlternatives(), "rule__Variable__Alternatives");
                         builder.put(grammarAccess.getAssignmentAccess().getAlternatives_1(), "rule__Assignment__Alternatives_1");
+                        builder.put(grammarAccess.getValidIdAccess().getAlternatives(), "rule__ValidId__Alternatives");
+                        builder.put(grammarAccess.getDoubleAccess().getAlternatives(), "rule__Double__Alternatives");
                         builder.put(grammarAccess.getCftModelAccess().getGroup(), "rule__CftModel__Group__0");
                         builder.put(grammarAccess.getImportDeclarationAccess().getGroup(), "rule__ImportDeclaration__Group__0");
                         builder.put(grammarAccess.getComponentDefinitionAccess().getGroup(), "rule__ComponentDefinition__Group__0");
@@ -46,8 +49,12 @@ public class CftLanguageParser extends AbstractContentAssistParser {
                         builder.put(grammarAccess.getComponentDefinitionAccess().getGroup_4(), "rule__ComponentDefinition__Group_4__0");
                         builder.put(grammarAccess.getInputEventAccess().getGroup(), "rule__InputEvent__Group__0");
                         builder.put(grammarAccess.getBasicEventDefinitionAccess().getGroup(), "rule__BasicEventDefinition__Group__0");
-                        builder.put(grammarAccess.getAndGateAccess().getGroup(), "rule__AndGate__Group__0");
-                        builder.put(grammarAccess.getOrGateAccess().getGroup(), "rule__OrGate__Group__0");
+                        builder.put(grammarAccess.getConstantDistributionAccess().getGroup(), "rule__ConstantDistribution__Group__0");
+                        builder.put(grammarAccess.getExponentialDistributionAccess().getGroup(), "rule__ExponentialDistribution__Group__0");
+                        builder.put(grammarAccess.getAndGateDefinitionAccess().getGroup(), "rule__AndGateDefinition__Group__0");
+                        builder.put(grammarAccess.getOrGateDefinitionAccess().getGroup(), "rule__OrGateDefinition__Group__0");
+                        builder.put(grammarAccess.getKOfMGateDefinitionAccess().getGroup(), "rule__KOfMGateDefinition__Group__0");
+                        builder.put(grammarAccess.getKOfMGateDefinitionAccess().getGroup_2_0(), "rule__KOfMGateDefinition__Group_2_0__0");
                         builder.put(grammarAccess.getTransformationDefinitionAccess().getGroup(), "rule__TransformationDefinition__Group__0");
                         builder.put(grammarAccess.getMappingDefinitionAccess().getGroup(), "rule__MappingDefinition__Group__0");
                         builder.put(grammarAccess.getMappingDefinitionAccess().getGroup_5(), "rule__MappingDefinition__Group_5__0");
@@ -74,11 +81,18 @@ public class CftLanguageParser extends AbstractContentAssistParser {
                         builder.put(grammarAccess.getInputEventAccess().getNameAssignment_0(), "rule__InputEvent__NameAssignment_0");
                         builder.put(grammarAccess.getInputEventAccess().getMultipleAssignment_1(), "rule__InputEvent__MultipleAssignment_1");
                         builder.put(grammarAccess.getBasicEventDefinitionAccess().getNameAssignment_0(), "rule__BasicEventDefinition__NameAssignment_0");
-                        builder.put(grammarAccess.getBasicEventDefinitionAccess().getRateAssignment_3(), "rule__BasicEventDefinition__RateAssignment_3");
-                        builder.put(grammarAccess.getAndGateAccess().getNameAssignment_0(), "rule__AndGate__NameAssignment_0");
-                        builder.put(grammarAccess.getAndGateAccess().getInputEventsAssignment_2(), "rule__AndGate__InputEventsAssignment_2");
-                        builder.put(grammarAccess.getOrGateAccess().getNameAssignment_0(), "rule__OrGate__NameAssignment_0");
-                        builder.put(grammarAccess.getOrGateAccess().getInputEventsAssignment_2(), "rule__OrGate__InputEventsAssignment_2");
+                        builder.put(grammarAccess.getBasicEventDefinitionAccess().getDistributionAssignment_1(), "rule__BasicEventDefinition__DistributionAssignment_1");
+                        builder.put(grammarAccess.getConstantDistributionAccess().getPAssignment_2(), "rule__ConstantDistribution__PAssignment_2");
+                        builder.put(grammarAccess.getExponentialDistributionAccess().getLambdaAssignment_2(), "rule__ExponentialDistribution__LambdaAssignment_2");
+                        builder.put(grammarAccess.getAndGateDefinitionAccess().getNameAssignment_0(), "rule__AndGateDefinition__NameAssignment_0");
+                        builder.put(grammarAccess.getAndGateDefinitionAccess().getInputEventsAssignment_2(), "rule__AndGateDefinition__InputEventsAssignment_2");
+                        builder.put(grammarAccess.getOrGateDefinitionAccess().getNameAssignment_0(), "rule__OrGateDefinition__NameAssignment_0");
+                        builder.put(grammarAccess.getOrGateDefinitionAccess().getInputEventsAssignment_2(), "rule__OrGateDefinition__InputEventsAssignment_2");
+                        builder.put(grammarAccess.getKOfMGateDefinitionAccess().getNameAssignment_0(), "rule__KOfMGateDefinition__NameAssignment_0");
+                        builder.put(grammarAccess.getKOfMGateDefinitionAccess().getKAssignment_1(), "rule__KOfMGateDefinition__KAssignment_1");
+                        builder.put(grammarAccess.getKOfMGateDefinitionAccess().getMAssignment_2_0_1(), "rule__KOfMGateDefinition__MAssignment_2_0_1");
+                        builder.put(grammarAccess.getKOfMGateDefinitionAccess().getMAssignment_2_1(), "rule__KOfMGateDefinition__MAssignment_2_1");
+                        builder.put(grammarAccess.getKOfMGateDefinitionAccess().getInputEventsAssignment_3(), "rule__KOfMGateDefinition__InputEventsAssignment_3");
                         builder.put(grammarAccess.getTransformationDefinitionAccess().getNameAssignment_1(), "rule__TransformationDefinition__NameAssignment_1");
                         builder.put(grammarAccess.getTransformationDefinitionAccess().getMappingDefinitionsAssignment_3(), "rule__TransformationDefinition__MappingDefinitionsAssignment_3");
                         builder.put(grammarAccess.getMappingDefinitionAccess().getTopLevelAssignment_0(), "rule__MappingDefinition__TopLevelAssignment_0");
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/contentassist/antlr/internal/InternalCftLanguage.g b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/contentassist/antlr/internal/InternalCftLanguage.g
index 84bb924e..7c04c163 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/contentassist/antlr/internal/InternalCftLanguage.g
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/contentassist/antlr/internal/InternalCftLanguage.g
@@ -199,6 +199,81 @@ finally {
         restoreStackSize(stackSize);
 }
 
+// Entry rule entryRuleDistribution
+entryRuleDistribution
+:
+{ before(grammarAccess.getDistributionRule()); }
+         ruleDistribution
+{ after(grammarAccess.getDistributionRule()); } 
+         EOF 
+;
+
+// Rule Distribution
+ruleDistribution 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getDistributionAccess().getAlternatives()); }
+                (rule__Distribution__Alternatives)
+                { after(grammarAccess.getDistributionAccess().getAlternatives()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+// Entry rule entryRuleConstantDistribution
+entryRuleConstantDistribution
+:
+{ before(grammarAccess.getConstantDistributionRule()); }
+         ruleConstantDistribution
+{ after(grammarAccess.getConstantDistributionRule()); } 
+         EOF 
+;
+
+// Rule ConstantDistribution
+ruleConstantDistribution 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getConstantDistributionAccess().getGroup()); }
+                (rule__ConstantDistribution__Group__0)
+                { after(grammarAccess.getConstantDistributionAccess().getGroup()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+// Entry rule entryRuleExponentialDistribution
+entryRuleExponentialDistribution
+:
+{ before(grammarAccess.getExponentialDistributionRule()); }
+         ruleExponentialDistribution
+{ after(grammarAccess.getExponentialDistributionRule()); } 
+         EOF 
+;
+
+// Rule ExponentialDistribution
+ruleExponentialDistribution 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getExponentialDistributionAccess().getGroup()); }
+                (rule__ExponentialDistribution__Group__0)
+                { after(grammarAccess.getExponentialDistributionAccess().getGroup()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
 // Entry rule entryRuleGateDefinition
 entryRuleGateDefinition
 :
@@ -224,50 +299,75 @@ finally {
         restoreStackSize(stackSize);
 }
 
-// Entry rule entryRuleAndGate
-entryRuleAndGate
+// Entry rule entryRuleAndGateDefinition
+entryRuleAndGateDefinition
 :
-{ before(grammarAccess.getAndGateRule()); }
-         ruleAndGate
-{ after(grammarAccess.getAndGateRule()); } 
+{ before(grammarAccess.getAndGateDefinitionRule()); }
+         ruleAndGateDefinition
+{ after(grammarAccess.getAndGateDefinitionRule()); } 
          EOF 
 ;
 
-// Rule AndGate
-ruleAndGate 
+// Rule AndGateDefinition
+ruleAndGateDefinition 
         @init {
                 int stackSize = keepStackSize();
         }
         :
         (
-                { before(grammarAccess.getAndGateAccess().getGroup()); }
-                (rule__AndGate__Group__0)
-                { after(grammarAccess.getAndGateAccess().getGroup()); }
+                { before(grammarAccess.getAndGateDefinitionAccess().getGroup()); }
+                (rule__AndGateDefinition__Group__0)
+                { after(grammarAccess.getAndGateDefinitionAccess().getGroup()); }
         )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-// Entry rule entryRuleOrGate
-entryRuleOrGate
+// Entry rule entryRuleOrGateDefinition
+entryRuleOrGateDefinition
 :
-{ before(grammarAccess.getOrGateRule()); }
-         ruleOrGate
-{ after(grammarAccess.getOrGateRule()); } 
+{ before(grammarAccess.getOrGateDefinitionRule()); }
+         ruleOrGateDefinition
+{ after(grammarAccess.getOrGateDefinitionRule()); } 
          EOF 
 ;
 
-// Rule OrGate
-ruleOrGate 
+// Rule OrGateDefinition
+ruleOrGateDefinition 
         @init {
                 int stackSize = keepStackSize();
         }
         :
         (
-                { before(grammarAccess.getOrGateAccess().getGroup()); }
-                (rule__OrGate__Group__0)
-                { after(grammarAccess.getOrGateAccess().getGroup()); }
+                { before(grammarAccess.getOrGateDefinitionAccess().getGroup()); }
+                (rule__OrGateDefinition__Group__0)
+                { after(grammarAccess.getOrGateDefinitionAccess().getGroup()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+// Entry rule entryRuleKOfMGateDefinition
+entryRuleKOfMGateDefinition
+:
+{ before(grammarAccess.getKOfMGateDefinitionRule()); }
+         ruleKOfMGateDefinition
+{ after(grammarAccess.getKOfMGateDefinitionRule()); } 
+         EOF 
+;
+
+// Rule KOfMGateDefinition
+ruleKOfMGateDefinition 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getKOfMGateDefinitionAccess().getGroup()); }
+                (rule__KOfMGateDefinition__Group__0)
+                { after(grammarAccess.getKOfMGateDefinitionAccess().getGroup()); }
         )
 ;
 finally {
@@ -499,6 +599,56 @@ finally {
         restoreStackSize(stackSize);
 }
 
+// Entry rule entryRuleValidId
+entryRuleValidId
+:
+{ before(grammarAccess.getValidIdRule()); }
+         ruleValidId
+{ after(grammarAccess.getValidIdRule()); } 
+         EOF 
+;
+
+// Rule ValidId
+ruleValidId 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getValidIdAccess().getAlternatives()); }
+                (rule__ValidId__Alternatives)
+                { after(grammarAccess.getValidIdAccess().getAlternatives()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+// Entry rule entryRuleDouble
+entryRuleDouble
+:
+{ before(grammarAccess.getDoubleRule()); }
+         ruleDouble
+{ after(grammarAccess.getDoubleRule()); } 
+         EOF 
+;
+
+// Rule Double
+ruleDouble 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getDoubleAccess().getAlternatives()); }
+                (rule__Double__Alternatives)
+                { after(grammarAccess.getDoubleAccess().getAlternatives()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
 rule__CftModel__Alternatives_4
         @init {
                 int stackSize = keepStackSize();
@@ -541,21 +691,69 @@ finally {
         restoreStackSize(stackSize);
 }
 
+rule__Distribution__Alternatives
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getDistributionAccess().getConstantDistributionParserRuleCall_0()); }
+                ruleConstantDistribution
+                { after(grammarAccess.getDistributionAccess().getConstantDistributionParserRuleCall_0()); }
+        )
+        |
+        (
+                { before(grammarAccess.getDistributionAccess().getExponentialDistributionParserRuleCall_1()); }
+                ruleExponentialDistribution
+                { after(grammarAccess.getDistributionAccess().getExponentialDistributionParserRuleCall_1()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
 rule__GateDefinition__Alternatives
         @init {
                 int stackSize = keepStackSize();
         }
 :
         (
-                { before(grammarAccess.getGateDefinitionAccess().getAndGateParserRuleCall_0()); }
-                ruleAndGate
-                { after(grammarAccess.getGateDefinitionAccess().getAndGateParserRuleCall_0()); }
+                { before(grammarAccess.getGateDefinitionAccess().getAndGateDefinitionParserRuleCall_0()); }
+                ruleAndGateDefinition
+                { after(grammarAccess.getGateDefinitionAccess().getAndGateDefinitionParserRuleCall_0()); }
+        )
+        |
+        (
+                { before(grammarAccess.getGateDefinitionAccess().getOrGateDefinitionParserRuleCall_1()); }
+                ruleOrGateDefinition
+                { after(grammarAccess.getGateDefinitionAccess().getOrGateDefinitionParserRuleCall_1()); }
+        )
+        |
+        (
+                { before(grammarAccess.getGateDefinitionAccess().getKOfMGateDefinitionParserRuleCall_2()); }
+                ruleKOfMGateDefinition
+                { after(grammarAccess.getGateDefinitionAccess().getKOfMGateDefinitionParserRuleCall_2()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__KOfMGateDefinition__Alternatives_2
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getKOfMGateDefinitionAccess().getGroup_2_0()); }
+                (rule__KOfMGateDefinition__Group_2_0__0)
+                { after(grammarAccess.getKOfMGateDefinitionAccess().getGroup_2_0()); }
         )
         |
         (
-                { before(grammarAccess.getGateDefinitionAccess().getOrGateParserRuleCall_1()); }
-                ruleOrGate
-                { after(grammarAccess.getGateDefinitionAccess().getOrGateParserRuleCall_1()); }
+                { before(grammarAccess.getKOfMGateDefinitionAccess().getMAssignment_2_1()); }
+                (rule__KOfMGateDefinition__MAssignment_2_1)
+                { after(grammarAccess.getKOfMGateDefinitionAccess().getMAssignment_2_1()); }
         )
 ;
 finally {
@@ -604,6 +802,48 @@ finally {
         restoreStackSize(stackSize);
 }
 
+rule__ValidId__Alternatives
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getValidIdAccess().getIDTerminalRuleCall_0()); }
+                RULE_ID
+                { after(grammarAccess.getValidIdAccess().getIDTerminalRuleCall_0()); }
+        )
+        |
+        (
+                { before(grammarAccess.getValidIdAccess().getOF_INTTerminalRuleCall_1()); }
+                RULE_OF_INT
+                { after(grammarAccess.getValidIdAccess().getOF_INTTerminalRuleCall_1()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Double__Alternatives
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getDoubleAccess().getINTTerminalRuleCall_0()); }
+                RULE_INT
+                { after(grammarAccess.getDoubleAccess().getINTTerminalRuleCall_0()); }
+        )
+        |
+        (
+                { before(grammarAccess.getDoubleAccess().getT_DOUBLETerminalRuleCall_1()); }
+                RULE_T_DOUBLE
+                { after(grammarAccess.getDoubleAccess().getT_DOUBLETerminalRuleCall_1()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
 rule__CftModel__Group__0
         @init {
                 int stackSize = keepStackSize();
@@ -1285,7 +1525,6 @@ rule__BasicEventDefinition__Group__1
         }
 :
         rule__BasicEventDefinition__Group__1__Impl
-        rule__BasicEventDefinition__Group__2
 ;
 finally {
         restoreStackSize(stackSize);
@@ -1297,62 +1536,171 @@ rule__BasicEventDefinition__Group__1__Impl
         }
 :
 (
-        { before(grammarAccess.getBasicEventDefinitionAccess().getLambdaKeyword_1()); }
+        { before(grammarAccess.getBasicEventDefinitionAccess().getDistributionAssignment_1()); }
+        (rule__BasicEventDefinition__DistributionAssignment_1)
+        { after(grammarAccess.getBasicEventDefinitionAccess().getDistributionAssignment_1()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+
+rule__ConstantDistribution__Group__0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__ConstantDistribution__Group__0__Impl
+        rule__ConstantDistribution__Group__1
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__ConstantDistribution__Group__0__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getConstantDistributionAccess().getPKeyword_0()); }
+        'p'
+        { after(grammarAccess.getConstantDistributionAccess().getPKeyword_0()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__ConstantDistribution__Group__1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__ConstantDistribution__Group__1__Impl
+        rule__ConstantDistribution__Group__2
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__ConstantDistribution__Group__1__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getConstantDistributionAccess().getEqualsSignKeyword_1()); }
+        '='
+        { after(grammarAccess.getConstantDistributionAccess().getEqualsSignKeyword_1()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__ConstantDistribution__Group__2
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__ConstantDistribution__Group__2__Impl
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__ConstantDistribution__Group__2__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getConstantDistributionAccess().getPAssignment_2()); }
+        (rule__ConstantDistribution__PAssignment_2)
+        { after(grammarAccess.getConstantDistributionAccess().getPAssignment_2()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+
+rule__ExponentialDistribution__Group__0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__ExponentialDistribution__Group__0__Impl
+        rule__ExponentialDistribution__Group__1
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__ExponentialDistribution__Group__0__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getExponentialDistributionAccess().getLambdaKeyword_0()); }
         'lambda'
-        { after(grammarAccess.getBasicEventDefinitionAccess().getLambdaKeyword_1()); }
+        { after(grammarAccess.getExponentialDistributionAccess().getLambdaKeyword_0()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__BasicEventDefinition__Group__2
+rule__ExponentialDistribution__Group__1
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__BasicEventDefinition__Group__2__Impl
-        rule__BasicEventDefinition__Group__3
+        rule__ExponentialDistribution__Group__1__Impl
+        rule__ExponentialDistribution__Group__2
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__BasicEventDefinition__Group__2__Impl
+rule__ExponentialDistribution__Group__1__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getBasicEventDefinitionAccess().getEqualsSignKeyword_2()); }
+        { before(grammarAccess.getExponentialDistributionAccess().getEqualsSignKeyword_1()); }
         '='
-        { after(grammarAccess.getBasicEventDefinitionAccess().getEqualsSignKeyword_2()); }
+        { after(grammarAccess.getExponentialDistributionAccess().getEqualsSignKeyword_1()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__BasicEventDefinition__Group__3
+rule__ExponentialDistribution__Group__2
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__BasicEventDefinition__Group__3__Impl
+        rule__ExponentialDistribution__Group__2__Impl
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__BasicEventDefinition__Group__3__Impl
+rule__ExponentialDistribution__Group__2__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getBasicEventDefinitionAccess().getRateAssignment_3()); }
-        (rule__BasicEventDefinition__RateAssignment_3)
-        { after(grammarAccess.getBasicEventDefinitionAccess().getRateAssignment_3()); }
+        { before(grammarAccess.getExponentialDistributionAccess().getLambdaAssignment_2()); }
+        (rule__ExponentialDistribution__LambdaAssignment_2)
+        { after(grammarAccess.getExponentialDistributionAccess().getLambdaAssignment_2()); }
 )
 ;
 finally {
@@ -1360,80 +1708,80 @@ finally {
 }
 
 
-rule__AndGate__Group__0
+rule__AndGateDefinition__Group__0
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__AndGate__Group__0__Impl
-        rule__AndGate__Group__1
+        rule__AndGateDefinition__Group__0__Impl
+        rule__AndGateDefinition__Group__1
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__AndGate__Group__0__Impl
+rule__AndGateDefinition__Group__0__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getAndGateAccess().getNameAssignment_0()); }
-        (rule__AndGate__NameAssignment_0)
-        { after(grammarAccess.getAndGateAccess().getNameAssignment_0()); }
+        { before(grammarAccess.getAndGateDefinitionAccess().getNameAssignment_0()); }
+        (rule__AndGateDefinition__NameAssignment_0)
+        { after(grammarAccess.getAndGateDefinitionAccess().getNameAssignment_0()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__AndGate__Group__1
+rule__AndGateDefinition__Group__1
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__AndGate__Group__1__Impl
-        rule__AndGate__Group__2
+        rule__AndGateDefinition__Group__1__Impl
+        rule__AndGateDefinition__Group__2
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__AndGate__Group__1__Impl
+rule__AndGateDefinition__Group__1__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getAndGateAccess().getAndKeyword_1()); }
+        { before(grammarAccess.getAndGateDefinitionAccess().getAndKeyword_1()); }
         'and'
-        { after(grammarAccess.getAndGateAccess().getAndKeyword_1()); }
+        { after(grammarAccess.getAndGateDefinitionAccess().getAndKeyword_1()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__AndGate__Group__2
+rule__AndGateDefinition__Group__2
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__AndGate__Group__2__Impl
+        rule__AndGateDefinition__Group__2__Impl
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__AndGate__Group__2__Impl
+rule__AndGateDefinition__Group__2__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getAndGateAccess().getInputEventsAssignment_2()); }
-        (rule__AndGate__InputEventsAssignment_2)*
-        { after(grammarAccess.getAndGateAccess().getInputEventsAssignment_2()); }
+        { before(grammarAccess.getAndGateDefinitionAccess().getInputEventsAssignment_2()); }
+        (rule__AndGateDefinition__InputEventsAssignment_2)*
+        { after(grammarAccess.getAndGateDefinitionAccess().getInputEventsAssignment_2()); }
 )
 ;
 finally {
@@ -1441,80 +1789,242 @@ finally {
 }
 
 
-rule__OrGate__Group__0
+rule__OrGateDefinition__Group__0
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__OrGate__Group__0__Impl
-        rule__OrGate__Group__1
+        rule__OrGateDefinition__Group__0__Impl
+        rule__OrGateDefinition__Group__1
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__OrGate__Group__0__Impl
+rule__OrGateDefinition__Group__0__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getOrGateAccess().getNameAssignment_0()); }
-        (rule__OrGate__NameAssignment_0)
-        { after(grammarAccess.getOrGateAccess().getNameAssignment_0()); }
+        { before(grammarAccess.getOrGateDefinitionAccess().getNameAssignment_0()); }
+        (rule__OrGateDefinition__NameAssignment_0)
+        { after(grammarAccess.getOrGateDefinitionAccess().getNameAssignment_0()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__OrGate__Group__1
+rule__OrGateDefinition__Group__1
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__OrGate__Group__1__Impl
-        rule__OrGate__Group__2
+        rule__OrGateDefinition__Group__1__Impl
+        rule__OrGateDefinition__Group__2
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__OrGate__Group__1__Impl
+rule__OrGateDefinition__Group__1__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getOrGateAccess().getOrKeyword_1()); }
+        { before(grammarAccess.getOrGateDefinitionAccess().getOrKeyword_1()); }
         'or'
-        { after(grammarAccess.getOrGateAccess().getOrKeyword_1()); }
+        { after(grammarAccess.getOrGateDefinitionAccess().getOrKeyword_1()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__OrGateDefinition__Group__2
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__OrGateDefinition__Group__2__Impl
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__OrGateDefinition__Group__2__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getOrGateDefinitionAccess().getInputEventsAssignment_2()); }
+        (rule__OrGateDefinition__InputEventsAssignment_2)*
+        { after(grammarAccess.getOrGateDefinitionAccess().getInputEventsAssignment_2()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+
+rule__KOfMGateDefinition__Group__0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__KOfMGateDefinition__Group__0__Impl
+        rule__KOfMGateDefinition__Group__1
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__KOfMGateDefinition__Group__0__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getKOfMGateDefinitionAccess().getNameAssignment_0()); }
+        (rule__KOfMGateDefinition__NameAssignment_0)
+        { after(grammarAccess.getKOfMGateDefinitionAccess().getNameAssignment_0()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__KOfMGateDefinition__Group__1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__KOfMGateDefinition__Group__1__Impl
+        rule__KOfMGateDefinition__Group__2
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__KOfMGateDefinition__Group__1__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getKOfMGateDefinitionAccess().getKAssignment_1()); }
+        (rule__KOfMGateDefinition__KAssignment_1)
+        { after(grammarAccess.getKOfMGateDefinitionAccess().getKAssignment_1()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__KOfMGateDefinition__Group__2
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__KOfMGateDefinition__Group__2__Impl
+        rule__KOfMGateDefinition__Group__3
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__KOfMGateDefinition__Group__2__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getKOfMGateDefinitionAccess().getAlternatives_2()); }
+        (rule__KOfMGateDefinition__Alternatives_2)
+        { after(grammarAccess.getKOfMGateDefinitionAccess().getAlternatives_2()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__KOfMGateDefinition__Group__3
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__KOfMGateDefinition__Group__3__Impl
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__KOfMGateDefinition__Group__3__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getKOfMGateDefinitionAccess().getInputEventsAssignment_3()); }
+        (rule__KOfMGateDefinition__InputEventsAssignment_3)*
+        { after(grammarAccess.getKOfMGateDefinitionAccess().getInputEventsAssignment_3()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+
+rule__KOfMGateDefinition__Group_2_0__0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__KOfMGateDefinition__Group_2_0__0__Impl
+        rule__KOfMGateDefinition__Group_2_0__1
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__KOfMGateDefinition__Group_2_0__0__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getKOfMGateDefinitionAccess().getOfKeyword_2_0_0()); }
+        'of'
+        { after(grammarAccess.getKOfMGateDefinitionAccess().getOfKeyword_2_0_0()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__OrGate__Group__2
+rule__KOfMGateDefinition__Group_2_0__1
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__OrGate__Group__2__Impl
+        rule__KOfMGateDefinition__Group_2_0__1__Impl
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__OrGate__Group__2__Impl
+rule__KOfMGateDefinition__Group_2_0__1__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getOrGateAccess().getInputEventsAssignment_2()); }
-        (rule__OrGate__InputEventsAssignment_2)*
-        { after(grammarAccess.getOrGateAccess().getInputEventsAssignment_2()); }
+        { before(grammarAccess.getKOfMGateDefinitionAccess().getMAssignment_2_0_1()); }
+        (rule__KOfMGateDefinition__MAssignment_2_0_1)
+        { after(grammarAccess.getKOfMGateDefinitionAccess().getMAssignment_2_0_1()); }
 )
 ;
 finally {
@@ -2620,9 +3130,9 @@ rule__QualifiedName__Group__0__Impl
         }
 :
 (
-        { before(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_0()); }
-        RULE_ID
-        { after(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_0()); }
+        { before(grammarAccess.getQualifiedNameAccess().getValidIdParserRuleCall_0()); }
+        ruleValidId
+        { after(grammarAccess.getQualifiedNameAccess().getValidIdParserRuleCall_0()); }
 )
 ;
 finally {
@@ -2700,9 +3210,9 @@ rule__QualifiedName__Group_1__1__Impl
         }
 :
 (
-        { before(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1()); }
-        RULE_ID
-        { after(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1()); }
+        { before(grammarAccess.getQualifiedNameAccess().getValidIdParserRuleCall_1_1()); }
+        ruleValidId
+        { after(grammarAccess.getQualifiedNameAccess().getValidIdParserRuleCall_1_1()); }
 )
 ;
 finally {
@@ -2982,9 +3492,9 @@ rule__ComponentDefinition__NameAssignment_1
         }
 :
         (
-                { before(grammarAccess.getComponentDefinitionAccess().getNameIDTerminalRuleCall_1_0()); }
-                RULE_ID
-                { after(grammarAccess.getComponentDefinitionAccess().getNameIDTerminalRuleCall_1_0()); }
+                { before(grammarAccess.getComponentDefinitionAccess().getNameValidIdParserRuleCall_1_0()); }
+                ruleValidId
+                { after(grammarAccess.getComponentDefinitionAccess().getNameValidIdParserRuleCall_1_0()); }
         )
 ;
 finally {
@@ -3014,9 +3524,9 @@ rule__ComponentDefinition__OutputEventsAssignment_3_1_1
         (
                 { before(grammarAccess.getComponentDefinitionAccess().getOutputEventsEventDeclarationCrossReference_3_1_1_0()); }
                 (
-                        { before(grammarAccess.getComponentDefinitionAccess().getOutputEventsEventDeclarationIDTerminalRuleCall_3_1_1_0_1()); }
-                        RULE_ID
-                        { after(grammarAccess.getComponentDefinitionAccess().getOutputEventsEventDeclarationIDTerminalRuleCall_3_1_1_0_1()); }
+                        { before(grammarAccess.getComponentDefinitionAccess().getOutputEventsEventDeclarationValidIdParserRuleCall_3_1_1_0_1()); }
+                        ruleValidId
+                        { after(grammarAccess.getComponentDefinitionAccess().getOutputEventsEventDeclarationValidIdParserRuleCall_3_1_1_0_1()); }
                 )
                 { after(grammarAccess.getComponentDefinitionAccess().getOutputEventsEventDeclarationCrossReference_3_1_1_0()); }
         )
@@ -3046,9 +3556,9 @@ rule__InputEvent__NameAssignment_0
         }
 :
         (
-                { before(grammarAccess.getInputEventAccess().getNameIDTerminalRuleCall_0_0()); }
-                RULE_ID
-                { after(grammarAccess.getInputEventAccess().getNameIDTerminalRuleCall_0_0()); }
+                { before(grammarAccess.getInputEventAccess().getNameValidIdParserRuleCall_0_0()); }
+                ruleValidId
+                { after(grammarAccess.getInputEventAccess().getNameValidIdParserRuleCall_0_0()); }
         )
 ;
 finally {
@@ -3080,92 +3590,201 @@ rule__BasicEventDefinition__NameAssignment_0
         }
 :
         (
-                { before(grammarAccess.getBasicEventDefinitionAccess().getNameIDTerminalRuleCall_0_0()); }
-                RULE_ID
-                { after(grammarAccess.getBasicEventDefinitionAccess().getNameIDTerminalRuleCall_0_0()); }
+                { before(grammarAccess.getBasicEventDefinitionAccess().getNameValidIdParserRuleCall_0_0()); }
+                ruleValidId
+                { after(grammarAccess.getBasicEventDefinitionAccess().getNameValidIdParserRuleCall_0_0()); }
         )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__BasicEventDefinition__RateAssignment_3
+rule__BasicEventDefinition__DistributionAssignment_1
         @init {
                 int stackSize = keepStackSize();
         }
 :
         (
-                { before(grammarAccess.getBasicEventDefinitionAccess().getRateDOULBETerminalRuleCall_3_0()); }
-                RULE_DOULBE
-                { after(grammarAccess.getBasicEventDefinitionAccess().getRateDOULBETerminalRuleCall_3_0()); }
+                { before(grammarAccess.getBasicEventDefinitionAccess().getDistributionDistributionParserRuleCall_1_0()); }
+                ruleDistribution
+                { after(grammarAccess.getBasicEventDefinitionAccess().getDistributionDistributionParserRuleCall_1_0()); }
         )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__AndGate__NameAssignment_0
+rule__ConstantDistribution__PAssignment_2
         @init {
                 int stackSize = keepStackSize();
         }
 :
         (
-                { before(grammarAccess.getAndGateAccess().getNameIDTerminalRuleCall_0_0()); }
-                RULE_ID
-                { after(grammarAccess.getAndGateAccess().getNameIDTerminalRuleCall_0_0()); }
+                { before(grammarAccess.getConstantDistributionAccess().getPDoubleParserRuleCall_2_0()); }
+                ruleDouble
+                { after(grammarAccess.getConstantDistributionAccess().getPDoubleParserRuleCall_2_0()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__ExponentialDistribution__LambdaAssignment_2
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getExponentialDistributionAccess().getLambdaDoubleParserRuleCall_2_0()); }
+                ruleDouble
+                { after(grammarAccess.getExponentialDistributionAccess().getLambdaDoubleParserRuleCall_2_0()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__AndGateDefinition__NameAssignment_0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getAndGateDefinitionAccess().getNameValidIdParserRuleCall_0_0()); }
+                ruleValidId
+                { after(grammarAccess.getAndGateDefinitionAccess().getNameValidIdParserRuleCall_0_0()); }
         )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__AndGate__InputEventsAssignment_2
+rule__AndGateDefinition__InputEventsAssignment_2
         @init {
                 int stackSize = keepStackSize();
         }
 :
         (
-                { before(grammarAccess.getAndGateAccess().getInputEventsEventDeclarationCrossReference_2_0()); }
+                { before(grammarAccess.getAndGateDefinitionAccess().getInputEventsEventDeclarationCrossReference_2_0()); }
                 (
-                        { before(grammarAccess.getAndGateAccess().getInputEventsEventDeclarationIDTerminalRuleCall_2_0_1()); }
-                        RULE_ID
-                        { after(grammarAccess.getAndGateAccess().getInputEventsEventDeclarationIDTerminalRuleCall_2_0_1()); }
+                        { before(grammarAccess.getAndGateDefinitionAccess().getInputEventsEventDeclarationValidIdParserRuleCall_2_0_1()); }
+                        ruleValidId
+                        { after(grammarAccess.getAndGateDefinitionAccess().getInputEventsEventDeclarationValidIdParserRuleCall_2_0_1()); }
                 )
-                { after(grammarAccess.getAndGateAccess().getInputEventsEventDeclarationCrossReference_2_0()); }
+                { after(grammarAccess.getAndGateDefinitionAccess().getInputEventsEventDeclarationCrossReference_2_0()); }
         )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__OrGate__NameAssignment_0
+rule__OrGateDefinition__NameAssignment_0
         @init {
                 int stackSize = keepStackSize();
         }
 :
         (
-                { before(grammarAccess.getOrGateAccess().getNameIDTerminalRuleCall_0_0()); }
-                RULE_ID
-                { after(grammarAccess.getOrGateAccess().getNameIDTerminalRuleCall_0_0()); }
+                { before(grammarAccess.getOrGateDefinitionAccess().getNameValidIdParserRuleCall_0_0()); }
+                ruleValidId
+                { after(grammarAccess.getOrGateDefinitionAccess().getNameValidIdParserRuleCall_0_0()); }
         )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__OrGate__InputEventsAssignment_2
+rule__OrGateDefinition__InputEventsAssignment_2
         @init {
                 int stackSize = keepStackSize();
         }
 :
         (
-                { before(grammarAccess.getOrGateAccess().getInputEventsEventDeclarationCrossReference_2_0()); }
+                { before(grammarAccess.getOrGateDefinitionAccess().getInputEventsEventDeclarationCrossReference_2_0()); }
                 (
-                        { before(grammarAccess.getOrGateAccess().getInputEventsEventDeclarationIDTerminalRuleCall_2_0_1()); }
-                        RULE_ID
-                        { after(grammarAccess.getOrGateAccess().getInputEventsEventDeclarationIDTerminalRuleCall_2_0_1()); }
+                        { before(grammarAccess.getOrGateDefinitionAccess().getInputEventsEventDeclarationValidIdParserRuleCall_2_0_1()); }
+                        ruleValidId
+                        { after(grammarAccess.getOrGateDefinitionAccess().getInputEventsEventDeclarationValidIdParserRuleCall_2_0_1()); }
                 )
-                { after(grammarAccess.getOrGateAccess().getInputEventsEventDeclarationCrossReference_2_0()); }
+                { after(grammarAccess.getOrGateDefinitionAccess().getInputEventsEventDeclarationCrossReference_2_0()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__KOfMGateDefinition__NameAssignment_0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getKOfMGateDefinitionAccess().getNameValidIdParserRuleCall_0_0()); }
+                ruleValidId
+                { after(grammarAccess.getKOfMGateDefinitionAccess().getNameValidIdParserRuleCall_0_0()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__KOfMGateDefinition__KAssignment_1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getKOfMGateDefinitionAccess().getKINTTerminalRuleCall_1_0()); }
+                RULE_INT
+                { after(grammarAccess.getKOfMGateDefinitionAccess().getKINTTerminalRuleCall_1_0()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__KOfMGateDefinition__MAssignment_2_0_1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getKOfMGateDefinitionAccess().getMINTTerminalRuleCall_2_0_1_0()); }
+                RULE_INT
+                { after(grammarAccess.getKOfMGateDefinitionAccess().getMINTTerminalRuleCall_2_0_1_0()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__KOfMGateDefinition__MAssignment_2_1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getKOfMGateDefinitionAccess().getMOF_INTTerminalRuleCall_2_1_0()); }
+                RULE_OF_INT
+                { after(grammarAccess.getKOfMGateDefinitionAccess().getMOF_INTTerminalRuleCall_2_1_0()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__KOfMGateDefinition__InputEventsAssignment_3
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getKOfMGateDefinitionAccess().getInputEventsEventDeclarationCrossReference_3_0()); }
+                (
+                        { before(grammarAccess.getKOfMGateDefinitionAccess().getInputEventsEventDeclarationValidIdParserRuleCall_3_0_1()); }
+                        ruleValidId
+                        { after(grammarAccess.getKOfMGateDefinitionAccess().getInputEventsEventDeclarationValidIdParserRuleCall_3_0_1()); }
+                )
+                { after(grammarAccess.getKOfMGateDefinitionAccess().getInputEventsEventDeclarationCrossReference_3_0()); }
         )
 ;
 finally {
@@ -3178,9 +3797,9 @@ rule__TransformationDefinition__NameAssignment_1
         }
 :
         (
-                { before(grammarAccess.getTransformationDefinitionAccess().getNameIDTerminalRuleCall_1_0()); }
-                RULE_ID
-                { after(grammarAccess.getTransformationDefinitionAccess().getNameIDTerminalRuleCall_1_0()); }
+                { before(grammarAccess.getTransformationDefinitionAccess().getNameValidIdParserRuleCall_1_0()); }
+                ruleValidId
+                { after(grammarAccess.getTransformationDefinitionAccess().getNameValidIdParserRuleCall_1_0()); }
         )
 ;
 finally {
@@ -3321,9 +3940,9 @@ rule__MappingParameter__NameAssignment
         }
 :
         (
-                { before(grammarAccess.getMappingParameterAccess().getNameIDTerminalRuleCall_0()); }
-                RULE_ID
-                { after(grammarAccess.getMappingParameterAccess().getNameIDTerminalRuleCall_0()); }
+                { before(grammarAccess.getMappingParameterAccess().getNameValidIdParserRuleCall_0()); }
+                ruleValidId
+                { after(grammarAccess.getMappingParameterAccess().getNameValidIdParserRuleCall_0()); }
         )
 ;
 finally {
@@ -3338,9 +3957,9 @@ rule__LookupDefinition__MappingAssignment_1
         (
                 { before(grammarAccess.getLookupDefinitionAccess().getMappingMappingDefinitionCrossReference_1_0()); }
                 (
-                        { before(grammarAccess.getLookupDefinitionAccess().getMappingMappingDefinitionIDTerminalRuleCall_1_0_1()); }
-                        RULE_ID
-                        { after(grammarAccess.getLookupDefinitionAccess().getMappingMappingDefinitionIDTerminalRuleCall_1_0_1()); }
+                        { before(grammarAccess.getLookupDefinitionAccess().getMappingMappingDefinitionQualifiedNameParserRuleCall_1_0_1()); }
+                        ruleQualifiedName
+                        { after(grammarAccess.getLookupDefinitionAccess().getMappingMappingDefinitionQualifiedNameParserRuleCall_1_0_1()); }
                 )
                 { after(grammarAccess.getLookupDefinitionAccess().getMappingMappingDefinitionCrossReference_1_0()); }
         )
@@ -3357,9 +3976,9 @@ rule__LookupDefinition__ArgumentsAssignment_3
         (
                 { before(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterCrossReference_3_0()); }
                 (
-                        { before(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterIDTerminalRuleCall_3_0_1()); }
-                        RULE_ID
-                        { after(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterIDTerminalRuleCall_3_0_1()); }
+                        { before(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterValidIdParserRuleCall_3_0_1()); }
+                        ruleValidId
+                        { after(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterValidIdParserRuleCall_3_0_1()); }
                 )
                 { after(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterCrossReference_3_0()); }
         )
@@ -3376,9 +3995,9 @@ rule__LookupDefinition__ArgumentsAssignment_4_1
         (
                 { before(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterCrossReference_4_1_0()); }
                 (
-                        { before(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterIDTerminalRuleCall_4_1_0_1()); }
-                        RULE_ID
-                        { after(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterIDTerminalRuleCall_4_1_0_1()); }
+                        { before(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterValidIdParserRuleCall_4_1_0_1()); }
+                        ruleValidId
+                        { after(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterValidIdParserRuleCall_4_1_0_1()); }
                 )
                 { after(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterCrossReference_4_1_0()); }
         )
@@ -3393,9 +4012,9 @@ rule__LookupDefinition__NameAssignment_7
         }
 :
         (
-                { before(grammarAccess.getLookupDefinitionAccess().getNameIDTerminalRuleCall_7_0()); }
-                RULE_ID
-                { after(grammarAccess.getLookupDefinitionAccess().getNameIDTerminalRuleCall_7_0()); }
+                { before(grammarAccess.getLookupDefinitionAccess().getNameValidIdParserRuleCall_7_0()); }
+                ruleValidId
+                { after(grammarAccess.getLookupDefinitionAccess().getNameValidIdParserRuleCall_7_0()); }
         )
 ;
 finally {
@@ -3459,9 +4078,9 @@ rule__EventReference__ComponentAssignment_0
         (
                 { before(grammarAccess.getEventReferenceAccess().getComponentVariableCrossReference_0_0()); }
                 (
-                        { before(grammarAccess.getEventReferenceAccess().getComponentVariableIDTerminalRuleCall_0_0_1()); }
-                        RULE_ID
-                        { after(grammarAccess.getEventReferenceAccess().getComponentVariableIDTerminalRuleCall_0_0_1()); }
+                        { before(grammarAccess.getEventReferenceAccess().getComponentVariableValidIdParserRuleCall_0_0_1()); }
+                        ruleValidId
+                        { after(grammarAccess.getEventReferenceAccess().getComponentVariableValidIdParserRuleCall_0_0_1()); }
                 )
                 { after(grammarAccess.getEventReferenceAccess().getComponentVariableCrossReference_0_0()); }
         )
@@ -3478,9 +4097,9 @@ rule__EventReference__EventAssignment_2
         (
                 { before(grammarAccess.getEventReferenceAccess().getEventEventDeclarationCrossReference_2_0()); }
                 (
-                        { before(grammarAccess.getEventReferenceAccess().getEventEventDeclarationIDTerminalRuleCall_2_0_1()); }
-                        RULE_ID
-                        { after(grammarAccess.getEventReferenceAccess().getEventEventDeclarationIDTerminalRuleCall_2_0_1()); }
+                        { before(grammarAccess.getEventReferenceAccess().getEventEventDeclarationValidIdParserRuleCall_2_0_1()); }
+                        ruleValidId
+                        { after(grammarAccess.getEventReferenceAccess().getEventEventDeclarationValidIdParserRuleCall_2_0_1()); }
                 )
                 { after(grammarAccess.getEventReferenceAccess().getEventEventDeclarationCrossReference_2_0()); }
         )
@@ -3523,7 +4142,9 @@ finally {
         restoreStackSize(stackSize);
 }
 
-RULE_DOULBE : ('0'..'9')+ ('.' ('0'..'9')+|('.' ('0'..'9')+)? ('e'|'E') ('+'|'-')? ('0'..'9')+);
+RULE_OF_INT : 'o' 'f' ('0'..'9')+;
+
+RULE_T_DOUBLE : ('0'..'9')+ ('.' ('0'..'9')+|('.' ('0'..'9')+)? ('e'|'E') ('+'|'-')? ('0'..'9')+);
 
 RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/contentassist/antlr/internal/InternalCftLanguage.tokens b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/contentassist/antlr/internal/InternalCftLanguage.tokens
index 77eb6696..ee87b574 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/contentassist/antlr/internal/InternalCftLanguage.tokens
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/contentassist/antlr/internal/InternalCftLanguage.tokens
@@ -1,38 +1,40 @@
-'('=27
-')'=28
-'*'=34
-'+='=37
-','=29
-'.'=32
-':='=12
-';'=14
-'='=22
-'=>'=33
-'[]'=35
-'and'=23
-'as'=31
-'cft'=16
-'import'=15
-'in'=19
-'lambda'=21
-'lookup'=30
-'mapping'=26
-'or'=24
-'out'=20
-'package'=13
-'toplevel'=36
-'transformation'=25
-'{'=17
-'}'=18
-RULE_ANY_OTHER=11
-RULE_DOULBE=5
+'('=30
+')'=31
+'*'=37
+'+='=40
+','=32
+'.'=35
+':='=13
+';'=15
+'='=23
+'=>'=36
+'[]'=38
+'and'=25
+'as'=34
+'cft'=17
+'import'=16
+'in'=20
+'lambda'=24
+'lookup'=33
+'mapping'=29
+'of'=27
+'or'=26
+'out'=21
+'p'=22
+'package'=14
+'toplevel'=39
+'transformation'=28
+'{'=18
+'}'=19
+RULE_ANY_OTHER=12
 RULE_ID=4
 RULE_INT=6
-RULE_ML_COMMENT=8
-RULE_SL_COMMENT=9
-RULE_STRING=7
-RULE_WS=10
-T__12=12
+RULE_ML_COMMENT=9
+RULE_OF_INT=5
+RULE_SL_COMMENT=10
+RULE_STRING=8
+RULE_T_DOUBLE=7
+RULE_WS=11
 T__13=13
 T__14=14
 T__15=15
@@ -58,3 +60,6 @@ T__34=34
 T__35=35
 T__36=36
 T__37=37
+T__38=38
+T__39=39
+T__40=40
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/contentassist/antlr/internal/InternalCftLanguageLexer.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/contentassist/antlr/internal/InternalCftLanguageLexer.java
index d80b13c6..21e09c33 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/contentassist/antlr/internal/InternalCftLanguageLexer.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/contentassist/antlr/internal/InternalCftLanguageLexer.java
@@ -12,17 +12,19 @@ import java.util.ArrayList;
 
 @SuppressWarnings("all")
 public class InternalCftLanguageLexer extends Lexer {
-    public static final int RULE_STRING=7;
-    public static final int RULE_SL_COMMENT=9;
+    public static final int RULE_STRING=8;
+    public static final int RULE_SL_COMMENT=10;
     public static final int T__19=19;
     public static final int T__15=15;
     public static final int T__37=37;
     public static final int T__16=16;
+    public static final int T__38=38;
     public static final int T__17=17;
+    public static final int T__39=39;
     public static final int T__18=18;
     public static final int T__33=33;
-    public static final int T__12=12;
     public static final int T__34=34;
+    public static final int RULE_T_DOUBLE=7;
     public static final int T__13=13;
     public static final int T__35=35;
     public static final int T__14=14;
@@ -31,20 +33,21 @@ public class InternalCftLanguageLexer extends Lexer {
     public static final int T__30=30;
     public static final int T__31=31;
     public static final int T__32=32;
+    public static final int RULE_OF_INT=5;
     public static final int RULE_ID=4;
-    public static final int RULE_WS=10;
-    public static final int RULE_DOULBE=5;
-    public static final int RULE_ANY_OTHER=11;
+    public static final int RULE_WS=11;
+    public static final int RULE_ANY_OTHER=12;
     public static final int T__26=26;
     public static final int T__27=27;
     public static final int T__28=28;
     public static final int RULE_INT=6;
     public static final int T__29=29;
     public static final int T__22=22;
-    public static final int RULE_ML_COMMENT=8;
+    public static final int RULE_ML_COMMENT=9;
     public static final int T__23=23;
     public static final int T__24=24;
     public static final int T__25=25;
+    public static final int T__40=40;
     public static final int T__20=20;
     public static final int T__21=21;
 
@@ -61,36 +64,15 @@ public class InternalCftLanguageLexer extends Lexer {
     }
     public String getGrammarFileName() { return "InternalCftLanguage.g"; }
 
-    // $ANTLR start "T__12"
-    public final void mT__12() throws RecognitionException {
-        try {
-            int _type = T__12;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:11:7: ( ':=' )
-            // InternalCftLanguage.g:11:9: ':='
-            {
-            match(":="); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__12"
-
     // $ANTLR start "T__13"
     public final void mT__13() throws RecognitionException {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:12:7: ( 'package' )
-            // InternalCftLanguage.g:12:9: 'package'
+            // InternalCftLanguage.g:11:7: ( ':=' )
+            // InternalCftLanguage.g:11:9: ':='
             {
-            match("package"); 
+            match(":="); 
 
 
             }
@@ -108,10 +90,11 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:13:7: ( ';' )
-            // InternalCftLanguage.g:13:9: ';'
+            // InternalCftLanguage.g:12:7: ( 'package' )
+            // InternalCftLanguage.g:12:9: 'package'
             {
-            match(';'); 
+            match("package"); 
+
 
             }
 
@@ -128,11 +111,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:14:7: ( 'import' )
-            // InternalCftLanguage.g:14:9: 'import'
+            // InternalCftLanguage.g:13:7: ( ';' )
+            // InternalCftLanguage.g:13:9: ';'
             {
-            match("import"); 
-
+            match(';'); 
 
             }
 
@@ -149,10 +131,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:15:7: ( 'cft' )
-            // InternalCftLanguage.g:15:9: 'cft'
+            // InternalCftLanguage.g:14:7: ( 'import' )
+            // InternalCftLanguage.g:14:9: 'import'
             {
-            match("cft"); 
+            match("import"); 
 
 
             }
@@ -170,10 +152,11 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:16:7: ( '{' )
-            // InternalCftLanguage.g:16:9: '{'
+            // InternalCftLanguage.g:15:7: ( 'cft' )
+            // InternalCftLanguage.g:15:9: 'cft'
             {
-            match('{'); 
+            match("cft"); 
+
 
             }
 
@@ -190,10 +173,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:17:7: ( '}' )
-            // InternalCftLanguage.g:17:9: '}'
+            // InternalCftLanguage.g:16:7: ( '{' )
+            // InternalCftLanguage.g:16:9: '{'
             {
-            match('}'); 
+            match('{'); 
 
             }
 
@@ -210,11 +193,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:18:7: ( 'in' )
-            // InternalCftLanguage.g:18:9: 'in'
+            // InternalCftLanguage.g:17:7: ( '}' )
+            // InternalCftLanguage.g:17:9: '}'
             {
-            match("in"); 
-
+            match('}'); 
 
             }
 
@@ -231,10 +213,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:19:7: ( 'out' )
-            // InternalCftLanguage.g:19:9: 'out'
+            // InternalCftLanguage.g:18:7: ( 'in' )
+            // InternalCftLanguage.g:18:9: 'in'
             {
-            match("out"); 
+            match("in"); 
 
 
             }
@@ -252,10 +234,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:20:7: ( 'lambda' )
-            // InternalCftLanguage.g:20:9: 'lambda'
+            // InternalCftLanguage.g:19:7: ( 'out' )
+            // InternalCftLanguage.g:19:9: 'out'
             {
-            match("lambda"); 
+            match("out"); 
 
 
             }
@@ -273,10 +255,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:21:7: ( '=' )
-            // InternalCftLanguage.g:21:9: '='
+            // InternalCftLanguage.g:20:7: ( 'p' )
+            // InternalCftLanguage.g:20:9: 'p'
             {
-            match('='); 
+            match('p'); 
 
             }
 
@@ -293,11 +275,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:22:7: ( 'and' )
-            // InternalCftLanguage.g:22:9: 'and'
+            // InternalCftLanguage.g:21:7: ( '=' )
+            // InternalCftLanguage.g:21:9: '='
             {
-            match("and"); 
-
+            match('='); 
 
             }
 
@@ -314,10 +295,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:23:7: ( 'or' )
-            // InternalCftLanguage.g:23:9: 'or'
+            // InternalCftLanguage.g:22:7: ( 'lambda' )
+            // InternalCftLanguage.g:22:9: 'lambda'
             {
-            match("or"); 
+            match("lambda"); 
 
 
             }
@@ -335,10 +316,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:24:7: ( 'transformation' )
-            // InternalCftLanguage.g:24:9: 'transformation'
+            // InternalCftLanguage.g:23:7: ( 'and' )
+            // InternalCftLanguage.g:23:9: 'and'
             {
-            match("transformation"); 
+            match("and"); 
 
 
             }
@@ -356,10 +337,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:25:7: ( 'mapping' )
-            // InternalCftLanguage.g:25:9: 'mapping'
+            // InternalCftLanguage.g:24:7: ( 'or' )
+            // InternalCftLanguage.g:24:9: 'or'
             {
-            match("mapping"); 
+            match("or"); 
 
 
             }
@@ -377,10 +358,11 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:26:7: ( '(' )
-            // InternalCftLanguage.g:26:9: '('
+            // InternalCftLanguage.g:25:7: ( 'of' )
+            // InternalCftLanguage.g:25:9: 'of'
             {
-            match('('); 
+            match("of"); 
+
 
             }
 
@@ -397,10 +379,11 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:27:7: ( ')' )
-            // InternalCftLanguage.g:27:9: ')'
+            // InternalCftLanguage.g:26:7: ( 'transformation' )
+            // InternalCftLanguage.g:26:9: 'transformation'
             {
-            match(')'); 
+            match("transformation"); 
+
 
             }
 
@@ -417,10 +400,11 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:28:7: ( ',' )
-            // InternalCftLanguage.g:28:9: ','
+            // InternalCftLanguage.g:27:7: ( 'mapping' )
+            // InternalCftLanguage.g:27:9: 'mapping'
             {
-            match(','); 
+            match("mapping"); 
+
 
             }
 
@@ -437,11 +421,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:29:7: ( 'lookup' )
-            // InternalCftLanguage.g:29:9: 'lookup'
+            // InternalCftLanguage.g:28:7: ( '(' )
+            // InternalCftLanguage.g:28:9: '('
             {
-            match("lookup"); 
-
+            match('('); 
 
             }
 
@@ -458,11 +441,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:30:7: ( 'as' )
-            // InternalCftLanguage.g:30:9: 'as'
+            // InternalCftLanguage.g:29:7: ( ')' )
+            // InternalCftLanguage.g:29:9: ')'
             {
-            match("as"); 
-
+            match(')'); 
 
             }
 
@@ -479,10 +461,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:31:7: ( '.' )
-            // InternalCftLanguage.g:31:9: '.'
+            // InternalCftLanguage.g:30:7: ( ',' )
+            // InternalCftLanguage.g:30:9: ','
             {
-            match('.'); 
+            match(','); 
 
             }
 
@@ -499,10 +481,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:32:7: ( '=>' )
-            // InternalCftLanguage.g:32:9: '=>'
+            // InternalCftLanguage.g:31:7: ( 'lookup' )
+            // InternalCftLanguage.g:31:9: 'lookup'
             {
-            match("=>"); 
+            match("lookup"); 
 
 
             }
@@ -520,10 +502,11 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:33:7: ( '*' )
-            // InternalCftLanguage.g:33:9: '*'
+            // InternalCftLanguage.g:32:7: ( 'as' )
+            // InternalCftLanguage.g:32:9: 'as'
             {
-            match('*'); 
+            match("as"); 
+
 
             }
 
@@ -540,11 +523,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:34:7: ( '[]' )
-            // InternalCftLanguage.g:34:9: '[]'
+            // InternalCftLanguage.g:33:7: ( '.' )
+            // InternalCftLanguage.g:33:9: '.'
             {
-            match("[]"); 
-
+            match('.'); 
 
             }
 
@@ -561,10 +543,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:35:7: ( 'toplevel' )
-            // InternalCftLanguage.g:35:9: 'toplevel'
+            // InternalCftLanguage.g:34:7: ( '=>' )
+            // InternalCftLanguage.g:34:9: '=>'
             {
-            match("toplevel"); 
+            match("=>"); 
 
 
             }
@@ -582,8 +564,70 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:36:7: ( '+=' )
-            // InternalCftLanguage.g:36:9: '+='
+            // InternalCftLanguage.g:35:7: ( '*' )
+            // InternalCftLanguage.g:35:9: '*'
+            {
+            match('*'); 
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__37"
+
+    // $ANTLR start "T__38"
+    public final void mT__38() throws RecognitionException {
+        try {
+            int _type = T__38;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalCftLanguage.g:36:7: ( '[]' )
+            // InternalCftLanguage.g:36:9: '[]'
+            {
+            match("[]"); 
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__38"
+
+    // $ANTLR start "T__39"
+    public final void mT__39() throws RecognitionException {
+        try {
+            int _type = T__39;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalCftLanguage.g:37:7: ( 'toplevel' )
+            // InternalCftLanguage.g:37:9: 'toplevel'
+            {
+            match("toplevel"); 
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__39"
+
+    // $ANTLR start "T__40"
+    public final void mT__40() throws RecognitionException {
+        try {
+            int _type = T__40;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalCftLanguage.g:38:7: ( '+=' )
+            // InternalCftLanguage.g:38:9: '+='
             {
             match("+="); 
 
@@ -596,17 +640,19 @@ public class InternalCftLanguageLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end "T__37"
+    // $ANTLR end "T__40"
 
-    // $ANTLR start "RULE_DOULBE"
-    public final void mRULE_DOULBE() throws RecognitionException {
+    // $ANTLR start "RULE_OF_INT"
+    public final void mRULE_OF_INT() throws RecognitionException {
         try {
-            int _type = RULE_DOULBE;
+            int _type = RULE_OF_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:3526:13: ( ( '0' .. '9' )+ ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ ) )
-            // InternalCftLanguage.g:3526:15: ( '0' .. '9' )+ ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )
+            // InternalCftLanguage.g:4145:13: ( 'o' 'f' ( '0' .. '9' )+ )
+            // InternalCftLanguage.g:4145:15: 'o' 'f' ( '0' .. '9' )+
             {
-            // InternalCftLanguage.g:3526:15: ( '0' .. '9' )+
+            match('o'); 
+            match('f'); 
+            // InternalCftLanguage.g:4145:23: ( '0' .. '9' )+
             int cnt1=0;
             loop1:
             do {
@@ -620,7 +666,7 @@ public class InternalCftLanguageLexer extends Lexer {
 
                 switch (alt1) {
                 case 1 :
-                    // InternalCftLanguage.g:3526:16: '0' .. '9'
+                    // InternalCftLanguage.g:4145:24: '0' .. '9'
                     {
                     matchRange('0','9'); 
 
@@ -636,29 +682,78 @@ public class InternalCftLanguageLexer extends Lexer {
                 cnt1++;
             } while (true);
 
-            // InternalCftLanguage.g:3526:27: ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )
-            int alt7=2;
-            alt7 = dfa7.predict(input);
-            switch (alt7) {
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "RULE_OF_INT"
+
+    // $ANTLR start "RULE_T_DOUBLE"
+    public final void mRULE_T_DOUBLE() throws RecognitionException {
+        try {
+            int _type = RULE_T_DOUBLE;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalCftLanguage.g:4147:15: ( ( '0' .. '9' )+ ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ ) )
+            // InternalCftLanguage.g:4147:17: ( '0' .. '9' )+ ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )
+            {
+            // InternalCftLanguage.g:4147:17: ( '0' .. '9' )+
+            int cnt2=0;
+            loop2:
+            do {
+                int alt2=2;
+                int LA2_0 = input.LA(1);
+
+                if ( ((LA2_0>='0' && LA2_0<='9')) ) {
+                    alt2=1;
+                }
+
+
+                switch (alt2) {
+                case 1 :
+                    // InternalCftLanguage.g:4147:18: '0' .. '9'
+                    {
+                    matchRange('0','9'); 
+
+                    }
+                    break;
+
+                default :
+                    if ( cnt2 >= 1 ) break loop2;
+                        EarlyExitException eee =
+                            new EarlyExitException(2, input);
+                        throw eee;
+                }
+                cnt2++;
+            } while (true);
+
+            // InternalCftLanguage.g:4147:29: ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )
+            int alt8=2;
+            alt8 = dfa8.predict(input);
+            switch (alt8) {
                 case 1 :
-                    // InternalCftLanguage.g:3526:28: '.' ( '0' .. '9' )+
+                    // InternalCftLanguage.g:4147:30: '.' ( '0' .. '9' )+
                     {
                     match('.'); 
-                    // InternalCftLanguage.g:3526:32: ( '0' .. '9' )+
-                    int cnt2=0;
-                    loop2:
+                    // InternalCftLanguage.g:4147:34: ( '0' .. '9' )+
+                    int cnt3=0;
+                    loop3:
                     do {
-                        int alt2=2;
-                        int LA2_0 = input.LA(1);
+                        int alt3=2;
+                        int LA3_0 = input.LA(1);
 
-                        if ( ((LA2_0>='0' && LA2_0<='9')) ) {
-                            alt2=1;
+                        if ( ((LA3_0>='0' && LA3_0<='9')) ) {
+                            alt3=1;
                         }
 
 
-                        switch (alt2) {
+                        switch (alt3) {
                         case 1 :
-                            // InternalCftLanguage.g:3526:33: '0' .. '9'
+                            // InternalCftLanguage.g:4147:35: '0' .. '9'
                             {
                             matchRange('0','9'); 
 
@@ -666,47 +761,47 @@ public class InternalCftLanguageLexer extends Lexer {
                             break;
 
                         default :
-                            if ( cnt2 >= 1 ) break loop2;
+                            if ( cnt3 >= 1 ) break loop3;
                                 EarlyExitException eee =
-                                    new EarlyExitException(2, input);
+                                    new EarlyExitException(3, input);
                                 throw eee;
                         }
-                        cnt2++;
+                        cnt3++;
                     } while (true);
 
 
                     }
                     break;
                 case 2 :
-                    // InternalCftLanguage.g:3526:44: ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
+                    // InternalCftLanguage.g:4147:46: ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
                     {
-                    // InternalCftLanguage.g:3526:44: ( '.' ( '0' .. '9' )+ )?
-                    int alt4=2;
-                    int LA4_0 = input.LA(1);
+                    // InternalCftLanguage.g:4147:46: ( '.' ( '0' .. '9' )+ )?
+                    int alt5=2;
+                    int LA5_0 = input.LA(1);
 
-                    if ( (LA4_0=='.') ) {
-                        alt4=1;
+                    if ( (LA5_0=='.') ) {
+                        alt5=1;
                     }
-                    switch (alt4) {
+                    switch (alt5) {
                         case 1 :
-                            // InternalCftLanguage.g:3526:45: '.' ( '0' .. '9' )+
+                            // InternalCftLanguage.g:4147:47: '.' ( '0' .. '9' )+
                             {
                             match('.'); 
-                            // InternalCftLanguage.g:3526:49: ( '0' .. '9' )+
-                            int cnt3=0;
-                            loop3:
+                            // InternalCftLanguage.g:4147:51: ( '0' .. '9' )+
+                            int cnt4=0;
+                            loop4:
                             do {
-                                int alt3=2;
-                                int LA3_0 = input.LA(1);
+                                int alt4=2;
+                                int LA4_0 = input.LA(1);
 
-                                if ( ((LA3_0>='0' && LA3_0<='9')) ) {
-                                    alt3=1;
+                                if ( ((LA4_0>='0' && LA4_0<='9')) ) {
+                                    alt4=1;
                                 }
 
 
-                                switch (alt3) {
+                                switch (alt4) {
                                 case 1 :
-                                    // InternalCftLanguage.g:3526:50: '0' .. '9'
+                                    // InternalCftLanguage.g:4147:52: '0' .. '9'
                                     {
                                     matchRange('0','9'); 
 
@@ -714,12 +809,12 @@ public class InternalCftLanguageLexer extends Lexer {
                                     break;
 
                                 default :
-                                    if ( cnt3 >= 1 ) break loop3;
+                                    if ( cnt4 >= 1 ) break loop4;
                                         EarlyExitException eee =
-                                            new EarlyExitException(3, input);
+                                            new EarlyExitException(4, input);
                                         throw eee;
                                 }
-                                cnt3++;
+                                cnt4++;
                             } while (true);
 
 
@@ -737,14 +832,14 @@ public class InternalCftLanguageLexer extends Lexer {
                         recover(mse);
                         throw mse;}
 
-                    // InternalCftLanguage.g:3526:73: ( '+' | '-' )?
-                    int alt5=2;
-                    int LA5_0 = input.LA(1);
+                    // InternalCftLanguage.g:4147:75: ( '+' | '-' )?
+                    int alt6=2;
+                    int LA6_0 = input.LA(1);
 
-                    if ( (LA5_0=='+'||LA5_0=='-') ) {
-                        alt5=1;
+                    if ( (LA6_0=='+'||LA6_0=='-') ) {
+                        alt6=1;
                     }
-                    switch (alt5) {
+                    switch (alt6) {
                         case 1 :
                             // InternalCftLanguage.g:
                             {
@@ -763,21 +858,21 @@ public class InternalCftLanguageLexer extends Lexer {
 
                     }
 
-                    // InternalCftLanguage.g:3526:84: ( '0' .. '9' )+
-                    int cnt6=0;
-                    loop6:
+                    // InternalCftLanguage.g:4147:86: ( '0' .. '9' )+
+                    int cnt7=0;
+                    loop7:
                     do {
-                        int alt6=2;
-                        int LA6_0 = input.LA(1);
+                        int alt7=2;
+                        int LA7_0 = input.LA(1);
 
-                        if ( ((LA6_0>='0' && LA6_0<='9')) ) {
-                            alt6=1;
+                        if ( ((LA7_0>='0' && LA7_0<='9')) ) {
+                            alt7=1;
                         }
 
 
-                        switch (alt6) {
+                        switch (alt7) {
                         case 1 :
-                            // InternalCftLanguage.g:3526:85: '0' .. '9'
+                            // InternalCftLanguage.g:4147:87: '0' .. '9'
                             {
                             matchRange('0','9'); 
 
@@ -785,12 +880,12 @@ public class InternalCftLanguageLexer extends Lexer {
                             break;
 
                         default :
-                            if ( cnt6 >= 1 ) break loop6;
+                            if ( cnt7 >= 1 ) break loop7;
                                 EarlyExitException eee =
-                                    new EarlyExitException(6, input);
+                                    new EarlyExitException(7, input);
                                 throw eee;
                         }
-                        cnt6++;
+                        cnt7++;
                     } while (true);
 
 
@@ -808,26 +903,26 @@ public class InternalCftLanguageLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end "RULE_DOULBE"
+    // $ANTLR end "RULE_T_DOUBLE"
 
     // $ANTLR start "RULE_ID"
     public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:3528:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // InternalCftLanguage.g:3528:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalCftLanguage.g:4149:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalCftLanguage.g:4149:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // InternalCftLanguage.g:3528:11: ( '^' )?
-            int alt8=2;
-            int LA8_0 = input.LA(1);
+            // InternalCftLanguage.g:4149:11: ( '^' )?
+            int alt9=2;
+            int LA9_0 = input.LA(1);
 
-            if ( (LA8_0=='^') ) {
-                alt8=1;
+            if ( (LA9_0=='^') ) {
+                alt9=1;
             }
-            switch (alt8) {
+            switch (alt9) {
                 case 1 :
-                    // InternalCftLanguage.g:3528:11: '^'
+                    // InternalCftLanguage.g:4149:11: '^'
                     {
                     match('^'); 
 
@@ -845,18 +940,18 @@ public class InternalCftLanguageLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // InternalCftLanguage.g:3528:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
-            loop9:
+            // InternalCftLanguage.g:4149:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            loop10:
             do {
-                int alt9=2;
-                int LA9_0 = input.LA(1);
+                int alt10=2;
+                int LA10_0 = input.LA(1);
 
-                if ( ((LA9_0>='0' && LA9_0<='9')||(LA9_0>='A' && LA9_0<='Z')||LA9_0=='_'||(LA9_0>='a' && LA9_0<='z')) ) {
-                    alt9=1;
+                if ( ((LA10_0>='0' && LA10_0<='9')||(LA10_0>='A' && LA10_0<='Z')||LA10_0=='_'||(LA10_0>='a' && LA10_0<='z')) ) {
+                    alt10=1;
                 }
 
 
-                switch (alt9) {
+                switch (alt10) {
                 case 1 :
                     // InternalCftLanguage.g:
                     {
@@ -874,7 +969,7 @@ public class InternalCftLanguageLexer extends Lexer {
                     break;
 
                 default :
-                    break loop9;
+                    break loop10;
                 }
             } while (true);
 
@@ -894,24 +989,24 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:3530:10: ( ( '0' .. '9' )+ )
-            // InternalCftLanguage.g:3530:12: ( '0' .. '9' )+
+            // InternalCftLanguage.g:4151:10: ( ( '0' .. '9' )+ )
+            // InternalCftLanguage.g:4151:12: ( '0' .. '9' )+
             {
-            // InternalCftLanguage.g:3530:12: ( '0' .. '9' )+
-            int cnt10=0;
-            loop10:
+            // InternalCftLanguage.g:4151:12: ( '0' .. '9' )+
+            int cnt11=0;
+            loop11:
             do {
-                int alt10=2;
-                int LA10_0 = input.LA(1);
+                int alt11=2;
+                int LA11_0 = input.LA(1);
 
-                if ( ((LA10_0>='0' && LA10_0<='9')) ) {
-                    alt10=1;
+                if ( ((LA11_0>='0' && LA11_0<='9')) ) {
+                    alt11=1;
                 }
 
 
-                switch (alt10) {
+                switch (alt11) {
                 case 1 :
-                    // InternalCftLanguage.g:3530:13: '0' .. '9'
+                    // InternalCftLanguage.g:4151:13: '0' .. '9'
                     {
                     matchRange('0','9'); 
 
@@ -919,12 +1014,12 @@ public class InternalCftLanguageLexer extends Lexer {
                     break;
 
                 default :
-                    if ( cnt10 >= 1 ) break loop10;
+                    if ( cnt11 >= 1 ) break loop11;
                         EarlyExitException eee =
-                            new EarlyExitException(10, input);
+                            new EarlyExitException(11, input);
                         throw eee;
                 }
-                cnt10++;
+                cnt11++;
             } while (true);
 
 
@@ -943,47 +1038,47 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:3532:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // InternalCftLanguage.g:3532:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalCftLanguage.g:4153:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalCftLanguage.g:4153:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // InternalCftLanguage.g:3532:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
-            int alt13=2;
-            int LA13_0 = input.LA(1);
+            // InternalCftLanguage.g:4153:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            int alt14=2;
+            int LA14_0 = input.LA(1);
 
-            if ( (LA13_0=='\"') ) {
-                alt13=1;
+            if ( (LA14_0=='\"') ) {
+                alt14=1;
             }
-            else if ( (LA13_0=='\'') ) {
-                alt13=2;
+            else if ( (LA14_0=='\'') ) {
+                alt14=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 13, 0, input);
+                    new NoViableAltException("", 14, 0, input);
 
                 throw nvae;
             }
-            switch (alt13) {
+            switch (alt14) {
                 case 1 :
-                    // InternalCftLanguage.g:3532:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalCftLanguage.g:4153:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // InternalCftLanguage.g:3532:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
-                    loop11:
+                    // InternalCftLanguage.g:4153:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    loop12:
                     do {
-                        int alt11=3;
-                        int LA11_0 = input.LA(1);
+                        int alt12=3;
+                        int LA12_0 = input.LA(1);
 
-                        if ( (LA11_0=='\\') ) {
-                            alt11=1;
+                        if ( (LA12_0=='\\') ) {
+                            alt12=1;
                         }
-                        else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA11_0>=']' && LA11_0<='\uFFFF')) ) {
-                            alt11=2;
+                        else if ( ((LA12_0>='\u0000' && LA12_0<='!')||(LA12_0>='#' && LA12_0<='[')||(LA12_0>=']' && LA12_0<='\uFFFF')) ) {
+                            alt12=2;
                         }
 
 
-                        switch (alt11) {
+                        switch (alt12) {
                         case 1 :
-                            // InternalCftLanguage.g:3532:21: '\\\\' .
+                            // InternalCftLanguage.g:4153:21: '\\\\' .
                             {
                             match('\\'); 
                             matchAny(); 
@@ -991,7 +1086,7 @@ public class InternalCftLanguageLexer extends Lexer {
                             }
                             break;
                         case 2 :
-                            // InternalCftLanguage.g:3532:28: ~ ( ( '\\\\' | '\"' ) )
+                            // InternalCftLanguage.g:4153:28: ~ ( ( '\\\\' | '\"' ) )
                             {
                             if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                                 input.consume();
@@ -1007,7 +1102,7 @@ public class InternalCftLanguageLexer extends Lexer {
                             break;
 
                         default :
-                            break loop11;
+                            break loop12;
                         }
                     } while (true);
 
@@ -1016,26 +1111,26 @@ public class InternalCftLanguageLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalCftLanguage.g:3532:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalCftLanguage.g:4153:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // InternalCftLanguage.g:3532:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
-                    loop12:
+                    // InternalCftLanguage.g:4153:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    loop13:
                     do {
-                        int alt12=3;
-                        int LA12_0 = input.LA(1);
+                        int alt13=3;
+                        int LA13_0 = input.LA(1);
 
-                        if ( (LA12_0=='\\') ) {
-                            alt12=1;
+                        if ( (LA13_0=='\\') ) {
+                            alt13=1;
                         }
-                        else if ( ((LA12_0>='\u0000' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='[')||(LA12_0>=']' && LA12_0<='\uFFFF')) ) {
-                            alt12=2;
+                        else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA13_0>=']' && LA13_0<='\uFFFF')) ) {
+                            alt13=2;
                         }
 
 
-                        switch (alt12) {
+                        switch (alt13) {
                         case 1 :
-                            // InternalCftLanguage.g:3532:54: '\\\\' .
+                            // InternalCftLanguage.g:4153:54: '\\\\' .
                             {
                             match('\\'); 
                             matchAny(); 
@@ -1043,7 +1138,7 @@ public class InternalCftLanguageLexer extends Lexer {
                             }
                             break;
                         case 2 :
-                            // InternalCftLanguage.g:3532:61: ~ ( ( '\\\\' | '\\'' ) )
+                            // InternalCftLanguage.g:4153:61: ~ ( ( '\\\\' | '\\'' ) )
                             {
                             if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                                 input.consume();
@@ -1059,7 +1154,7 @@ public class InternalCftLanguageLexer extends Lexer {
                             break;
 
                         default :
-                            break loop12;
+                            break loop13;
                         }
                     } while (true);
 
@@ -1086,37 +1181,37 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:3534:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // InternalCftLanguage.g:3534:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalCftLanguage.g:4155:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalCftLanguage.g:4155:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // InternalCftLanguage.g:3534:24: ( options {greedy=false; } : . )*
-            loop14:
+            // InternalCftLanguage.g:4155:24: ( options {greedy=false; } : . )*
+            loop15:
             do {
-                int alt14=2;
-                int LA14_0 = input.LA(1);
+                int alt15=2;
+                int LA15_0 = input.LA(1);
 
-                if ( (LA14_0=='*') ) {
-                    int LA14_1 = input.LA(2);
+                if ( (LA15_0=='*') ) {
+                    int LA15_1 = input.LA(2);
 
-                    if ( (LA14_1=='/') ) {
-                        alt14=2;
+                    if ( (LA15_1=='/') ) {
+                        alt15=2;
                     }
-                    else if ( ((LA14_1>='\u0000' && LA14_1<='.')||(LA14_1>='0' && LA14_1<='\uFFFF')) ) {
-                        alt14=1;
+                    else if ( ((LA15_1>='\u0000' && LA15_1<='.')||(LA15_1>='0' && LA15_1<='\uFFFF')) ) {
+                        alt15=1;
                     }
 
 
                 }
-                else if ( ((LA14_0>='\u0000' && LA14_0<=')')||(LA14_0>='+' && LA14_0<='\uFFFF')) ) {
-                    alt14=1;
+                else if ( ((LA15_0>='\u0000' && LA15_0<=')')||(LA15_0>='+' && LA15_0<='\uFFFF')) ) {
+                    alt15=1;
                 }
 
 
-                switch (alt14) {
+                switch (alt15) {
                 case 1 :
-                    // InternalCftLanguage.g:3534:52: .
+                    // InternalCftLanguage.g:4155:52: .
                     {
                     matchAny(); 
 
@@ -1124,7 +1219,7 @@ public class InternalCftLanguageLexer extends Lexer {
                     break;
 
                 default :
-                    break loop14;
+                    break loop15;
                 }
             } while (true);
 
@@ -1146,25 +1241,25 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:3536:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // InternalCftLanguage.g:3536:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalCftLanguage.g:4157:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalCftLanguage.g:4157:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // InternalCftLanguage.g:3536:24: (~ ( ( '\\n' | '\\r' ) ) )*
-            loop15:
+            // InternalCftLanguage.g:4157:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            loop16:
             do {
-                int alt15=2;
-                int LA15_0 = input.LA(1);
+                int alt16=2;
+                int LA16_0 = input.LA(1);
 
-                if ( ((LA15_0>='\u0000' && LA15_0<='\t')||(LA15_0>='\u000B' && LA15_0<='\f')||(LA15_0>='\u000E' && LA15_0<='\uFFFF')) ) {
-                    alt15=1;
+                if ( ((LA16_0>='\u0000' && LA16_0<='\t')||(LA16_0>='\u000B' && LA16_0<='\f')||(LA16_0>='\u000E' && LA16_0<='\uFFFF')) ) {
+                    alt16=1;
                 }
 
 
-                switch (alt15) {
+                switch (alt16) {
                 case 1 :
-                    // InternalCftLanguage.g:3536:24: ~ ( ( '\\n' | '\\r' ) )
+                    // InternalCftLanguage.g:4157:24: ~ ( ( '\\n' | '\\r' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -1180,31 +1275,31 @@ public class InternalCftLanguageLexer extends Lexer {
                     break;
 
                 default :
-                    break loop15;
+                    break loop16;
                 }
             } while (true);
 
-            // InternalCftLanguage.g:3536:40: ( ( '\\r' )? '\\n' )?
-            int alt17=2;
-            int LA17_0 = input.LA(1);
+            // InternalCftLanguage.g:4157:40: ( ( '\\r' )? '\\n' )?
+            int alt18=2;
+            int LA18_0 = input.LA(1);
 
-            if ( (LA17_0=='\n'||LA17_0=='\r') ) {
-                alt17=1;
+            if ( (LA18_0=='\n'||LA18_0=='\r') ) {
+                alt18=1;
             }
-            switch (alt17) {
+            switch (alt18) {
                 case 1 :
-                    // InternalCftLanguage.g:3536:41: ( '\\r' )? '\\n'
+                    // InternalCftLanguage.g:4157:41: ( '\\r' )? '\\n'
                     {
-                    // InternalCftLanguage.g:3536:41: ( '\\r' )?
-                    int alt16=2;
-                    int LA16_0 = input.LA(1);
+                    // InternalCftLanguage.g:4157:41: ( '\\r' )?
+                    int alt17=2;
+                    int LA17_0 = input.LA(1);
 
-                    if ( (LA16_0=='\r') ) {
-                        alt16=1;
+                    if ( (LA17_0=='\r') ) {
+                        alt17=1;
                     }
-                    switch (alt16) {
+                    switch (alt17) {
                         case 1 :
-                            // InternalCftLanguage.g:3536:41: '\\r'
+                            // InternalCftLanguage.g:4157:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1236,22 +1331,22 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:3538:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // InternalCftLanguage.g:3538:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalCftLanguage.g:4159:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalCftLanguage.g:4159:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // InternalCftLanguage.g:3538:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
-            int cnt18=0;
-            loop18:
+            // InternalCftLanguage.g:4159:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            int cnt19=0;
+            loop19:
             do {
-                int alt18=2;
-                int LA18_0 = input.LA(1);
+                int alt19=2;
+                int LA19_0 = input.LA(1);
 
-                if ( ((LA18_0>='\t' && LA18_0<='\n')||LA18_0=='\r'||LA18_0==' ') ) {
-                    alt18=1;
+                if ( ((LA19_0>='\t' && LA19_0<='\n')||LA19_0=='\r'||LA19_0==' ') ) {
+                    alt19=1;
                 }
 
 
-                switch (alt18) {
+                switch (alt19) {
                 case 1 :
                     // InternalCftLanguage.g:
                     {
@@ -1269,12 +1364,12 @@ public class InternalCftLanguageLexer extends Lexer {
                     break;
 
                 default :
-                    if ( cnt18 >= 1 ) break loop18;
+                    if ( cnt19 >= 1 ) break loop19;
                         EarlyExitException eee =
-                            new EarlyExitException(18, input);
+                            new EarlyExitException(19, input);
                         throw eee;
                 }
-                cnt18++;
+                cnt19++;
             } while (true);
 
 
@@ -1293,8 +1388,8 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:3540:16: ( . )
-            // InternalCftLanguage.g:3540:18: .
+            // InternalCftLanguage.g:4161:16: ( . )
+            // InternalCftLanguage.g:4161:18: .
             {
             matchAny(); 
 
@@ -1309,243 +1404,264 @@ public class InternalCftLanguageLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // InternalCftLanguage.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | RULE_DOULBE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt19=34;
-        alt19 = dfa19.predict(input);
-        switch (alt19) {
+        // InternalCftLanguage.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | RULE_OF_INT | RULE_T_DOUBLE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        int alt20=37;
+        alt20 = dfa20.predict(input);
+        switch (alt20) {
             case 1 :
-                // InternalCftLanguage.g:1:10: T__12
+                // InternalCftLanguage.g:1:10: T__13
                 {
-                mT__12(); 
+                mT__13(); 
 
                 }
                 break;
             case 2 :
-                // InternalCftLanguage.g:1:16: T__13
+                // InternalCftLanguage.g:1:16: T__14
                 {
-                mT__13(); 
+                mT__14(); 
 
                 }
                 break;
             case 3 :
-                // InternalCftLanguage.g:1:22: T__14
+                // InternalCftLanguage.g:1:22: T__15
                 {
-                mT__14(); 
+                mT__15(); 
 
                 }
                 break;
             case 4 :
-                // InternalCftLanguage.g:1:28: T__15
+                // InternalCftLanguage.g:1:28: T__16
                 {
-                mT__15(); 
+                mT__16(); 
 
                 }
                 break;
             case 5 :
-                // InternalCftLanguage.g:1:34: T__16
+                // InternalCftLanguage.g:1:34: T__17
                 {
-                mT__16(); 
+                mT__17(); 
 
                 }
                 break;
             case 6 :
-                // InternalCftLanguage.g:1:40: T__17
+                // InternalCftLanguage.g:1:40: T__18
                 {
-                mT__17(); 
+                mT__18(); 
 
                 }
                 break;
             case 7 :
-                // InternalCftLanguage.g:1:46: T__18
+                // InternalCftLanguage.g:1:46: T__19
                 {
-                mT__18(); 
+                mT__19(); 
 
                 }
                 break;
             case 8 :
-                // InternalCftLanguage.g:1:52: T__19
+                // InternalCftLanguage.g:1:52: T__20
                 {
-                mT__19(); 
+                mT__20(); 
 
                 }
                 break;
             case 9 :
-                // InternalCftLanguage.g:1:58: T__20
+                // InternalCftLanguage.g:1:58: T__21
                 {
-                mT__20(); 
+                mT__21(); 
 
                 }
                 break;
             case 10 :
-                // InternalCftLanguage.g:1:64: T__21
+                // InternalCftLanguage.g:1:64: T__22
                 {
-                mT__21(); 
+                mT__22(); 
 
                 }
                 break;
             case 11 :
-                // InternalCftLanguage.g:1:70: T__22
+                // InternalCftLanguage.g:1:70: T__23
                 {
-                mT__22(); 
+                mT__23(); 
 
                 }
                 break;
             case 12 :
-                // InternalCftLanguage.g:1:76: T__23
+                // InternalCftLanguage.g:1:76: T__24
                 {
-                mT__23(); 
+                mT__24(); 
 
                 }
                 break;
             case 13 :
-                // InternalCftLanguage.g:1:82: T__24
+                // InternalCftLanguage.g:1:82: T__25
                 {
-                mT__24(); 
+                mT__25(); 
 
                 }
                 break;
             case 14 :
-                // InternalCftLanguage.g:1:88: T__25
+                // InternalCftLanguage.g:1:88: T__26
                 {
-                mT__25(); 
+                mT__26(); 
 
                 }
                 break;
             case 15 :
-                // InternalCftLanguage.g:1:94: T__26
+                // InternalCftLanguage.g:1:94: T__27
                 {
-                mT__26(); 
+                mT__27(); 
 
                 }
                 break;
             case 16 :
-                // InternalCftLanguage.g:1:100: T__27
+                // InternalCftLanguage.g:1:100: T__28
                 {
-                mT__27(); 
+                mT__28(); 
 
                 }
                 break;
             case 17 :
-                // InternalCftLanguage.g:1:106: T__28
+                // InternalCftLanguage.g:1:106: T__29
                 {
-                mT__28(); 
+                mT__29(); 
 
                 }
                 break;
             case 18 :
-                // InternalCftLanguage.g:1:112: T__29
+                // InternalCftLanguage.g:1:112: T__30
                 {
-                mT__29(); 
+                mT__30(); 
 
                 }
                 break;
             case 19 :
-                // InternalCftLanguage.g:1:118: T__30
+                // InternalCftLanguage.g:1:118: T__31
                 {
-                mT__30(); 
+                mT__31(); 
 
                 }
                 break;
             case 20 :
-                // InternalCftLanguage.g:1:124: T__31
+                // InternalCftLanguage.g:1:124: T__32
                 {
-                mT__31(); 
+                mT__32(); 
 
                 }
                 break;
             case 21 :
-                // InternalCftLanguage.g:1:130: T__32
+                // InternalCftLanguage.g:1:130: T__33
                 {
-                mT__32(); 
+                mT__33(); 
 
                 }
                 break;
             case 22 :
-                // InternalCftLanguage.g:1:136: T__33
+                // InternalCftLanguage.g:1:136: T__34
                 {
-                mT__33(); 
+                mT__34(); 
 
                 }
                 break;
             case 23 :
-                // InternalCftLanguage.g:1:142: T__34
+                // InternalCftLanguage.g:1:142: T__35
                 {
-                mT__34(); 
+                mT__35(); 
 
                 }
                 break;
             case 24 :
-                // InternalCftLanguage.g:1:148: T__35
+                // InternalCftLanguage.g:1:148: T__36
                 {
-                mT__35(); 
+                mT__36(); 
 
                 }
                 break;
             case 25 :
-                // InternalCftLanguage.g:1:154: T__36
+                // InternalCftLanguage.g:1:154: T__37
                 {
-                mT__36(); 
+                mT__37(); 
 
                 }
                 break;
             case 26 :
-                // InternalCftLanguage.g:1:160: T__37
+                // InternalCftLanguage.g:1:160: T__38
                 {
-                mT__37(); 
+                mT__38(); 
 
                 }
                 break;
             case 27 :
-                // InternalCftLanguage.g:1:166: RULE_DOULBE
+                // InternalCftLanguage.g:1:166: T__39
                 {
-                mRULE_DOULBE(); 
+                mT__39(); 
 
                 }
                 break;
             case 28 :
-                // InternalCftLanguage.g:1:178: RULE_ID
+                // InternalCftLanguage.g:1:172: T__40
                 {
-                mRULE_ID(); 
+                mT__40(); 
 
                 }
                 break;
             case 29 :
-                // InternalCftLanguage.g:1:186: RULE_INT
+                // InternalCftLanguage.g:1:178: RULE_OF_INT
                 {
-                mRULE_INT(); 
+                mRULE_OF_INT(); 
 
                 }
                 break;
             case 30 :
-                // InternalCftLanguage.g:1:195: RULE_STRING
+                // InternalCftLanguage.g:1:190: RULE_T_DOUBLE
                 {
-                mRULE_STRING(); 
+                mRULE_T_DOUBLE(); 
 
                 }
                 break;
             case 31 :
-                // InternalCftLanguage.g:1:207: RULE_ML_COMMENT
+                // InternalCftLanguage.g:1:204: RULE_ID
                 {
-                mRULE_ML_COMMENT(); 
+                mRULE_ID(); 
 
                 }
                 break;
             case 32 :
-                // InternalCftLanguage.g:1:223: RULE_SL_COMMENT
+                // InternalCftLanguage.g:1:212: RULE_INT
                 {
-                mRULE_SL_COMMENT(); 
+                mRULE_INT(); 
 
                 }
                 break;
             case 33 :
-                // InternalCftLanguage.g:1:239: RULE_WS
+                // InternalCftLanguage.g:1:221: RULE_STRING
                 {
-                mRULE_WS(); 
+                mRULE_STRING(); 
 
                 }
                 break;
             case 34 :
-                // InternalCftLanguage.g:1:247: RULE_ANY_OTHER
+                // InternalCftLanguage.g:1:233: RULE_ML_COMMENT
+                {
+                mRULE_ML_COMMENT(); 
+
+                }
+                break;
+            case 35 :
+                // InternalCftLanguage.g:1:249: RULE_SL_COMMENT
+                {
+                mRULE_SL_COMMENT(); 
+
+                }
+                break;
+            case 36 :
+                // InternalCftLanguage.g:1:265: RULE_WS
+                {
+                mRULE_WS(); 
+
+                }
+                break;
+            case 37 :
+                // InternalCftLanguage.g:1:273: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1557,21 +1673,21 @@ public class InternalCftLanguageLexer extends Lexer {
     }
 
 
-    protected DFA7 dfa7 = new DFA7(this);
-    protected DFA19 dfa19 = new DFA19(this);
-    static final String DFA7_eotS =
+    protected DFA8 dfa8 = new DFA8(this);
+    protected DFA20 dfa20 = new DFA20(this);
+    static final String DFA8_eotS =
         "\3\uffff\1\4\1\uffff";
-    static final String DFA7_eofS =
+    static final String DFA8_eofS =
         "\5\uffff";
-    static final String DFA7_minS =
+    static final String DFA8_minS =
         "\1\56\1\60\1\uffff\1\60\1\uffff";
-    static final String DFA7_maxS =
+    static final String DFA8_maxS =
         "\1\145\1\71\1\uffff\1\145\1\uffff";
-    static final String DFA7_acceptS =
+    static final String DFA8_acceptS =
         "\2\uffff\1\2\1\uffff\1\1";
-    static final String DFA7_specialS =
+    static final String DFA8_specialS =
         "\5\uffff}>";
-    static final String[] DFA7_transitionS = {
+    static final String[] DFA8_transitionS = {
             "\1\1\26\uffff\1\2\37\uffff\1\2",
             "\12\3",
             "",
@@ -1579,101 +1695,103 @@ public class InternalCftLanguageLexer extends Lexer {
             ""
     };
 
-    static final short[] DFA7_eot = DFA.unpackEncodedString(DFA7_eotS);
-    static final short[] DFA7_eof = DFA.unpackEncodedString(DFA7_eofS);
-    static final char[] DFA7_min = DFA.unpackEncodedStringToUnsignedChars(DFA7_minS);
-    static final char[] DFA7_max = DFA.unpackEncodedStringToUnsignedChars(DFA7_maxS);
-    static final short[] DFA7_accept = DFA.unpackEncodedString(DFA7_acceptS);
-    static final short[] DFA7_special = DFA.unpackEncodedString(DFA7_specialS);
-    static final short[][] DFA7_transition;
+    static final short[] DFA8_eot = DFA.unpackEncodedString(DFA8_eotS);
+    static final short[] DFA8_eof = DFA.unpackEncodedString(DFA8_eofS);
+    static final char[] DFA8_min = DFA.unpackEncodedStringToUnsignedChars(DFA8_minS);
+    static final char[] DFA8_max = DFA.unpackEncodedStringToUnsignedChars(DFA8_maxS);
+    static final short[] DFA8_accept = DFA.unpackEncodedString(DFA8_acceptS);
+    static final short[] DFA8_special = DFA.unpackEncodedString(DFA8_specialS);
+    static final short[][] DFA8_transition;
 
     static {
-        int numStates = DFA7_transitionS.length;
-        DFA7_transition = new short[numStates][];
+        int numStates = DFA8_transitionS.length;
+        DFA8_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA7_transition[i] = DFA.unpackEncodedString(DFA7_transitionS[i]);
+            DFA8_transition[i] = DFA.unpackEncodedString(DFA8_transitionS[i]);
         }
     }
 
-    class DFA7 extends DFA {
+    class DFA8 extends DFA {
 
-        public DFA7(BaseRecognizer recognizer) {
+        public DFA8(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 7;
-            this.eot = DFA7_eot;
-            this.eof = DFA7_eof;
-            this.min = DFA7_min;
-            this.max = DFA7_max;
-            this.accept = DFA7_accept;
-            this.special = DFA7_special;
-            this.transition = DFA7_transition;
+            this.decisionNumber = 8;
+            this.eot = DFA8_eot;
+            this.eof = DFA8_eof;
+            this.min = DFA8_min;
+            this.max = DFA8_max;
+            this.accept = DFA8_accept;
+            this.special = DFA8_special;
+            this.transition = DFA8_transition;
         }
         public String getDescription() {
-            return "3526:27: ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )";
+            return "4147:29: ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )";
         }
     }
-    static final String DFA19_eotS =
-        "\1\uffff\1\34\1\37\1\uffff\2\37\2\uffff\2\37\1\53\3\37\5\uffff\2\34\1\72\1\34\1\uffff\3\34\3\uffff\1\37\2\uffff\1\37\1\101\1\37\2\uffff\1\37\1\104\2\37\2\uffff\1\37\1\110\3\37\10\uffff\1\72\5\uffff\2\37\1\uffff\1\116\1\117\1\uffff\2\37\1\122\1\uffff\5\37\2\uffff\2\37\1\uffff\13\37\1\145\1\146\1\147\3\37\1\153\3\uffff\2\37\1\156\1\uffff\1\37\1\160\1\uffff\1\37\1\uffff\4\37\1\166\1\uffff";
-    static final String DFA19_eofS =
-        "\167\uffff";
-    static final String DFA19_minS =
-        "\1\0\1\75\1\141\1\uffff\1\155\1\146\2\uffff\1\162\1\141\1\76\1\156\1\157\1\141\5\uffff\1\135\1\75\1\56\1\101\1\uffff\2\0\1\52\3\uffff\1\143\2\uffff\1\160\1\60\1\164\2\uffff\1\164\1\60\1\155\1\157\2\uffff\1\144\1\60\1\141\2\160\10\uffff\1\56\5\uffff\1\153\1\157\1\uffff\2\60\1\uffff\1\142\1\153\1\60\1\uffff\1\156\1\154\1\160\1\141\1\162\2\uffff\1\144\1\165\1\uffff\1\163\1\145\1\151\1\147\1\164\1\141\1\160\1\146\1\166\1\156\1\145\3\60\1\157\1\145\1\147\1\60\3\uffff\1\162\1\154\1\60\1\uffff\1\155\1\60\1\uffff\1\141\1\uffff\1\164\1\151\1\157\1\156\1\60\1\uffff";
-    static final String DFA19_maxS =
-        "\1\uffff\1\75\1\141\1\uffff\1\156\1\146\2\uffff\1\165\1\157\1\76\1\163\1\162\1\141\5\uffff\1\135\1\75\1\145\1\172\1\uffff\2\uffff\1\57\3\uffff\1\143\2\uffff\1\160\1\172\1\164\2\uffff\1\164\1\172\1\155\1\157\2\uffff\1\144\1\172\1\141\2\160\10\uffff\1\145\5\uffff\1\153\1\157\1\uffff\2\172\1\uffff\1\142\1\153\1\172\1\uffff\1\156\1\154\1\160\1\141\1\162\2\uffff\1\144\1\165\1\uffff\1\163\1\145\1\151\1\147\1\164\1\141\1\160\1\146\1\166\1\156\1\145\3\172\1\157\1\145\1\147\1\172\3\uffff\1\162\1\154\1\172\1\uffff\1\155\1\172\1\uffff\1\141\1\uffff\1\164\1\151\1\157\1\156\1\172\1\uffff";
-    static final String DFA19_acceptS =
-        "\3\uffff\1\3\2\uffff\1\6\1\7\6\uffff\1\20\1\21\1\22\1\25\1\27\4\uffff\1\34\3\uffff\1\41\1\42\1\1\1\uffff\1\34\1\3\3\uffff\1\6\1\7\4\uffff\1\26\1\13\5\uffff\1\20\1\21\1\22\1\25\1\27\1\30\1\32\1\33\1\uffff\1\35\1\36\1\37\1\40\1\41\2\uffff\1\10\2\uffff\1\15\3\uffff\1\24\5\uffff\1\5\1\11\2\uffff\1\14\22\uffff\1\4\1\12\1\23\3\uffff\1\2\2\uffff\1\17\1\uffff\1\31\5\uffff\1\16";
-    static final String DFA19_specialS =
-        "\1\2\27\uffff\1\1\1\0\135\uffff}>";
-    static final String[] DFA19_transitionS = {
-            "\11\34\2\33\2\34\1\33\22\34\1\33\1\34\1\30\4\34\1\31\1\16\1\17\1\22\1\24\1\20\1\34\1\21\1\32\12\25\1\1\1\3\1\34\1\12\3\34\32\27\1\23\2\34\1\26\1\27\1\34\1\13\1\27\1\5\5\27\1\4\2\27\1\11\1\15\1\27\1\10\1\2\3\27\1\14\6\27\1\6\1\34\1\7\uff82\34",
+    static final String DFA20_eotS =
+        "\1\uffff\1\34\1\37\1\uffff\2\40\2\uffff\1\40\1\53\4\40\5\uffff\2\34\1\72\1\34\1\uffff\3\34\3\uffff\1\40\3\uffff\1\40\1\103\1\40\2\uffff\1\40\1\106\1\110\2\uffff\3\40\1\114\3\40\10\uffff\1\72\5\uffff\2\40\1\uffff\1\122\1\123\1\uffff\1\124\1\uffff\2\40\1\127\1\uffff\5\40\3\uffff\2\40\1\uffff\13\40\1\152\1\153\1\154\3\40\1\160\3\uffff\2\40\1\163\1\uffff\1\40\1\165\1\uffff\1\40\1\uffff\4\40\1\173\1\uffff";
+    static final String DFA20_eofS =
+        "\174\uffff";
+    static final String DFA20_minS =
+        "\1\0\1\75\1\60\1\uffff\1\155\1\146\2\uffff\1\146\1\76\1\141\1\156\1\157\1\141\5\uffff\1\135\1\75\1\56\1\101\1\uffff\2\0\1\52\3\uffff\1\143\3\uffff\1\160\1\60\1\164\2\uffff\1\164\2\60\2\uffff\1\155\1\157\1\144\1\60\1\141\2\160\10\uffff\1\56\5\uffff\1\153\1\157\1\uffff\2\60\1\uffff\1\60\1\uffff\1\142\1\153\1\60\1\uffff\1\156\1\154\1\160\1\141\1\162\3\uffff\1\144\1\165\1\uffff\1\163\1\145\1\151\1\147\1\164\1\141\1\160\1\146\1\166\1\156\1\145\3\60\1\157\1\145\1\147\1\60\3\uffff\1\162\1\154\1\60\1\uffff\1\155\1\60\1\uffff\1\141\1\uffff\1\164\1\151\1\157\1\156\1\60\1\uffff";
+    static final String DFA20_maxS =
+        "\1\uffff\1\75\1\172\1\uffff\1\156\1\146\2\uffff\1\165\1\76\1\157\1\163\1\162\1\141\5\uffff\1\135\1\75\1\145\1\172\1\uffff\2\uffff\1\57\3\uffff\1\143\3\uffff\1\160\1\172\1\164\2\uffff\1\164\2\172\2\uffff\1\155\1\157\1\144\1\172\1\141\2\160\10\uffff\1\145\5\uffff\1\153\1\157\1\uffff\2\172\1\uffff\1\172\1\uffff\1\142\1\153\1\172\1\uffff\1\156\1\154\1\160\1\141\1\162\3\uffff\1\144\1\165\1\uffff\1\163\1\145\1\151\1\147\1\164\1\141\1\160\1\146\1\166\1\156\1\145\3\172\1\157\1\145\1\147\1\172\3\uffff\1\162\1\154\1\172\1\uffff\1\155\1\172\1\uffff\1\141\1\uffff\1\164\1\151\1\157\1\156\1\172\1\uffff";
+    static final String DFA20_acceptS =
+        "\3\uffff\1\3\2\uffff\1\6\1\7\6\uffff\1\22\1\23\1\24\1\27\1\31\4\uffff\1\37\3\uffff\1\44\1\45\1\1\1\uffff\1\12\1\37\1\3\3\uffff\1\6\1\7\3\uffff\1\30\1\13\7\uffff\1\22\1\23\1\24\1\27\1\31\1\32\1\34\1\40\1\uffff\1\36\1\41\1\42\1\43\1\44\2\uffff\1\10\2\uffff\1\16\1\uffff\1\17\3\uffff\1\26\5\uffff\1\5\1\11\1\35\2\uffff\1\15\22\uffff\1\4\1\14\1\25\3\uffff\1\2\2\uffff\1\21\1\uffff\1\33\5\uffff\1\20";
+    static final String DFA20_specialS =
+        "\1\2\27\uffff\1\1\1\0\142\uffff}>";
+    static final String[] DFA20_transitionS = {
+            "\11\34\2\33\2\34\1\33\22\34\1\33\1\34\1\30\4\34\1\31\1\16\1\17\1\22\1\24\1\20\1\34\1\21\1\32\12\25\1\1\1\3\1\34\1\11\3\34\32\27\1\23\2\34\1\26\1\27\1\34\1\13\1\27\1\5\5\27\1\4\2\27\1\12\1\15\1\27\1\10\1\2\3\27\1\14\6\27\1\6\1\34\1\7\uff82\34",
             "\1\35",
-            "\1\36",
+            "\12\40\7\uffff\32\40\4\uffff\1\40\1\uffff\1\36\31\40",
             "",
-            "\1\41\1\42",
-            "\1\43",
+            "\1\42\1\43",
+            "\1\44",
             "",
             "",
-            "\1\47\2\uffff\1\46",
-            "\1\50\15\uffff\1\51",
+            "\1\51\13\uffff\1\50\2\uffff\1\47",
             "\1\52",
-            "\1\54\4\uffff\1\55",
-            "\1\57\2\uffff\1\56",
-            "\1\60",
+            "\1\54\15\uffff\1\55",
+            "\1\56\4\uffff\1\57",
+            "\1\61\2\uffff\1\60",
+            "\1\62",
             "",
             "",
             "",
             "",
             "",
-            "\1\66",
-            "\1\67",
-            "\1\70\1\uffff\12\71\13\uffff\1\70\37\uffff\1\70",
-            "\32\37\4\uffff\1\37\1\uffff\32\37",
+            "\1\70",
+            "\1\71",
+            "\1\74\1\uffff\12\73\13\uffff\1\74\37\uffff\1\74",
+            "\32\40\4\uffff\1\40\1\uffff\32\40",
             "",
-            "\0\73",
-            "\0\73",
-            "\1\74\4\uffff\1\75",
+            "\0\75",
+            "\0\75",
+            "\1\76\4\uffff\1\77",
             "",
             "",
             "",
-            "\1\77",
+            "\1\101",
+            "",
             "",
             "",
-            "\1\100",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
             "\1\102",
+            "\12\40\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40",
+            "\1\104",
             "",
             "",
-            "\1\103",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
             "\1\105",
-            "\1\106",
+            "\12\40\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40",
+            "\12\107\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40",
             "",
             "",
-            "\1\107",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
             "\1\111",
             "\1\112",
             "\1\113",
+            "\12\40\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40",
+            "\1\115",
+            "\1\116",
+            "\1\117",
             "",
             "",
             "",
@@ -1682,191 +1800,194 @@ public class InternalCftLanguageLexer extends Lexer {
             "",
             "",
             "",
-            "\1\70\1\uffff\12\71\13\uffff\1\70\37\uffff\1\70",
-            "",
-            "",
+            "\1\74\1\uffff\12\73\13\uffff\1\74\37\uffff\1\74",
             "",
             "",
             "",
-            "\1\114",
-            "\1\115",
             "",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
             "",
             "\1\120",
             "\1\121",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
             "",
-            "\1\123",
-            "\1\124",
+            "\12\40\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40",
+            "\12\40\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40",
+            "",
+            "\12\107\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40",
+            "",
             "\1\125",
             "\1\126",
-            "\1\127",
-            "",
+            "\12\40\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40",
             "",
             "\1\130",
             "\1\131",
-            "",
             "\1\132",
             "\1\133",
             "\1\134",
+            "",
+            "",
+            "",
             "\1\135",
             "\1\136",
+            "",
             "\1\137",
             "\1\140",
             "\1\141",
             "\1\142",
             "\1\143",
             "\1\144",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
+            "\1\145",
+            "\1\146",
+            "\1\147",
             "\1\150",
             "\1\151",
-            "\1\152",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "",
-            "",
-            "",
-            "\1\154",
+            "\12\40\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40",
+            "\12\40\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40",
+            "\12\40\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40",
             "\1\155",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "",
+            "\1\156",
             "\1\157",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
+            "\12\40\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40",
             "",
-            "\1\161",
             "",
+            "",
+            "\1\161",
             "\1\162",
-            "\1\163",
+            "\12\40\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40",
+            "",
             "\1\164",
-            "\1\165",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
+            "\12\40\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40",
+            "",
+            "\1\166",
+            "",
+            "\1\167",
+            "\1\170",
+            "\1\171",
+            "\1\172",
+            "\12\40\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40",
             ""
     };
 
-    static final short[] DFA19_eot = DFA.unpackEncodedString(DFA19_eotS);
-    static final short[] DFA19_eof = DFA.unpackEncodedString(DFA19_eofS);
-    static final char[] DFA19_min = DFA.unpackEncodedStringToUnsignedChars(DFA19_minS);
-    static final char[] DFA19_max = DFA.unpackEncodedStringToUnsignedChars(DFA19_maxS);
-    static final short[] DFA19_accept = DFA.unpackEncodedString(DFA19_acceptS);
-    static final short[] DFA19_special = DFA.unpackEncodedString(DFA19_specialS);
-    static final short[][] DFA19_transition;
+    static final short[] DFA20_eot = DFA.unpackEncodedString(DFA20_eotS);
+    static final short[] DFA20_eof = DFA.unpackEncodedString(DFA20_eofS);
+    static final char[] DFA20_min = DFA.unpackEncodedStringToUnsignedChars(DFA20_minS);
+    static final char[] DFA20_max = DFA.unpackEncodedStringToUnsignedChars(DFA20_maxS);
+    static final short[] DFA20_accept = DFA.unpackEncodedString(DFA20_acceptS);
+    static final short[] DFA20_special = DFA.unpackEncodedString(DFA20_specialS);
+    static final short[][] DFA20_transition;
 
     static {
-        int numStates = DFA19_transitionS.length;
-        DFA19_transition = new short[numStates][];
+        int numStates = DFA20_transitionS.length;
+        DFA20_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA19_transition[i] = DFA.unpackEncodedString(DFA19_transitionS[i]);
+            DFA20_transition[i] = DFA.unpackEncodedString(DFA20_transitionS[i]);
         }
     }
 
-    class DFA19 extends DFA {
+    class DFA20 extends DFA {
 
-        public DFA19(BaseRecognizer recognizer) {
+        public DFA20(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 19;
-            this.eot = DFA19_eot;
-            this.eof = DFA19_eof;
-            this.min = DFA19_min;
-            this.max = DFA19_max;
-            this.accept = DFA19_accept;
-            this.special = DFA19_special;
-            this.transition = DFA19_transition;
+            this.decisionNumber = 20;
+            this.eot = DFA20_eot;
+            this.eof = DFA20_eof;
+            this.min = DFA20_min;
+            this.max = DFA20_max;
+            this.accept = DFA20_accept;
+            this.special = DFA20_special;
+            this.transition = DFA20_transition;
         }
         public String getDescription() {
-            return "1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | RULE_DOULBE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
+            return "1:1: Tokens : ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | RULE_OF_INT | RULE_T_DOUBLE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             IntStream input = _input;
                 int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA19_25 = input.LA(1);
+                        int LA20_25 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA19_25>='\u0000' && LA19_25<='\uFFFF')) ) {s = 59;}
+                        if ( ((LA20_25>='\u0000' && LA20_25<='\uFFFF')) ) {s = 61;}
 
                         else s = 28;
 
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA19_24 = input.LA(1);
+                        int LA20_24 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA19_24>='\u0000' && LA19_24<='\uFFFF')) ) {s = 59;}
+                        if ( ((LA20_24>='\u0000' && LA20_24<='\uFFFF')) ) {s = 61;}
 
                         else s = 28;
 
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA19_0 = input.LA(1);
+                        int LA20_0 = input.LA(1);
 
                         s = -1;
-                        if ( (LA19_0==':') ) {s = 1;}
+                        if ( (LA20_0==':') ) {s = 1;}
 
-                        else if ( (LA19_0=='p') ) {s = 2;}
+                        else if ( (LA20_0=='p') ) {s = 2;}
 
-                        else if ( (LA19_0==';') ) {s = 3;}
+                        else if ( (LA20_0==';') ) {s = 3;}
 
-                        else if ( (LA19_0=='i') ) {s = 4;}
+                        else if ( (LA20_0=='i') ) {s = 4;}
 
-                        else if ( (LA19_0=='c') ) {s = 5;}
+                        else if ( (LA20_0=='c') ) {s = 5;}
 
-                        else if ( (LA19_0=='{') ) {s = 6;}
+                        else if ( (LA20_0=='{') ) {s = 6;}
 
-                        else if ( (LA19_0=='}') ) {s = 7;}
+                        else if ( (LA20_0=='}') ) {s = 7;}
 
-                        else if ( (LA19_0=='o') ) {s = 8;}
+                        else if ( (LA20_0=='o') ) {s = 8;}
 
-                        else if ( (LA19_0=='l') ) {s = 9;}
+                        else if ( (LA20_0=='=') ) {s = 9;}
 
-                        else if ( (LA19_0=='=') ) {s = 10;}
+                        else if ( (LA20_0=='l') ) {s = 10;}
 
-                        else if ( (LA19_0=='a') ) {s = 11;}
+                        else if ( (LA20_0=='a') ) {s = 11;}
 
-                        else if ( (LA19_0=='t') ) {s = 12;}
+                        else if ( (LA20_0=='t') ) {s = 12;}
 
-                        else if ( (LA19_0=='m') ) {s = 13;}
+                        else if ( (LA20_0=='m') ) {s = 13;}
 
-                        else if ( (LA19_0=='(') ) {s = 14;}
+                        else if ( (LA20_0=='(') ) {s = 14;}
 
-                        else if ( (LA19_0==')') ) {s = 15;}
+                        else if ( (LA20_0==')') ) {s = 15;}
 
-                        else if ( (LA19_0==',') ) {s = 16;}
+                        else if ( (LA20_0==',') ) {s = 16;}
 
-                        else if ( (LA19_0=='.') ) {s = 17;}
+                        else if ( (LA20_0=='.') ) {s = 17;}
 
-                        else if ( (LA19_0=='*') ) {s = 18;}
+                        else if ( (LA20_0=='*') ) {s = 18;}
 
-                        else if ( (LA19_0=='[') ) {s = 19;}
+                        else if ( (LA20_0=='[') ) {s = 19;}
 
-                        else if ( (LA19_0=='+') ) {s = 20;}
+                        else if ( (LA20_0=='+') ) {s = 20;}
 
-                        else if ( ((LA19_0>='0' && LA19_0<='9')) ) {s = 21;}
+                        else if ( ((LA20_0>='0' && LA20_0<='9')) ) {s = 21;}
 
-                        else if ( (LA19_0=='^') ) {s = 22;}
+                        else if ( (LA20_0=='^') ) {s = 22;}
 
-                        else if ( ((LA19_0>='A' && LA19_0<='Z')||LA19_0=='_'||LA19_0=='b'||(LA19_0>='d' && LA19_0<='h')||(LA19_0>='j' && LA19_0<='k')||LA19_0=='n'||(LA19_0>='q' && LA19_0<='s')||(LA19_0>='u' && LA19_0<='z')) ) {s = 23;}
+                        else if ( ((LA20_0>='A' && LA20_0<='Z')||LA20_0=='_'||LA20_0=='b'||(LA20_0>='d' && LA20_0<='h')||(LA20_0>='j' && LA20_0<='k')||LA20_0=='n'||(LA20_0>='q' && LA20_0<='s')||(LA20_0>='u' && LA20_0<='z')) ) {s = 23;}
 
-                        else if ( (LA19_0=='\"') ) {s = 24;}
+                        else if ( (LA20_0=='\"') ) {s = 24;}
 
-                        else if ( (LA19_0=='\'') ) {s = 25;}
+                        else if ( (LA20_0=='\'') ) {s = 25;}
 
-                        else if ( (LA19_0=='/') ) {s = 26;}
+                        else if ( (LA20_0=='/') ) {s = 26;}
 
-                        else if ( ((LA19_0>='\t' && LA19_0<='\n')||LA19_0=='\r'||LA19_0==' ') ) {s = 27;}
+                        else if ( ((LA20_0>='\t' && LA20_0<='\n')||LA20_0=='\r'||LA20_0==' ') ) {s = 27;}
 
-                        else if ( ((LA19_0>='\u0000' && LA19_0<='\b')||(LA19_0>='\u000B' && LA19_0<='\f')||(LA19_0>='\u000E' && LA19_0<='\u001F')||LA19_0=='!'||(LA19_0>='#' && LA19_0<='&')||LA19_0=='-'||LA19_0=='<'||(LA19_0>='>' && LA19_0<='@')||(LA19_0>='\\' && LA19_0<=']')||LA19_0=='`'||LA19_0=='|'||(LA19_0>='~' && LA19_0<='\uFFFF')) ) {s = 28;}
+                        else if ( ((LA20_0>='\u0000' && LA20_0<='\b')||(LA20_0>='\u000B' && LA20_0<='\f')||(LA20_0>='\u000E' && LA20_0<='\u001F')||LA20_0=='!'||(LA20_0>='#' && LA20_0<='&')||LA20_0=='-'||LA20_0=='<'||(LA20_0>='>' && LA20_0<='@')||(LA20_0>='\\' && LA20_0<=']')||LA20_0=='`'||LA20_0=='|'||(LA20_0>='~' && LA20_0<='\uFFFF')) ) {s = 28;}
 
                         if ( s>=0 ) return s;
                         break;
             }
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 19, _s, input);
+                new NoViableAltException(getDescription(), 20, _s, input);
             error(nvae);
             throw nvae;
         }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/contentassist/antlr/internal/InternalCftLanguageParser.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/contentassist/antlr/internal/InternalCftLanguageParser.java
index a12d9fd8..be5e3140 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/contentassist/antlr/internal/InternalCftLanguageParser.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/contentassist/antlr/internal/InternalCftLanguageParser.java
@@ -22,19 +22,21 @@ import java.util.ArrayList;
 @SuppressWarnings("all")
 public class InternalCftLanguageParser extends AbstractInternalContentAssistParser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_DOULBE", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "':='", "'package'", "';'", "'import'", "'cft'", "'{'", "'}'", "'in'", "'out'", "'lambda'", "'='", "'and'", "'or'", "'transformation'", "'mapping'", "'('", "')'", "','", "'lookup'", "'as'", "'.'", "'=>'", "'*'", "'[]'", "'toplevel'", "'+='"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_OF_INT", "RULE_INT", "RULE_T_DOUBLE", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "':='", "'package'", "';'", "'import'", "'cft'", "'{'", "'}'", "'in'", "'out'", "'p'", "'='", "'lambda'", "'and'", "'or'", "'of'", "'transformation'", "'mapping'", "'('", "')'", "','", "'lookup'", "'as'", "'.'", "'=>'", "'*'", "'[]'", "'toplevel'", "'+='"
     };
-    public static final int RULE_STRING=7;
-    public static final int RULE_SL_COMMENT=9;
+    public static final int RULE_STRING=8;
+    public static final int RULE_SL_COMMENT=10;
     public static final int T__19=19;
     public static final int T__15=15;
     public static final int T__37=37;
     public static final int T__16=16;
+    public static final int T__38=38;
     public static final int T__17=17;
+    public static final int T__39=39;
     public static final int T__18=18;
     public static final int T__33=33;
-    public static final int T__12=12;
     public static final int T__34=34;
+    public static final int RULE_T_DOUBLE=7;
     public static final int T__13=13;
     public static final int T__35=35;
     public static final int T__14=14;
@@ -43,20 +45,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
     public static final int T__30=30;
     public static final int T__31=31;
     public static final int T__32=32;
+    public static final int RULE_OF_INT=5;
     public static final int RULE_ID=4;
-    public static final int RULE_WS=10;
-    public static final int RULE_DOULBE=5;
-    public static final int RULE_ANY_OTHER=11;
+    public static final int RULE_WS=11;
+    public static final int RULE_ANY_OTHER=12;
     public static final int T__26=26;
     public static final int T__27=27;
     public static final int T__28=28;
     public static final int RULE_INT=6;
     public static final int T__29=29;
     public static final int T__22=22;
-    public static final int RULE_ML_COMMENT=8;
+    public static final int RULE_ML_COMMENT=9;
     public static final int T__23=23;
     public static final int T__24=24;
     public static final int T__25=25;
+    public static final int T__40=40;
     public static final int T__20=20;
     public static final int T__21=21;
 
@@ -557,12 +560,243 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
     // $ANTLR end "ruleBasicEventDefinition"
 
 
+    // $ANTLR start "entryRuleDistribution"
+    // InternalCftLanguage.g:203:1: entryRuleDistribution : ruleDistribution EOF ;
+    public final void entryRuleDistribution() throws RecognitionException {
+        try {
+            // InternalCftLanguage.g:204:1: ( ruleDistribution EOF )
+            // InternalCftLanguage.g:205:1: ruleDistribution EOF
+            {
+             before(grammarAccess.getDistributionRule()); 
+            pushFollow(FOLLOW_1);
+            ruleDistribution();
+
+            state._fsp--;
+
+             after(grammarAccess.getDistributionRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleDistribution"
+
+
+    // $ANTLR start "ruleDistribution"
+    // InternalCftLanguage.g:212:1: ruleDistribution : ( ( rule__Distribution__Alternatives ) ) ;
+    public final void ruleDistribution() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:216:2: ( ( ( rule__Distribution__Alternatives ) ) )
+            // InternalCftLanguage.g:217:2: ( ( rule__Distribution__Alternatives ) )
+            {
+            // InternalCftLanguage.g:217:2: ( ( rule__Distribution__Alternatives ) )
+            // InternalCftLanguage.g:218:3: ( rule__Distribution__Alternatives )
+            {
+             before(grammarAccess.getDistributionAccess().getAlternatives()); 
+            // InternalCftLanguage.g:219:3: ( rule__Distribution__Alternatives )
+            // InternalCftLanguage.g:219:4: rule__Distribution__Alternatives
+            {
+            pushFollow(FOLLOW_2);
+            rule__Distribution__Alternatives();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getDistributionAccess().getAlternatives()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleDistribution"
+
+
+    // $ANTLR start "entryRuleConstantDistribution"
+    // InternalCftLanguage.g:228:1: entryRuleConstantDistribution : ruleConstantDistribution EOF ;
+    public final void entryRuleConstantDistribution() throws RecognitionException {
+        try {
+            // InternalCftLanguage.g:229:1: ( ruleConstantDistribution EOF )
+            // InternalCftLanguage.g:230:1: ruleConstantDistribution EOF
+            {
+             before(grammarAccess.getConstantDistributionRule()); 
+            pushFollow(FOLLOW_1);
+            ruleConstantDistribution();
+
+            state._fsp--;
+
+             after(grammarAccess.getConstantDistributionRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleConstantDistribution"
+
+
+    // $ANTLR start "ruleConstantDistribution"
+    // InternalCftLanguage.g:237:1: ruleConstantDistribution : ( ( rule__ConstantDistribution__Group__0 ) ) ;
+    public final void ruleConstantDistribution() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:241:2: ( ( ( rule__ConstantDistribution__Group__0 ) ) )
+            // InternalCftLanguage.g:242:2: ( ( rule__ConstantDistribution__Group__0 ) )
+            {
+            // InternalCftLanguage.g:242:2: ( ( rule__ConstantDistribution__Group__0 ) )
+            // InternalCftLanguage.g:243:3: ( rule__ConstantDistribution__Group__0 )
+            {
+             before(grammarAccess.getConstantDistributionAccess().getGroup()); 
+            // InternalCftLanguage.g:244:3: ( rule__ConstantDistribution__Group__0 )
+            // InternalCftLanguage.g:244:4: rule__ConstantDistribution__Group__0
+            {
+            pushFollow(FOLLOW_2);
+            rule__ConstantDistribution__Group__0();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getConstantDistributionAccess().getGroup()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleConstantDistribution"
+
+
+    // $ANTLR start "entryRuleExponentialDistribution"
+    // InternalCftLanguage.g:253:1: entryRuleExponentialDistribution : ruleExponentialDistribution EOF ;
+    public final void entryRuleExponentialDistribution() throws RecognitionException {
+        try {
+            // InternalCftLanguage.g:254:1: ( ruleExponentialDistribution EOF )
+            // InternalCftLanguage.g:255:1: ruleExponentialDistribution EOF
+            {
+             before(grammarAccess.getExponentialDistributionRule()); 
+            pushFollow(FOLLOW_1);
+            ruleExponentialDistribution();
+
+            state._fsp--;
+
+             after(grammarAccess.getExponentialDistributionRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleExponentialDistribution"
+
+
+    // $ANTLR start "ruleExponentialDistribution"
+    // InternalCftLanguage.g:262:1: ruleExponentialDistribution : ( ( rule__ExponentialDistribution__Group__0 ) ) ;
+    public final void ruleExponentialDistribution() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:266:2: ( ( ( rule__ExponentialDistribution__Group__0 ) ) )
+            // InternalCftLanguage.g:267:2: ( ( rule__ExponentialDistribution__Group__0 ) )
+            {
+            // InternalCftLanguage.g:267:2: ( ( rule__ExponentialDistribution__Group__0 ) )
+            // InternalCftLanguage.g:268:3: ( rule__ExponentialDistribution__Group__0 )
+            {
+             before(grammarAccess.getExponentialDistributionAccess().getGroup()); 
+            // InternalCftLanguage.g:269:3: ( rule__ExponentialDistribution__Group__0 )
+            // InternalCftLanguage.g:269:4: rule__ExponentialDistribution__Group__0
+            {
+            pushFollow(FOLLOW_2);
+            rule__ExponentialDistribution__Group__0();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getExponentialDistributionAccess().getGroup()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleExponentialDistribution"
+
+
     // $ANTLR start "entryRuleGateDefinition"
-    // InternalCftLanguage.g:203:1: entryRuleGateDefinition : ruleGateDefinition EOF ;
+    // InternalCftLanguage.g:278:1: entryRuleGateDefinition : ruleGateDefinition EOF ;
     public final void entryRuleGateDefinition() throws RecognitionException {
         try {
-            // InternalCftLanguage.g:204:1: ( ruleGateDefinition EOF )
-            // InternalCftLanguage.g:205:1: ruleGateDefinition EOF
+            // InternalCftLanguage.g:279:1: ( ruleGateDefinition EOF )
+            // InternalCftLanguage.g:280:1: ruleGateDefinition EOF
             {
              before(grammarAccess.getGateDefinitionRule()); 
             pushFollow(FOLLOW_1);
@@ -588,21 +822,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "ruleGateDefinition"
-    // InternalCftLanguage.g:212:1: ruleGateDefinition : ( ( rule__GateDefinition__Alternatives ) ) ;
+    // InternalCftLanguage.g:287:1: ruleGateDefinition : ( ( rule__GateDefinition__Alternatives ) ) ;
     public final void ruleGateDefinition() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:216:2: ( ( ( rule__GateDefinition__Alternatives ) ) )
-            // InternalCftLanguage.g:217:2: ( ( rule__GateDefinition__Alternatives ) )
+            // InternalCftLanguage.g:291:2: ( ( ( rule__GateDefinition__Alternatives ) ) )
+            // InternalCftLanguage.g:292:2: ( ( rule__GateDefinition__Alternatives ) )
             {
-            // InternalCftLanguage.g:217:2: ( ( rule__GateDefinition__Alternatives ) )
-            // InternalCftLanguage.g:218:3: ( rule__GateDefinition__Alternatives )
+            // InternalCftLanguage.g:292:2: ( ( rule__GateDefinition__Alternatives ) )
+            // InternalCftLanguage.g:293:3: ( rule__GateDefinition__Alternatives )
             {
              before(grammarAccess.getGateDefinitionAccess().getAlternatives()); 
-            // InternalCftLanguage.g:219:3: ( rule__GateDefinition__Alternatives )
-            // InternalCftLanguage.g:219:4: rule__GateDefinition__Alternatives
+            // InternalCftLanguage.g:294:3: ( rule__GateDefinition__Alternatives )
+            // InternalCftLanguage.g:294:4: rule__GateDefinition__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__GateDefinition__Alternatives();
@@ -634,20 +868,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
     // $ANTLR end "ruleGateDefinition"
 
 
-    // $ANTLR start "entryRuleAndGate"
-    // InternalCftLanguage.g:228:1: entryRuleAndGate : ruleAndGate EOF ;
-    public final void entryRuleAndGate() throws RecognitionException {
+    // $ANTLR start "entryRuleAndGateDefinition"
+    // InternalCftLanguage.g:303:1: entryRuleAndGateDefinition : ruleAndGateDefinition EOF ;
+    public final void entryRuleAndGateDefinition() throws RecognitionException {
         try {
-            // InternalCftLanguage.g:229:1: ( ruleAndGate EOF )
-            // InternalCftLanguage.g:230:1: ruleAndGate EOF
+            // InternalCftLanguage.g:304:1: ( ruleAndGateDefinition EOF )
+            // InternalCftLanguage.g:305:1: ruleAndGateDefinition EOF
             {
-             before(grammarAccess.getAndGateRule()); 
+             before(grammarAccess.getAndGateDefinitionRule()); 
             pushFollow(FOLLOW_1);
-            ruleAndGate();
+            ruleAndGateDefinition();
 
             state._fsp--;
 
-             after(grammarAccess.getAndGateRule()); 
+             after(grammarAccess.getAndGateDefinitionRule()); 
             match(input,EOF,FOLLOW_2); 
 
             }
@@ -661,35 +895,35 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "entryRuleAndGate"
+    // $ANTLR end "entryRuleAndGateDefinition"
 
 
-    // $ANTLR start "ruleAndGate"
-    // InternalCftLanguage.g:237:1: ruleAndGate : ( ( rule__AndGate__Group__0 ) ) ;
-    public final void ruleAndGate() throws RecognitionException {
+    // $ANTLR start "ruleAndGateDefinition"
+    // InternalCftLanguage.g:312:1: ruleAndGateDefinition : ( ( rule__AndGateDefinition__Group__0 ) ) ;
+    public final void ruleAndGateDefinition() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:241:2: ( ( ( rule__AndGate__Group__0 ) ) )
-            // InternalCftLanguage.g:242:2: ( ( rule__AndGate__Group__0 ) )
+            // InternalCftLanguage.g:316:2: ( ( ( rule__AndGateDefinition__Group__0 ) ) )
+            // InternalCftLanguage.g:317:2: ( ( rule__AndGateDefinition__Group__0 ) )
             {
-            // InternalCftLanguage.g:242:2: ( ( rule__AndGate__Group__0 ) )
-            // InternalCftLanguage.g:243:3: ( rule__AndGate__Group__0 )
+            // InternalCftLanguage.g:317:2: ( ( rule__AndGateDefinition__Group__0 ) )
+            // InternalCftLanguage.g:318:3: ( rule__AndGateDefinition__Group__0 )
             {
-             before(grammarAccess.getAndGateAccess().getGroup()); 
-            // InternalCftLanguage.g:244:3: ( rule__AndGate__Group__0 )
-            // InternalCftLanguage.g:244:4: rule__AndGate__Group__0
+             before(grammarAccess.getAndGateDefinitionAccess().getGroup()); 
+            // InternalCftLanguage.g:319:3: ( rule__AndGateDefinition__Group__0 )
+            // InternalCftLanguage.g:319:4: rule__AndGateDefinition__Group__0
             {
             pushFollow(FOLLOW_2);
-            rule__AndGate__Group__0();
+            rule__AndGateDefinition__Group__0();
 
             state._fsp--;
 
 
             }
 
-             after(grammarAccess.getAndGateAccess().getGroup()); 
+             after(grammarAccess.getAndGateDefinitionAccess().getGroup()); 
 
             }
 
@@ -708,23 +942,23 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "ruleAndGate"
+    // $ANTLR end "ruleAndGateDefinition"
 
 
-    // $ANTLR start "entryRuleOrGate"
-    // InternalCftLanguage.g:253:1: entryRuleOrGate : ruleOrGate EOF ;
-    public final void entryRuleOrGate() throws RecognitionException {
+    // $ANTLR start "entryRuleOrGateDefinition"
+    // InternalCftLanguage.g:328:1: entryRuleOrGateDefinition : ruleOrGateDefinition EOF ;
+    public final void entryRuleOrGateDefinition() throws RecognitionException {
         try {
-            // InternalCftLanguage.g:254:1: ( ruleOrGate EOF )
-            // InternalCftLanguage.g:255:1: ruleOrGate EOF
+            // InternalCftLanguage.g:329:1: ( ruleOrGateDefinition EOF )
+            // InternalCftLanguage.g:330:1: ruleOrGateDefinition EOF
             {
-             before(grammarAccess.getOrGateRule()); 
+             before(grammarAccess.getOrGateDefinitionRule()); 
             pushFollow(FOLLOW_1);
-            ruleOrGate();
+            ruleOrGateDefinition();
 
             state._fsp--;
 
-             after(grammarAccess.getOrGateRule()); 
+             after(grammarAccess.getOrGateDefinitionRule()); 
             match(input,EOF,FOLLOW_2); 
 
             }
@@ -738,35 +972,35 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "entryRuleOrGate"
+    // $ANTLR end "entryRuleOrGateDefinition"
 
 
-    // $ANTLR start "ruleOrGate"
-    // InternalCftLanguage.g:262:1: ruleOrGate : ( ( rule__OrGate__Group__0 ) ) ;
-    public final void ruleOrGate() throws RecognitionException {
+    // $ANTLR start "ruleOrGateDefinition"
+    // InternalCftLanguage.g:337:1: ruleOrGateDefinition : ( ( rule__OrGateDefinition__Group__0 ) ) ;
+    public final void ruleOrGateDefinition() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:266:2: ( ( ( rule__OrGate__Group__0 ) ) )
-            // InternalCftLanguage.g:267:2: ( ( rule__OrGate__Group__0 ) )
+            // InternalCftLanguage.g:341:2: ( ( ( rule__OrGateDefinition__Group__0 ) ) )
+            // InternalCftLanguage.g:342:2: ( ( rule__OrGateDefinition__Group__0 ) )
             {
-            // InternalCftLanguage.g:267:2: ( ( rule__OrGate__Group__0 ) )
-            // InternalCftLanguage.g:268:3: ( rule__OrGate__Group__0 )
+            // InternalCftLanguage.g:342:2: ( ( rule__OrGateDefinition__Group__0 ) )
+            // InternalCftLanguage.g:343:3: ( rule__OrGateDefinition__Group__0 )
             {
-             before(grammarAccess.getOrGateAccess().getGroup()); 
-            // InternalCftLanguage.g:269:3: ( rule__OrGate__Group__0 )
-            // InternalCftLanguage.g:269:4: rule__OrGate__Group__0
+             before(grammarAccess.getOrGateDefinitionAccess().getGroup()); 
+            // InternalCftLanguage.g:344:3: ( rule__OrGateDefinition__Group__0 )
+            // InternalCftLanguage.g:344:4: rule__OrGateDefinition__Group__0
             {
             pushFollow(FOLLOW_2);
-            rule__OrGate__Group__0();
+            rule__OrGateDefinition__Group__0();
 
             state._fsp--;
 
 
             }
 
-             after(grammarAccess.getOrGateAccess().getGroup()); 
+             after(grammarAccess.getOrGateDefinitionAccess().getGroup()); 
 
             }
 
@@ -785,15 +1019,92 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "ruleOrGate"
+    // $ANTLR end "ruleOrGateDefinition"
+
+
+    // $ANTLR start "entryRuleKOfMGateDefinition"
+    // InternalCftLanguage.g:353:1: entryRuleKOfMGateDefinition : ruleKOfMGateDefinition EOF ;
+    public final void entryRuleKOfMGateDefinition() throws RecognitionException {
+        try {
+            // InternalCftLanguage.g:354:1: ( ruleKOfMGateDefinition EOF )
+            // InternalCftLanguage.g:355:1: ruleKOfMGateDefinition EOF
+            {
+             before(grammarAccess.getKOfMGateDefinitionRule()); 
+            pushFollow(FOLLOW_1);
+            ruleKOfMGateDefinition();
+
+            state._fsp--;
+
+             after(grammarAccess.getKOfMGateDefinitionRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleKOfMGateDefinition"
+
+
+    // $ANTLR start "ruleKOfMGateDefinition"
+    // InternalCftLanguage.g:362:1: ruleKOfMGateDefinition : ( ( rule__KOfMGateDefinition__Group__0 ) ) ;
+    public final void ruleKOfMGateDefinition() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:366:2: ( ( ( rule__KOfMGateDefinition__Group__0 ) ) )
+            // InternalCftLanguage.g:367:2: ( ( rule__KOfMGateDefinition__Group__0 ) )
+            {
+            // InternalCftLanguage.g:367:2: ( ( rule__KOfMGateDefinition__Group__0 ) )
+            // InternalCftLanguage.g:368:3: ( rule__KOfMGateDefinition__Group__0 )
+            {
+             before(grammarAccess.getKOfMGateDefinitionAccess().getGroup()); 
+            // InternalCftLanguage.g:369:3: ( rule__KOfMGateDefinition__Group__0 )
+            // InternalCftLanguage.g:369:4: rule__KOfMGateDefinition__Group__0
+            {
+            pushFollow(FOLLOW_2);
+            rule__KOfMGateDefinition__Group__0();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getKOfMGateDefinitionAccess().getGroup()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleKOfMGateDefinition"
 
 
     // $ANTLR start "entryRuleTransformationDefinition"
-    // InternalCftLanguage.g:278:1: entryRuleTransformationDefinition : ruleTransformationDefinition EOF ;
+    // InternalCftLanguage.g:378:1: entryRuleTransformationDefinition : ruleTransformationDefinition EOF ;
     public final void entryRuleTransformationDefinition() throws RecognitionException {
         try {
-            // InternalCftLanguage.g:279:1: ( ruleTransformationDefinition EOF )
-            // InternalCftLanguage.g:280:1: ruleTransformationDefinition EOF
+            // InternalCftLanguage.g:379:1: ( ruleTransformationDefinition EOF )
+            // InternalCftLanguage.g:380:1: ruleTransformationDefinition EOF
             {
              before(grammarAccess.getTransformationDefinitionRule()); 
             pushFollow(FOLLOW_1);
@@ -819,21 +1130,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "ruleTransformationDefinition"
-    // InternalCftLanguage.g:287:1: ruleTransformationDefinition : ( ( rule__TransformationDefinition__Group__0 ) ) ;
+    // InternalCftLanguage.g:387:1: ruleTransformationDefinition : ( ( rule__TransformationDefinition__Group__0 ) ) ;
     public final void ruleTransformationDefinition() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:291:2: ( ( ( rule__TransformationDefinition__Group__0 ) ) )
-            // InternalCftLanguage.g:292:2: ( ( rule__TransformationDefinition__Group__0 ) )
+            // InternalCftLanguage.g:391:2: ( ( ( rule__TransformationDefinition__Group__0 ) ) )
+            // InternalCftLanguage.g:392:2: ( ( rule__TransformationDefinition__Group__0 ) )
             {
-            // InternalCftLanguage.g:292:2: ( ( rule__TransformationDefinition__Group__0 ) )
-            // InternalCftLanguage.g:293:3: ( rule__TransformationDefinition__Group__0 )
+            // InternalCftLanguage.g:392:2: ( ( rule__TransformationDefinition__Group__0 ) )
+            // InternalCftLanguage.g:393:3: ( rule__TransformationDefinition__Group__0 )
             {
              before(grammarAccess.getTransformationDefinitionAccess().getGroup()); 
-            // InternalCftLanguage.g:294:3: ( rule__TransformationDefinition__Group__0 )
-            // InternalCftLanguage.g:294:4: rule__TransformationDefinition__Group__0
+            // InternalCftLanguage.g:394:3: ( rule__TransformationDefinition__Group__0 )
+            // InternalCftLanguage.g:394:4: rule__TransformationDefinition__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TransformationDefinition__Group__0();
@@ -866,11 +1177,11 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "entryRuleMappingDefinition"
-    // InternalCftLanguage.g:303:1: entryRuleMappingDefinition : ruleMappingDefinition EOF ;
+    // InternalCftLanguage.g:403:1: entryRuleMappingDefinition : ruleMappingDefinition EOF ;
     public final void entryRuleMappingDefinition() throws RecognitionException {
         try {
-            // InternalCftLanguage.g:304:1: ( ruleMappingDefinition EOF )
-            // InternalCftLanguage.g:305:1: ruleMappingDefinition EOF
+            // InternalCftLanguage.g:404:1: ( ruleMappingDefinition EOF )
+            // InternalCftLanguage.g:405:1: ruleMappingDefinition EOF
             {
              before(grammarAccess.getMappingDefinitionRule()); 
             pushFollow(FOLLOW_1);
@@ -896,21 +1207,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "ruleMappingDefinition"
-    // InternalCftLanguage.g:312:1: ruleMappingDefinition : ( ( rule__MappingDefinition__Group__0 ) ) ;
+    // InternalCftLanguage.g:412:1: ruleMappingDefinition : ( ( rule__MappingDefinition__Group__0 ) ) ;
     public final void ruleMappingDefinition() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:316:2: ( ( ( rule__MappingDefinition__Group__0 ) ) )
-            // InternalCftLanguage.g:317:2: ( ( rule__MappingDefinition__Group__0 ) )
+            // InternalCftLanguage.g:416:2: ( ( ( rule__MappingDefinition__Group__0 ) ) )
+            // InternalCftLanguage.g:417:2: ( ( rule__MappingDefinition__Group__0 ) )
             {
-            // InternalCftLanguage.g:317:2: ( ( rule__MappingDefinition__Group__0 ) )
-            // InternalCftLanguage.g:318:3: ( rule__MappingDefinition__Group__0 )
+            // InternalCftLanguage.g:417:2: ( ( rule__MappingDefinition__Group__0 ) )
+            // InternalCftLanguage.g:418:3: ( rule__MappingDefinition__Group__0 )
             {
              before(grammarAccess.getMappingDefinitionAccess().getGroup()); 
-            // InternalCftLanguage.g:319:3: ( rule__MappingDefinition__Group__0 )
-            // InternalCftLanguage.g:319:4: rule__MappingDefinition__Group__0
+            // InternalCftLanguage.g:419:3: ( rule__MappingDefinition__Group__0 )
+            // InternalCftLanguage.g:419:4: rule__MappingDefinition__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__MappingDefinition__Group__0();
@@ -943,11 +1254,11 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "entryRuleMappingParameter"
-    // InternalCftLanguage.g:328:1: entryRuleMappingParameter : ruleMappingParameter EOF ;
+    // InternalCftLanguage.g:428:1: entryRuleMappingParameter : ruleMappingParameter EOF ;
     public final void entryRuleMappingParameter() throws RecognitionException {
         try {
-            // InternalCftLanguage.g:329:1: ( ruleMappingParameter EOF )
-            // InternalCftLanguage.g:330:1: ruleMappingParameter EOF
+            // InternalCftLanguage.g:429:1: ( ruleMappingParameter EOF )
+            // InternalCftLanguage.g:430:1: ruleMappingParameter EOF
             {
              before(grammarAccess.getMappingParameterRule()); 
             pushFollow(FOLLOW_1);
@@ -973,21 +1284,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "ruleMappingParameter"
-    // InternalCftLanguage.g:337:1: ruleMappingParameter : ( ( rule__MappingParameter__NameAssignment ) ) ;
+    // InternalCftLanguage.g:437:1: ruleMappingParameter : ( ( rule__MappingParameter__NameAssignment ) ) ;
     public final void ruleMappingParameter() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:341:2: ( ( ( rule__MappingParameter__NameAssignment ) ) )
-            // InternalCftLanguage.g:342:2: ( ( rule__MappingParameter__NameAssignment ) )
+            // InternalCftLanguage.g:441:2: ( ( ( rule__MappingParameter__NameAssignment ) ) )
+            // InternalCftLanguage.g:442:2: ( ( rule__MappingParameter__NameAssignment ) )
             {
-            // InternalCftLanguage.g:342:2: ( ( rule__MappingParameter__NameAssignment ) )
-            // InternalCftLanguage.g:343:3: ( rule__MappingParameter__NameAssignment )
+            // InternalCftLanguage.g:442:2: ( ( rule__MappingParameter__NameAssignment ) )
+            // InternalCftLanguage.g:443:3: ( rule__MappingParameter__NameAssignment )
             {
              before(grammarAccess.getMappingParameterAccess().getNameAssignment()); 
-            // InternalCftLanguage.g:344:3: ( rule__MappingParameter__NameAssignment )
-            // InternalCftLanguage.g:344:4: rule__MappingParameter__NameAssignment
+            // InternalCftLanguage.g:444:3: ( rule__MappingParameter__NameAssignment )
+            // InternalCftLanguage.g:444:4: rule__MappingParameter__NameAssignment
             {
             pushFollow(FOLLOW_2);
             rule__MappingParameter__NameAssignment();
@@ -1020,11 +1331,11 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "entryRuleLookupDefinition"
-    // InternalCftLanguage.g:353:1: entryRuleLookupDefinition : ruleLookupDefinition EOF ;
+    // InternalCftLanguage.g:453:1: entryRuleLookupDefinition : ruleLookupDefinition EOF ;
     public final void entryRuleLookupDefinition() throws RecognitionException {
         try {
-            // InternalCftLanguage.g:354:1: ( ruleLookupDefinition EOF )
-            // InternalCftLanguage.g:355:1: ruleLookupDefinition EOF
+            // InternalCftLanguage.g:454:1: ( ruleLookupDefinition EOF )
+            // InternalCftLanguage.g:455:1: ruleLookupDefinition EOF
             {
              before(grammarAccess.getLookupDefinitionRule()); 
             pushFollow(FOLLOW_1);
@@ -1050,21 +1361,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "ruleLookupDefinition"
-    // InternalCftLanguage.g:362:1: ruleLookupDefinition : ( ( rule__LookupDefinition__Group__0 ) ) ;
+    // InternalCftLanguage.g:462:1: ruleLookupDefinition : ( ( rule__LookupDefinition__Group__0 ) ) ;
     public final void ruleLookupDefinition() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:366:2: ( ( ( rule__LookupDefinition__Group__0 ) ) )
-            // InternalCftLanguage.g:367:2: ( ( rule__LookupDefinition__Group__0 ) )
+            // InternalCftLanguage.g:466:2: ( ( ( rule__LookupDefinition__Group__0 ) ) )
+            // InternalCftLanguage.g:467:2: ( ( rule__LookupDefinition__Group__0 ) )
             {
-            // InternalCftLanguage.g:367:2: ( ( rule__LookupDefinition__Group__0 ) )
-            // InternalCftLanguage.g:368:3: ( rule__LookupDefinition__Group__0 )
+            // InternalCftLanguage.g:467:2: ( ( rule__LookupDefinition__Group__0 ) )
+            // InternalCftLanguage.g:468:3: ( rule__LookupDefinition__Group__0 )
             {
              before(grammarAccess.getLookupDefinitionAccess().getGroup()); 
-            // InternalCftLanguage.g:369:3: ( rule__LookupDefinition__Group__0 )
-            // InternalCftLanguage.g:369:4: rule__LookupDefinition__Group__0
+            // InternalCftLanguage.g:469:3: ( rule__LookupDefinition__Group__0 )
+            // InternalCftLanguage.g:469:4: rule__LookupDefinition__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__LookupDefinition__Group__0();
@@ -1097,11 +1408,11 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "entryRuleAssignment"
-    // InternalCftLanguage.g:378:1: entryRuleAssignment : ruleAssignment EOF ;
+    // InternalCftLanguage.g:478:1: entryRuleAssignment : ruleAssignment EOF ;
     public final void entryRuleAssignment() throws RecognitionException {
         try {
-            // InternalCftLanguage.g:379:1: ( ruleAssignment EOF )
-            // InternalCftLanguage.g:380:1: ruleAssignment EOF
+            // InternalCftLanguage.g:479:1: ( ruleAssignment EOF )
+            // InternalCftLanguage.g:480:1: ruleAssignment EOF
             {
              before(grammarAccess.getAssignmentRule()); 
             pushFollow(FOLLOW_1);
@@ -1127,21 +1438,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "ruleAssignment"
-    // InternalCftLanguage.g:387:1: ruleAssignment : ( ( rule__Assignment__Group__0 ) ) ;
+    // InternalCftLanguage.g:487:1: ruleAssignment : ( ( rule__Assignment__Group__0 ) ) ;
     public final void ruleAssignment() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:391:2: ( ( ( rule__Assignment__Group__0 ) ) )
-            // InternalCftLanguage.g:392:2: ( ( rule__Assignment__Group__0 ) )
+            // InternalCftLanguage.g:491:2: ( ( ( rule__Assignment__Group__0 ) ) )
+            // InternalCftLanguage.g:492:2: ( ( rule__Assignment__Group__0 ) )
             {
-            // InternalCftLanguage.g:392:2: ( ( rule__Assignment__Group__0 ) )
-            // InternalCftLanguage.g:393:3: ( rule__Assignment__Group__0 )
+            // InternalCftLanguage.g:492:2: ( ( rule__Assignment__Group__0 ) )
+            // InternalCftLanguage.g:493:3: ( rule__Assignment__Group__0 )
             {
              before(grammarAccess.getAssignmentAccess().getGroup()); 
-            // InternalCftLanguage.g:394:3: ( rule__Assignment__Group__0 )
-            // InternalCftLanguage.g:394:4: rule__Assignment__Group__0
+            // InternalCftLanguage.g:494:3: ( rule__Assignment__Group__0 )
+            // InternalCftLanguage.g:494:4: rule__Assignment__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__Assignment__Group__0();
@@ -1174,11 +1485,11 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "entryRuleEventReference"
-    // InternalCftLanguage.g:403:1: entryRuleEventReference : ruleEventReference EOF ;
+    // InternalCftLanguage.g:503:1: entryRuleEventReference : ruleEventReference EOF ;
     public final void entryRuleEventReference() throws RecognitionException {
         try {
-            // InternalCftLanguage.g:404:1: ( ruleEventReference EOF )
-            // InternalCftLanguage.g:405:1: ruleEventReference EOF
+            // InternalCftLanguage.g:504:1: ( ruleEventReference EOF )
+            // InternalCftLanguage.g:505:1: ruleEventReference EOF
             {
              before(grammarAccess.getEventReferenceRule()); 
             pushFollow(FOLLOW_1);
@@ -1204,21 +1515,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "ruleEventReference"
-    // InternalCftLanguage.g:412:1: ruleEventReference : ( ( rule__EventReference__Group__0 ) ) ;
+    // InternalCftLanguage.g:512:1: ruleEventReference : ( ( rule__EventReference__Group__0 ) ) ;
     public final void ruleEventReference() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:416:2: ( ( ( rule__EventReference__Group__0 ) ) )
-            // InternalCftLanguage.g:417:2: ( ( rule__EventReference__Group__0 ) )
+            // InternalCftLanguage.g:516:2: ( ( ( rule__EventReference__Group__0 ) ) )
+            // InternalCftLanguage.g:517:2: ( ( rule__EventReference__Group__0 ) )
             {
-            // InternalCftLanguage.g:417:2: ( ( rule__EventReference__Group__0 ) )
-            // InternalCftLanguage.g:418:3: ( rule__EventReference__Group__0 )
+            // InternalCftLanguage.g:517:2: ( ( rule__EventReference__Group__0 ) )
+            // InternalCftLanguage.g:518:3: ( rule__EventReference__Group__0 )
             {
              before(grammarAccess.getEventReferenceAccess().getGroup()); 
-            // InternalCftLanguage.g:419:3: ( rule__EventReference__Group__0 )
-            // InternalCftLanguage.g:419:4: rule__EventReference__Group__0
+            // InternalCftLanguage.g:519:3: ( rule__EventReference__Group__0 )
+            // InternalCftLanguage.g:519:4: rule__EventReference__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__EventReference__Group__0();
@@ -1251,11 +1562,11 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "entryRuleComponentInstance"
-    // InternalCftLanguage.g:428:1: entryRuleComponentInstance : ruleComponentInstance EOF ;
+    // InternalCftLanguage.g:528:1: entryRuleComponentInstance : ruleComponentInstance EOF ;
     public final void entryRuleComponentInstance() throws RecognitionException {
         try {
-            // InternalCftLanguage.g:429:1: ( ruleComponentInstance EOF )
-            // InternalCftLanguage.g:430:1: ruleComponentInstance EOF
+            // InternalCftLanguage.g:529:1: ( ruleComponentInstance EOF )
+            // InternalCftLanguage.g:530:1: ruleComponentInstance EOF
             {
              before(grammarAccess.getComponentInstanceRule()); 
             pushFollow(FOLLOW_1);
@@ -1281,21 +1592,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "ruleComponentInstance"
-    // InternalCftLanguage.g:437:1: ruleComponentInstance : ( ( rule__ComponentInstance__Group__0 ) ) ;
+    // InternalCftLanguage.g:537:1: ruleComponentInstance : ( ( rule__ComponentInstance__Group__0 ) ) ;
     public final void ruleComponentInstance() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:441:2: ( ( ( rule__ComponentInstance__Group__0 ) ) )
-            // InternalCftLanguage.g:442:2: ( ( rule__ComponentInstance__Group__0 ) )
+            // InternalCftLanguage.g:541:2: ( ( ( rule__ComponentInstance__Group__0 ) ) )
+            // InternalCftLanguage.g:542:2: ( ( rule__ComponentInstance__Group__0 ) )
             {
-            // InternalCftLanguage.g:442:2: ( ( rule__ComponentInstance__Group__0 ) )
-            // InternalCftLanguage.g:443:3: ( rule__ComponentInstance__Group__0 )
+            // InternalCftLanguage.g:542:2: ( ( rule__ComponentInstance__Group__0 ) )
+            // InternalCftLanguage.g:543:3: ( rule__ComponentInstance__Group__0 )
             {
              before(grammarAccess.getComponentInstanceAccess().getGroup()); 
-            // InternalCftLanguage.g:444:3: ( rule__ComponentInstance__Group__0 )
-            // InternalCftLanguage.g:444:4: rule__ComponentInstance__Group__0
+            // InternalCftLanguage.g:544:3: ( rule__ComponentInstance__Group__0 )
+            // InternalCftLanguage.g:544:4: rule__ComponentInstance__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__ComponentInstance__Group__0();
@@ -1328,11 +1639,11 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "entryRuleQualifiedName"
-    // InternalCftLanguage.g:453:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
+    // InternalCftLanguage.g:553:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
     public final void entryRuleQualifiedName() throws RecognitionException {
         try {
-            // InternalCftLanguage.g:454:1: ( ruleQualifiedName EOF )
-            // InternalCftLanguage.g:455:1: ruleQualifiedName EOF
+            // InternalCftLanguage.g:554:1: ( ruleQualifiedName EOF )
+            // InternalCftLanguage.g:555:1: ruleQualifiedName EOF
             {
              before(grammarAccess.getQualifiedNameRule()); 
             pushFollow(FOLLOW_1);
@@ -1358,21 +1669,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "ruleQualifiedName"
-    // InternalCftLanguage.g:462:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
+    // InternalCftLanguage.g:562:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
     public final void ruleQualifiedName() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:466:2: ( ( ( rule__QualifiedName__Group__0 ) ) )
-            // InternalCftLanguage.g:467:2: ( ( rule__QualifiedName__Group__0 ) )
+            // InternalCftLanguage.g:566:2: ( ( ( rule__QualifiedName__Group__0 ) ) )
+            // InternalCftLanguage.g:567:2: ( ( rule__QualifiedName__Group__0 ) )
             {
-            // InternalCftLanguage.g:467:2: ( ( rule__QualifiedName__Group__0 ) )
-            // InternalCftLanguage.g:468:3: ( rule__QualifiedName__Group__0 )
+            // InternalCftLanguage.g:567:2: ( ( rule__QualifiedName__Group__0 ) )
+            // InternalCftLanguage.g:568:3: ( rule__QualifiedName__Group__0 )
             {
              before(grammarAccess.getQualifiedNameAccess().getGroup()); 
-            // InternalCftLanguage.g:469:3: ( rule__QualifiedName__Group__0 )
-            // InternalCftLanguage.g:469:4: rule__QualifiedName__Group__0
+            // InternalCftLanguage.g:569:3: ( rule__QualifiedName__Group__0 )
+            // InternalCftLanguage.g:569:4: rule__QualifiedName__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedName__Group__0();
@@ -1405,11 +1716,11 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "entryRuleQualifiedNameWithWildcard"
-    // InternalCftLanguage.g:478:1: entryRuleQualifiedNameWithWildcard : ruleQualifiedNameWithWildcard EOF ;
+    // InternalCftLanguage.g:578:1: entryRuleQualifiedNameWithWildcard : ruleQualifiedNameWithWildcard EOF ;
     public final void entryRuleQualifiedNameWithWildcard() throws RecognitionException {
         try {
-            // InternalCftLanguage.g:479:1: ( ruleQualifiedNameWithWildcard EOF )
-            // InternalCftLanguage.g:480:1: ruleQualifiedNameWithWildcard EOF
+            // InternalCftLanguage.g:579:1: ( ruleQualifiedNameWithWildcard EOF )
+            // InternalCftLanguage.g:580:1: ruleQualifiedNameWithWildcard EOF
             {
              before(grammarAccess.getQualifiedNameWithWildcardRule()); 
             pushFollow(FOLLOW_1);
@@ -1435,21 +1746,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "ruleQualifiedNameWithWildcard"
-    // InternalCftLanguage.g:487:1: ruleQualifiedNameWithWildcard : ( ( rule__QualifiedNameWithWildcard__Group__0 ) ) ;
+    // InternalCftLanguage.g:587:1: ruleQualifiedNameWithWildcard : ( ( rule__QualifiedNameWithWildcard__Group__0 ) ) ;
     public final void ruleQualifiedNameWithWildcard() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:491:2: ( ( ( rule__QualifiedNameWithWildcard__Group__0 ) ) )
-            // InternalCftLanguage.g:492:2: ( ( rule__QualifiedNameWithWildcard__Group__0 ) )
+            // InternalCftLanguage.g:591:2: ( ( ( rule__QualifiedNameWithWildcard__Group__0 ) ) )
+            // InternalCftLanguage.g:592:2: ( ( rule__QualifiedNameWithWildcard__Group__0 ) )
             {
-            // InternalCftLanguage.g:492:2: ( ( rule__QualifiedNameWithWildcard__Group__0 ) )
-            // InternalCftLanguage.g:493:3: ( rule__QualifiedNameWithWildcard__Group__0 )
+            // InternalCftLanguage.g:592:2: ( ( rule__QualifiedNameWithWildcard__Group__0 ) )
+            // InternalCftLanguage.g:593:3: ( rule__QualifiedNameWithWildcard__Group__0 )
             {
              before(grammarAccess.getQualifiedNameWithWildcardAccess().getGroup()); 
-            // InternalCftLanguage.g:494:3: ( rule__QualifiedNameWithWildcard__Group__0 )
-            // InternalCftLanguage.g:494:4: rule__QualifiedNameWithWildcard__Group__0
+            // InternalCftLanguage.g:594:3: ( rule__QualifiedNameWithWildcard__Group__0 )
+            // InternalCftLanguage.g:594:4: rule__QualifiedNameWithWildcard__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedNameWithWildcard__Group__0();
@@ -1481,21 +1792,175 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
     // $ANTLR end "ruleQualifiedNameWithWildcard"
 
 
+    // $ANTLR start "entryRuleValidId"
+    // InternalCftLanguage.g:603:1: entryRuleValidId : ruleValidId EOF ;
+    public final void entryRuleValidId() throws RecognitionException {
+        try {
+            // InternalCftLanguage.g:604:1: ( ruleValidId EOF )
+            // InternalCftLanguage.g:605:1: ruleValidId EOF
+            {
+             before(grammarAccess.getValidIdRule()); 
+            pushFollow(FOLLOW_1);
+            ruleValidId();
+
+            state._fsp--;
+
+             after(grammarAccess.getValidIdRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleValidId"
+
+
+    // $ANTLR start "ruleValidId"
+    // InternalCftLanguage.g:612:1: ruleValidId : ( ( rule__ValidId__Alternatives ) ) ;
+    public final void ruleValidId() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:616:2: ( ( ( rule__ValidId__Alternatives ) ) )
+            // InternalCftLanguage.g:617:2: ( ( rule__ValidId__Alternatives ) )
+            {
+            // InternalCftLanguage.g:617:2: ( ( rule__ValidId__Alternatives ) )
+            // InternalCftLanguage.g:618:3: ( rule__ValidId__Alternatives )
+            {
+             before(grammarAccess.getValidIdAccess().getAlternatives()); 
+            // InternalCftLanguage.g:619:3: ( rule__ValidId__Alternatives )
+            // InternalCftLanguage.g:619:4: rule__ValidId__Alternatives
+            {
+            pushFollow(FOLLOW_2);
+            rule__ValidId__Alternatives();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getValidIdAccess().getAlternatives()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleValidId"
+
+
+    // $ANTLR start "entryRuleDouble"
+    // InternalCftLanguage.g:628:1: entryRuleDouble : ruleDouble EOF ;
+    public final void entryRuleDouble() throws RecognitionException {
+        try {
+            // InternalCftLanguage.g:629:1: ( ruleDouble EOF )
+            // InternalCftLanguage.g:630:1: ruleDouble EOF
+            {
+             before(grammarAccess.getDoubleRule()); 
+            pushFollow(FOLLOW_1);
+            ruleDouble();
+
+            state._fsp--;
+
+             after(grammarAccess.getDoubleRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleDouble"
+
+
+    // $ANTLR start "ruleDouble"
+    // InternalCftLanguage.g:637:1: ruleDouble : ( ( rule__Double__Alternatives ) ) ;
+    public final void ruleDouble() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:641:2: ( ( ( rule__Double__Alternatives ) ) )
+            // InternalCftLanguage.g:642:2: ( ( rule__Double__Alternatives ) )
+            {
+            // InternalCftLanguage.g:642:2: ( ( rule__Double__Alternatives ) )
+            // InternalCftLanguage.g:643:3: ( rule__Double__Alternatives )
+            {
+             before(grammarAccess.getDoubleAccess().getAlternatives()); 
+            // InternalCftLanguage.g:644:3: ( rule__Double__Alternatives )
+            // InternalCftLanguage.g:644:4: rule__Double__Alternatives
+            {
+            pushFollow(FOLLOW_2);
+            rule__Double__Alternatives();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getDoubleAccess().getAlternatives()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleDouble"
+
+
     // $ANTLR start "rule__CftModel__Alternatives_4"
-    // InternalCftLanguage.g:502:1: rule__CftModel__Alternatives_4 : ( ( ( rule__CftModel__ComponentDefinitionsAssignment_4_0 ) ) | ( ( rule__CftModel__TransformationDefinitionsAssignment_4_1 ) ) );
+    // InternalCftLanguage.g:652:1: rule__CftModel__Alternatives_4 : ( ( ( rule__CftModel__ComponentDefinitionsAssignment_4_0 ) ) | ( ( rule__CftModel__TransformationDefinitionsAssignment_4_1 ) ) );
     public final void rule__CftModel__Alternatives_4() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:506:1: ( ( ( rule__CftModel__ComponentDefinitionsAssignment_4_0 ) ) | ( ( rule__CftModel__TransformationDefinitionsAssignment_4_1 ) ) )
+            // InternalCftLanguage.g:656:1: ( ( ( rule__CftModel__ComponentDefinitionsAssignment_4_0 ) ) | ( ( rule__CftModel__TransformationDefinitionsAssignment_4_1 ) ) )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
-            if ( (LA1_0==16) ) {
+            if ( (LA1_0==17) ) {
                 alt1=1;
             }
-            else if ( (LA1_0==25) ) {
+            else if ( (LA1_0==28) ) {
                 alt1=2;
             }
             else {
@@ -1506,14 +1971,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
             }
             switch (alt1) {
                 case 1 :
-                    // InternalCftLanguage.g:507:2: ( ( rule__CftModel__ComponentDefinitionsAssignment_4_0 ) )
+                    // InternalCftLanguage.g:657:2: ( ( rule__CftModel__ComponentDefinitionsAssignment_4_0 ) )
                     {
-                    // InternalCftLanguage.g:507:2: ( ( rule__CftModel__ComponentDefinitionsAssignment_4_0 ) )
-                    // InternalCftLanguage.g:508:3: ( rule__CftModel__ComponentDefinitionsAssignment_4_0 )
+                    // InternalCftLanguage.g:657:2: ( ( rule__CftModel__ComponentDefinitionsAssignment_4_0 ) )
+                    // InternalCftLanguage.g:658:3: ( rule__CftModel__ComponentDefinitionsAssignment_4_0 )
                     {
                      before(grammarAccess.getCftModelAccess().getComponentDefinitionsAssignment_4_0()); 
-                    // InternalCftLanguage.g:509:3: ( rule__CftModel__ComponentDefinitionsAssignment_4_0 )
-                    // InternalCftLanguage.g:509:4: rule__CftModel__ComponentDefinitionsAssignment_4_0
+                    // InternalCftLanguage.g:659:3: ( rule__CftModel__ComponentDefinitionsAssignment_4_0 )
+                    // InternalCftLanguage.g:659:4: rule__CftModel__ComponentDefinitionsAssignment_4_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__CftModel__ComponentDefinitionsAssignment_4_0();
@@ -1531,14 +1996,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
                     }
                     break;
                 case 2 :
-                    // InternalCftLanguage.g:513:2: ( ( rule__CftModel__TransformationDefinitionsAssignment_4_1 ) )
+                    // InternalCftLanguage.g:663:2: ( ( rule__CftModel__TransformationDefinitionsAssignment_4_1 ) )
                     {
-                    // InternalCftLanguage.g:513:2: ( ( rule__CftModel__TransformationDefinitionsAssignment_4_1 ) )
-                    // InternalCftLanguage.g:514:3: ( rule__CftModel__TransformationDefinitionsAssignment_4_1 )
+                    // InternalCftLanguage.g:663:2: ( ( rule__CftModel__TransformationDefinitionsAssignment_4_1 ) )
+                    // InternalCftLanguage.g:664:3: ( rule__CftModel__TransformationDefinitionsAssignment_4_1 )
                     {
                      before(grammarAccess.getCftModelAccess().getTransformationDefinitionsAssignment_4_1()); 
-                    // InternalCftLanguage.g:515:3: ( rule__CftModel__TransformationDefinitionsAssignment_4_1 )
-                    // InternalCftLanguage.g:515:4: rule__CftModel__TransformationDefinitionsAssignment_4_1
+                    // InternalCftLanguage.g:665:3: ( rule__CftModel__TransformationDefinitionsAssignment_4_1 )
+                    // InternalCftLanguage.g:665:4: rule__CftModel__TransformationDefinitionsAssignment_4_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__CftModel__TransformationDefinitionsAssignment_4_1();
@@ -1573,28 +2038,44 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__EventDefinition__Alternatives"
-    // InternalCftLanguage.g:523:1: rule__EventDefinition__Alternatives : ( ( ruleBasicEventDefinition ) | ( ruleGateDefinition ) );
+    // InternalCftLanguage.g:673:1: rule__EventDefinition__Alternatives : ( ( ruleBasicEventDefinition ) | ( ruleGateDefinition ) );
     public final void rule__EventDefinition__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:527:1: ( ( ruleBasicEventDefinition ) | ( ruleGateDefinition ) )
+            // InternalCftLanguage.g:677:1: ( ( ruleBasicEventDefinition ) | ( ruleGateDefinition ) )
             int alt2=2;
             int LA2_0 = input.LA(1);
 
             if ( (LA2_0==RULE_ID) ) {
                 int LA2_1 = input.LA(2);
 
-                if ( (LA2_1==21) ) {
+                if ( (LA2_1==RULE_INT||(LA2_1>=25 && LA2_1<=26)) ) {
+                    alt2=2;
+                }
+                else if ( (LA2_1==22||LA2_1==24) ) {
                     alt2=1;
                 }
-                else if ( ((LA2_1>=23 && LA2_1<=24)) ) {
+                else {
+                    NoViableAltException nvae =
+                        new NoViableAltException("", 2, 1, input);
+
+                    throw nvae;
+                }
+            }
+            else if ( (LA2_0==RULE_OF_INT) ) {
+                int LA2_2 = input.LA(2);
+
+                if ( (LA2_2==22||LA2_2==24) ) {
+                    alt2=1;
+                }
+                else if ( (LA2_2==RULE_INT||(LA2_2>=25 && LA2_2<=26)) ) {
                     alt2=2;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("", 2, 1, input);
+                        new NoViableAltException("", 2, 2, input);
 
                     throw nvae;
                 }
@@ -1607,10 +2088,10 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
             }
             switch (alt2) {
                 case 1 :
-                    // InternalCftLanguage.g:528:2: ( ruleBasicEventDefinition )
+                    // InternalCftLanguage.g:678:2: ( ruleBasicEventDefinition )
                     {
-                    // InternalCftLanguage.g:528:2: ( ruleBasicEventDefinition )
-                    // InternalCftLanguage.g:529:3: ruleBasicEventDefinition
+                    // InternalCftLanguage.g:678:2: ( ruleBasicEventDefinition )
+                    // InternalCftLanguage.g:679:3: ruleBasicEventDefinition
                     {
                      before(grammarAccess.getEventDefinitionAccess().getBasicEventDefinitionParserRuleCall_0()); 
                     pushFollow(FOLLOW_2);
@@ -1626,10 +2107,10 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
                     }
                     break;
                 case 2 :
-                    // InternalCftLanguage.g:534:2: ( ruleGateDefinition )
+                    // InternalCftLanguage.g:684:2: ( ruleGateDefinition )
                     {
-                    // InternalCftLanguage.g:534:2: ( ruleGateDefinition )
-                    // InternalCftLanguage.g:535:3: ruleGateDefinition
+                    // InternalCftLanguage.g:684:2: ( ruleGateDefinition )
+                    // InternalCftLanguage.g:685:3: ruleGateDefinition
                     {
                      before(grammarAccess.getEventDefinitionAccess().getGateDefinitionParserRuleCall_1()); 
                     pushFollow(FOLLOW_2);
@@ -1661,53 +2142,166 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
     // $ANTLR end "rule__EventDefinition__Alternatives"
 
 
-    // $ANTLR start "rule__GateDefinition__Alternatives"
-    // InternalCftLanguage.g:544:1: rule__GateDefinition__Alternatives : ( ( ruleAndGate ) | ( ruleOrGate ) );
-    public final void rule__GateDefinition__Alternatives() throws RecognitionException {
+    // $ANTLR start "rule__Distribution__Alternatives"
+    // InternalCftLanguage.g:694:1: rule__Distribution__Alternatives : ( ( ruleConstantDistribution ) | ( ruleExponentialDistribution ) );
+    public final void rule__Distribution__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:548:1: ( ( ruleAndGate ) | ( ruleOrGate ) )
+            // InternalCftLanguage.g:698:1: ( ( ruleConstantDistribution ) | ( ruleExponentialDistribution ) )
             int alt3=2;
             int LA3_0 = input.LA(1);
 
-            if ( (LA3_0==RULE_ID) ) {
-                int LA3_1 = input.LA(2);
+            if ( (LA3_0==22) ) {
+                alt3=1;
+            }
+            else if ( (LA3_0==24) ) {
+                alt3=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 3, 0, input);
+
+                throw nvae;
+            }
+            switch (alt3) {
+                case 1 :
+                    // InternalCftLanguage.g:699:2: ( ruleConstantDistribution )
+                    {
+                    // InternalCftLanguage.g:699:2: ( ruleConstantDistribution )
+                    // InternalCftLanguage.g:700:3: ruleConstantDistribution
+                    {
+                     before(grammarAccess.getDistributionAccess().getConstantDistributionParserRuleCall_0()); 
+                    pushFollow(FOLLOW_2);
+                    ruleConstantDistribution();
+
+                    state._fsp--;
 
-                if ( (LA3_1==23) ) {
-                    alt3=1;
-                }
-                else if ( (LA3_1==24) ) {
-                    alt3=2;
+                     after(grammarAccess.getDistributionAccess().getConstantDistributionParserRuleCall_0()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalCftLanguage.g:705:2: ( ruleExponentialDistribution )
+                    {
+                    // InternalCftLanguage.g:705:2: ( ruleExponentialDistribution )
+                    // InternalCftLanguage.g:706:3: ruleExponentialDistribution
+                    {
+                     before(grammarAccess.getDistributionAccess().getExponentialDistributionParserRuleCall_1()); 
+                    pushFollow(FOLLOW_2);
+                    ruleExponentialDistribution();
+
+                    state._fsp--;
+
+                     after(grammarAccess.getDistributionAccess().getExponentialDistributionParserRuleCall_1()); 
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Distribution__Alternatives"
+
+
+    // $ANTLR start "rule__GateDefinition__Alternatives"
+    // InternalCftLanguage.g:715:1: rule__GateDefinition__Alternatives : ( ( ruleAndGateDefinition ) | ( ruleOrGateDefinition ) | ( ruleKOfMGateDefinition ) );
+    public final void rule__GateDefinition__Alternatives() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:719:1: ( ( ruleAndGateDefinition ) | ( ruleOrGateDefinition ) | ( ruleKOfMGateDefinition ) )
+            int alt4=3;
+            int LA4_0 = input.LA(1);
+
+            if ( (LA4_0==RULE_ID) ) {
+                switch ( input.LA(2) ) {
+                case 26:
+                    {
+                    alt4=2;
+                    }
+                    break;
+                case RULE_INT:
+                    {
+                    alt4=3;
+                    }
+                    break;
+                case 25:
+                    {
+                    alt4=1;
+                    }
+                    break;
+                default:
+                    NoViableAltException nvae =
+                        new NoViableAltException("", 4, 1, input);
+
+                    throw nvae;
                 }
-                else {
+
+            }
+            else if ( (LA4_0==RULE_OF_INT) ) {
+                switch ( input.LA(2) ) {
+                case RULE_INT:
+                    {
+                    alt4=3;
+                    }
+                    break;
+                case 25:
+                    {
+                    alt4=1;
+                    }
+                    break;
+                case 26:
+                    {
+                    alt4=2;
+                    }
+                    break;
+                default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 3, 1, input);
+                        new NoViableAltException("", 4, 2, input);
 
                     throw nvae;
                 }
+
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 3, 0, input);
+                    new NoViableAltException("", 4, 0, input);
 
                 throw nvae;
             }
-            switch (alt3) {
+            switch (alt4) {
                 case 1 :
-                    // InternalCftLanguage.g:549:2: ( ruleAndGate )
+                    // InternalCftLanguage.g:720:2: ( ruleAndGateDefinition )
                     {
-                    // InternalCftLanguage.g:549:2: ( ruleAndGate )
-                    // InternalCftLanguage.g:550:3: ruleAndGate
+                    // InternalCftLanguage.g:720:2: ( ruleAndGateDefinition )
+                    // InternalCftLanguage.g:721:3: ruleAndGateDefinition
                     {
-                     before(grammarAccess.getGateDefinitionAccess().getAndGateParserRuleCall_0()); 
+                     before(grammarAccess.getGateDefinitionAccess().getAndGateDefinitionParserRuleCall_0()); 
                     pushFollow(FOLLOW_2);
-                    ruleAndGate();
+                    ruleAndGateDefinition();
 
                     state._fsp--;
 
-                     after(grammarAccess.getGateDefinitionAccess().getAndGateParserRuleCall_0()); 
+                     after(grammarAccess.getGateDefinitionAccess().getAndGateDefinitionParserRuleCall_0()); 
 
                     }
 
@@ -1715,18 +2309,37 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
                     }
                     break;
                 case 2 :
-                    // InternalCftLanguage.g:555:2: ( ruleOrGate )
+                    // InternalCftLanguage.g:726:2: ( ruleOrGateDefinition )
                     {
-                    // InternalCftLanguage.g:555:2: ( ruleOrGate )
-                    // InternalCftLanguage.g:556:3: ruleOrGate
+                    // InternalCftLanguage.g:726:2: ( ruleOrGateDefinition )
+                    // InternalCftLanguage.g:727:3: ruleOrGateDefinition
                     {
-                     before(grammarAccess.getGateDefinitionAccess().getOrGateParserRuleCall_1()); 
+                     before(grammarAccess.getGateDefinitionAccess().getOrGateDefinitionParserRuleCall_1()); 
                     pushFollow(FOLLOW_2);
-                    ruleOrGate();
+                    ruleOrGateDefinition();
 
                     state._fsp--;
 
-                     after(grammarAccess.getGateDefinitionAccess().getOrGateParserRuleCall_1()); 
+                     after(grammarAccess.getGateDefinitionAccess().getOrGateDefinitionParserRuleCall_1()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 3 :
+                    // InternalCftLanguage.g:732:2: ( ruleKOfMGateDefinition )
+                    {
+                    // InternalCftLanguage.g:732:2: ( ruleKOfMGateDefinition )
+                    // InternalCftLanguage.g:733:3: ruleKOfMGateDefinition
+                    {
+                     before(grammarAccess.getGateDefinitionAccess().getKOfMGateDefinitionParserRuleCall_2()); 
+                    pushFollow(FOLLOW_2);
+                    ruleKOfMGateDefinition();
+
+                    state._fsp--;
+
+                     after(grammarAccess.getGateDefinitionAccess().getKOfMGateDefinitionParserRuleCall_2()); 
 
                     }
 
@@ -1750,39 +2363,130 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
     // $ANTLR end "rule__GateDefinition__Alternatives"
 
 
+    // $ANTLR start "rule__KOfMGateDefinition__Alternatives_2"
+    // InternalCftLanguage.g:742:1: rule__KOfMGateDefinition__Alternatives_2 : ( ( ( rule__KOfMGateDefinition__Group_2_0__0 ) ) | ( ( rule__KOfMGateDefinition__MAssignment_2_1 ) ) );
+    public final void rule__KOfMGateDefinition__Alternatives_2() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:746:1: ( ( ( rule__KOfMGateDefinition__Group_2_0__0 ) ) | ( ( rule__KOfMGateDefinition__MAssignment_2_1 ) ) )
+            int alt5=2;
+            int LA5_0 = input.LA(1);
+
+            if ( (LA5_0==27) ) {
+                alt5=1;
+            }
+            else if ( (LA5_0==RULE_OF_INT) ) {
+                alt5=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 5, 0, input);
+
+                throw nvae;
+            }
+            switch (alt5) {
+                case 1 :
+                    // InternalCftLanguage.g:747:2: ( ( rule__KOfMGateDefinition__Group_2_0__0 ) )
+                    {
+                    // InternalCftLanguage.g:747:2: ( ( rule__KOfMGateDefinition__Group_2_0__0 ) )
+                    // InternalCftLanguage.g:748:3: ( rule__KOfMGateDefinition__Group_2_0__0 )
+                    {
+                     before(grammarAccess.getKOfMGateDefinitionAccess().getGroup_2_0()); 
+                    // InternalCftLanguage.g:749:3: ( rule__KOfMGateDefinition__Group_2_0__0 )
+                    // InternalCftLanguage.g:749:4: rule__KOfMGateDefinition__Group_2_0__0
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__KOfMGateDefinition__Group_2_0__0();
+
+                    state._fsp--;
+
+
+                    }
+
+                     after(grammarAccess.getKOfMGateDefinitionAccess().getGroup_2_0()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalCftLanguage.g:753:2: ( ( rule__KOfMGateDefinition__MAssignment_2_1 ) )
+                    {
+                    // InternalCftLanguage.g:753:2: ( ( rule__KOfMGateDefinition__MAssignment_2_1 ) )
+                    // InternalCftLanguage.g:754:3: ( rule__KOfMGateDefinition__MAssignment_2_1 )
+                    {
+                     before(grammarAccess.getKOfMGateDefinitionAccess().getMAssignment_2_1()); 
+                    // InternalCftLanguage.g:755:3: ( rule__KOfMGateDefinition__MAssignment_2_1 )
+                    // InternalCftLanguage.g:755:4: rule__KOfMGateDefinition__MAssignment_2_1
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__KOfMGateDefinition__MAssignment_2_1();
+
+                    state._fsp--;
+
+
+                    }
+
+                     after(grammarAccess.getKOfMGateDefinitionAccess().getMAssignment_2_1()); 
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__KOfMGateDefinition__Alternatives_2"
+
+
     // $ANTLR start "rule__MappingDefinition__Alternatives_8_1_0"
-    // InternalCftLanguage.g:565:1: rule__MappingDefinition__Alternatives_8_1_0 : ( ( ( rule__MappingDefinition__LookupDefinitionsAssignment_8_1_0_0 ) ) | ( ( rule__MappingDefinition__AssignmentsAssignment_8_1_0_1 ) ) );
+    // InternalCftLanguage.g:763:1: rule__MappingDefinition__Alternatives_8_1_0 : ( ( ( rule__MappingDefinition__LookupDefinitionsAssignment_8_1_0_0 ) ) | ( ( rule__MappingDefinition__AssignmentsAssignment_8_1_0_1 ) ) );
     public final void rule__MappingDefinition__Alternatives_8_1_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:569:1: ( ( ( rule__MappingDefinition__LookupDefinitionsAssignment_8_1_0_0 ) ) | ( ( rule__MappingDefinition__AssignmentsAssignment_8_1_0_1 ) ) )
-            int alt4=2;
-            int LA4_0 = input.LA(1);
+            // InternalCftLanguage.g:767:1: ( ( ( rule__MappingDefinition__LookupDefinitionsAssignment_8_1_0_0 ) ) | ( ( rule__MappingDefinition__AssignmentsAssignment_8_1_0_1 ) ) )
+            int alt6=2;
+            int LA6_0 = input.LA(1);
 
-            if ( (LA4_0==30) ) {
-                alt4=1;
+            if ( (LA6_0==33) ) {
+                alt6=1;
             }
-            else if ( (LA4_0==RULE_ID) ) {
-                alt4=2;
+            else if ( ((LA6_0>=RULE_ID && LA6_0<=RULE_OF_INT)) ) {
+                alt6=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 4, 0, input);
+                    new NoViableAltException("", 6, 0, input);
 
                 throw nvae;
             }
-            switch (alt4) {
+            switch (alt6) {
                 case 1 :
-                    // InternalCftLanguage.g:570:2: ( ( rule__MappingDefinition__LookupDefinitionsAssignment_8_1_0_0 ) )
+                    // InternalCftLanguage.g:768:2: ( ( rule__MappingDefinition__LookupDefinitionsAssignment_8_1_0_0 ) )
                     {
-                    // InternalCftLanguage.g:570:2: ( ( rule__MappingDefinition__LookupDefinitionsAssignment_8_1_0_0 ) )
-                    // InternalCftLanguage.g:571:3: ( rule__MappingDefinition__LookupDefinitionsAssignment_8_1_0_0 )
+                    // InternalCftLanguage.g:768:2: ( ( rule__MappingDefinition__LookupDefinitionsAssignment_8_1_0_0 ) )
+                    // InternalCftLanguage.g:769:3: ( rule__MappingDefinition__LookupDefinitionsAssignment_8_1_0_0 )
                     {
                      before(grammarAccess.getMappingDefinitionAccess().getLookupDefinitionsAssignment_8_1_0_0()); 
-                    // InternalCftLanguage.g:572:3: ( rule__MappingDefinition__LookupDefinitionsAssignment_8_1_0_0 )
-                    // InternalCftLanguage.g:572:4: rule__MappingDefinition__LookupDefinitionsAssignment_8_1_0_0
+                    // InternalCftLanguage.g:770:3: ( rule__MappingDefinition__LookupDefinitionsAssignment_8_1_0_0 )
+                    // InternalCftLanguage.g:770:4: rule__MappingDefinition__LookupDefinitionsAssignment_8_1_0_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__MappingDefinition__LookupDefinitionsAssignment_8_1_0_0();
@@ -1800,14 +2504,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
                     }
                     break;
                 case 2 :
-                    // InternalCftLanguage.g:576:2: ( ( rule__MappingDefinition__AssignmentsAssignment_8_1_0_1 ) )
+                    // InternalCftLanguage.g:774:2: ( ( rule__MappingDefinition__AssignmentsAssignment_8_1_0_1 ) )
                     {
-                    // InternalCftLanguage.g:576:2: ( ( rule__MappingDefinition__AssignmentsAssignment_8_1_0_1 ) )
-                    // InternalCftLanguage.g:577:3: ( rule__MappingDefinition__AssignmentsAssignment_8_1_0_1 )
+                    // InternalCftLanguage.g:774:2: ( ( rule__MappingDefinition__AssignmentsAssignment_8_1_0_1 ) )
+                    // InternalCftLanguage.g:775:3: ( rule__MappingDefinition__AssignmentsAssignment_8_1_0_1 )
                     {
                      before(grammarAccess.getMappingDefinitionAccess().getAssignmentsAssignment_8_1_0_1()); 
-                    // InternalCftLanguage.g:578:3: ( rule__MappingDefinition__AssignmentsAssignment_8_1_0_1 )
-                    // InternalCftLanguage.g:578:4: rule__MappingDefinition__AssignmentsAssignment_8_1_0_1
+                    // InternalCftLanguage.g:776:3: ( rule__MappingDefinition__AssignmentsAssignment_8_1_0_1 )
+                    // InternalCftLanguage.g:776:4: rule__MappingDefinition__AssignmentsAssignment_8_1_0_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__MappingDefinition__AssignmentsAssignment_8_1_0_1();
@@ -1842,38 +2546,38 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__Assignment__Alternatives_1"
-    // InternalCftLanguage.g:586:1: rule__Assignment__Alternatives_1 : ( ( ( rule__Assignment__MultipleAssignment_1_0 ) ) | ( ':=' ) );
+    // InternalCftLanguage.g:784:1: rule__Assignment__Alternatives_1 : ( ( ( rule__Assignment__MultipleAssignment_1_0 ) ) | ( ':=' ) );
     public final void rule__Assignment__Alternatives_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:590:1: ( ( ( rule__Assignment__MultipleAssignment_1_0 ) ) | ( ':=' ) )
-            int alt5=2;
-            int LA5_0 = input.LA(1);
+            // InternalCftLanguage.g:788:1: ( ( ( rule__Assignment__MultipleAssignment_1_0 ) ) | ( ':=' ) )
+            int alt7=2;
+            int LA7_0 = input.LA(1);
 
-            if ( (LA5_0==37) ) {
-                alt5=1;
+            if ( (LA7_0==40) ) {
+                alt7=1;
             }
-            else if ( (LA5_0==12) ) {
-                alt5=2;
+            else if ( (LA7_0==13) ) {
+                alt7=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 5, 0, input);
+                    new NoViableAltException("", 7, 0, input);
 
                 throw nvae;
             }
-            switch (alt5) {
+            switch (alt7) {
                 case 1 :
-                    // InternalCftLanguage.g:591:2: ( ( rule__Assignment__MultipleAssignment_1_0 ) )
+                    // InternalCftLanguage.g:789:2: ( ( rule__Assignment__MultipleAssignment_1_0 ) )
                     {
-                    // InternalCftLanguage.g:591:2: ( ( rule__Assignment__MultipleAssignment_1_0 ) )
-                    // InternalCftLanguage.g:592:3: ( rule__Assignment__MultipleAssignment_1_0 )
+                    // InternalCftLanguage.g:789:2: ( ( rule__Assignment__MultipleAssignment_1_0 ) )
+                    // InternalCftLanguage.g:790:3: ( rule__Assignment__MultipleAssignment_1_0 )
                     {
                      before(grammarAccess.getAssignmentAccess().getMultipleAssignment_1_0()); 
-                    // InternalCftLanguage.g:593:3: ( rule__Assignment__MultipleAssignment_1_0 )
-                    // InternalCftLanguage.g:593:4: rule__Assignment__MultipleAssignment_1_0
+                    // InternalCftLanguage.g:791:3: ( rule__Assignment__MultipleAssignment_1_0 )
+                    // InternalCftLanguage.g:791:4: rule__Assignment__MultipleAssignment_1_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Assignment__MultipleAssignment_1_0();
@@ -1891,13 +2595,13 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
                     }
                     break;
                 case 2 :
-                    // InternalCftLanguage.g:597:2: ( ':=' )
+                    // InternalCftLanguage.g:795:2: ( ':=' )
                     {
-                    // InternalCftLanguage.g:597:2: ( ':=' )
-                    // InternalCftLanguage.g:598:3: ':='
+                    // InternalCftLanguage.g:795:2: ( ':=' )
+                    // InternalCftLanguage.g:796:3: ':='
                     {
                      before(grammarAccess.getAssignmentAccess().getColonEqualsSignKeyword_1_1()); 
-                    match(input,12,FOLLOW_2); 
+                    match(input,13,FOLLOW_2); 
                      after(grammarAccess.getAssignmentAccess().getColonEqualsSignKeyword_1_1()); 
 
                     }
@@ -1922,15 +2626,157 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
     // $ANTLR end "rule__Assignment__Alternatives_1"
 
 
+    // $ANTLR start "rule__ValidId__Alternatives"
+    // InternalCftLanguage.g:805:1: rule__ValidId__Alternatives : ( ( RULE_ID ) | ( RULE_OF_INT ) );
+    public final void rule__ValidId__Alternatives() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:809:1: ( ( RULE_ID ) | ( RULE_OF_INT ) )
+            int alt8=2;
+            int LA8_0 = input.LA(1);
+
+            if ( (LA8_0==RULE_ID) ) {
+                alt8=1;
+            }
+            else if ( (LA8_0==RULE_OF_INT) ) {
+                alt8=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 8, 0, input);
+
+                throw nvae;
+            }
+            switch (alt8) {
+                case 1 :
+                    // InternalCftLanguage.g:810:2: ( RULE_ID )
+                    {
+                    // InternalCftLanguage.g:810:2: ( RULE_ID )
+                    // InternalCftLanguage.g:811:3: RULE_ID
+                    {
+                     before(grammarAccess.getValidIdAccess().getIDTerminalRuleCall_0()); 
+                    match(input,RULE_ID,FOLLOW_2); 
+                     after(grammarAccess.getValidIdAccess().getIDTerminalRuleCall_0()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalCftLanguage.g:816:2: ( RULE_OF_INT )
+                    {
+                    // InternalCftLanguage.g:816:2: ( RULE_OF_INT )
+                    // InternalCftLanguage.g:817:3: RULE_OF_INT
+                    {
+                     before(grammarAccess.getValidIdAccess().getOF_INTTerminalRuleCall_1()); 
+                    match(input,RULE_OF_INT,FOLLOW_2); 
+                     after(grammarAccess.getValidIdAccess().getOF_INTTerminalRuleCall_1()); 
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__ValidId__Alternatives"
+
+
+    // $ANTLR start "rule__Double__Alternatives"
+    // InternalCftLanguage.g:826:1: rule__Double__Alternatives : ( ( RULE_INT ) | ( RULE_T_DOUBLE ) );
+    public final void rule__Double__Alternatives() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:830:1: ( ( RULE_INT ) | ( RULE_T_DOUBLE ) )
+            int alt9=2;
+            int LA9_0 = input.LA(1);
+
+            if ( (LA9_0==RULE_INT) ) {
+                alt9=1;
+            }
+            else if ( (LA9_0==RULE_T_DOUBLE) ) {
+                alt9=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 9, 0, input);
+
+                throw nvae;
+            }
+            switch (alt9) {
+                case 1 :
+                    // InternalCftLanguage.g:831:2: ( RULE_INT )
+                    {
+                    // InternalCftLanguage.g:831:2: ( RULE_INT )
+                    // InternalCftLanguage.g:832:3: RULE_INT
+                    {
+                     before(grammarAccess.getDoubleAccess().getINTTerminalRuleCall_0()); 
+                    match(input,RULE_INT,FOLLOW_2); 
+                     after(grammarAccess.getDoubleAccess().getINTTerminalRuleCall_0()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalCftLanguage.g:837:2: ( RULE_T_DOUBLE )
+                    {
+                    // InternalCftLanguage.g:837:2: ( RULE_T_DOUBLE )
+                    // InternalCftLanguage.g:838:3: RULE_T_DOUBLE
+                    {
+                     before(grammarAccess.getDoubleAccess().getT_DOUBLETerminalRuleCall_1()); 
+                    match(input,RULE_T_DOUBLE,FOLLOW_2); 
+                     after(grammarAccess.getDoubleAccess().getT_DOUBLETerminalRuleCall_1()); 
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Double__Alternatives"
+
+
     // $ANTLR start "rule__CftModel__Group__0"
-    // InternalCftLanguage.g:607:1: rule__CftModel__Group__0 : rule__CftModel__Group__0__Impl rule__CftModel__Group__1 ;
+    // InternalCftLanguage.g:847:1: rule__CftModel__Group__0 : rule__CftModel__Group__0__Impl rule__CftModel__Group__1 ;
     public final void rule__CftModel__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:611:1: ( rule__CftModel__Group__0__Impl rule__CftModel__Group__1 )
-            // InternalCftLanguage.g:612:2: rule__CftModel__Group__0__Impl rule__CftModel__Group__1
+            // InternalCftLanguage.g:851:1: ( rule__CftModel__Group__0__Impl rule__CftModel__Group__1 )
+            // InternalCftLanguage.g:852:2: rule__CftModel__Group__0__Impl rule__CftModel__Group__1
             {
             pushFollow(FOLLOW_3);
             rule__CftModel__Group__0__Impl();
@@ -1961,20 +2807,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__CftModel__Group__0__Impl"
-    // InternalCftLanguage.g:619:1: rule__CftModel__Group__0__Impl : ( 'package' ) ;
+    // InternalCftLanguage.g:859:1: rule__CftModel__Group__0__Impl : ( 'package' ) ;
     public final void rule__CftModel__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:623:1: ( ( 'package' ) )
-            // InternalCftLanguage.g:624:1: ( 'package' )
+            // InternalCftLanguage.g:863:1: ( ( 'package' ) )
+            // InternalCftLanguage.g:864:1: ( 'package' )
             {
-            // InternalCftLanguage.g:624:1: ( 'package' )
-            // InternalCftLanguage.g:625:2: 'package'
+            // InternalCftLanguage.g:864:1: ( 'package' )
+            // InternalCftLanguage.g:865:2: 'package'
             {
              before(grammarAccess.getCftModelAccess().getPackageKeyword_0()); 
-            match(input,13,FOLLOW_2); 
+            match(input,14,FOLLOW_2); 
              after(grammarAccess.getCftModelAccess().getPackageKeyword_0()); 
 
             }
@@ -1998,14 +2844,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__CftModel__Group__1"
-    // InternalCftLanguage.g:634:1: rule__CftModel__Group__1 : rule__CftModel__Group__1__Impl rule__CftModel__Group__2 ;
+    // InternalCftLanguage.g:874:1: rule__CftModel__Group__1 : rule__CftModel__Group__1__Impl rule__CftModel__Group__2 ;
     public final void rule__CftModel__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:638:1: ( rule__CftModel__Group__1__Impl rule__CftModel__Group__2 )
-            // InternalCftLanguage.g:639:2: rule__CftModel__Group__1__Impl rule__CftModel__Group__2
+            // InternalCftLanguage.g:878:1: ( rule__CftModel__Group__1__Impl rule__CftModel__Group__2 )
+            // InternalCftLanguage.g:879:2: rule__CftModel__Group__1__Impl rule__CftModel__Group__2
             {
             pushFollow(FOLLOW_4);
             rule__CftModel__Group__1__Impl();
@@ -2036,21 +2882,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__CftModel__Group__1__Impl"
-    // InternalCftLanguage.g:646:1: rule__CftModel__Group__1__Impl : ( ( rule__CftModel__PackageNameAssignment_1 ) ) ;
+    // InternalCftLanguage.g:886:1: rule__CftModel__Group__1__Impl : ( ( rule__CftModel__PackageNameAssignment_1 ) ) ;
     public final void rule__CftModel__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:650:1: ( ( ( rule__CftModel__PackageNameAssignment_1 ) ) )
-            // InternalCftLanguage.g:651:1: ( ( rule__CftModel__PackageNameAssignment_1 ) )
+            // InternalCftLanguage.g:890:1: ( ( ( rule__CftModel__PackageNameAssignment_1 ) ) )
+            // InternalCftLanguage.g:891:1: ( ( rule__CftModel__PackageNameAssignment_1 ) )
             {
-            // InternalCftLanguage.g:651:1: ( ( rule__CftModel__PackageNameAssignment_1 ) )
-            // InternalCftLanguage.g:652:2: ( rule__CftModel__PackageNameAssignment_1 )
+            // InternalCftLanguage.g:891:1: ( ( rule__CftModel__PackageNameAssignment_1 ) )
+            // InternalCftLanguage.g:892:2: ( rule__CftModel__PackageNameAssignment_1 )
             {
              before(grammarAccess.getCftModelAccess().getPackageNameAssignment_1()); 
-            // InternalCftLanguage.g:653:2: ( rule__CftModel__PackageNameAssignment_1 )
-            // InternalCftLanguage.g:653:3: rule__CftModel__PackageNameAssignment_1
+            // InternalCftLanguage.g:893:2: ( rule__CftModel__PackageNameAssignment_1 )
+            // InternalCftLanguage.g:893:3: rule__CftModel__PackageNameAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__CftModel__PackageNameAssignment_1();
@@ -2083,14 +2929,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__CftModel__Group__2"
-    // InternalCftLanguage.g:661:1: rule__CftModel__Group__2 : rule__CftModel__Group__2__Impl rule__CftModel__Group__3 ;
+    // InternalCftLanguage.g:901:1: rule__CftModel__Group__2 : rule__CftModel__Group__2__Impl rule__CftModel__Group__3 ;
     public final void rule__CftModel__Group__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:665:1: ( rule__CftModel__Group__2__Impl rule__CftModel__Group__3 )
-            // InternalCftLanguage.g:666:2: rule__CftModel__Group__2__Impl rule__CftModel__Group__3
+            // InternalCftLanguage.g:905:1: ( rule__CftModel__Group__2__Impl rule__CftModel__Group__3 )
+            // InternalCftLanguage.g:906:2: rule__CftModel__Group__2__Impl rule__CftModel__Group__3
             {
             pushFollow(FOLLOW_4);
             rule__CftModel__Group__2__Impl();
@@ -2121,31 +2967,31 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__CftModel__Group__2__Impl"
-    // InternalCftLanguage.g:673:1: rule__CftModel__Group__2__Impl : ( ( ';' )? ) ;
+    // InternalCftLanguage.g:913:1: rule__CftModel__Group__2__Impl : ( ( ';' )? ) ;
     public final void rule__CftModel__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:677:1: ( ( ( ';' )? ) )
-            // InternalCftLanguage.g:678:1: ( ( ';' )? )
+            // InternalCftLanguage.g:917:1: ( ( ( ';' )? ) )
+            // InternalCftLanguage.g:918:1: ( ( ';' )? )
             {
-            // InternalCftLanguage.g:678:1: ( ( ';' )? )
-            // InternalCftLanguage.g:679:2: ( ';' )?
+            // InternalCftLanguage.g:918:1: ( ( ';' )? )
+            // InternalCftLanguage.g:919:2: ( ';' )?
             {
              before(grammarAccess.getCftModelAccess().getSemicolonKeyword_2()); 
-            // InternalCftLanguage.g:680:2: ( ';' )?
-            int alt6=2;
-            int LA6_0 = input.LA(1);
+            // InternalCftLanguage.g:920:2: ( ';' )?
+            int alt10=2;
+            int LA10_0 = input.LA(1);
 
-            if ( (LA6_0==14) ) {
-                alt6=1;
+            if ( (LA10_0==15) ) {
+                alt10=1;
             }
-            switch (alt6) {
+            switch (alt10) {
                 case 1 :
-                    // InternalCftLanguage.g:680:3: ';'
+                    // InternalCftLanguage.g:920:3: ';'
                     {
-                    match(input,14,FOLLOW_2); 
+                    match(input,15,FOLLOW_2); 
 
                     }
                     break;
@@ -2175,14 +3021,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__CftModel__Group__3"
-    // InternalCftLanguage.g:688:1: rule__CftModel__Group__3 : rule__CftModel__Group__3__Impl rule__CftModel__Group__4 ;
+    // InternalCftLanguage.g:928:1: rule__CftModel__Group__3 : rule__CftModel__Group__3__Impl rule__CftModel__Group__4 ;
     public final void rule__CftModel__Group__3() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:692:1: ( rule__CftModel__Group__3__Impl rule__CftModel__Group__4 )
-            // InternalCftLanguage.g:693:2: rule__CftModel__Group__3__Impl rule__CftModel__Group__4
+            // InternalCftLanguage.g:932:1: ( rule__CftModel__Group__3__Impl rule__CftModel__Group__4 )
+            // InternalCftLanguage.g:933:2: rule__CftModel__Group__3__Impl rule__CftModel__Group__4
             {
             pushFollow(FOLLOW_4);
             rule__CftModel__Group__3__Impl();
@@ -2213,33 +3059,33 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__CftModel__Group__3__Impl"
-    // InternalCftLanguage.g:700:1: rule__CftModel__Group__3__Impl : ( ( rule__CftModel__ImportsAssignment_3 )* ) ;
+    // InternalCftLanguage.g:940:1: rule__CftModel__Group__3__Impl : ( ( rule__CftModel__ImportsAssignment_3 )* ) ;
     public final void rule__CftModel__Group__3__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:704:1: ( ( ( rule__CftModel__ImportsAssignment_3 )* ) )
-            // InternalCftLanguage.g:705:1: ( ( rule__CftModel__ImportsAssignment_3 )* )
+            // InternalCftLanguage.g:944:1: ( ( ( rule__CftModel__ImportsAssignment_3 )* ) )
+            // InternalCftLanguage.g:945:1: ( ( rule__CftModel__ImportsAssignment_3 )* )
             {
-            // InternalCftLanguage.g:705:1: ( ( rule__CftModel__ImportsAssignment_3 )* )
-            // InternalCftLanguage.g:706:2: ( rule__CftModel__ImportsAssignment_3 )*
+            // InternalCftLanguage.g:945:1: ( ( rule__CftModel__ImportsAssignment_3 )* )
+            // InternalCftLanguage.g:946:2: ( rule__CftModel__ImportsAssignment_3 )*
             {
              before(grammarAccess.getCftModelAccess().getImportsAssignment_3()); 
-            // InternalCftLanguage.g:707:2: ( rule__CftModel__ImportsAssignment_3 )*
-            loop7:
+            // InternalCftLanguage.g:947:2: ( rule__CftModel__ImportsAssignment_3 )*
+            loop11:
             do {
-                int alt7=2;
-                int LA7_0 = input.LA(1);
+                int alt11=2;
+                int LA11_0 = input.LA(1);
 
-                if ( (LA7_0==15) ) {
-                    alt7=1;
+                if ( (LA11_0==16) ) {
+                    alt11=1;
                 }
 
 
-                switch (alt7) {
+                switch (alt11) {
                 case 1 :
-                    // InternalCftLanguage.g:707:3: rule__CftModel__ImportsAssignment_3
+                    // InternalCftLanguage.g:947:3: rule__CftModel__ImportsAssignment_3
                     {
                     pushFollow(FOLLOW_5);
                     rule__CftModel__ImportsAssignment_3();
@@ -2251,7 +3097,7 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
                     break;
 
                 default :
-                    break loop7;
+                    break loop11;
                 }
             } while (true);
 
@@ -2278,14 +3124,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__CftModel__Group__4"
-    // InternalCftLanguage.g:715:1: rule__CftModel__Group__4 : rule__CftModel__Group__4__Impl ;
+    // InternalCftLanguage.g:955:1: rule__CftModel__Group__4 : rule__CftModel__Group__4__Impl ;
     public final void rule__CftModel__Group__4() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:719:1: ( rule__CftModel__Group__4__Impl )
-            // InternalCftLanguage.g:720:2: rule__CftModel__Group__4__Impl
+            // InternalCftLanguage.g:959:1: ( rule__CftModel__Group__4__Impl )
+            // InternalCftLanguage.g:960:2: rule__CftModel__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__CftModel__Group__4__Impl();
@@ -2311,33 +3157,33 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__CftModel__Group__4__Impl"
-    // InternalCftLanguage.g:726:1: rule__CftModel__Group__4__Impl : ( ( rule__CftModel__Alternatives_4 )* ) ;
+    // InternalCftLanguage.g:966:1: rule__CftModel__Group__4__Impl : ( ( rule__CftModel__Alternatives_4 )* ) ;
     public final void rule__CftModel__Group__4__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:730:1: ( ( ( rule__CftModel__Alternatives_4 )* ) )
-            // InternalCftLanguage.g:731:1: ( ( rule__CftModel__Alternatives_4 )* )
+            // InternalCftLanguage.g:970:1: ( ( ( rule__CftModel__Alternatives_4 )* ) )
+            // InternalCftLanguage.g:971:1: ( ( rule__CftModel__Alternatives_4 )* )
             {
-            // InternalCftLanguage.g:731:1: ( ( rule__CftModel__Alternatives_4 )* )
-            // InternalCftLanguage.g:732:2: ( rule__CftModel__Alternatives_4 )*
+            // InternalCftLanguage.g:971:1: ( ( rule__CftModel__Alternatives_4 )* )
+            // InternalCftLanguage.g:972:2: ( rule__CftModel__Alternatives_4 )*
             {
              before(grammarAccess.getCftModelAccess().getAlternatives_4()); 
-            // InternalCftLanguage.g:733:2: ( rule__CftModel__Alternatives_4 )*
-            loop8:
+            // InternalCftLanguage.g:973:2: ( rule__CftModel__Alternatives_4 )*
+            loop12:
             do {
-                int alt8=2;
-                int LA8_0 = input.LA(1);
+                int alt12=2;
+                int LA12_0 = input.LA(1);
 
-                if ( (LA8_0==16||LA8_0==25) ) {
-                    alt8=1;
+                if ( (LA12_0==17||LA12_0==28) ) {
+                    alt12=1;
                 }
 
 
-                switch (alt8) {
+                switch (alt12) {
                 case 1 :
-                    // InternalCftLanguage.g:733:3: rule__CftModel__Alternatives_4
+                    // InternalCftLanguage.g:973:3: rule__CftModel__Alternatives_4
                     {
                     pushFollow(FOLLOW_6);
                     rule__CftModel__Alternatives_4();
@@ -2349,7 +3195,7 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
                     break;
 
                 default :
-                    break loop8;
+                    break loop12;
                 }
             } while (true);
 
@@ -2376,14 +3222,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ImportDeclaration__Group__0"
-    // InternalCftLanguage.g:742:1: rule__ImportDeclaration__Group__0 : rule__ImportDeclaration__Group__0__Impl rule__ImportDeclaration__Group__1 ;
+    // InternalCftLanguage.g:982:1: rule__ImportDeclaration__Group__0 : rule__ImportDeclaration__Group__0__Impl rule__ImportDeclaration__Group__1 ;
     public final void rule__ImportDeclaration__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:746:1: ( rule__ImportDeclaration__Group__0__Impl rule__ImportDeclaration__Group__1 )
-            // InternalCftLanguage.g:747:2: rule__ImportDeclaration__Group__0__Impl rule__ImportDeclaration__Group__1
+            // InternalCftLanguage.g:986:1: ( rule__ImportDeclaration__Group__0__Impl rule__ImportDeclaration__Group__1 )
+            // InternalCftLanguage.g:987:2: rule__ImportDeclaration__Group__0__Impl rule__ImportDeclaration__Group__1
             {
             pushFollow(FOLLOW_3);
             rule__ImportDeclaration__Group__0__Impl();
@@ -2414,20 +3260,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ImportDeclaration__Group__0__Impl"
-    // InternalCftLanguage.g:754:1: rule__ImportDeclaration__Group__0__Impl : ( 'import' ) ;
+    // InternalCftLanguage.g:994:1: rule__ImportDeclaration__Group__0__Impl : ( 'import' ) ;
     public final void rule__ImportDeclaration__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:758:1: ( ( 'import' ) )
-            // InternalCftLanguage.g:759:1: ( 'import' )
+            // InternalCftLanguage.g:998:1: ( ( 'import' ) )
+            // InternalCftLanguage.g:999:1: ( 'import' )
             {
-            // InternalCftLanguage.g:759:1: ( 'import' )
-            // InternalCftLanguage.g:760:2: 'import'
+            // InternalCftLanguage.g:999:1: ( 'import' )
+            // InternalCftLanguage.g:1000:2: 'import'
             {
              before(grammarAccess.getImportDeclarationAccess().getImportKeyword_0()); 
-            match(input,15,FOLLOW_2); 
+            match(input,16,FOLLOW_2); 
              after(grammarAccess.getImportDeclarationAccess().getImportKeyword_0()); 
 
             }
@@ -2451,14 +3297,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ImportDeclaration__Group__1"
-    // InternalCftLanguage.g:769:1: rule__ImportDeclaration__Group__1 : rule__ImportDeclaration__Group__1__Impl rule__ImportDeclaration__Group__2 ;
+    // InternalCftLanguage.g:1009:1: rule__ImportDeclaration__Group__1 : rule__ImportDeclaration__Group__1__Impl rule__ImportDeclaration__Group__2 ;
     public final void rule__ImportDeclaration__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:773:1: ( rule__ImportDeclaration__Group__1__Impl rule__ImportDeclaration__Group__2 )
-            // InternalCftLanguage.g:774:2: rule__ImportDeclaration__Group__1__Impl rule__ImportDeclaration__Group__2
+            // InternalCftLanguage.g:1013:1: ( rule__ImportDeclaration__Group__1__Impl rule__ImportDeclaration__Group__2 )
+            // InternalCftLanguage.g:1014:2: rule__ImportDeclaration__Group__1__Impl rule__ImportDeclaration__Group__2
             {
             pushFollow(FOLLOW_7);
             rule__ImportDeclaration__Group__1__Impl();
@@ -2489,21 +3335,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ImportDeclaration__Group__1__Impl"
-    // InternalCftLanguage.g:781:1: rule__ImportDeclaration__Group__1__Impl : ( ( rule__ImportDeclaration__ImportedNamespaceAssignment_1 ) ) ;
+    // InternalCftLanguage.g:1021:1: rule__ImportDeclaration__Group__1__Impl : ( ( rule__ImportDeclaration__ImportedNamespaceAssignment_1 ) ) ;
     public final void rule__ImportDeclaration__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:785:1: ( ( ( rule__ImportDeclaration__ImportedNamespaceAssignment_1 ) ) )
-            // InternalCftLanguage.g:786:1: ( ( rule__ImportDeclaration__ImportedNamespaceAssignment_1 ) )
+            // InternalCftLanguage.g:1025:1: ( ( ( rule__ImportDeclaration__ImportedNamespaceAssignment_1 ) ) )
+            // InternalCftLanguage.g:1026:1: ( ( rule__ImportDeclaration__ImportedNamespaceAssignment_1 ) )
             {
-            // InternalCftLanguage.g:786:1: ( ( rule__ImportDeclaration__ImportedNamespaceAssignment_1 ) )
-            // InternalCftLanguage.g:787:2: ( rule__ImportDeclaration__ImportedNamespaceAssignment_1 )
+            // InternalCftLanguage.g:1026:1: ( ( rule__ImportDeclaration__ImportedNamespaceAssignment_1 ) )
+            // InternalCftLanguage.g:1027:2: ( rule__ImportDeclaration__ImportedNamespaceAssignment_1 )
             {
              before(grammarAccess.getImportDeclarationAccess().getImportedNamespaceAssignment_1()); 
-            // InternalCftLanguage.g:788:2: ( rule__ImportDeclaration__ImportedNamespaceAssignment_1 )
-            // InternalCftLanguage.g:788:3: rule__ImportDeclaration__ImportedNamespaceAssignment_1
+            // InternalCftLanguage.g:1028:2: ( rule__ImportDeclaration__ImportedNamespaceAssignment_1 )
+            // InternalCftLanguage.g:1028:3: rule__ImportDeclaration__ImportedNamespaceAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__ImportDeclaration__ImportedNamespaceAssignment_1();
@@ -2536,14 +3382,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ImportDeclaration__Group__2"
-    // InternalCftLanguage.g:796:1: rule__ImportDeclaration__Group__2 : rule__ImportDeclaration__Group__2__Impl ;
+    // InternalCftLanguage.g:1036:1: rule__ImportDeclaration__Group__2 : rule__ImportDeclaration__Group__2__Impl ;
     public final void rule__ImportDeclaration__Group__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:800:1: ( rule__ImportDeclaration__Group__2__Impl )
-            // InternalCftLanguage.g:801:2: rule__ImportDeclaration__Group__2__Impl
+            // InternalCftLanguage.g:1040:1: ( rule__ImportDeclaration__Group__2__Impl )
+            // InternalCftLanguage.g:1041:2: rule__ImportDeclaration__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ImportDeclaration__Group__2__Impl();
@@ -2569,31 +3415,31 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ImportDeclaration__Group__2__Impl"
-    // InternalCftLanguage.g:807:1: rule__ImportDeclaration__Group__2__Impl : ( ( ';' )? ) ;
+    // InternalCftLanguage.g:1047:1: rule__ImportDeclaration__Group__2__Impl : ( ( ';' )? ) ;
     public final void rule__ImportDeclaration__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:811:1: ( ( ( ';' )? ) )
-            // InternalCftLanguage.g:812:1: ( ( ';' )? )
+            // InternalCftLanguage.g:1051:1: ( ( ( ';' )? ) )
+            // InternalCftLanguage.g:1052:1: ( ( ';' )? )
             {
-            // InternalCftLanguage.g:812:1: ( ( ';' )? )
-            // InternalCftLanguage.g:813:2: ( ';' )?
+            // InternalCftLanguage.g:1052:1: ( ( ';' )? )
+            // InternalCftLanguage.g:1053:2: ( ';' )?
             {
              before(grammarAccess.getImportDeclarationAccess().getSemicolonKeyword_2()); 
-            // InternalCftLanguage.g:814:2: ( ';' )?
-            int alt9=2;
-            int LA9_0 = input.LA(1);
+            // InternalCftLanguage.g:1054:2: ( ';' )?
+            int alt13=2;
+            int LA13_0 = input.LA(1);
 
-            if ( (LA9_0==14) ) {
-                alt9=1;
+            if ( (LA13_0==15) ) {
+                alt13=1;
             }
-            switch (alt9) {
+            switch (alt13) {
                 case 1 :
-                    // InternalCftLanguage.g:814:3: ';'
+                    // InternalCftLanguage.g:1054:3: ';'
                     {
-                    match(input,14,FOLLOW_2); 
+                    match(input,15,FOLLOW_2); 
 
                     }
                     break;
@@ -2623,14 +3469,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group__0"
-    // InternalCftLanguage.g:823:1: rule__ComponentDefinition__Group__0 : rule__ComponentDefinition__Group__0__Impl rule__ComponentDefinition__Group__1 ;
+    // InternalCftLanguage.g:1063:1: rule__ComponentDefinition__Group__0 : rule__ComponentDefinition__Group__0__Impl rule__ComponentDefinition__Group__1 ;
     public final void rule__ComponentDefinition__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:827:1: ( rule__ComponentDefinition__Group__0__Impl rule__ComponentDefinition__Group__1 )
-            // InternalCftLanguage.g:828:2: rule__ComponentDefinition__Group__0__Impl rule__ComponentDefinition__Group__1
+            // InternalCftLanguage.g:1067:1: ( rule__ComponentDefinition__Group__0__Impl rule__ComponentDefinition__Group__1 )
+            // InternalCftLanguage.g:1068:2: rule__ComponentDefinition__Group__0__Impl rule__ComponentDefinition__Group__1
             {
             pushFollow(FOLLOW_3);
             rule__ComponentDefinition__Group__0__Impl();
@@ -2661,20 +3507,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group__0__Impl"
-    // InternalCftLanguage.g:835:1: rule__ComponentDefinition__Group__0__Impl : ( 'cft' ) ;
+    // InternalCftLanguage.g:1075:1: rule__ComponentDefinition__Group__0__Impl : ( 'cft' ) ;
     public final void rule__ComponentDefinition__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:839:1: ( ( 'cft' ) )
-            // InternalCftLanguage.g:840:1: ( 'cft' )
+            // InternalCftLanguage.g:1079:1: ( ( 'cft' ) )
+            // InternalCftLanguage.g:1080:1: ( 'cft' )
             {
-            // InternalCftLanguage.g:840:1: ( 'cft' )
-            // InternalCftLanguage.g:841:2: 'cft'
+            // InternalCftLanguage.g:1080:1: ( 'cft' )
+            // InternalCftLanguage.g:1081:2: 'cft'
             {
              before(grammarAccess.getComponentDefinitionAccess().getCftKeyword_0()); 
-            match(input,16,FOLLOW_2); 
+            match(input,17,FOLLOW_2); 
              after(grammarAccess.getComponentDefinitionAccess().getCftKeyword_0()); 
 
             }
@@ -2698,14 +3544,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group__1"
-    // InternalCftLanguage.g:850:1: rule__ComponentDefinition__Group__1 : rule__ComponentDefinition__Group__1__Impl rule__ComponentDefinition__Group__2 ;
+    // InternalCftLanguage.g:1090:1: rule__ComponentDefinition__Group__1 : rule__ComponentDefinition__Group__1__Impl rule__ComponentDefinition__Group__2 ;
     public final void rule__ComponentDefinition__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:854:1: ( rule__ComponentDefinition__Group__1__Impl rule__ComponentDefinition__Group__2 )
-            // InternalCftLanguage.g:855:2: rule__ComponentDefinition__Group__1__Impl rule__ComponentDefinition__Group__2
+            // InternalCftLanguage.g:1094:1: ( rule__ComponentDefinition__Group__1__Impl rule__ComponentDefinition__Group__2 )
+            // InternalCftLanguage.g:1095:2: rule__ComponentDefinition__Group__1__Impl rule__ComponentDefinition__Group__2
             {
             pushFollow(FOLLOW_8);
             rule__ComponentDefinition__Group__1__Impl();
@@ -2736,21 +3582,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group__1__Impl"
-    // InternalCftLanguage.g:862:1: rule__ComponentDefinition__Group__1__Impl : ( ( rule__ComponentDefinition__NameAssignment_1 ) ) ;
+    // InternalCftLanguage.g:1102:1: rule__ComponentDefinition__Group__1__Impl : ( ( rule__ComponentDefinition__NameAssignment_1 ) ) ;
     public final void rule__ComponentDefinition__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:866:1: ( ( ( rule__ComponentDefinition__NameAssignment_1 ) ) )
-            // InternalCftLanguage.g:867:1: ( ( rule__ComponentDefinition__NameAssignment_1 ) )
+            // InternalCftLanguage.g:1106:1: ( ( ( rule__ComponentDefinition__NameAssignment_1 ) ) )
+            // InternalCftLanguage.g:1107:1: ( ( rule__ComponentDefinition__NameAssignment_1 ) )
             {
-            // InternalCftLanguage.g:867:1: ( ( rule__ComponentDefinition__NameAssignment_1 ) )
-            // InternalCftLanguage.g:868:2: ( rule__ComponentDefinition__NameAssignment_1 )
+            // InternalCftLanguage.g:1107:1: ( ( rule__ComponentDefinition__NameAssignment_1 ) )
+            // InternalCftLanguage.g:1108:2: ( rule__ComponentDefinition__NameAssignment_1 )
             {
              before(grammarAccess.getComponentDefinitionAccess().getNameAssignment_1()); 
-            // InternalCftLanguage.g:869:2: ( rule__ComponentDefinition__NameAssignment_1 )
-            // InternalCftLanguage.g:869:3: rule__ComponentDefinition__NameAssignment_1
+            // InternalCftLanguage.g:1109:2: ( rule__ComponentDefinition__NameAssignment_1 )
+            // InternalCftLanguage.g:1109:3: rule__ComponentDefinition__NameAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__ComponentDefinition__NameAssignment_1();
@@ -2783,14 +3629,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group__2"
-    // InternalCftLanguage.g:877:1: rule__ComponentDefinition__Group__2 : rule__ComponentDefinition__Group__2__Impl rule__ComponentDefinition__Group__3 ;
+    // InternalCftLanguage.g:1117:1: rule__ComponentDefinition__Group__2 : rule__ComponentDefinition__Group__2__Impl rule__ComponentDefinition__Group__3 ;
     public final void rule__ComponentDefinition__Group__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:881:1: ( rule__ComponentDefinition__Group__2__Impl rule__ComponentDefinition__Group__3 )
-            // InternalCftLanguage.g:882:2: rule__ComponentDefinition__Group__2__Impl rule__ComponentDefinition__Group__3
+            // InternalCftLanguage.g:1121:1: ( rule__ComponentDefinition__Group__2__Impl rule__ComponentDefinition__Group__3 )
+            // InternalCftLanguage.g:1122:2: rule__ComponentDefinition__Group__2__Impl rule__ComponentDefinition__Group__3
             {
             pushFollow(FOLLOW_9);
             rule__ComponentDefinition__Group__2__Impl();
@@ -2821,20 +3667,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group__2__Impl"
-    // InternalCftLanguage.g:889:1: rule__ComponentDefinition__Group__2__Impl : ( '{' ) ;
+    // InternalCftLanguage.g:1129:1: rule__ComponentDefinition__Group__2__Impl : ( '{' ) ;
     public final void rule__ComponentDefinition__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:893:1: ( ( '{' ) )
-            // InternalCftLanguage.g:894:1: ( '{' )
+            // InternalCftLanguage.g:1133:1: ( ( '{' ) )
+            // InternalCftLanguage.g:1134:1: ( '{' )
             {
-            // InternalCftLanguage.g:894:1: ( '{' )
-            // InternalCftLanguage.g:895:2: '{'
+            // InternalCftLanguage.g:1134:1: ( '{' )
+            // InternalCftLanguage.g:1135:2: '{'
             {
              before(grammarAccess.getComponentDefinitionAccess().getLeftCurlyBracketKeyword_2()); 
-            match(input,17,FOLLOW_2); 
+            match(input,18,FOLLOW_2); 
              after(grammarAccess.getComponentDefinitionAccess().getLeftCurlyBracketKeyword_2()); 
 
             }
@@ -2858,14 +3704,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group__3"
-    // InternalCftLanguage.g:904:1: rule__ComponentDefinition__Group__3 : rule__ComponentDefinition__Group__3__Impl rule__ComponentDefinition__Group__4 ;
+    // InternalCftLanguage.g:1144:1: rule__ComponentDefinition__Group__3 : rule__ComponentDefinition__Group__3__Impl rule__ComponentDefinition__Group__4 ;
     public final void rule__ComponentDefinition__Group__3() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:908:1: ( rule__ComponentDefinition__Group__3__Impl rule__ComponentDefinition__Group__4 )
-            // InternalCftLanguage.g:909:2: rule__ComponentDefinition__Group__3__Impl rule__ComponentDefinition__Group__4
+            // InternalCftLanguage.g:1148:1: ( rule__ComponentDefinition__Group__3__Impl rule__ComponentDefinition__Group__4 )
+            // InternalCftLanguage.g:1149:2: rule__ComponentDefinition__Group__3__Impl rule__ComponentDefinition__Group__4
             {
             pushFollow(FOLLOW_10);
             rule__ComponentDefinition__Group__3__Impl();
@@ -2896,21 +3742,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group__3__Impl"
-    // InternalCftLanguage.g:916:1: rule__ComponentDefinition__Group__3__Impl : ( ( rule__ComponentDefinition__UnorderedGroup_3 ) ) ;
+    // InternalCftLanguage.g:1156:1: rule__ComponentDefinition__Group__3__Impl : ( ( rule__ComponentDefinition__UnorderedGroup_3 ) ) ;
     public final void rule__ComponentDefinition__Group__3__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:920:1: ( ( ( rule__ComponentDefinition__UnorderedGroup_3 ) ) )
-            // InternalCftLanguage.g:921:1: ( ( rule__ComponentDefinition__UnorderedGroup_3 ) )
+            // InternalCftLanguage.g:1160:1: ( ( ( rule__ComponentDefinition__UnorderedGroup_3 ) ) )
+            // InternalCftLanguage.g:1161:1: ( ( rule__ComponentDefinition__UnorderedGroup_3 ) )
             {
-            // InternalCftLanguage.g:921:1: ( ( rule__ComponentDefinition__UnorderedGroup_3 ) )
-            // InternalCftLanguage.g:922:2: ( rule__ComponentDefinition__UnorderedGroup_3 )
+            // InternalCftLanguage.g:1161:1: ( ( rule__ComponentDefinition__UnorderedGroup_3 ) )
+            // InternalCftLanguage.g:1162:2: ( rule__ComponentDefinition__UnorderedGroup_3 )
             {
              before(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3()); 
-            // InternalCftLanguage.g:923:2: ( rule__ComponentDefinition__UnorderedGroup_3 )
-            // InternalCftLanguage.g:923:3: rule__ComponentDefinition__UnorderedGroup_3
+            // InternalCftLanguage.g:1163:2: ( rule__ComponentDefinition__UnorderedGroup_3 )
+            // InternalCftLanguage.g:1163:3: rule__ComponentDefinition__UnorderedGroup_3
             {
             pushFollow(FOLLOW_2);
             rule__ComponentDefinition__UnorderedGroup_3();
@@ -2943,14 +3789,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group__4"
-    // InternalCftLanguage.g:931:1: rule__ComponentDefinition__Group__4 : rule__ComponentDefinition__Group__4__Impl rule__ComponentDefinition__Group__5 ;
+    // InternalCftLanguage.g:1171:1: rule__ComponentDefinition__Group__4 : rule__ComponentDefinition__Group__4__Impl rule__ComponentDefinition__Group__5 ;
     public final void rule__ComponentDefinition__Group__4() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:935:1: ( rule__ComponentDefinition__Group__4__Impl rule__ComponentDefinition__Group__5 )
-            // InternalCftLanguage.g:936:2: rule__ComponentDefinition__Group__4__Impl rule__ComponentDefinition__Group__5
+            // InternalCftLanguage.g:1175:1: ( rule__ComponentDefinition__Group__4__Impl rule__ComponentDefinition__Group__5 )
+            // InternalCftLanguage.g:1176:2: rule__ComponentDefinition__Group__4__Impl rule__ComponentDefinition__Group__5
             {
             pushFollow(FOLLOW_10);
             rule__ComponentDefinition__Group__4__Impl();
@@ -2981,33 +3827,33 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group__4__Impl"
-    // InternalCftLanguage.g:943:1: rule__ComponentDefinition__Group__4__Impl : ( ( rule__ComponentDefinition__Group_4__0 )* ) ;
+    // InternalCftLanguage.g:1183:1: rule__ComponentDefinition__Group__4__Impl : ( ( rule__ComponentDefinition__Group_4__0 )* ) ;
     public final void rule__ComponentDefinition__Group__4__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:947:1: ( ( ( rule__ComponentDefinition__Group_4__0 )* ) )
-            // InternalCftLanguage.g:948:1: ( ( rule__ComponentDefinition__Group_4__0 )* )
+            // InternalCftLanguage.g:1187:1: ( ( ( rule__ComponentDefinition__Group_4__0 )* ) )
+            // InternalCftLanguage.g:1188:1: ( ( rule__ComponentDefinition__Group_4__0 )* )
             {
-            // InternalCftLanguage.g:948:1: ( ( rule__ComponentDefinition__Group_4__0 )* )
-            // InternalCftLanguage.g:949:2: ( rule__ComponentDefinition__Group_4__0 )*
+            // InternalCftLanguage.g:1188:1: ( ( rule__ComponentDefinition__Group_4__0 )* )
+            // InternalCftLanguage.g:1189:2: ( rule__ComponentDefinition__Group_4__0 )*
             {
              before(grammarAccess.getComponentDefinitionAccess().getGroup_4()); 
-            // InternalCftLanguage.g:950:2: ( rule__ComponentDefinition__Group_4__0 )*
-            loop10:
+            // InternalCftLanguage.g:1190:2: ( rule__ComponentDefinition__Group_4__0 )*
+            loop14:
             do {
-                int alt10=2;
-                int LA10_0 = input.LA(1);
+                int alt14=2;
+                int LA14_0 = input.LA(1);
 
-                if ( (LA10_0==RULE_ID) ) {
-                    alt10=1;
+                if ( ((LA14_0>=RULE_ID && LA14_0<=RULE_OF_INT)) ) {
+                    alt14=1;
                 }
 
 
-                switch (alt10) {
+                switch (alt14) {
                 case 1 :
-                    // InternalCftLanguage.g:950:3: rule__ComponentDefinition__Group_4__0
+                    // InternalCftLanguage.g:1190:3: rule__ComponentDefinition__Group_4__0
                     {
                     pushFollow(FOLLOW_11);
                     rule__ComponentDefinition__Group_4__0();
@@ -3019,7 +3865,7 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
                     break;
 
                 default :
-                    break loop10;
+                    break loop14;
                 }
             } while (true);
 
@@ -3046,14 +3892,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group__5"
-    // InternalCftLanguage.g:958:1: rule__ComponentDefinition__Group__5 : rule__ComponentDefinition__Group__5__Impl ;
+    // InternalCftLanguage.g:1198:1: rule__ComponentDefinition__Group__5 : rule__ComponentDefinition__Group__5__Impl ;
     public final void rule__ComponentDefinition__Group__5() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:962:1: ( rule__ComponentDefinition__Group__5__Impl )
-            // InternalCftLanguage.g:963:2: rule__ComponentDefinition__Group__5__Impl
+            // InternalCftLanguage.g:1202:1: ( rule__ComponentDefinition__Group__5__Impl )
+            // InternalCftLanguage.g:1203:2: rule__ComponentDefinition__Group__5__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ComponentDefinition__Group__5__Impl();
@@ -3079,20 +3925,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group__5__Impl"
-    // InternalCftLanguage.g:969:1: rule__ComponentDefinition__Group__5__Impl : ( '}' ) ;
+    // InternalCftLanguage.g:1209:1: rule__ComponentDefinition__Group__5__Impl : ( '}' ) ;
     public final void rule__ComponentDefinition__Group__5__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:973:1: ( ( '}' ) )
-            // InternalCftLanguage.g:974:1: ( '}' )
+            // InternalCftLanguage.g:1213:1: ( ( '}' ) )
+            // InternalCftLanguage.g:1214:1: ( '}' )
             {
-            // InternalCftLanguage.g:974:1: ( '}' )
-            // InternalCftLanguage.g:975:2: '}'
+            // InternalCftLanguage.g:1214:1: ( '}' )
+            // InternalCftLanguage.g:1215:2: '}'
             {
              before(grammarAccess.getComponentDefinitionAccess().getRightCurlyBracketKeyword_5()); 
-            match(input,18,FOLLOW_2); 
+            match(input,19,FOLLOW_2); 
              after(grammarAccess.getComponentDefinitionAccess().getRightCurlyBracketKeyword_5()); 
 
             }
@@ -3116,14 +3962,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group_3_0__0"
-    // InternalCftLanguage.g:985:1: rule__ComponentDefinition__Group_3_0__0 : rule__ComponentDefinition__Group_3_0__0__Impl rule__ComponentDefinition__Group_3_0__1 ;
+    // InternalCftLanguage.g:1225:1: rule__ComponentDefinition__Group_3_0__0 : rule__ComponentDefinition__Group_3_0__0__Impl rule__ComponentDefinition__Group_3_0__1 ;
     public final void rule__ComponentDefinition__Group_3_0__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:989:1: ( rule__ComponentDefinition__Group_3_0__0__Impl rule__ComponentDefinition__Group_3_0__1 )
-            // InternalCftLanguage.g:990:2: rule__ComponentDefinition__Group_3_0__0__Impl rule__ComponentDefinition__Group_3_0__1
+            // InternalCftLanguage.g:1229:1: ( rule__ComponentDefinition__Group_3_0__0__Impl rule__ComponentDefinition__Group_3_0__1 )
+            // InternalCftLanguage.g:1230:2: rule__ComponentDefinition__Group_3_0__0__Impl rule__ComponentDefinition__Group_3_0__1
             {
             pushFollow(FOLLOW_12);
             rule__ComponentDefinition__Group_3_0__0__Impl();
@@ -3154,20 +4000,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group_3_0__0__Impl"
-    // InternalCftLanguage.g:997:1: rule__ComponentDefinition__Group_3_0__0__Impl : ( 'in' ) ;
+    // InternalCftLanguage.g:1237:1: rule__ComponentDefinition__Group_3_0__0__Impl : ( 'in' ) ;
     public final void rule__ComponentDefinition__Group_3_0__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1001:1: ( ( 'in' ) )
-            // InternalCftLanguage.g:1002:1: ( 'in' )
+            // InternalCftLanguage.g:1241:1: ( ( 'in' ) )
+            // InternalCftLanguage.g:1242:1: ( 'in' )
             {
-            // InternalCftLanguage.g:1002:1: ( 'in' )
-            // InternalCftLanguage.g:1003:2: 'in'
+            // InternalCftLanguage.g:1242:1: ( 'in' )
+            // InternalCftLanguage.g:1243:2: 'in'
             {
              before(grammarAccess.getComponentDefinitionAccess().getInKeyword_3_0_0()); 
-            match(input,19,FOLLOW_2); 
+            match(input,20,FOLLOW_2); 
              after(grammarAccess.getComponentDefinitionAccess().getInKeyword_3_0_0()); 
 
             }
@@ -3191,14 +4037,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group_3_0__1"
-    // InternalCftLanguage.g:1012:1: rule__ComponentDefinition__Group_3_0__1 : rule__ComponentDefinition__Group_3_0__1__Impl rule__ComponentDefinition__Group_3_0__2 ;
+    // InternalCftLanguage.g:1252:1: rule__ComponentDefinition__Group_3_0__1 : rule__ComponentDefinition__Group_3_0__1__Impl rule__ComponentDefinition__Group_3_0__2 ;
     public final void rule__ComponentDefinition__Group_3_0__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1016:1: ( rule__ComponentDefinition__Group_3_0__1__Impl rule__ComponentDefinition__Group_3_0__2 )
-            // InternalCftLanguage.g:1017:2: rule__ComponentDefinition__Group_3_0__1__Impl rule__ComponentDefinition__Group_3_0__2
+            // InternalCftLanguage.g:1256:1: ( rule__ComponentDefinition__Group_3_0__1__Impl rule__ComponentDefinition__Group_3_0__2 )
+            // InternalCftLanguage.g:1257:2: rule__ComponentDefinition__Group_3_0__1__Impl rule__ComponentDefinition__Group_3_0__2
             {
             pushFollow(FOLLOW_12);
             rule__ComponentDefinition__Group_3_0__1__Impl();
@@ -3229,33 +4075,33 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group_3_0__1__Impl"
-    // InternalCftLanguage.g:1024:1: rule__ComponentDefinition__Group_3_0__1__Impl : ( ( rule__ComponentDefinition__InputEventsAssignment_3_0_1 )* ) ;
+    // InternalCftLanguage.g:1264:1: rule__ComponentDefinition__Group_3_0__1__Impl : ( ( rule__ComponentDefinition__InputEventsAssignment_3_0_1 )* ) ;
     public final void rule__ComponentDefinition__Group_3_0__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1028:1: ( ( ( rule__ComponentDefinition__InputEventsAssignment_3_0_1 )* ) )
-            // InternalCftLanguage.g:1029:1: ( ( rule__ComponentDefinition__InputEventsAssignment_3_0_1 )* )
+            // InternalCftLanguage.g:1268:1: ( ( ( rule__ComponentDefinition__InputEventsAssignment_3_0_1 )* ) )
+            // InternalCftLanguage.g:1269:1: ( ( rule__ComponentDefinition__InputEventsAssignment_3_0_1 )* )
             {
-            // InternalCftLanguage.g:1029:1: ( ( rule__ComponentDefinition__InputEventsAssignment_3_0_1 )* )
-            // InternalCftLanguage.g:1030:2: ( rule__ComponentDefinition__InputEventsAssignment_3_0_1 )*
+            // InternalCftLanguage.g:1269:1: ( ( rule__ComponentDefinition__InputEventsAssignment_3_0_1 )* )
+            // InternalCftLanguage.g:1270:2: ( rule__ComponentDefinition__InputEventsAssignment_3_0_1 )*
             {
              before(grammarAccess.getComponentDefinitionAccess().getInputEventsAssignment_3_0_1()); 
-            // InternalCftLanguage.g:1031:2: ( rule__ComponentDefinition__InputEventsAssignment_3_0_1 )*
-            loop11:
+            // InternalCftLanguage.g:1271:2: ( rule__ComponentDefinition__InputEventsAssignment_3_0_1 )*
+            loop15:
             do {
-                int alt11=2;
-                int LA11_0 = input.LA(1);
+                int alt15=2;
+                int LA15_0 = input.LA(1);
 
-                if ( (LA11_0==RULE_ID) ) {
-                    alt11=1;
+                if ( ((LA15_0>=RULE_ID && LA15_0<=RULE_OF_INT)) ) {
+                    alt15=1;
                 }
 
 
-                switch (alt11) {
+                switch (alt15) {
                 case 1 :
-                    // InternalCftLanguage.g:1031:3: rule__ComponentDefinition__InputEventsAssignment_3_0_1
+                    // InternalCftLanguage.g:1271:3: rule__ComponentDefinition__InputEventsAssignment_3_0_1
                     {
                     pushFollow(FOLLOW_11);
                     rule__ComponentDefinition__InputEventsAssignment_3_0_1();
@@ -3267,7 +4113,7 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
                     break;
 
                 default :
-                    break loop11;
+                    break loop15;
                 }
             } while (true);
 
@@ -3294,14 +4140,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group_3_0__2"
-    // InternalCftLanguage.g:1039:1: rule__ComponentDefinition__Group_3_0__2 : rule__ComponentDefinition__Group_3_0__2__Impl ;
+    // InternalCftLanguage.g:1279:1: rule__ComponentDefinition__Group_3_0__2 : rule__ComponentDefinition__Group_3_0__2__Impl ;
     public final void rule__ComponentDefinition__Group_3_0__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1043:1: ( rule__ComponentDefinition__Group_3_0__2__Impl )
-            // InternalCftLanguage.g:1044:2: rule__ComponentDefinition__Group_3_0__2__Impl
+            // InternalCftLanguage.g:1283:1: ( rule__ComponentDefinition__Group_3_0__2__Impl )
+            // InternalCftLanguage.g:1284:2: rule__ComponentDefinition__Group_3_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ComponentDefinition__Group_3_0__2__Impl();
@@ -3327,20 +4173,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group_3_0__2__Impl"
-    // InternalCftLanguage.g:1050:1: rule__ComponentDefinition__Group_3_0__2__Impl : ( ';' ) ;
+    // InternalCftLanguage.g:1290:1: rule__ComponentDefinition__Group_3_0__2__Impl : ( ';' ) ;
     public final void rule__ComponentDefinition__Group_3_0__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1054:1: ( ( ';' ) )
-            // InternalCftLanguage.g:1055:1: ( ';' )
+            // InternalCftLanguage.g:1294:1: ( ( ';' ) )
+            // InternalCftLanguage.g:1295:1: ( ';' )
             {
-            // InternalCftLanguage.g:1055:1: ( ';' )
-            // InternalCftLanguage.g:1056:2: ';'
+            // InternalCftLanguage.g:1295:1: ( ';' )
+            // InternalCftLanguage.g:1296:2: ';'
             {
              before(grammarAccess.getComponentDefinitionAccess().getSemicolonKeyword_3_0_2()); 
-            match(input,14,FOLLOW_2); 
+            match(input,15,FOLLOW_2); 
              after(grammarAccess.getComponentDefinitionAccess().getSemicolonKeyword_3_0_2()); 
 
             }
@@ -3364,14 +4210,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group_3_1__0"
-    // InternalCftLanguage.g:1066:1: rule__ComponentDefinition__Group_3_1__0 : rule__ComponentDefinition__Group_3_1__0__Impl rule__ComponentDefinition__Group_3_1__1 ;
+    // InternalCftLanguage.g:1306:1: rule__ComponentDefinition__Group_3_1__0 : rule__ComponentDefinition__Group_3_1__0__Impl rule__ComponentDefinition__Group_3_1__1 ;
     public final void rule__ComponentDefinition__Group_3_1__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1070:1: ( rule__ComponentDefinition__Group_3_1__0__Impl rule__ComponentDefinition__Group_3_1__1 )
-            // InternalCftLanguage.g:1071:2: rule__ComponentDefinition__Group_3_1__0__Impl rule__ComponentDefinition__Group_3_1__1
+            // InternalCftLanguage.g:1310:1: ( rule__ComponentDefinition__Group_3_1__0__Impl rule__ComponentDefinition__Group_3_1__1 )
+            // InternalCftLanguage.g:1311:2: rule__ComponentDefinition__Group_3_1__0__Impl rule__ComponentDefinition__Group_3_1__1
             {
             pushFollow(FOLLOW_12);
             rule__ComponentDefinition__Group_3_1__0__Impl();
@@ -3402,20 +4248,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group_3_1__0__Impl"
-    // InternalCftLanguage.g:1078:1: rule__ComponentDefinition__Group_3_1__0__Impl : ( 'out' ) ;
+    // InternalCftLanguage.g:1318:1: rule__ComponentDefinition__Group_3_1__0__Impl : ( 'out' ) ;
     public final void rule__ComponentDefinition__Group_3_1__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1082:1: ( ( 'out' ) )
-            // InternalCftLanguage.g:1083:1: ( 'out' )
+            // InternalCftLanguage.g:1322:1: ( ( 'out' ) )
+            // InternalCftLanguage.g:1323:1: ( 'out' )
             {
-            // InternalCftLanguage.g:1083:1: ( 'out' )
-            // InternalCftLanguage.g:1084:2: 'out'
+            // InternalCftLanguage.g:1323:1: ( 'out' )
+            // InternalCftLanguage.g:1324:2: 'out'
             {
              before(grammarAccess.getComponentDefinitionAccess().getOutKeyword_3_1_0()); 
-            match(input,20,FOLLOW_2); 
+            match(input,21,FOLLOW_2); 
              after(grammarAccess.getComponentDefinitionAccess().getOutKeyword_3_1_0()); 
 
             }
@@ -3439,14 +4285,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group_3_1__1"
-    // InternalCftLanguage.g:1093:1: rule__ComponentDefinition__Group_3_1__1 : rule__ComponentDefinition__Group_3_1__1__Impl rule__ComponentDefinition__Group_3_1__2 ;
+    // InternalCftLanguage.g:1333:1: rule__ComponentDefinition__Group_3_1__1 : rule__ComponentDefinition__Group_3_1__1__Impl rule__ComponentDefinition__Group_3_1__2 ;
     public final void rule__ComponentDefinition__Group_3_1__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1097:1: ( rule__ComponentDefinition__Group_3_1__1__Impl rule__ComponentDefinition__Group_3_1__2 )
-            // InternalCftLanguage.g:1098:2: rule__ComponentDefinition__Group_3_1__1__Impl rule__ComponentDefinition__Group_3_1__2
+            // InternalCftLanguage.g:1337:1: ( rule__ComponentDefinition__Group_3_1__1__Impl rule__ComponentDefinition__Group_3_1__2 )
+            // InternalCftLanguage.g:1338:2: rule__ComponentDefinition__Group_3_1__1__Impl rule__ComponentDefinition__Group_3_1__2
             {
             pushFollow(FOLLOW_12);
             rule__ComponentDefinition__Group_3_1__1__Impl();
@@ -3477,33 +4323,33 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group_3_1__1__Impl"
-    // InternalCftLanguage.g:1105:1: rule__ComponentDefinition__Group_3_1__1__Impl : ( ( rule__ComponentDefinition__OutputEventsAssignment_3_1_1 )* ) ;
+    // InternalCftLanguage.g:1345:1: rule__ComponentDefinition__Group_3_1__1__Impl : ( ( rule__ComponentDefinition__OutputEventsAssignment_3_1_1 )* ) ;
     public final void rule__ComponentDefinition__Group_3_1__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1109:1: ( ( ( rule__ComponentDefinition__OutputEventsAssignment_3_1_1 )* ) )
-            // InternalCftLanguage.g:1110:1: ( ( rule__ComponentDefinition__OutputEventsAssignment_3_1_1 )* )
+            // InternalCftLanguage.g:1349:1: ( ( ( rule__ComponentDefinition__OutputEventsAssignment_3_1_1 )* ) )
+            // InternalCftLanguage.g:1350:1: ( ( rule__ComponentDefinition__OutputEventsAssignment_3_1_1 )* )
             {
-            // InternalCftLanguage.g:1110:1: ( ( rule__ComponentDefinition__OutputEventsAssignment_3_1_1 )* )
-            // InternalCftLanguage.g:1111:2: ( rule__ComponentDefinition__OutputEventsAssignment_3_1_1 )*
+            // InternalCftLanguage.g:1350:1: ( ( rule__ComponentDefinition__OutputEventsAssignment_3_1_1 )* )
+            // InternalCftLanguage.g:1351:2: ( rule__ComponentDefinition__OutputEventsAssignment_3_1_1 )*
             {
              before(grammarAccess.getComponentDefinitionAccess().getOutputEventsAssignment_3_1_1()); 
-            // InternalCftLanguage.g:1112:2: ( rule__ComponentDefinition__OutputEventsAssignment_3_1_1 )*
-            loop12:
+            // InternalCftLanguage.g:1352:2: ( rule__ComponentDefinition__OutputEventsAssignment_3_1_1 )*
+            loop16:
             do {
-                int alt12=2;
-                int LA12_0 = input.LA(1);
+                int alt16=2;
+                int LA16_0 = input.LA(1);
 
-                if ( (LA12_0==RULE_ID) ) {
-                    alt12=1;
+                if ( ((LA16_0>=RULE_ID && LA16_0<=RULE_OF_INT)) ) {
+                    alt16=1;
                 }
 
 
-                switch (alt12) {
+                switch (alt16) {
                 case 1 :
-                    // InternalCftLanguage.g:1112:3: rule__ComponentDefinition__OutputEventsAssignment_3_1_1
+                    // InternalCftLanguage.g:1352:3: rule__ComponentDefinition__OutputEventsAssignment_3_1_1
                     {
                     pushFollow(FOLLOW_11);
                     rule__ComponentDefinition__OutputEventsAssignment_3_1_1();
@@ -3515,7 +4361,7 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
                     break;
 
                 default :
-                    break loop12;
+                    break loop16;
                 }
             } while (true);
 
@@ -3542,14 +4388,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group_3_1__2"
-    // InternalCftLanguage.g:1120:1: rule__ComponentDefinition__Group_3_1__2 : rule__ComponentDefinition__Group_3_1__2__Impl ;
+    // InternalCftLanguage.g:1360:1: rule__ComponentDefinition__Group_3_1__2 : rule__ComponentDefinition__Group_3_1__2__Impl ;
     public final void rule__ComponentDefinition__Group_3_1__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1124:1: ( rule__ComponentDefinition__Group_3_1__2__Impl )
-            // InternalCftLanguage.g:1125:2: rule__ComponentDefinition__Group_3_1__2__Impl
+            // InternalCftLanguage.g:1364:1: ( rule__ComponentDefinition__Group_3_1__2__Impl )
+            // InternalCftLanguage.g:1365:2: rule__ComponentDefinition__Group_3_1__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ComponentDefinition__Group_3_1__2__Impl();
@@ -3575,20 +4421,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group_3_1__2__Impl"
-    // InternalCftLanguage.g:1131:1: rule__ComponentDefinition__Group_3_1__2__Impl : ( ';' ) ;
+    // InternalCftLanguage.g:1371:1: rule__ComponentDefinition__Group_3_1__2__Impl : ( ';' ) ;
     public final void rule__ComponentDefinition__Group_3_1__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1135:1: ( ( ';' ) )
-            // InternalCftLanguage.g:1136:1: ( ';' )
+            // InternalCftLanguage.g:1375:1: ( ( ';' ) )
+            // InternalCftLanguage.g:1376:1: ( ';' )
             {
-            // InternalCftLanguage.g:1136:1: ( ';' )
-            // InternalCftLanguage.g:1137:2: ';'
+            // InternalCftLanguage.g:1376:1: ( ';' )
+            // InternalCftLanguage.g:1377:2: ';'
             {
              before(grammarAccess.getComponentDefinitionAccess().getSemicolonKeyword_3_1_2()); 
-            match(input,14,FOLLOW_2); 
+            match(input,15,FOLLOW_2); 
              after(grammarAccess.getComponentDefinitionAccess().getSemicolonKeyword_3_1_2()); 
 
             }
@@ -3612,14 +4458,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group_4__0"
-    // InternalCftLanguage.g:1147:1: rule__ComponentDefinition__Group_4__0 : rule__ComponentDefinition__Group_4__0__Impl rule__ComponentDefinition__Group_4__1 ;
+    // InternalCftLanguage.g:1387:1: rule__ComponentDefinition__Group_4__0 : rule__ComponentDefinition__Group_4__0__Impl rule__ComponentDefinition__Group_4__1 ;
     public final void rule__ComponentDefinition__Group_4__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1151:1: ( rule__ComponentDefinition__Group_4__0__Impl rule__ComponentDefinition__Group_4__1 )
-            // InternalCftLanguage.g:1152:2: rule__ComponentDefinition__Group_4__0__Impl rule__ComponentDefinition__Group_4__1
+            // InternalCftLanguage.g:1391:1: ( rule__ComponentDefinition__Group_4__0__Impl rule__ComponentDefinition__Group_4__1 )
+            // InternalCftLanguage.g:1392:2: rule__ComponentDefinition__Group_4__0__Impl rule__ComponentDefinition__Group_4__1
             {
             pushFollow(FOLLOW_7);
             rule__ComponentDefinition__Group_4__0__Impl();
@@ -3650,21 +4496,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group_4__0__Impl"
-    // InternalCftLanguage.g:1159:1: rule__ComponentDefinition__Group_4__0__Impl : ( ( rule__ComponentDefinition__EventDefinitionsAssignment_4_0 ) ) ;
+    // InternalCftLanguage.g:1399:1: rule__ComponentDefinition__Group_4__0__Impl : ( ( rule__ComponentDefinition__EventDefinitionsAssignment_4_0 ) ) ;
     public final void rule__ComponentDefinition__Group_4__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1163:1: ( ( ( rule__ComponentDefinition__EventDefinitionsAssignment_4_0 ) ) )
-            // InternalCftLanguage.g:1164:1: ( ( rule__ComponentDefinition__EventDefinitionsAssignment_4_0 ) )
+            // InternalCftLanguage.g:1403:1: ( ( ( rule__ComponentDefinition__EventDefinitionsAssignment_4_0 ) ) )
+            // InternalCftLanguage.g:1404:1: ( ( rule__ComponentDefinition__EventDefinitionsAssignment_4_0 ) )
             {
-            // InternalCftLanguage.g:1164:1: ( ( rule__ComponentDefinition__EventDefinitionsAssignment_4_0 ) )
-            // InternalCftLanguage.g:1165:2: ( rule__ComponentDefinition__EventDefinitionsAssignment_4_0 )
+            // InternalCftLanguage.g:1404:1: ( ( rule__ComponentDefinition__EventDefinitionsAssignment_4_0 ) )
+            // InternalCftLanguage.g:1405:2: ( rule__ComponentDefinition__EventDefinitionsAssignment_4_0 )
             {
              before(grammarAccess.getComponentDefinitionAccess().getEventDefinitionsAssignment_4_0()); 
-            // InternalCftLanguage.g:1166:2: ( rule__ComponentDefinition__EventDefinitionsAssignment_4_0 )
-            // InternalCftLanguage.g:1166:3: rule__ComponentDefinition__EventDefinitionsAssignment_4_0
+            // InternalCftLanguage.g:1406:2: ( rule__ComponentDefinition__EventDefinitionsAssignment_4_0 )
+            // InternalCftLanguage.g:1406:3: rule__ComponentDefinition__EventDefinitionsAssignment_4_0
             {
             pushFollow(FOLLOW_2);
             rule__ComponentDefinition__EventDefinitionsAssignment_4_0();
@@ -3697,14 +4543,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group_4__1"
-    // InternalCftLanguage.g:1174:1: rule__ComponentDefinition__Group_4__1 : rule__ComponentDefinition__Group_4__1__Impl ;
+    // InternalCftLanguage.g:1414:1: rule__ComponentDefinition__Group_4__1 : rule__ComponentDefinition__Group_4__1__Impl ;
     public final void rule__ComponentDefinition__Group_4__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1178:1: ( rule__ComponentDefinition__Group_4__1__Impl )
-            // InternalCftLanguage.g:1179:2: rule__ComponentDefinition__Group_4__1__Impl
+            // InternalCftLanguage.g:1418:1: ( rule__ComponentDefinition__Group_4__1__Impl )
+            // InternalCftLanguage.g:1419:2: rule__ComponentDefinition__Group_4__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ComponentDefinition__Group_4__1__Impl();
@@ -3730,20 +4576,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__Group_4__1__Impl"
-    // InternalCftLanguage.g:1185:1: rule__ComponentDefinition__Group_4__1__Impl : ( ';' ) ;
+    // InternalCftLanguage.g:1425:1: rule__ComponentDefinition__Group_4__1__Impl : ( ';' ) ;
     public final void rule__ComponentDefinition__Group_4__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1189:1: ( ( ';' ) )
-            // InternalCftLanguage.g:1190:1: ( ';' )
+            // InternalCftLanguage.g:1429:1: ( ( ';' ) )
+            // InternalCftLanguage.g:1430:1: ( ';' )
             {
-            // InternalCftLanguage.g:1190:1: ( ';' )
-            // InternalCftLanguage.g:1191:2: ';'
+            // InternalCftLanguage.g:1430:1: ( ';' )
+            // InternalCftLanguage.g:1431:2: ';'
             {
              before(grammarAccess.getComponentDefinitionAccess().getSemicolonKeyword_4_1()); 
-            match(input,14,FOLLOW_2); 
+            match(input,15,FOLLOW_2); 
              after(grammarAccess.getComponentDefinitionAccess().getSemicolonKeyword_4_1()); 
 
             }
@@ -3767,14 +4613,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__InputEvent__Group__0"
-    // InternalCftLanguage.g:1201:1: rule__InputEvent__Group__0 : rule__InputEvent__Group__0__Impl rule__InputEvent__Group__1 ;
+    // InternalCftLanguage.g:1441:1: rule__InputEvent__Group__0 : rule__InputEvent__Group__0__Impl rule__InputEvent__Group__1 ;
     public final void rule__InputEvent__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1205:1: ( rule__InputEvent__Group__0__Impl rule__InputEvent__Group__1 )
-            // InternalCftLanguage.g:1206:2: rule__InputEvent__Group__0__Impl rule__InputEvent__Group__1
+            // InternalCftLanguage.g:1445:1: ( rule__InputEvent__Group__0__Impl rule__InputEvent__Group__1 )
+            // InternalCftLanguage.g:1446:2: rule__InputEvent__Group__0__Impl rule__InputEvent__Group__1
             {
             pushFollow(FOLLOW_13);
             rule__InputEvent__Group__0__Impl();
@@ -3805,21 +4651,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__InputEvent__Group__0__Impl"
-    // InternalCftLanguage.g:1213:1: rule__InputEvent__Group__0__Impl : ( ( rule__InputEvent__NameAssignment_0 ) ) ;
+    // InternalCftLanguage.g:1453:1: rule__InputEvent__Group__0__Impl : ( ( rule__InputEvent__NameAssignment_0 ) ) ;
     public final void rule__InputEvent__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1217:1: ( ( ( rule__InputEvent__NameAssignment_0 ) ) )
-            // InternalCftLanguage.g:1218:1: ( ( rule__InputEvent__NameAssignment_0 ) )
+            // InternalCftLanguage.g:1457:1: ( ( ( rule__InputEvent__NameAssignment_0 ) ) )
+            // InternalCftLanguage.g:1458:1: ( ( rule__InputEvent__NameAssignment_0 ) )
             {
-            // InternalCftLanguage.g:1218:1: ( ( rule__InputEvent__NameAssignment_0 ) )
-            // InternalCftLanguage.g:1219:2: ( rule__InputEvent__NameAssignment_0 )
+            // InternalCftLanguage.g:1458:1: ( ( rule__InputEvent__NameAssignment_0 ) )
+            // InternalCftLanguage.g:1459:2: ( rule__InputEvent__NameAssignment_0 )
             {
              before(grammarAccess.getInputEventAccess().getNameAssignment_0()); 
-            // InternalCftLanguage.g:1220:2: ( rule__InputEvent__NameAssignment_0 )
-            // InternalCftLanguage.g:1220:3: rule__InputEvent__NameAssignment_0
+            // InternalCftLanguage.g:1460:2: ( rule__InputEvent__NameAssignment_0 )
+            // InternalCftLanguage.g:1460:3: rule__InputEvent__NameAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__InputEvent__NameAssignment_0();
@@ -3852,14 +4698,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__InputEvent__Group__1"
-    // InternalCftLanguage.g:1228:1: rule__InputEvent__Group__1 : rule__InputEvent__Group__1__Impl ;
+    // InternalCftLanguage.g:1468:1: rule__InputEvent__Group__1 : rule__InputEvent__Group__1__Impl ;
     public final void rule__InputEvent__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1232:1: ( rule__InputEvent__Group__1__Impl )
-            // InternalCftLanguage.g:1233:2: rule__InputEvent__Group__1__Impl
+            // InternalCftLanguage.g:1472:1: ( rule__InputEvent__Group__1__Impl )
+            // InternalCftLanguage.g:1473:2: rule__InputEvent__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__InputEvent__Group__1__Impl();
@@ -3885,29 +4731,29 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__InputEvent__Group__1__Impl"
-    // InternalCftLanguage.g:1239:1: rule__InputEvent__Group__1__Impl : ( ( rule__InputEvent__MultipleAssignment_1 )? ) ;
+    // InternalCftLanguage.g:1479:1: rule__InputEvent__Group__1__Impl : ( ( rule__InputEvent__MultipleAssignment_1 )? ) ;
     public final void rule__InputEvent__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1243:1: ( ( ( rule__InputEvent__MultipleAssignment_1 )? ) )
-            // InternalCftLanguage.g:1244:1: ( ( rule__InputEvent__MultipleAssignment_1 )? )
+            // InternalCftLanguage.g:1483:1: ( ( ( rule__InputEvent__MultipleAssignment_1 )? ) )
+            // InternalCftLanguage.g:1484:1: ( ( rule__InputEvent__MultipleAssignment_1 )? )
             {
-            // InternalCftLanguage.g:1244:1: ( ( rule__InputEvent__MultipleAssignment_1 )? )
-            // InternalCftLanguage.g:1245:2: ( rule__InputEvent__MultipleAssignment_1 )?
+            // InternalCftLanguage.g:1484:1: ( ( rule__InputEvent__MultipleAssignment_1 )? )
+            // InternalCftLanguage.g:1485:2: ( rule__InputEvent__MultipleAssignment_1 )?
             {
              before(grammarAccess.getInputEventAccess().getMultipleAssignment_1()); 
-            // InternalCftLanguage.g:1246:2: ( rule__InputEvent__MultipleAssignment_1 )?
-            int alt13=2;
-            int LA13_0 = input.LA(1);
+            // InternalCftLanguage.g:1486:2: ( rule__InputEvent__MultipleAssignment_1 )?
+            int alt17=2;
+            int LA17_0 = input.LA(1);
 
-            if ( (LA13_0==35) ) {
-                alt13=1;
+            if ( (LA17_0==38) ) {
+                alt17=1;
             }
-            switch (alt13) {
+            switch (alt17) {
                 case 1 :
-                    // InternalCftLanguage.g:1246:3: rule__InputEvent__MultipleAssignment_1
+                    // InternalCftLanguage.g:1486:3: rule__InputEvent__MultipleAssignment_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__InputEvent__MultipleAssignment_1();
@@ -3943,14 +4789,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__BasicEventDefinition__Group__0"
-    // InternalCftLanguage.g:1255:1: rule__BasicEventDefinition__Group__0 : rule__BasicEventDefinition__Group__0__Impl rule__BasicEventDefinition__Group__1 ;
+    // InternalCftLanguage.g:1495:1: rule__BasicEventDefinition__Group__0 : rule__BasicEventDefinition__Group__0__Impl rule__BasicEventDefinition__Group__1 ;
     public final void rule__BasicEventDefinition__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1259:1: ( rule__BasicEventDefinition__Group__0__Impl rule__BasicEventDefinition__Group__1 )
-            // InternalCftLanguage.g:1260:2: rule__BasicEventDefinition__Group__0__Impl rule__BasicEventDefinition__Group__1
+            // InternalCftLanguage.g:1499:1: ( rule__BasicEventDefinition__Group__0__Impl rule__BasicEventDefinition__Group__1 )
+            // InternalCftLanguage.g:1500:2: rule__BasicEventDefinition__Group__0__Impl rule__BasicEventDefinition__Group__1
             {
             pushFollow(FOLLOW_14);
             rule__BasicEventDefinition__Group__0__Impl();
@@ -3981,21 +4827,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__BasicEventDefinition__Group__0__Impl"
-    // InternalCftLanguage.g:1267:1: rule__BasicEventDefinition__Group__0__Impl : ( ( rule__BasicEventDefinition__NameAssignment_0 ) ) ;
+    // InternalCftLanguage.g:1507:1: rule__BasicEventDefinition__Group__0__Impl : ( ( rule__BasicEventDefinition__NameAssignment_0 ) ) ;
     public final void rule__BasicEventDefinition__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1271:1: ( ( ( rule__BasicEventDefinition__NameAssignment_0 ) ) )
-            // InternalCftLanguage.g:1272:1: ( ( rule__BasicEventDefinition__NameAssignment_0 ) )
+            // InternalCftLanguage.g:1511:1: ( ( ( rule__BasicEventDefinition__NameAssignment_0 ) ) )
+            // InternalCftLanguage.g:1512:1: ( ( rule__BasicEventDefinition__NameAssignment_0 ) )
             {
-            // InternalCftLanguage.g:1272:1: ( ( rule__BasicEventDefinition__NameAssignment_0 ) )
-            // InternalCftLanguage.g:1273:2: ( rule__BasicEventDefinition__NameAssignment_0 )
+            // InternalCftLanguage.g:1512:1: ( ( rule__BasicEventDefinition__NameAssignment_0 ) )
+            // InternalCftLanguage.g:1513:2: ( rule__BasicEventDefinition__NameAssignment_0 )
             {
              before(grammarAccess.getBasicEventDefinitionAccess().getNameAssignment_0()); 
-            // InternalCftLanguage.g:1274:2: ( rule__BasicEventDefinition__NameAssignment_0 )
-            // InternalCftLanguage.g:1274:3: rule__BasicEventDefinition__NameAssignment_0
+            // InternalCftLanguage.g:1514:2: ( rule__BasicEventDefinition__NameAssignment_0 )
+            // InternalCftLanguage.g:1514:3: rule__BasicEventDefinition__NameAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__BasicEventDefinition__NameAssignment_0();
@@ -4028,22 +4874,17 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__BasicEventDefinition__Group__1"
-    // InternalCftLanguage.g:1282:1: rule__BasicEventDefinition__Group__1 : rule__BasicEventDefinition__Group__1__Impl rule__BasicEventDefinition__Group__2 ;
+    // InternalCftLanguage.g:1522:1: rule__BasicEventDefinition__Group__1 : rule__BasicEventDefinition__Group__1__Impl ;
     public final void rule__BasicEventDefinition__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1286:1: ( rule__BasicEventDefinition__Group__1__Impl rule__BasicEventDefinition__Group__2 )
-            // InternalCftLanguage.g:1287:2: rule__BasicEventDefinition__Group__1__Impl rule__BasicEventDefinition__Group__2
+            // InternalCftLanguage.g:1526:1: ( rule__BasicEventDefinition__Group__1__Impl )
+            // InternalCftLanguage.g:1527:2: rule__BasicEventDefinition__Group__1__Impl
             {
-            pushFollow(FOLLOW_15);
-            rule__BasicEventDefinition__Group__1__Impl();
-
-            state._fsp--;
-
             pushFollow(FOLLOW_2);
-            rule__BasicEventDefinition__Group__2();
+            rule__BasicEventDefinition__Group__1__Impl();
 
             state._fsp--;
 
@@ -4066,21 +4907,31 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__BasicEventDefinition__Group__1__Impl"
-    // InternalCftLanguage.g:1294:1: rule__BasicEventDefinition__Group__1__Impl : ( 'lambda' ) ;
+    // InternalCftLanguage.g:1533:1: rule__BasicEventDefinition__Group__1__Impl : ( ( rule__BasicEventDefinition__DistributionAssignment_1 ) ) ;
     public final void rule__BasicEventDefinition__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1298:1: ( ( 'lambda' ) )
-            // InternalCftLanguage.g:1299:1: ( 'lambda' )
+            // InternalCftLanguage.g:1537:1: ( ( ( rule__BasicEventDefinition__DistributionAssignment_1 ) ) )
+            // InternalCftLanguage.g:1538:1: ( ( rule__BasicEventDefinition__DistributionAssignment_1 ) )
             {
-            // InternalCftLanguage.g:1299:1: ( 'lambda' )
-            // InternalCftLanguage.g:1300:2: 'lambda'
+            // InternalCftLanguage.g:1538:1: ( ( rule__BasicEventDefinition__DistributionAssignment_1 ) )
+            // InternalCftLanguage.g:1539:2: ( rule__BasicEventDefinition__DistributionAssignment_1 )
             {
-             before(grammarAccess.getBasicEventDefinitionAccess().getLambdaKeyword_1()); 
-            match(input,21,FOLLOW_2); 
-             after(grammarAccess.getBasicEventDefinitionAccess().getLambdaKeyword_1()); 
+             before(grammarAccess.getBasicEventDefinitionAccess().getDistributionAssignment_1()); 
+            // InternalCftLanguage.g:1540:2: ( rule__BasicEventDefinition__DistributionAssignment_1 )
+            // InternalCftLanguage.g:1540:3: rule__BasicEventDefinition__DistributionAssignment_1
+            {
+            pushFollow(FOLLOW_2);
+            rule__BasicEventDefinition__DistributionAssignment_1();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getBasicEventDefinitionAccess().getDistributionAssignment_1()); 
 
             }
 
@@ -4102,23 +4953,23 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
     // $ANTLR end "rule__BasicEventDefinition__Group__1__Impl"
 
 
-    // $ANTLR start "rule__BasicEventDefinition__Group__2"
-    // InternalCftLanguage.g:1309:1: rule__BasicEventDefinition__Group__2 : rule__BasicEventDefinition__Group__2__Impl rule__BasicEventDefinition__Group__3 ;
-    public final void rule__BasicEventDefinition__Group__2() throws RecognitionException {
+    // $ANTLR start "rule__ConstantDistribution__Group__0"
+    // InternalCftLanguage.g:1549:1: rule__ConstantDistribution__Group__0 : rule__ConstantDistribution__Group__0__Impl rule__ConstantDistribution__Group__1 ;
+    public final void rule__ConstantDistribution__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1313:1: ( rule__BasicEventDefinition__Group__2__Impl rule__BasicEventDefinition__Group__3 )
-            // InternalCftLanguage.g:1314:2: rule__BasicEventDefinition__Group__2__Impl rule__BasicEventDefinition__Group__3
+            // InternalCftLanguage.g:1553:1: ( rule__ConstantDistribution__Group__0__Impl rule__ConstantDistribution__Group__1 )
+            // InternalCftLanguage.g:1554:2: rule__ConstantDistribution__Group__0__Impl rule__ConstantDistribution__Group__1
             {
-            pushFollow(FOLLOW_16);
-            rule__BasicEventDefinition__Group__2__Impl();
+            pushFollow(FOLLOW_15);
+            rule__ConstantDistribution__Group__0__Impl();
 
             state._fsp--;
 
             pushFollow(FOLLOW_2);
-            rule__BasicEventDefinition__Group__3();
+            rule__ConstantDistribution__Group__1();
 
             state._fsp--;
 
@@ -4137,25 +4988,25 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__BasicEventDefinition__Group__2"
+    // $ANTLR end "rule__ConstantDistribution__Group__0"
 
 
-    // $ANTLR start "rule__BasicEventDefinition__Group__2__Impl"
-    // InternalCftLanguage.g:1321:1: rule__BasicEventDefinition__Group__2__Impl : ( '=' ) ;
-    public final void rule__BasicEventDefinition__Group__2__Impl() throws RecognitionException {
+    // $ANTLR start "rule__ConstantDistribution__Group__0__Impl"
+    // InternalCftLanguage.g:1561:1: rule__ConstantDistribution__Group__0__Impl : ( 'p' ) ;
+    public final void rule__ConstantDistribution__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1325:1: ( ( '=' ) )
-            // InternalCftLanguage.g:1326:1: ( '=' )
+            // InternalCftLanguage.g:1565:1: ( ( 'p' ) )
+            // InternalCftLanguage.g:1566:1: ( 'p' )
             {
-            // InternalCftLanguage.g:1326:1: ( '=' )
-            // InternalCftLanguage.g:1327:2: '='
+            // InternalCftLanguage.g:1566:1: ( 'p' )
+            // InternalCftLanguage.g:1567:2: 'p'
             {
-             before(grammarAccess.getBasicEventDefinitionAccess().getEqualsSignKeyword_2()); 
+             before(grammarAccess.getConstantDistributionAccess().getPKeyword_0()); 
             match(input,22,FOLLOW_2); 
-             after(grammarAccess.getBasicEventDefinitionAccess().getEqualsSignKeyword_2()); 
+             after(grammarAccess.getConstantDistributionAccess().getPKeyword_0()); 
 
             }
 
@@ -4174,21 +5025,26 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__BasicEventDefinition__Group__2__Impl"
+    // $ANTLR end "rule__ConstantDistribution__Group__0__Impl"
 
 
-    // $ANTLR start "rule__BasicEventDefinition__Group__3"
-    // InternalCftLanguage.g:1336:1: rule__BasicEventDefinition__Group__3 : rule__BasicEventDefinition__Group__3__Impl ;
-    public final void rule__BasicEventDefinition__Group__3() throws RecognitionException {
+    // $ANTLR start "rule__ConstantDistribution__Group__1"
+    // InternalCftLanguage.g:1576:1: rule__ConstantDistribution__Group__1 : rule__ConstantDistribution__Group__1__Impl rule__ConstantDistribution__Group__2 ;
+    public final void rule__ConstantDistribution__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1340:1: ( rule__BasicEventDefinition__Group__3__Impl )
-            // InternalCftLanguage.g:1341:2: rule__BasicEventDefinition__Group__3__Impl
+            // InternalCftLanguage.g:1580:1: ( rule__ConstantDistribution__Group__1__Impl rule__ConstantDistribution__Group__2 )
+            // InternalCftLanguage.g:1581:2: rule__ConstantDistribution__Group__1__Impl rule__ConstantDistribution__Group__2
             {
+            pushFollow(FOLLOW_16);
+            rule__ConstantDistribution__Group__1__Impl();
+
+            state._fsp--;
+
             pushFollow(FOLLOW_2);
-            rule__BasicEventDefinition__Group__3__Impl();
+            rule__ConstantDistribution__Group__2();
 
             state._fsp--;
 
@@ -4207,35 +5063,180 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__BasicEventDefinition__Group__3"
+    // $ANTLR end "rule__ConstantDistribution__Group__1"
 
 
-    // $ANTLR start "rule__BasicEventDefinition__Group__3__Impl"
-    // InternalCftLanguage.g:1347:1: rule__BasicEventDefinition__Group__3__Impl : ( ( rule__BasicEventDefinition__RateAssignment_3 ) ) ;
-    public final void rule__BasicEventDefinition__Group__3__Impl() throws RecognitionException {
+    // $ANTLR start "rule__ConstantDistribution__Group__1__Impl"
+    // InternalCftLanguage.g:1588:1: rule__ConstantDistribution__Group__1__Impl : ( '=' ) ;
+    public final void rule__ConstantDistribution__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1351:1: ( ( ( rule__BasicEventDefinition__RateAssignment_3 ) ) )
-            // InternalCftLanguage.g:1352:1: ( ( rule__BasicEventDefinition__RateAssignment_3 ) )
+            // InternalCftLanguage.g:1592:1: ( ( '=' ) )
+            // InternalCftLanguage.g:1593:1: ( '=' )
             {
-            // InternalCftLanguage.g:1352:1: ( ( rule__BasicEventDefinition__RateAssignment_3 ) )
-            // InternalCftLanguage.g:1353:2: ( rule__BasicEventDefinition__RateAssignment_3 )
+            // InternalCftLanguage.g:1593:1: ( '=' )
+            // InternalCftLanguage.g:1594:2: '='
             {
-             before(grammarAccess.getBasicEventDefinitionAccess().getRateAssignment_3()); 
-            // InternalCftLanguage.g:1354:2: ( rule__BasicEventDefinition__RateAssignment_3 )
-            // InternalCftLanguage.g:1354:3: rule__BasicEventDefinition__RateAssignment_3
+             before(grammarAccess.getConstantDistributionAccess().getEqualsSignKeyword_1()); 
+            match(input,23,FOLLOW_2); 
+             after(grammarAccess.getConstantDistributionAccess().getEqualsSignKeyword_1()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__ConstantDistribution__Group__1__Impl"
+
+
+    // $ANTLR start "rule__ConstantDistribution__Group__2"
+    // InternalCftLanguage.g:1603:1: rule__ConstantDistribution__Group__2 : rule__ConstantDistribution__Group__2__Impl ;
+    public final void rule__ConstantDistribution__Group__2() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:1607:1: ( rule__ConstantDistribution__Group__2__Impl )
+            // InternalCftLanguage.g:1608:2: rule__ConstantDistribution__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
-            rule__BasicEventDefinition__RateAssignment_3();
+            rule__ConstantDistribution__Group__2__Impl();
 
             state._fsp--;
 
 
             }
 
-             after(grammarAccess.getBasicEventDefinitionAccess().getRateAssignment_3()); 
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__ConstantDistribution__Group__2"
+
+
+    // $ANTLR start "rule__ConstantDistribution__Group__2__Impl"
+    // InternalCftLanguage.g:1614:1: rule__ConstantDistribution__Group__2__Impl : ( ( rule__ConstantDistribution__PAssignment_2 ) ) ;
+    public final void rule__ConstantDistribution__Group__2__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:1618:1: ( ( ( rule__ConstantDistribution__PAssignment_2 ) ) )
+            // InternalCftLanguage.g:1619:1: ( ( rule__ConstantDistribution__PAssignment_2 ) )
+            {
+            // InternalCftLanguage.g:1619:1: ( ( rule__ConstantDistribution__PAssignment_2 ) )
+            // InternalCftLanguage.g:1620:2: ( rule__ConstantDistribution__PAssignment_2 )
+            {
+             before(grammarAccess.getConstantDistributionAccess().getPAssignment_2()); 
+            // InternalCftLanguage.g:1621:2: ( rule__ConstantDistribution__PAssignment_2 )
+            // InternalCftLanguage.g:1621:3: rule__ConstantDistribution__PAssignment_2
+            {
+            pushFollow(FOLLOW_2);
+            rule__ConstantDistribution__PAssignment_2();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getConstantDistributionAccess().getPAssignment_2()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__ConstantDistribution__Group__2__Impl"
+
+
+    // $ANTLR start "rule__ExponentialDistribution__Group__0"
+    // InternalCftLanguage.g:1630:1: rule__ExponentialDistribution__Group__0 : rule__ExponentialDistribution__Group__0__Impl rule__ExponentialDistribution__Group__1 ;
+    public final void rule__ExponentialDistribution__Group__0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:1634:1: ( rule__ExponentialDistribution__Group__0__Impl rule__ExponentialDistribution__Group__1 )
+            // InternalCftLanguage.g:1635:2: rule__ExponentialDistribution__Group__0__Impl rule__ExponentialDistribution__Group__1
+            {
+            pushFollow(FOLLOW_15);
+            rule__ExponentialDistribution__Group__0__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__ExponentialDistribution__Group__1();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__ExponentialDistribution__Group__0"
+
+
+    // $ANTLR start "rule__ExponentialDistribution__Group__0__Impl"
+    // InternalCftLanguage.g:1642:1: rule__ExponentialDistribution__Group__0__Impl : ( 'lambda' ) ;
+    public final void rule__ExponentialDistribution__Group__0__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:1646:1: ( ( 'lambda' ) )
+            // InternalCftLanguage.g:1647:1: ( 'lambda' )
+            {
+            // InternalCftLanguage.g:1647:1: ( 'lambda' )
+            // InternalCftLanguage.g:1648:2: 'lambda'
+            {
+             before(grammarAccess.getExponentialDistributionAccess().getLambdaKeyword_0()); 
+            match(input,24,FOLLOW_2); 
+             after(grammarAccess.getExponentialDistributionAccess().getLambdaKeyword_0()); 
 
             }
 
@@ -4254,26 +5255,181 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__BasicEventDefinition__Group__3__Impl"
+    // $ANTLR end "rule__ExponentialDistribution__Group__0__Impl"
 
 
-    // $ANTLR start "rule__AndGate__Group__0"
-    // InternalCftLanguage.g:1363:1: rule__AndGate__Group__0 : rule__AndGate__Group__0__Impl rule__AndGate__Group__1 ;
-    public final void rule__AndGate__Group__0() throws RecognitionException {
+    // $ANTLR start "rule__ExponentialDistribution__Group__1"
+    // InternalCftLanguage.g:1657:1: rule__ExponentialDistribution__Group__1 : rule__ExponentialDistribution__Group__1__Impl rule__ExponentialDistribution__Group__2 ;
+    public final void rule__ExponentialDistribution__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1367:1: ( rule__AndGate__Group__0__Impl rule__AndGate__Group__1 )
-            // InternalCftLanguage.g:1368:2: rule__AndGate__Group__0__Impl rule__AndGate__Group__1
+            // InternalCftLanguage.g:1661:1: ( rule__ExponentialDistribution__Group__1__Impl rule__ExponentialDistribution__Group__2 )
+            // InternalCftLanguage.g:1662:2: rule__ExponentialDistribution__Group__1__Impl rule__ExponentialDistribution__Group__2
+            {
+            pushFollow(FOLLOW_16);
+            rule__ExponentialDistribution__Group__1__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__ExponentialDistribution__Group__2();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__ExponentialDistribution__Group__1"
+
+
+    // $ANTLR start "rule__ExponentialDistribution__Group__1__Impl"
+    // InternalCftLanguage.g:1669:1: rule__ExponentialDistribution__Group__1__Impl : ( '=' ) ;
+    public final void rule__ExponentialDistribution__Group__1__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:1673:1: ( ( '=' ) )
+            // InternalCftLanguage.g:1674:1: ( '=' )
+            {
+            // InternalCftLanguage.g:1674:1: ( '=' )
+            // InternalCftLanguage.g:1675:2: '='
+            {
+             before(grammarAccess.getExponentialDistributionAccess().getEqualsSignKeyword_1()); 
+            match(input,23,FOLLOW_2); 
+             after(grammarAccess.getExponentialDistributionAccess().getEqualsSignKeyword_1()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__ExponentialDistribution__Group__1__Impl"
+
+
+    // $ANTLR start "rule__ExponentialDistribution__Group__2"
+    // InternalCftLanguage.g:1684:1: rule__ExponentialDistribution__Group__2 : rule__ExponentialDistribution__Group__2__Impl ;
+    public final void rule__ExponentialDistribution__Group__2() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:1688:1: ( rule__ExponentialDistribution__Group__2__Impl )
+            // InternalCftLanguage.g:1689:2: rule__ExponentialDistribution__Group__2__Impl
+            {
+            pushFollow(FOLLOW_2);
+            rule__ExponentialDistribution__Group__2__Impl();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__ExponentialDistribution__Group__2"
+
+
+    // $ANTLR start "rule__ExponentialDistribution__Group__2__Impl"
+    // InternalCftLanguage.g:1695:1: rule__ExponentialDistribution__Group__2__Impl : ( ( rule__ExponentialDistribution__LambdaAssignment_2 ) ) ;
+    public final void rule__ExponentialDistribution__Group__2__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:1699:1: ( ( ( rule__ExponentialDistribution__LambdaAssignment_2 ) ) )
+            // InternalCftLanguage.g:1700:1: ( ( rule__ExponentialDistribution__LambdaAssignment_2 ) )
+            {
+            // InternalCftLanguage.g:1700:1: ( ( rule__ExponentialDistribution__LambdaAssignment_2 ) )
+            // InternalCftLanguage.g:1701:2: ( rule__ExponentialDistribution__LambdaAssignment_2 )
+            {
+             before(grammarAccess.getExponentialDistributionAccess().getLambdaAssignment_2()); 
+            // InternalCftLanguage.g:1702:2: ( rule__ExponentialDistribution__LambdaAssignment_2 )
+            // InternalCftLanguage.g:1702:3: rule__ExponentialDistribution__LambdaAssignment_2
+            {
+            pushFollow(FOLLOW_2);
+            rule__ExponentialDistribution__LambdaAssignment_2();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getExponentialDistributionAccess().getLambdaAssignment_2()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__ExponentialDistribution__Group__2__Impl"
+
+
+    // $ANTLR start "rule__AndGateDefinition__Group__0"
+    // InternalCftLanguage.g:1711:1: rule__AndGateDefinition__Group__0 : rule__AndGateDefinition__Group__0__Impl rule__AndGateDefinition__Group__1 ;
+    public final void rule__AndGateDefinition__Group__0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:1715:1: ( rule__AndGateDefinition__Group__0__Impl rule__AndGateDefinition__Group__1 )
+            // InternalCftLanguage.g:1716:2: rule__AndGateDefinition__Group__0__Impl rule__AndGateDefinition__Group__1
             {
             pushFollow(FOLLOW_17);
-            rule__AndGate__Group__0__Impl();
+            rule__AndGateDefinition__Group__0__Impl();
 
             state._fsp--;
 
             pushFollow(FOLLOW_2);
-            rule__AndGate__Group__1();
+            rule__AndGateDefinition__Group__1();
 
             state._fsp--;
 
@@ -4292,35 +5448,35 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__AndGate__Group__0"
+    // $ANTLR end "rule__AndGateDefinition__Group__0"
 
 
-    // $ANTLR start "rule__AndGate__Group__0__Impl"
-    // InternalCftLanguage.g:1375:1: rule__AndGate__Group__0__Impl : ( ( rule__AndGate__NameAssignment_0 ) ) ;
-    public final void rule__AndGate__Group__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__AndGateDefinition__Group__0__Impl"
+    // InternalCftLanguage.g:1723:1: rule__AndGateDefinition__Group__0__Impl : ( ( rule__AndGateDefinition__NameAssignment_0 ) ) ;
+    public final void rule__AndGateDefinition__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1379:1: ( ( ( rule__AndGate__NameAssignment_0 ) ) )
-            // InternalCftLanguage.g:1380:1: ( ( rule__AndGate__NameAssignment_0 ) )
+            // InternalCftLanguage.g:1727:1: ( ( ( rule__AndGateDefinition__NameAssignment_0 ) ) )
+            // InternalCftLanguage.g:1728:1: ( ( rule__AndGateDefinition__NameAssignment_0 ) )
             {
-            // InternalCftLanguage.g:1380:1: ( ( rule__AndGate__NameAssignment_0 ) )
-            // InternalCftLanguage.g:1381:2: ( rule__AndGate__NameAssignment_0 )
+            // InternalCftLanguage.g:1728:1: ( ( rule__AndGateDefinition__NameAssignment_0 ) )
+            // InternalCftLanguage.g:1729:2: ( rule__AndGateDefinition__NameAssignment_0 )
             {
-             before(grammarAccess.getAndGateAccess().getNameAssignment_0()); 
-            // InternalCftLanguage.g:1382:2: ( rule__AndGate__NameAssignment_0 )
-            // InternalCftLanguage.g:1382:3: rule__AndGate__NameAssignment_0
+             before(grammarAccess.getAndGateDefinitionAccess().getNameAssignment_0()); 
+            // InternalCftLanguage.g:1730:2: ( rule__AndGateDefinition__NameAssignment_0 )
+            // InternalCftLanguage.g:1730:3: rule__AndGateDefinition__NameAssignment_0
             {
             pushFollow(FOLLOW_2);
-            rule__AndGate__NameAssignment_0();
+            rule__AndGateDefinition__NameAssignment_0();
 
             state._fsp--;
 
 
             }
 
-             after(grammarAccess.getAndGateAccess().getNameAssignment_0()); 
+             after(grammarAccess.getAndGateDefinitionAccess().getNameAssignment_0()); 
 
             }
 
@@ -4339,26 +5495,26 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__AndGate__Group__0__Impl"
+    // $ANTLR end "rule__AndGateDefinition__Group__0__Impl"
 
 
-    // $ANTLR start "rule__AndGate__Group__1"
-    // InternalCftLanguage.g:1390:1: rule__AndGate__Group__1 : rule__AndGate__Group__1__Impl rule__AndGate__Group__2 ;
-    public final void rule__AndGate__Group__1() throws RecognitionException {
+    // $ANTLR start "rule__AndGateDefinition__Group__1"
+    // InternalCftLanguage.g:1738:1: rule__AndGateDefinition__Group__1 : rule__AndGateDefinition__Group__1__Impl rule__AndGateDefinition__Group__2 ;
+    public final void rule__AndGateDefinition__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1394:1: ( rule__AndGate__Group__1__Impl rule__AndGate__Group__2 )
-            // InternalCftLanguage.g:1395:2: rule__AndGate__Group__1__Impl rule__AndGate__Group__2
+            // InternalCftLanguage.g:1742:1: ( rule__AndGateDefinition__Group__1__Impl rule__AndGateDefinition__Group__2 )
+            // InternalCftLanguage.g:1743:2: rule__AndGateDefinition__Group__1__Impl rule__AndGateDefinition__Group__2
             {
             pushFollow(FOLLOW_3);
-            rule__AndGate__Group__1__Impl();
+            rule__AndGateDefinition__Group__1__Impl();
 
             state._fsp--;
 
             pushFollow(FOLLOW_2);
-            rule__AndGate__Group__2();
+            rule__AndGateDefinition__Group__2();
 
             state._fsp--;
 
@@ -4377,25 +5533,25 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__AndGate__Group__1"
+    // $ANTLR end "rule__AndGateDefinition__Group__1"
 
 
-    // $ANTLR start "rule__AndGate__Group__1__Impl"
-    // InternalCftLanguage.g:1402:1: rule__AndGate__Group__1__Impl : ( 'and' ) ;
-    public final void rule__AndGate__Group__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__AndGateDefinition__Group__1__Impl"
+    // InternalCftLanguage.g:1750:1: rule__AndGateDefinition__Group__1__Impl : ( 'and' ) ;
+    public final void rule__AndGateDefinition__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1406:1: ( ( 'and' ) )
-            // InternalCftLanguage.g:1407:1: ( 'and' )
+            // InternalCftLanguage.g:1754:1: ( ( 'and' ) )
+            // InternalCftLanguage.g:1755:1: ( 'and' )
             {
-            // InternalCftLanguage.g:1407:1: ( 'and' )
-            // InternalCftLanguage.g:1408:2: 'and'
+            // InternalCftLanguage.g:1755:1: ( 'and' )
+            // InternalCftLanguage.g:1756:2: 'and'
             {
-             before(grammarAccess.getAndGateAccess().getAndKeyword_1()); 
-            match(input,23,FOLLOW_2); 
-             after(grammarAccess.getAndGateAccess().getAndKeyword_1()); 
+             before(grammarAccess.getAndGateDefinitionAccess().getAndKeyword_1()); 
+            match(input,25,FOLLOW_2); 
+             after(grammarAccess.getAndGateDefinitionAccess().getAndKeyword_1()); 
 
             }
 
@@ -4414,21 +5570,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__AndGate__Group__1__Impl"
+    // $ANTLR end "rule__AndGateDefinition__Group__1__Impl"
 
 
-    // $ANTLR start "rule__AndGate__Group__2"
-    // InternalCftLanguage.g:1417:1: rule__AndGate__Group__2 : rule__AndGate__Group__2__Impl ;
-    public final void rule__AndGate__Group__2() throws RecognitionException {
+    // $ANTLR start "rule__AndGateDefinition__Group__2"
+    // InternalCftLanguage.g:1765:1: rule__AndGateDefinition__Group__2 : rule__AndGateDefinition__Group__2__Impl ;
+    public final void rule__AndGateDefinition__Group__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1421:1: ( rule__AndGate__Group__2__Impl )
-            // InternalCftLanguage.g:1422:2: rule__AndGate__Group__2__Impl
+            // InternalCftLanguage.g:1769:1: ( rule__AndGateDefinition__Group__2__Impl )
+            // InternalCftLanguage.g:1770:2: rule__AndGateDefinition__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
-            rule__AndGate__Group__2__Impl();
+            rule__AndGateDefinition__Group__2__Impl();
 
             state._fsp--;
 
@@ -4447,40 +5603,40 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__AndGate__Group__2"
+    // $ANTLR end "rule__AndGateDefinition__Group__2"
 
 
-    // $ANTLR start "rule__AndGate__Group__2__Impl"
-    // InternalCftLanguage.g:1428:1: rule__AndGate__Group__2__Impl : ( ( rule__AndGate__InputEventsAssignment_2 )* ) ;
-    public final void rule__AndGate__Group__2__Impl() throws RecognitionException {
+    // $ANTLR start "rule__AndGateDefinition__Group__2__Impl"
+    // InternalCftLanguage.g:1776:1: rule__AndGateDefinition__Group__2__Impl : ( ( rule__AndGateDefinition__InputEventsAssignment_2 )* ) ;
+    public final void rule__AndGateDefinition__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1432:1: ( ( ( rule__AndGate__InputEventsAssignment_2 )* ) )
-            // InternalCftLanguage.g:1433:1: ( ( rule__AndGate__InputEventsAssignment_2 )* )
+            // InternalCftLanguage.g:1780:1: ( ( ( rule__AndGateDefinition__InputEventsAssignment_2 )* ) )
+            // InternalCftLanguage.g:1781:1: ( ( rule__AndGateDefinition__InputEventsAssignment_2 )* )
             {
-            // InternalCftLanguage.g:1433:1: ( ( rule__AndGate__InputEventsAssignment_2 )* )
-            // InternalCftLanguage.g:1434:2: ( rule__AndGate__InputEventsAssignment_2 )*
+            // InternalCftLanguage.g:1781:1: ( ( rule__AndGateDefinition__InputEventsAssignment_2 )* )
+            // InternalCftLanguage.g:1782:2: ( rule__AndGateDefinition__InputEventsAssignment_2 )*
             {
-             before(grammarAccess.getAndGateAccess().getInputEventsAssignment_2()); 
-            // InternalCftLanguage.g:1435:2: ( rule__AndGate__InputEventsAssignment_2 )*
-            loop14:
+             before(grammarAccess.getAndGateDefinitionAccess().getInputEventsAssignment_2()); 
+            // InternalCftLanguage.g:1783:2: ( rule__AndGateDefinition__InputEventsAssignment_2 )*
+            loop18:
             do {
-                int alt14=2;
-                int LA14_0 = input.LA(1);
+                int alt18=2;
+                int LA18_0 = input.LA(1);
 
-                if ( (LA14_0==RULE_ID) ) {
-                    alt14=1;
+                if ( ((LA18_0>=RULE_ID && LA18_0<=RULE_OF_INT)) ) {
+                    alt18=1;
                 }
 
 
-                switch (alt14) {
+                switch (alt18) {
                 case 1 :
-                    // InternalCftLanguage.g:1435:3: rule__AndGate__InputEventsAssignment_2
+                    // InternalCftLanguage.g:1783:3: rule__AndGateDefinition__InputEventsAssignment_2
                     {
                     pushFollow(FOLLOW_11);
-                    rule__AndGate__InputEventsAssignment_2();
+                    rule__AndGateDefinition__InputEventsAssignment_2();
 
                     state._fsp--;
 
@@ -4489,11 +5645,11 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
                     break;
 
                 default :
-                    break loop14;
+                    break loop18;
                 }
             } while (true);
 
-             after(grammarAccess.getAndGateAccess().getInputEventsAssignment_2()); 
+             after(grammarAccess.getAndGateDefinitionAccess().getInputEventsAssignment_2()); 
 
             }
 
@@ -4512,26 +5668,26 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__AndGate__Group__2__Impl"
+    // $ANTLR end "rule__AndGateDefinition__Group__2__Impl"
 
 
-    // $ANTLR start "rule__OrGate__Group__0"
-    // InternalCftLanguage.g:1444:1: rule__OrGate__Group__0 : rule__OrGate__Group__0__Impl rule__OrGate__Group__1 ;
-    public final void rule__OrGate__Group__0() throws RecognitionException {
+    // $ANTLR start "rule__OrGateDefinition__Group__0"
+    // InternalCftLanguage.g:1792:1: rule__OrGateDefinition__Group__0 : rule__OrGateDefinition__Group__0__Impl rule__OrGateDefinition__Group__1 ;
+    public final void rule__OrGateDefinition__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1448:1: ( rule__OrGate__Group__0__Impl rule__OrGate__Group__1 )
-            // InternalCftLanguage.g:1449:2: rule__OrGate__Group__0__Impl rule__OrGate__Group__1
+            // InternalCftLanguage.g:1796:1: ( rule__OrGateDefinition__Group__0__Impl rule__OrGateDefinition__Group__1 )
+            // InternalCftLanguage.g:1797:2: rule__OrGateDefinition__Group__0__Impl rule__OrGateDefinition__Group__1
             {
             pushFollow(FOLLOW_18);
-            rule__OrGate__Group__0__Impl();
+            rule__OrGateDefinition__Group__0__Impl();
 
             state._fsp--;
 
             pushFollow(FOLLOW_2);
-            rule__OrGate__Group__1();
+            rule__OrGateDefinition__Group__1();
 
             state._fsp--;
 
@@ -4550,35 +5706,35 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__OrGate__Group__0"
+    // $ANTLR end "rule__OrGateDefinition__Group__0"
 
 
-    // $ANTLR start "rule__OrGate__Group__0__Impl"
-    // InternalCftLanguage.g:1456:1: rule__OrGate__Group__0__Impl : ( ( rule__OrGate__NameAssignment_0 ) ) ;
-    public final void rule__OrGate__Group__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__OrGateDefinition__Group__0__Impl"
+    // InternalCftLanguage.g:1804:1: rule__OrGateDefinition__Group__0__Impl : ( ( rule__OrGateDefinition__NameAssignment_0 ) ) ;
+    public final void rule__OrGateDefinition__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1460:1: ( ( ( rule__OrGate__NameAssignment_0 ) ) )
-            // InternalCftLanguage.g:1461:1: ( ( rule__OrGate__NameAssignment_0 ) )
+            // InternalCftLanguage.g:1808:1: ( ( ( rule__OrGateDefinition__NameAssignment_0 ) ) )
+            // InternalCftLanguage.g:1809:1: ( ( rule__OrGateDefinition__NameAssignment_0 ) )
             {
-            // InternalCftLanguage.g:1461:1: ( ( rule__OrGate__NameAssignment_0 ) )
-            // InternalCftLanguage.g:1462:2: ( rule__OrGate__NameAssignment_0 )
+            // InternalCftLanguage.g:1809:1: ( ( rule__OrGateDefinition__NameAssignment_0 ) )
+            // InternalCftLanguage.g:1810:2: ( rule__OrGateDefinition__NameAssignment_0 )
             {
-             before(grammarAccess.getOrGateAccess().getNameAssignment_0()); 
-            // InternalCftLanguage.g:1463:2: ( rule__OrGate__NameAssignment_0 )
-            // InternalCftLanguage.g:1463:3: rule__OrGate__NameAssignment_0
+             before(grammarAccess.getOrGateDefinitionAccess().getNameAssignment_0()); 
+            // InternalCftLanguage.g:1811:2: ( rule__OrGateDefinition__NameAssignment_0 )
+            // InternalCftLanguage.g:1811:3: rule__OrGateDefinition__NameAssignment_0
             {
             pushFollow(FOLLOW_2);
-            rule__OrGate__NameAssignment_0();
+            rule__OrGateDefinition__NameAssignment_0();
 
             state._fsp--;
 
 
             }
 
-             after(grammarAccess.getOrGateAccess().getNameAssignment_0()); 
+             after(grammarAccess.getOrGateDefinitionAccess().getNameAssignment_0()); 
 
             }
 
@@ -4597,26 +5753,26 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__OrGate__Group__0__Impl"
+    // $ANTLR end "rule__OrGateDefinition__Group__0__Impl"
 
 
-    // $ANTLR start "rule__OrGate__Group__1"
-    // InternalCftLanguage.g:1471:1: rule__OrGate__Group__1 : rule__OrGate__Group__1__Impl rule__OrGate__Group__2 ;
-    public final void rule__OrGate__Group__1() throws RecognitionException {
+    // $ANTLR start "rule__OrGateDefinition__Group__1"
+    // InternalCftLanguage.g:1819:1: rule__OrGateDefinition__Group__1 : rule__OrGateDefinition__Group__1__Impl rule__OrGateDefinition__Group__2 ;
+    public final void rule__OrGateDefinition__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1475:1: ( rule__OrGate__Group__1__Impl rule__OrGate__Group__2 )
-            // InternalCftLanguage.g:1476:2: rule__OrGate__Group__1__Impl rule__OrGate__Group__2
+            // InternalCftLanguage.g:1823:1: ( rule__OrGateDefinition__Group__1__Impl rule__OrGateDefinition__Group__2 )
+            // InternalCftLanguage.g:1824:2: rule__OrGateDefinition__Group__1__Impl rule__OrGateDefinition__Group__2
             {
             pushFollow(FOLLOW_3);
-            rule__OrGate__Group__1__Impl();
+            rule__OrGateDefinition__Group__1__Impl();
 
             state._fsp--;
 
             pushFollow(FOLLOW_2);
-            rule__OrGate__Group__2();
+            rule__OrGateDefinition__Group__2();
 
             state._fsp--;
 
@@ -4635,25 +5791,25 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__OrGate__Group__1"
+    // $ANTLR end "rule__OrGateDefinition__Group__1"
 
 
-    // $ANTLR start "rule__OrGate__Group__1__Impl"
-    // InternalCftLanguage.g:1483:1: rule__OrGate__Group__1__Impl : ( 'or' ) ;
-    public final void rule__OrGate__Group__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__OrGateDefinition__Group__1__Impl"
+    // InternalCftLanguage.g:1831:1: rule__OrGateDefinition__Group__1__Impl : ( 'or' ) ;
+    public final void rule__OrGateDefinition__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1487:1: ( ( 'or' ) )
-            // InternalCftLanguage.g:1488:1: ( 'or' )
+            // InternalCftLanguage.g:1835:1: ( ( 'or' ) )
+            // InternalCftLanguage.g:1836:1: ( 'or' )
             {
-            // InternalCftLanguage.g:1488:1: ( 'or' )
-            // InternalCftLanguage.g:1489:2: 'or'
+            // InternalCftLanguage.g:1836:1: ( 'or' )
+            // InternalCftLanguage.g:1837:2: 'or'
             {
-             before(grammarAccess.getOrGateAccess().getOrKeyword_1()); 
-            match(input,24,FOLLOW_2); 
-             after(grammarAccess.getOrGateAccess().getOrKeyword_1()); 
+             before(grammarAccess.getOrGateDefinitionAccess().getOrKeyword_1()); 
+            match(input,26,FOLLOW_2); 
+             after(grammarAccess.getOrGateDefinitionAccess().getOrKeyword_1()); 
 
             }
 
@@ -4672,21 +5828,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__OrGate__Group__1__Impl"
+    // $ANTLR end "rule__OrGateDefinition__Group__1__Impl"
 
 
-    // $ANTLR start "rule__OrGate__Group__2"
-    // InternalCftLanguage.g:1498:1: rule__OrGate__Group__2 : rule__OrGate__Group__2__Impl ;
-    public final void rule__OrGate__Group__2() throws RecognitionException {
+    // $ANTLR start "rule__OrGateDefinition__Group__2"
+    // InternalCftLanguage.g:1846:1: rule__OrGateDefinition__Group__2 : rule__OrGateDefinition__Group__2__Impl ;
+    public final void rule__OrGateDefinition__Group__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1502:1: ( rule__OrGate__Group__2__Impl )
-            // InternalCftLanguage.g:1503:2: rule__OrGate__Group__2__Impl
+            // InternalCftLanguage.g:1850:1: ( rule__OrGateDefinition__Group__2__Impl )
+            // InternalCftLanguage.g:1851:2: rule__OrGateDefinition__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
-            rule__OrGate__Group__2__Impl();
+            rule__OrGateDefinition__Group__2__Impl();
 
             state._fsp--;
 
@@ -4705,40 +5861,40 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__OrGate__Group__2"
+    // $ANTLR end "rule__OrGateDefinition__Group__2"
 
 
-    // $ANTLR start "rule__OrGate__Group__2__Impl"
-    // InternalCftLanguage.g:1509:1: rule__OrGate__Group__2__Impl : ( ( rule__OrGate__InputEventsAssignment_2 )* ) ;
-    public final void rule__OrGate__Group__2__Impl() throws RecognitionException {
+    // $ANTLR start "rule__OrGateDefinition__Group__2__Impl"
+    // InternalCftLanguage.g:1857:1: rule__OrGateDefinition__Group__2__Impl : ( ( rule__OrGateDefinition__InputEventsAssignment_2 )* ) ;
+    public final void rule__OrGateDefinition__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1513:1: ( ( ( rule__OrGate__InputEventsAssignment_2 )* ) )
-            // InternalCftLanguage.g:1514:1: ( ( rule__OrGate__InputEventsAssignment_2 )* )
+            // InternalCftLanguage.g:1861:1: ( ( ( rule__OrGateDefinition__InputEventsAssignment_2 )* ) )
+            // InternalCftLanguage.g:1862:1: ( ( rule__OrGateDefinition__InputEventsAssignment_2 )* )
             {
-            // InternalCftLanguage.g:1514:1: ( ( rule__OrGate__InputEventsAssignment_2 )* )
-            // InternalCftLanguage.g:1515:2: ( rule__OrGate__InputEventsAssignment_2 )*
+            // InternalCftLanguage.g:1862:1: ( ( rule__OrGateDefinition__InputEventsAssignment_2 )* )
+            // InternalCftLanguage.g:1863:2: ( rule__OrGateDefinition__InputEventsAssignment_2 )*
             {
-             before(grammarAccess.getOrGateAccess().getInputEventsAssignment_2()); 
-            // InternalCftLanguage.g:1516:2: ( rule__OrGate__InputEventsAssignment_2 )*
-            loop15:
+             before(grammarAccess.getOrGateDefinitionAccess().getInputEventsAssignment_2()); 
+            // InternalCftLanguage.g:1864:2: ( rule__OrGateDefinition__InputEventsAssignment_2 )*
+            loop19:
             do {
-                int alt15=2;
-                int LA15_0 = input.LA(1);
+                int alt19=2;
+                int LA19_0 = input.LA(1);
 
-                if ( (LA15_0==RULE_ID) ) {
-                    alt15=1;
+                if ( ((LA19_0>=RULE_ID && LA19_0<=RULE_OF_INT)) ) {
+                    alt19=1;
                 }
 
 
-                switch (alt15) {
+                switch (alt19) {
                 case 1 :
-                    // InternalCftLanguage.g:1516:3: rule__OrGate__InputEventsAssignment_2
+                    // InternalCftLanguage.g:1864:3: rule__OrGateDefinition__InputEventsAssignment_2
                     {
                     pushFollow(FOLLOW_11);
-                    rule__OrGate__InputEventsAssignment_2();
+                    rule__OrGateDefinition__InputEventsAssignment_2();
 
                     state._fsp--;
 
@@ -4747,11 +5903,519 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
                     break;
 
                 default :
-                    break loop15;
+                    break loop19;
+                }
+            } while (true);
+
+             after(grammarAccess.getOrGateDefinitionAccess().getInputEventsAssignment_2()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__OrGateDefinition__Group__2__Impl"
+
+
+    // $ANTLR start "rule__KOfMGateDefinition__Group__0"
+    // InternalCftLanguage.g:1873:1: rule__KOfMGateDefinition__Group__0 : rule__KOfMGateDefinition__Group__0__Impl rule__KOfMGateDefinition__Group__1 ;
+    public final void rule__KOfMGateDefinition__Group__0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:1877:1: ( rule__KOfMGateDefinition__Group__0__Impl rule__KOfMGateDefinition__Group__1 )
+            // InternalCftLanguage.g:1878:2: rule__KOfMGateDefinition__Group__0__Impl rule__KOfMGateDefinition__Group__1
+            {
+            pushFollow(FOLLOW_19);
+            rule__KOfMGateDefinition__Group__0__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__KOfMGateDefinition__Group__1();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__KOfMGateDefinition__Group__0"
+
+
+    // $ANTLR start "rule__KOfMGateDefinition__Group__0__Impl"
+    // InternalCftLanguage.g:1885:1: rule__KOfMGateDefinition__Group__0__Impl : ( ( rule__KOfMGateDefinition__NameAssignment_0 ) ) ;
+    public final void rule__KOfMGateDefinition__Group__0__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:1889:1: ( ( ( rule__KOfMGateDefinition__NameAssignment_0 ) ) )
+            // InternalCftLanguage.g:1890:1: ( ( rule__KOfMGateDefinition__NameAssignment_0 ) )
+            {
+            // InternalCftLanguage.g:1890:1: ( ( rule__KOfMGateDefinition__NameAssignment_0 ) )
+            // InternalCftLanguage.g:1891:2: ( rule__KOfMGateDefinition__NameAssignment_0 )
+            {
+             before(grammarAccess.getKOfMGateDefinitionAccess().getNameAssignment_0()); 
+            // InternalCftLanguage.g:1892:2: ( rule__KOfMGateDefinition__NameAssignment_0 )
+            // InternalCftLanguage.g:1892:3: rule__KOfMGateDefinition__NameAssignment_0
+            {
+            pushFollow(FOLLOW_2);
+            rule__KOfMGateDefinition__NameAssignment_0();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getKOfMGateDefinitionAccess().getNameAssignment_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__KOfMGateDefinition__Group__0__Impl"
+
+
+    // $ANTLR start "rule__KOfMGateDefinition__Group__1"
+    // InternalCftLanguage.g:1900:1: rule__KOfMGateDefinition__Group__1 : rule__KOfMGateDefinition__Group__1__Impl rule__KOfMGateDefinition__Group__2 ;
+    public final void rule__KOfMGateDefinition__Group__1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:1904:1: ( rule__KOfMGateDefinition__Group__1__Impl rule__KOfMGateDefinition__Group__2 )
+            // InternalCftLanguage.g:1905:2: rule__KOfMGateDefinition__Group__1__Impl rule__KOfMGateDefinition__Group__2
+            {
+            pushFollow(FOLLOW_20);
+            rule__KOfMGateDefinition__Group__1__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__KOfMGateDefinition__Group__2();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__KOfMGateDefinition__Group__1"
+
+
+    // $ANTLR start "rule__KOfMGateDefinition__Group__1__Impl"
+    // InternalCftLanguage.g:1912:1: rule__KOfMGateDefinition__Group__1__Impl : ( ( rule__KOfMGateDefinition__KAssignment_1 ) ) ;
+    public final void rule__KOfMGateDefinition__Group__1__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:1916:1: ( ( ( rule__KOfMGateDefinition__KAssignment_1 ) ) )
+            // InternalCftLanguage.g:1917:1: ( ( rule__KOfMGateDefinition__KAssignment_1 ) )
+            {
+            // InternalCftLanguage.g:1917:1: ( ( rule__KOfMGateDefinition__KAssignment_1 ) )
+            // InternalCftLanguage.g:1918:2: ( rule__KOfMGateDefinition__KAssignment_1 )
+            {
+             before(grammarAccess.getKOfMGateDefinitionAccess().getKAssignment_1()); 
+            // InternalCftLanguage.g:1919:2: ( rule__KOfMGateDefinition__KAssignment_1 )
+            // InternalCftLanguage.g:1919:3: rule__KOfMGateDefinition__KAssignment_1
+            {
+            pushFollow(FOLLOW_2);
+            rule__KOfMGateDefinition__KAssignment_1();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getKOfMGateDefinitionAccess().getKAssignment_1()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__KOfMGateDefinition__Group__1__Impl"
+
+
+    // $ANTLR start "rule__KOfMGateDefinition__Group__2"
+    // InternalCftLanguage.g:1927:1: rule__KOfMGateDefinition__Group__2 : rule__KOfMGateDefinition__Group__2__Impl rule__KOfMGateDefinition__Group__3 ;
+    public final void rule__KOfMGateDefinition__Group__2() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:1931:1: ( rule__KOfMGateDefinition__Group__2__Impl rule__KOfMGateDefinition__Group__3 )
+            // InternalCftLanguage.g:1932:2: rule__KOfMGateDefinition__Group__2__Impl rule__KOfMGateDefinition__Group__3
+            {
+            pushFollow(FOLLOW_3);
+            rule__KOfMGateDefinition__Group__2__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__KOfMGateDefinition__Group__3();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__KOfMGateDefinition__Group__2"
+
+
+    // $ANTLR start "rule__KOfMGateDefinition__Group__2__Impl"
+    // InternalCftLanguage.g:1939:1: rule__KOfMGateDefinition__Group__2__Impl : ( ( rule__KOfMGateDefinition__Alternatives_2 ) ) ;
+    public final void rule__KOfMGateDefinition__Group__2__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:1943:1: ( ( ( rule__KOfMGateDefinition__Alternatives_2 ) ) )
+            // InternalCftLanguage.g:1944:1: ( ( rule__KOfMGateDefinition__Alternatives_2 ) )
+            {
+            // InternalCftLanguage.g:1944:1: ( ( rule__KOfMGateDefinition__Alternatives_2 ) )
+            // InternalCftLanguage.g:1945:2: ( rule__KOfMGateDefinition__Alternatives_2 )
+            {
+             before(grammarAccess.getKOfMGateDefinitionAccess().getAlternatives_2()); 
+            // InternalCftLanguage.g:1946:2: ( rule__KOfMGateDefinition__Alternatives_2 )
+            // InternalCftLanguage.g:1946:3: rule__KOfMGateDefinition__Alternatives_2
+            {
+            pushFollow(FOLLOW_2);
+            rule__KOfMGateDefinition__Alternatives_2();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getKOfMGateDefinitionAccess().getAlternatives_2()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__KOfMGateDefinition__Group__2__Impl"
+
+
+    // $ANTLR start "rule__KOfMGateDefinition__Group__3"
+    // InternalCftLanguage.g:1954:1: rule__KOfMGateDefinition__Group__3 : rule__KOfMGateDefinition__Group__3__Impl ;
+    public final void rule__KOfMGateDefinition__Group__3() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:1958:1: ( rule__KOfMGateDefinition__Group__3__Impl )
+            // InternalCftLanguage.g:1959:2: rule__KOfMGateDefinition__Group__3__Impl
+            {
+            pushFollow(FOLLOW_2);
+            rule__KOfMGateDefinition__Group__3__Impl();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__KOfMGateDefinition__Group__3"
+
+
+    // $ANTLR start "rule__KOfMGateDefinition__Group__3__Impl"
+    // InternalCftLanguage.g:1965:1: rule__KOfMGateDefinition__Group__3__Impl : ( ( rule__KOfMGateDefinition__InputEventsAssignment_3 )* ) ;
+    public final void rule__KOfMGateDefinition__Group__3__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:1969:1: ( ( ( rule__KOfMGateDefinition__InputEventsAssignment_3 )* ) )
+            // InternalCftLanguage.g:1970:1: ( ( rule__KOfMGateDefinition__InputEventsAssignment_3 )* )
+            {
+            // InternalCftLanguage.g:1970:1: ( ( rule__KOfMGateDefinition__InputEventsAssignment_3 )* )
+            // InternalCftLanguage.g:1971:2: ( rule__KOfMGateDefinition__InputEventsAssignment_3 )*
+            {
+             before(grammarAccess.getKOfMGateDefinitionAccess().getInputEventsAssignment_3()); 
+            // InternalCftLanguage.g:1972:2: ( rule__KOfMGateDefinition__InputEventsAssignment_3 )*
+            loop20:
+            do {
+                int alt20=2;
+                int LA20_0 = input.LA(1);
+
+                if ( ((LA20_0>=RULE_ID && LA20_0<=RULE_OF_INT)) ) {
+                    alt20=1;
+                }
+
+
+                switch (alt20) {
+                case 1 :
+                    // InternalCftLanguage.g:1972:3: rule__KOfMGateDefinition__InputEventsAssignment_3
+                    {
+                    pushFollow(FOLLOW_11);
+                    rule__KOfMGateDefinition__InputEventsAssignment_3();
+
+                    state._fsp--;
+
+
+                    }
+                    break;
+
+                default :
+                    break loop20;
                 }
             } while (true);
 
-             after(grammarAccess.getOrGateAccess().getInputEventsAssignment_2()); 
+             after(grammarAccess.getKOfMGateDefinitionAccess().getInputEventsAssignment_3()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__KOfMGateDefinition__Group__3__Impl"
+
+
+    // $ANTLR start "rule__KOfMGateDefinition__Group_2_0__0"
+    // InternalCftLanguage.g:1981:1: rule__KOfMGateDefinition__Group_2_0__0 : rule__KOfMGateDefinition__Group_2_0__0__Impl rule__KOfMGateDefinition__Group_2_0__1 ;
+    public final void rule__KOfMGateDefinition__Group_2_0__0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:1985:1: ( rule__KOfMGateDefinition__Group_2_0__0__Impl rule__KOfMGateDefinition__Group_2_0__1 )
+            // InternalCftLanguage.g:1986:2: rule__KOfMGateDefinition__Group_2_0__0__Impl rule__KOfMGateDefinition__Group_2_0__1
+            {
+            pushFollow(FOLLOW_19);
+            rule__KOfMGateDefinition__Group_2_0__0__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__KOfMGateDefinition__Group_2_0__1();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__KOfMGateDefinition__Group_2_0__0"
+
+
+    // $ANTLR start "rule__KOfMGateDefinition__Group_2_0__0__Impl"
+    // InternalCftLanguage.g:1993:1: rule__KOfMGateDefinition__Group_2_0__0__Impl : ( 'of' ) ;
+    public final void rule__KOfMGateDefinition__Group_2_0__0__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:1997:1: ( ( 'of' ) )
+            // InternalCftLanguage.g:1998:1: ( 'of' )
+            {
+            // InternalCftLanguage.g:1998:1: ( 'of' )
+            // InternalCftLanguage.g:1999:2: 'of'
+            {
+             before(grammarAccess.getKOfMGateDefinitionAccess().getOfKeyword_2_0_0()); 
+            match(input,27,FOLLOW_2); 
+             after(grammarAccess.getKOfMGateDefinitionAccess().getOfKeyword_2_0_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__KOfMGateDefinition__Group_2_0__0__Impl"
+
+
+    // $ANTLR start "rule__KOfMGateDefinition__Group_2_0__1"
+    // InternalCftLanguage.g:2008:1: rule__KOfMGateDefinition__Group_2_0__1 : rule__KOfMGateDefinition__Group_2_0__1__Impl ;
+    public final void rule__KOfMGateDefinition__Group_2_0__1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:2012:1: ( rule__KOfMGateDefinition__Group_2_0__1__Impl )
+            // InternalCftLanguage.g:2013:2: rule__KOfMGateDefinition__Group_2_0__1__Impl
+            {
+            pushFollow(FOLLOW_2);
+            rule__KOfMGateDefinition__Group_2_0__1__Impl();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__KOfMGateDefinition__Group_2_0__1"
+
+
+    // $ANTLR start "rule__KOfMGateDefinition__Group_2_0__1__Impl"
+    // InternalCftLanguage.g:2019:1: rule__KOfMGateDefinition__Group_2_0__1__Impl : ( ( rule__KOfMGateDefinition__MAssignment_2_0_1 ) ) ;
+    public final void rule__KOfMGateDefinition__Group_2_0__1__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:2023:1: ( ( ( rule__KOfMGateDefinition__MAssignment_2_0_1 ) ) )
+            // InternalCftLanguage.g:2024:1: ( ( rule__KOfMGateDefinition__MAssignment_2_0_1 ) )
+            {
+            // InternalCftLanguage.g:2024:1: ( ( rule__KOfMGateDefinition__MAssignment_2_0_1 ) )
+            // InternalCftLanguage.g:2025:2: ( rule__KOfMGateDefinition__MAssignment_2_0_1 )
+            {
+             before(grammarAccess.getKOfMGateDefinitionAccess().getMAssignment_2_0_1()); 
+            // InternalCftLanguage.g:2026:2: ( rule__KOfMGateDefinition__MAssignment_2_0_1 )
+            // InternalCftLanguage.g:2026:3: rule__KOfMGateDefinition__MAssignment_2_0_1
+            {
+            pushFollow(FOLLOW_2);
+            rule__KOfMGateDefinition__MAssignment_2_0_1();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getKOfMGateDefinitionAccess().getMAssignment_2_0_1()); 
 
             }
 
@@ -4770,18 +6434,18 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__OrGate__Group__2__Impl"
+    // $ANTLR end "rule__KOfMGateDefinition__Group_2_0__1__Impl"
 
 
     // $ANTLR start "rule__TransformationDefinition__Group__0"
-    // InternalCftLanguage.g:1525:1: rule__TransformationDefinition__Group__0 : rule__TransformationDefinition__Group__0__Impl rule__TransformationDefinition__Group__1 ;
+    // InternalCftLanguage.g:2035:1: rule__TransformationDefinition__Group__0 : rule__TransformationDefinition__Group__0__Impl rule__TransformationDefinition__Group__1 ;
     public final void rule__TransformationDefinition__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1529:1: ( rule__TransformationDefinition__Group__0__Impl rule__TransformationDefinition__Group__1 )
-            // InternalCftLanguage.g:1530:2: rule__TransformationDefinition__Group__0__Impl rule__TransformationDefinition__Group__1
+            // InternalCftLanguage.g:2039:1: ( rule__TransformationDefinition__Group__0__Impl rule__TransformationDefinition__Group__1 )
+            // InternalCftLanguage.g:2040:2: rule__TransformationDefinition__Group__0__Impl rule__TransformationDefinition__Group__1
             {
             pushFollow(FOLLOW_3);
             rule__TransformationDefinition__Group__0__Impl();
@@ -4812,20 +6476,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__TransformationDefinition__Group__0__Impl"
-    // InternalCftLanguage.g:1537:1: rule__TransformationDefinition__Group__0__Impl : ( 'transformation' ) ;
+    // InternalCftLanguage.g:2047:1: rule__TransformationDefinition__Group__0__Impl : ( 'transformation' ) ;
     public final void rule__TransformationDefinition__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1541:1: ( ( 'transformation' ) )
-            // InternalCftLanguage.g:1542:1: ( 'transformation' )
+            // InternalCftLanguage.g:2051:1: ( ( 'transformation' ) )
+            // InternalCftLanguage.g:2052:1: ( 'transformation' )
             {
-            // InternalCftLanguage.g:1542:1: ( 'transformation' )
-            // InternalCftLanguage.g:1543:2: 'transformation'
+            // InternalCftLanguage.g:2052:1: ( 'transformation' )
+            // InternalCftLanguage.g:2053:2: 'transformation'
             {
              before(grammarAccess.getTransformationDefinitionAccess().getTransformationKeyword_0()); 
-            match(input,25,FOLLOW_2); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getTransformationDefinitionAccess().getTransformationKeyword_0()); 
 
             }
@@ -4849,14 +6513,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__TransformationDefinition__Group__1"
-    // InternalCftLanguage.g:1552:1: rule__TransformationDefinition__Group__1 : rule__TransformationDefinition__Group__1__Impl rule__TransformationDefinition__Group__2 ;
+    // InternalCftLanguage.g:2062:1: rule__TransformationDefinition__Group__1 : rule__TransformationDefinition__Group__1__Impl rule__TransformationDefinition__Group__2 ;
     public final void rule__TransformationDefinition__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1556:1: ( rule__TransformationDefinition__Group__1__Impl rule__TransformationDefinition__Group__2 )
-            // InternalCftLanguage.g:1557:2: rule__TransformationDefinition__Group__1__Impl rule__TransformationDefinition__Group__2
+            // InternalCftLanguage.g:2066:1: ( rule__TransformationDefinition__Group__1__Impl rule__TransformationDefinition__Group__2 )
+            // InternalCftLanguage.g:2067:2: rule__TransformationDefinition__Group__1__Impl rule__TransformationDefinition__Group__2
             {
             pushFollow(FOLLOW_8);
             rule__TransformationDefinition__Group__1__Impl();
@@ -4887,21 +6551,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__TransformationDefinition__Group__1__Impl"
-    // InternalCftLanguage.g:1564:1: rule__TransformationDefinition__Group__1__Impl : ( ( rule__TransformationDefinition__NameAssignment_1 ) ) ;
+    // InternalCftLanguage.g:2074:1: rule__TransformationDefinition__Group__1__Impl : ( ( rule__TransformationDefinition__NameAssignment_1 ) ) ;
     public final void rule__TransformationDefinition__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1568:1: ( ( ( rule__TransformationDefinition__NameAssignment_1 ) ) )
-            // InternalCftLanguage.g:1569:1: ( ( rule__TransformationDefinition__NameAssignment_1 ) )
+            // InternalCftLanguage.g:2078:1: ( ( ( rule__TransformationDefinition__NameAssignment_1 ) ) )
+            // InternalCftLanguage.g:2079:1: ( ( rule__TransformationDefinition__NameAssignment_1 ) )
             {
-            // InternalCftLanguage.g:1569:1: ( ( rule__TransformationDefinition__NameAssignment_1 ) )
-            // InternalCftLanguage.g:1570:2: ( rule__TransformationDefinition__NameAssignment_1 )
+            // InternalCftLanguage.g:2079:1: ( ( rule__TransformationDefinition__NameAssignment_1 ) )
+            // InternalCftLanguage.g:2080:2: ( rule__TransformationDefinition__NameAssignment_1 )
             {
              before(grammarAccess.getTransformationDefinitionAccess().getNameAssignment_1()); 
-            // InternalCftLanguage.g:1571:2: ( rule__TransformationDefinition__NameAssignment_1 )
-            // InternalCftLanguage.g:1571:3: rule__TransformationDefinition__NameAssignment_1
+            // InternalCftLanguage.g:2081:2: ( rule__TransformationDefinition__NameAssignment_1 )
+            // InternalCftLanguage.g:2081:3: rule__TransformationDefinition__NameAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__TransformationDefinition__NameAssignment_1();
@@ -4934,16 +6598,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__TransformationDefinition__Group__2"
-    // InternalCftLanguage.g:1579:1: rule__TransformationDefinition__Group__2 : rule__TransformationDefinition__Group__2__Impl rule__TransformationDefinition__Group__3 ;
+    // InternalCftLanguage.g:2089:1: rule__TransformationDefinition__Group__2 : rule__TransformationDefinition__Group__2__Impl rule__TransformationDefinition__Group__3 ;
     public final void rule__TransformationDefinition__Group__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1583:1: ( rule__TransformationDefinition__Group__2__Impl rule__TransformationDefinition__Group__3 )
-            // InternalCftLanguage.g:1584:2: rule__TransformationDefinition__Group__2__Impl rule__TransformationDefinition__Group__3
+            // InternalCftLanguage.g:2093:1: ( rule__TransformationDefinition__Group__2__Impl rule__TransformationDefinition__Group__3 )
+            // InternalCftLanguage.g:2094:2: rule__TransformationDefinition__Group__2__Impl rule__TransformationDefinition__Group__3
             {
-            pushFollow(FOLLOW_19);
+            pushFollow(FOLLOW_21);
             rule__TransformationDefinition__Group__2__Impl();
 
             state._fsp--;
@@ -4972,20 +6636,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__TransformationDefinition__Group__2__Impl"
-    // InternalCftLanguage.g:1591:1: rule__TransformationDefinition__Group__2__Impl : ( '{' ) ;
+    // InternalCftLanguage.g:2101:1: rule__TransformationDefinition__Group__2__Impl : ( '{' ) ;
     public final void rule__TransformationDefinition__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1595:1: ( ( '{' ) )
-            // InternalCftLanguage.g:1596:1: ( '{' )
+            // InternalCftLanguage.g:2105:1: ( ( '{' ) )
+            // InternalCftLanguage.g:2106:1: ( '{' )
             {
-            // InternalCftLanguage.g:1596:1: ( '{' )
-            // InternalCftLanguage.g:1597:2: '{'
+            // InternalCftLanguage.g:2106:1: ( '{' )
+            // InternalCftLanguage.g:2107:2: '{'
             {
              before(grammarAccess.getTransformationDefinitionAccess().getLeftCurlyBracketKeyword_2()); 
-            match(input,17,FOLLOW_2); 
+            match(input,18,FOLLOW_2); 
              after(grammarAccess.getTransformationDefinitionAccess().getLeftCurlyBracketKeyword_2()); 
 
             }
@@ -5009,16 +6673,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__TransformationDefinition__Group__3"
-    // InternalCftLanguage.g:1606:1: rule__TransformationDefinition__Group__3 : rule__TransformationDefinition__Group__3__Impl rule__TransformationDefinition__Group__4 ;
+    // InternalCftLanguage.g:2116:1: rule__TransformationDefinition__Group__3 : rule__TransformationDefinition__Group__3__Impl rule__TransformationDefinition__Group__4 ;
     public final void rule__TransformationDefinition__Group__3() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1610:1: ( rule__TransformationDefinition__Group__3__Impl rule__TransformationDefinition__Group__4 )
-            // InternalCftLanguage.g:1611:2: rule__TransformationDefinition__Group__3__Impl rule__TransformationDefinition__Group__4
+            // InternalCftLanguage.g:2120:1: ( rule__TransformationDefinition__Group__3__Impl rule__TransformationDefinition__Group__4 )
+            // InternalCftLanguage.g:2121:2: rule__TransformationDefinition__Group__3__Impl rule__TransformationDefinition__Group__4
             {
-            pushFollow(FOLLOW_19);
+            pushFollow(FOLLOW_21);
             rule__TransformationDefinition__Group__3__Impl();
 
             state._fsp--;
@@ -5047,35 +6711,35 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__TransformationDefinition__Group__3__Impl"
-    // InternalCftLanguage.g:1618:1: rule__TransformationDefinition__Group__3__Impl : ( ( rule__TransformationDefinition__MappingDefinitionsAssignment_3 )* ) ;
+    // InternalCftLanguage.g:2128:1: rule__TransformationDefinition__Group__3__Impl : ( ( rule__TransformationDefinition__MappingDefinitionsAssignment_3 )* ) ;
     public final void rule__TransformationDefinition__Group__3__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1622:1: ( ( ( rule__TransformationDefinition__MappingDefinitionsAssignment_3 )* ) )
-            // InternalCftLanguage.g:1623:1: ( ( rule__TransformationDefinition__MappingDefinitionsAssignment_3 )* )
+            // InternalCftLanguage.g:2132:1: ( ( ( rule__TransformationDefinition__MappingDefinitionsAssignment_3 )* ) )
+            // InternalCftLanguage.g:2133:1: ( ( rule__TransformationDefinition__MappingDefinitionsAssignment_3 )* )
             {
-            // InternalCftLanguage.g:1623:1: ( ( rule__TransformationDefinition__MappingDefinitionsAssignment_3 )* )
-            // InternalCftLanguage.g:1624:2: ( rule__TransformationDefinition__MappingDefinitionsAssignment_3 )*
+            // InternalCftLanguage.g:2133:1: ( ( rule__TransformationDefinition__MappingDefinitionsAssignment_3 )* )
+            // InternalCftLanguage.g:2134:2: ( rule__TransformationDefinition__MappingDefinitionsAssignment_3 )*
             {
              before(grammarAccess.getTransformationDefinitionAccess().getMappingDefinitionsAssignment_3()); 
-            // InternalCftLanguage.g:1625:2: ( rule__TransformationDefinition__MappingDefinitionsAssignment_3 )*
-            loop16:
+            // InternalCftLanguage.g:2135:2: ( rule__TransformationDefinition__MappingDefinitionsAssignment_3 )*
+            loop21:
             do {
-                int alt16=2;
-                int LA16_0 = input.LA(1);
+                int alt21=2;
+                int LA21_0 = input.LA(1);
 
-                if ( (LA16_0==26||LA16_0==36) ) {
-                    alt16=1;
+                if ( (LA21_0==29||LA21_0==39) ) {
+                    alt21=1;
                 }
 
 
-                switch (alt16) {
+                switch (alt21) {
                 case 1 :
-                    // InternalCftLanguage.g:1625:3: rule__TransformationDefinition__MappingDefinitionsAssignment_3
+                    // InternalCftLanguage.g:2135:3: rule__TransformationDefinition__MappingDefinitionsAssignment_3
                     {
-                    pushFollow(FOLLOW_20);
+                    pushFollow(FOLLOW_22);
                     rule__TransformationDefinition__MappingDefinitionsAssignment_3();
 
                     state._fsp--;
@@ -5085,7 +6749,7 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
                     break;
 
                 default :
-                    break loop16;
+                    break loop21;
                 }
             } while (true);
 
@@ -5112,14 +6776,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__TransformationDefinition__Group__4"
-    // InternalCftLanguage.g:1633:1: rule__TransformationDefinition__Group__4 : rule__TransformationDefinition__Group__4__Impl ;
+    // InternalCftLanguage.g:2143:1: rule__TransformationDefinition__Group__4 : rule__TransformationDefinition__Group__4__Impl ;
     public final void rule__TransformationDefinition__Group__4() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1637:1: ( rule__TransformationDefinition__Group__4__Impl )
-            // InternalCftLanguage.g:1638:2: rule__TransformationDefinition__Group__4__Impl
+            // InternalCftLanguage.g:2147:1: ( rule__TransformationDefinition__Group__4__Impl )
+            // InternalCftLanguage.g:2148:2: rule__TransformationDefinition__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TransformationDefinition__Group__4__Impl();
@@ -5145,20 +6809,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__TransformationDefinition__Group__4__Impl"
-    // InternalCftLanguage.g:1644:1: rule__TransformationDefinition__Group__4__Impl : ( '}' ) ;
+    // InternalCftLanguage.g:2154:1: rule__TransformationDefinition__Group__4__Impl : ( '}' ) ;
     public final void rule__TransformationDefinition__Group__4__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1648:1: ( ( '}' ) )
-            // InternalCftLanguage.g:1649:1: ( '}' )
+            // InternalCftLanguage.g:2158:1: ( ( '}' ) )
+            // InternalCftLanguage.g:2159:1: ( '}' )
             {
-            // InternalCftLanguage.g:1649:1: ( '}' )
-            // InternalCftLanguage.g:1650:2: '}'
+            // InternalCftLanguage.g:2159:1: ( '}' )
+            // InternalCftLanguage.g:2160:2: '}'
             {
              before(grammarAccess.getTransformationDefinitionAccess().getRightCurlyBracketKeyword_4()); 
-            match(input,18,FOLLOW_2); 
+            match(input,19,FOLLOW_2); 
              after(grammarAccess.getTransformationDefinitionAccess().getRightCurlyBracketKeyword_4()); 
 
             }
@@ -5182,16 +6846,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group__0"
-    // InternalCftLanguage.g:1660:1: rule__MappingDefinition__Group__0 : rule__MappingDefinition__Group__0__Impl rule__MappingDefinition__Group__1 ;
+    // InternalCftLanguage.g:2170:1: rule__MappingDefinition__Group__0 : rule__MappingDefinition__Group__0__Impl rule__MappingDefinition__Group__1 ;
     public final void rule__MappingDefinition__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1664:1: ( rule__MappingDefinition__Group__0__Impl rule__MappingDefinition__Group__1 )
-            // InternalCftLanguage.g:1665:2: rule__MappingDefinition__Group__0__Impl rule__MappingDefinition__Group__1
+            // InternalCftLanguage.g:2174:1: ( rule__MappingDefinition__Group__0__Impl rule__MappingDefinition__Group__1 )
+            // InternalCftLanguage.g:2175:2: rule__MappingDefinition__Group__0__Impl rule__MappingDefinition__Group__1
             {
-            pushFollow(FOLLOW_21);
+            pushFollow(FOLLOW_23);
             rule__MappingDefinition__Group__0__Impl();
 
             state._fsp--;
@@ -5220,29 +6884,29 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group__0__Impl"
-    // InternalCftLanguage.g:1672:1: rule__MappingDefinition__Group__0__Impl : ( ( rule__MappingDefinition__TopLevelAssignment_0 )? ) ;
+    // InternalCftLanguage.g:2182:1: rule__MappingDefinition__Group__0__Impl : ( ( rule__MappingDefinition__TopLevelAssignment_0 )? ) ;
     public final void rule__MappingDefinition__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1676:1: ( ( ( rule__MappingDefinition__TopLevelAssignment_0 )? ) )
-            // InternalCftLanguage.g:1677:1: ( ( rule__MappingDefinition__TopLevelAssignment_0 )? )
+            // InternalCftLanguage.g:2186:1: ( ( ( rule__MappingDefinition__TopLevelAssignment_0 )? ) )
+            // InternalCftLanguage.g:2187:1: ( ( rule__MappingDefinition__TopLevelAssignment_0 )? )
             {
-            // InternalCftLanguage.g:1677:1: ( ( rule__MappingDefinition__TopLevelAssignment_0 )? )
-            // InternalCftLanguage.g:1678:2: ( rule__MappingDefinition__TopLevelAssignment_0 )?
+            // InternalCftLanguage.g:2187:1: ( ( rule__MappingDefinition__TopLevelAssignment_0 )? )
+            // InternalCftLanguage.g:2188:2: ( rule__MappingDefinition__TopLevelAssignment_0 )?
             {
              before(grammarAccess.getMappingDefinitionAccess().getTopLevelAssignment_0()); 
-            // InternalCftLanguage.g:1679:2: ( rule__MappingDefinition__TopLevelAssignment_0 )?
-            int alt17=2;
-            int LA17_0 = input.LA(1);
+            // InternalCftLanguage.g:2189:2: ( rule__MappingDefinition__TopLevelAssignment_0 )?
+            int alt22=2;
+            int LA22_0 = input.LA(1);
 
-            if ( (LA17_0==36) ) {
-                alt17=1;
+            if ( (LA22_0==39) ) {
+                alt22=1;
             }
-            switch (alt17) {
+            switch (alt22) {
                 case 1 :
-                    // InternalCftLanguage.g:1679:3: rule__MappingDefinition__TopLevelAssignment_0
+                    // InternalCftLanguage.g:2189:3: rule__MappingDefinition__TopLevelAssignment_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__MappingDefinition__TopLevelAssignment_0();
@@ -5278,14 +6942,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group__1"
-    // InternalCftLanguage.g:1687:1: rule__MappingDefinition__Group__1 : rule__MappingDefinition__Group__1__Impl rule__MappingDefinition__Group__2 ;
+    // InternalCftLanguage.g:2197:1: rule__MappingDefinition__Group__1 : rule__MappingDefinition__Group__1__Impl rule__MappingDefinition__Group__2 ;
     public final void rule__MappingDefinition__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1691:1: ( rule__MappingDefinition__Group__1__Impl rule__MappingDefinition__Group__2 )
-            // InternalCftLanguage.g:1692:2: rule__MappingDefinition__Group__1__Impl rule__MappingDefinition__Group__2
+            // InternalCftLanguage.g:2201:1: ( rule__MappingDefinition__Group__1__Impl rule__MappingDefinition__Group__2 )
+            // InternalCftLanguage.g:2202:2: rule__MappingDefinition__Group__1__Impl rule__MappingDefinition__Group__2
             {
             pushFollow(FOLLOW_3);
             rule__MappingDefinition__Group__1__Impl();
@@ -5316,20 +6980,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group__1__Impl"
-    // InternalCftLanguage.g:1699:1: rule__MappingDefinition__Group__1__Impl : ( 'mapping' ) ;
+    // InternalCftLanguage.g:2209:1: rule__MappingDefinition__Group__1__Impl : ( 'mapping' ) ;
     public final void rule__MappingDefinition__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1703:1: ( ( 'mapping' ) )
-            // InternalCftLanguage.g:1704:1: ( 'mapping' )
+            // InternalCftLanguage.g:2213:1: ( ( 'mapping' ) )
+            // InternalCftLanguage.g:2214:1: ( 'mapping' )
             {
-            // InternalCftLanguage.g:1704:1: ( 'mapping' )
-            // InternalCftLanguage.g:1705:2: 'mapping'
+            // InternalCftLanguage.g:2214:1: ( 'mapping' )
+            // InternalCftLanguage.g:2215:2: 'mapping'
             {
              before(grammarAccess.getMappingDefinitionAccess().getMappingKeyword_1()); 
-            match(input,26,FOLLOW_2); 
+            match(input,29,FOLLOW_2); 
              after(grammarAccess.getMappingDefinitionAccess().getMappingKeyword_1()); 
 
             }
@@ -5353,16 +7017,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group__2"
-    // InternalCftLanguage.g:1714:1: rule__MappingDefinition__Group__2 : rule__MappingDefinition__Group__2__Impl rule__MappingDefinition__Group__3 ;
+    // InternalCftLanguage.g:2224:1: rule__MappingDefinition__Group__2 : rule__MappingDefinition__Group__2__Impl rule__MappingDefinition__Group__3 ;
     public final void rule__MappingDefinition__Group__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1718:1: ( rule__MappingDefinition__Group__2__Impl rule__MappingDefinition__Group__3 )
-            // InternalCftLanguage.g:1719:2: rule__MappingDefinition__Group__2__Impl rule__MappingDefinition__Group__3
+            // InternalCftLanguage.g:2228:1: ( rule__MappingDefinition__Group__2__Impl rule__MappingDefinition__Group__3 )
+            // InternalCftLanguage.g:2229:2: rule__MappingDefinition__Group__2__Impl rule__MappingDefinition__Group__3
             {
-            pushFollow(FOLLOW_22);
+            pushFollow(FOLLOW_24);
             rule__MappingDefinition__Group__2__Impl();
 
             state._fsp--;
@@ -5391,21 +7055,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group__2__Impl"
-    // InternalCftLanguage.g:1726:1: rule__MappingDefinition__Group__2__Impl : ( ( rule__MappingDefinition__PatternAssignment_2 ) ) ;
+    // InternalCftLanguage.g:2236:1: rule__MappingDefinition__Group__2__Impl : ( ( rule__MappingDefinition__PatternAssignment_2 ) ) ;
     public final void rule__MappingDefinition__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1730:1: ( ( ( rule__MappingDefinition__PatternAssignment_2 ) ) )
-            // InternalCftLanguage.g:1731:1: ( ( rule__MappingDefinition__PatternAssignment_2 ) )
+            // InternalCftLanguage.g:2240:1: ( ( ( rule__MappingDefinition__PatternAssignment_2 ) ) )
+            // InternalCftLanguage.g:2241:1: ( ( rule__MappingDefinition__PatternAssignment_2 ) )
             {
-            // InternalCftLanguage.g:1731:1: ( ( rule__MappingDefinition__PatternAssignment_2 ) )
-            // InternalCftLanguage.g:1732:2: ( rule__MappingDefinition__PatternAssignment_2 )
+            // InternalCftLanguage.g:2241:1: ( ( rule__MappingDefinition__PatternAssignment_2 ) )
+            // InternalCftLanguage.g:2242:2: ( rule__MappingDefinition__PatternAssignment_2 )
             {
              before(grammarAccess.getMappingDefinitionAccess().getPatternAssignment_2()); 
-            // InternalCftLanguage.g:1733:2: ( rule__MappingDefinition__PatternAssignment_2 )
-            // InternalCftLanguage.g:1733:3: rule__MappingDefinition__PatternAssignment_2
+            // InternalCftLanguage.g:2243:2: ( rule__MappingDefinition__PatternAssignment_2 )
+            // InternalCftLanguage.g:2243:3: rule__MappingDefinition__PatternAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__MappingDefinition__PatternAssignment_2();
@@ -5438,14 +7102,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group__3"
-    // InternalCftLanguage.g:1741:1: rule__MappingDefinition__Group__3 : rule__MappingDefinition__Group__3__Impl rule__MappingDefinition__Group__4 ;
+    // InternalCftLanguage.g:2251:1: rule__MappingDefinition__Group__3 : rule__MappingDefinition__Group__3__Impl rule__MappingDefinition__Group__4 ;
     public final void rule__MappingDefinition__Group__3() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1745:1: ( rule__MappingDefinition__Group__3__Impl rule__MappingDefinition__Group__4 )
-            // InternalCftLanguage.g:1746:2: rule__MappingDefinition__Group__3__Impl rule__MappingDefinition__Group__4
+            // InternalCftLanguage.g:2255:1: ( rule__MappingDefinition__Group__3__Impl rule__MappingDefinition__Group__4 )
+            // InternalCftLanguage.g:2256:2: rule__MappingDefinition__Group__3__Impl rule__MappingDefinition__Group__4
             {
             pushFollow(FOLLOW_3);
             rule__MappingDefinition__Group__3__Impl();
@@ -5476,20 +7140,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group__3__Impl"
-    // InternalCftLanguage.g:1753:1: rule__MappingDefinition__Group__3__Impl : ( '(' ) ;
+    // InternalCftLanguage.g:2263:1: rule__MappingDefinition__Group__3__Impl : ( '(' ) ;
     public final void rule__MappingDefinition__Group__3__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1757:1: ( ( '(' ) )
-            // InternalCftLanguage.g:1758:1: ( '(' )
+            // InternalCftLanguage.g:2267:1: ( ( '(' ) )
+            // InternalCftLanguage.g:2268:1: ( '(' )
             {
-            // InternalCftLanguage.g:1758:1: ( '(' )
-            // InternalCftLanguage.g:1759:2: '('
+            // InternalCftLanguage.g:2268:1: ( '(' )
+            // InternalCftLanguage.g:2269:2: '('
             {
              before(grammarAccess.getMappingDefinitionAccess().getLeftParenthesisKeyword_3()); 
-            match(input,27,FOLLOW_2); 
+            match(input,30,FOLLOW_2); 
              after(grammarAccess.getMappingDefinitionAccess().getLeftParenthesisKeyword_3()); 
 
             }
@@ -5513,16 +7177,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group__4"
-    // InternalCftLanguage.g:1768:1: rule__MappingDefinition__Group__4 : rule__MappingDefinition__Group__4__Impl rule__MappingDefinition__Group__5 ;
+    // InternalCftLanguage.g:2278:1: rule__MappingDefinition__Group__4 : rule__MappingDefinition__Group__4__Impl rule__MappingDefinition__Group__5 ;
     public final void rule__MappingDefinition__Group__4() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1772:1: ( rule__MappingDefinition__Group__4__Impl rule__MappingDefinition__Group__5 )
-            // InternalCftLanguage.g:1773:2: rule__MappingDefinition__Group__4__Impl rule__MappingDefinition__Group__5
+            // InternalCftLanguage.g:2282:1: ( rule__MappingDefinition__Group__4__Impl rule__MappingDefinition__Group__5 )
+            // InternalCftLanguage.g:2283:2: rule__MappingDefinition__Group__4__Impl rule__MappingDefinition__Group__5
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_25);
             rule__MappingDefinition__Group__4__Impl();
 
             state._fsp--;
@@ -5551,21 +7215,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group__4__Impl"
-    // InternalCftLanguage.g:1780:1: rule__MappingDefinition__Group__4__Impl : ( ( rule__MappingDefinition__ParametersAssignment_4 ) ) ;
+    // InternalCftLanguage.g:2290:1: rule__MappingDefinition__Group__4__Impl : ( ( rule__MappingDefinition__ParametersAssignment_4 ) ) ;
     public final void rule__MappingDefinition__Group__4__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1784:1: ( ( ( rule__MappingDefinition__ParametersAssignment_4 ) ) )
-            // InternalCftLanguage.g:1785:1: ( ( rule__MappingDefinition__ParametersAssignment_4 ) )
+            // InternalCftLanguage.g:2294:1: ( ( ( rule__MappingDefinition__ParametersAssignment_4 ) ) )
+            // InternalCftLanguage.g:2295:1: ( ( rule__MappingDefinition__ParametersAssignment_4 ) )
             {
-            // InternalCftLanguage.g:1785:1: ( ( rule__MappingDefinition__ParametersAssignment_4 ) )
-            // InternalCftLanguage.g:1786:2: ( rule__MappingDefinition__ParametersAssignment_4 )
+            // InternalCftLanguage.g:2295:1: ( ( rule__MappingDefinition__ParametersAssignment_4 ) )
+            // InternalCftLanguage.g:2296:2: ( rule__MappingDefinition__ParametersAssignment_4 )
             {
              before(grammarAccess.getMappingDefinitionAccess().getParametersAssignment_4()); 
-            // InternalCftLanguage.g:1787:2: ( rule__MappingDefinition__ParametersAssignment_4 )
-            // InternalCftLanguage.g:1787:3: rule__MappingDefinition__ParametersAssignment_4
+            // InternalCftLanguage.g:2297:2: ( rule__MappingDefinition__ParametersAssignment_4 )
+            // InternalCftLanguage.g:2297:3: rule__MappingDefinition__ParametersAssignment_4
             {
             pushFollow(FOLLOW_2);
             rule__MappingDefinition__ParametersAssignment_4();
@@ -5598,16 +7262,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group__5"
-    // InternalCftLanguage.g:1795:1: rule__MappingDefinition__Group__5 : rule__MappingDefinition__Group__5__Impl rule__MappingDefinition__Group__6 ;
+    // InternalCftLanguage.g:2305:1: rule__MappingDefinition__Group__5 : rule__MappingDefinition__Group__5__Impl rule__MappingDefinition__Group__6 ;
     public final void rule__MappingDefinition__Group__5() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1799:1: ( rule__MappingDefinition__Group__5__Impl rule__MappingDefinition__Group__6 )
-            // InternalCftLanguage.g:1800:2: rule__MappingDefinition__Group__5__Impl rule__MappingDefinition__Group__6
+            // InternalCftLanguage.g:2309:1: ( rule__MappingDefinition__Group__5__Impl rule__MappingDefinition__Group__6 )
+            // InternalCftLanguage.g:2310:2: rule__MappingDefinition__Group__5__Impl rule__MappingDefinition__Group__6
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_25);
             rule__MappingDefinition__Group__5__Impl();
 
             state._fsp--;
@@ -5636,35 +7300,35 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group__5__Impl"
-    // InternalCftLanguage.g:1807:1: rule__MappingDefinition__Group__5__Impl : ( ( rule__MappingDefinition__Group_5__0 )* ) ;
+    // InternalCftLanguage.g:2317:1: rule__MappingDefinition__Group__5__Impl : ( ( rule__MappingDefinition__Group_5__0 )* ) ;
     public final void rule__MappingDefinition__Group__5__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1811:1: ( ( ( rule__MappingDefinition__Group_5__0 )* ) )
-            // InternalCftLanguage.g:1812:1: ( ( rule__MappingDefinition__Group_5__0 )* )
+            // InternalCftLanguage.g:2321:1: ( ( ( rule__MappingDefinition__Group_5__0 )* ) )
+            // InternalCftLanguage.g:2322:1: ( ( rule__MappingDefinition__Group_5__0 )* )
             {
-            // InternalCftLanguage.g:1812:1: ( ( rule__MappingDefinition__Group_5__0 )* )
-            // InternalCftLanguage.g:1813:2: ( rule__MappingDefinition__Group_5__0 )*
+            // InternalCftLanguage.g:2322:1: ( ( rule__MappingDefinition__Group_5__0 )* )
+            // InternalCftLanguage.g:2323:2: ( rule__MappingDefinition__Group_5__0 )*
             {
              before(grammarAccess.getMappingDefinitionAccess().getGroup_5()); 
-            // InternalCftLanguage.g:1814:2: ( rule__MappingDefinition__Group_5__0 )*
-            loop18:
+            // InternalCftLanguage.g:2324:2: ( rule__MappingDefinition__Group_5__0 )*
+            loop23:
             do {
-                int alt18=2;
-                int LA18_0 = input.LA(1);
+                int alt23=2;
+                int LA23_0 = input.LA(1);
 
-                if ( (LA18_0==29) ) {
-                    alt18=1;
+                if ( (LA23_0==32) ) {
+                    alt23=1;
                 }
 
 
-                switch (alt18) {
+                switch (alt23) {
                 case 1 :
-                    // InternalCftLanguage.g:1814:3: rule__MappingDefinition__Group_5__0
+                    // InternalCftLanguage.g:2324:3: rule__MappingDefinition__Group_5__0
                     {
-                    pushFollow(FOLLOW_24);
+                    pushFollow(FOLLOW_26);
                     rule__MappingDefinition__Group_5__0();
 
                     state._fsp--;
@@ -5674,7 +7338,7 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
                     break;
 
                 default :
-                    break loop18;
+                    break loop23;
                 }
             } while (true);
 
@@ -5701,16 +7365,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group__6"
-    // InternalCftLanguage.g:1822:1: rule__MappingDefinition__Group__6 : rule__MappingDefinition__Group__6__Impl rule__MappingDefinition__Group__7 ;
+    // InternalCftLanguage.g:2332:1: rule__MappingDefinition__Group__6 : rule__MappingDefinition__Group__6__Impl rule__MappingDefinition__Group__7 ;
     public final void rule__MappingDefinition__Group__6() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1826:1: ( rule__MappingDefinition__Group__6__Impl rule__MappingDefinition__Group__7 )
-            // InternalCftLanguage.g:1827:2: rule__MappingDefinition__Group__6__Impl rule__MappingDefinition__Group__7
+            // InternalCftLanguage.g:2336:1: ( rule__MappingDefinition__Group__6__Impl rule__MappingDefinition__Group__7 )
+            // InternalCftLanguage.g:2337:2: rule__MappingDefinition__Group__6__Impl rule__MappingDefinition__Group__7
             {
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_27);
             rule__MappingDefinition__Group__6__Impl();
 
             state._fsp--;
@@ -5739,20 +7403,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group__6__Impl"
-    // InternalCftLanguage.g:1834:1: rule__MappingDefinition__Group__6__Impl : ( ')' ) ;
+    // InternalCftLanguage.g:2344:1: rule__MappingDefinition__Group__6__Impl : ( ')' ) ;
     public final void rule__MappingDefinition__Group__6__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1838:1: ( ( ')' ) )
-            // InternalCftLanguage.g:1839:1: ( ')' )
+            // InternalCftLanguage.g:2348:1: ( ( ')' ) )
+            // InternalCftLanguage.g:2349:1: ( ')' )
             {
-            // InternalCftLanguage.g:1839:1: ( ')' )
-            // InternalCftLanguage.g:1840:2: ')'
+            // InternalCftLanguage.g:2349:1: ( ')' )
+            // InternalCftLanguage.g:2350:2: ')'
             {
              before(grammarAccess.getMappingDefinitionAccess().getRightParenthesisKeyword_6()); 
-            match(input,28,FOLLOW_2); 
+            match(input,31,FOLLOW_2); 
              after(grammarAccess.getMappingDefinitionAccess().getRightParenthesisKeyword_6()); 
 
             }
@@ -5776,16 +7440,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group__7"
-    // InternalCftLanguage.g:1849:1: rule__MappingDefinition__Group__7 : rule__MappingDefinition__Group__7__Impl rule__MappingDefinition__Group__8 ;
+    // InternalCftLanguage.g:2359:1: rule__MappingDefinition__Group__7 : rule__MappingDefinition__Group__7__Impl rule__MappingDefinition__Group__8 ;
     public final void rule__MappingDefinition__Group__7() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1853:1: ( rule__MappingDefinition__Group__7__Impl rule__MappingDefinition__Group__8 )
-            // InternalCftLanguage.g:1854:2: rule__MappingDefinition__Group__7__Impl rule__MappingDefinition__Group__8
+            // InternalCftLanguage.g:2363:1: ( rule__MappingDefinition__Group__7__Impl rule__MappingDefinition__Group__8 )
+            // InternalCftLanguage.g:2364:2: rule__MappingDefinition__Group__7__Impl rule__MappingDefinition__Group__8
             {
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_27);
             rule__MappingDefinition__Group__7__Impl();
 
             state._fsp--;
@@ -5814,29 +7478,29 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group__7__Impl"
-    // InternalCftLanguage.g:1861:1: rule__MappingDefinition__Group__7__Impl : ( ( rule__MappingDefinition__ComponentInstanceAssignment_7 )? ) ;
+    // InternalCftLanguage.g:2371:1: rule__MappingDefinition__Group__7__Impl : ( ( rule__MappingDefinition__ComponentInstanceAssignment_7 )? ) ;
     public final void rule__MappingDefinition__Group__7__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1865:1: ( ( ( rule__MappingDefinition__ComponentInstanceAssignment_7 )? ) )
-            // InternalCftLanguage.g:1866:1: ( ( rule__MappingDefinition__ComponentInstanceAssignment_7 )? )
+            // InternalCftLanguage.g:2375:1: ( ( ( rule__MappingDefinition__ComponentInstanceAssignment_7 )? ) )
+            // InternalCftLanguage.g:2376:1: ( ( rule__MappingDefinition__ComponentInstanceAssignment_7 )? )
             {
-            // InternalCftLanguage.g:1866:1: ( ( rule__MappingDefinition__ComponentInstanceAssignment_7 )? )
-            // InternalCftLanguage.g:1867:2: ( rule__MappingDefinition__ComponentInstanceAssignment_7 )?
+            // InternalCftLanguage.g:2376:1: ( ( rule__MappingDefinition__ComponentInstanceAssignment_7 )? )
+            // InternalCftLanguage.g:2377:2: ( rule__MappingDefinition__ComponentInstanceAssignment_7 )?
             {
              before(grammarAccess.getMappingDefinitionAccess().getComponentInstanceAssignment_7()); 
-            // InternalCftLanguage.g:1868:2: ( rule__MappingDefinition__ComponentInstanceAssignment_7 )?
-            int alt19=2;
-            int LA19_0 = input.LA(1);
+            // InternalCftLanguage.g:2378:2: ( rule__MappingDefinition__ComponentInstanceAssignment_7 )?
+            int alt24=2;
+            int LA24_0 = input.LA(1);
 
-            if ( (LA19_0==33) ) {
-                alt19=1;
+            if ( (LA24_0==36) ) {
+                alt24=1;
             }
-            switch (alt19) {
+            switch (alt24) {
                 case 1 :
-                    // InternalCftLanguage.g:1868:3: rule__MappingDefinition__ComponentInstanceAssignment_7
+                    // InternalCftLanguage.g:2378:3: rule__MappingDefinition__ComponentInstanceAssignment_7
                     {
                     pushFollow(FOLLOW_2);
                     rule__MappingDefinition__ComponentInstanceAssignment_7();
@@ -5872,14 +7536,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group__8"
-    // InternalCftLanguage.g:1876:1: rule__MappingDefinition__Group__8 : rule__MappingDefinition__Group__8__Impl ;
+    // InternalCftLanguage.g:2386:1: rule__MappingDefinition__Group__8 : rule__MappingDefinition__Group__8__Impl ;
     public final void rule__MappingDefinition__Group__8() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1880:1: ( rule__MappingDefinition__Group__8__Impl )
-            // InternalCftLanguage.g:1881:2: rule__MappingDefinition__Group__8__Impl
+            // InternalCftLanguage.g:2390:1: ( rule__MappingDefinition__Group__8__Impl )
+            // InternalCftLanguage.g:2391:2: rule__MappingDefinition__Group__8__Impl
             {
             pushFollow(FOLLOW_2);
             rule__MappingDefinition__Group__8__Impl();
@@ -5905,29 +7569,29 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group__8__Impl"
-    // InternalCftLanguage.g:1887:1: rule__MappingDefinition__Group__8__Impl : ( ( rule__MappingDefinition__Group_8__0 )? ) ;
+    // InternalCftLanguage.g:2397:1: rule__MappingDefinition__Group__8__Impl : ( ( rule__MappingDefinition__Group_8__0 )? ) ;
     public final void rule__MappingDefinition__Group__8__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1891:1: ( ( ( rule__MappingDefinition__Group_8__0 )? ) )
-            // InternalCftLanguage.g:1892:1: ( ( rule__MappingDefinition__Group_8__0 )? )
+            // InternalCftLanguage.g:2401:1: ( ( ( rule__MappingDefinition__Group_8__0 )? ) )
+            // InternalCftLanguage.g:2402:1: ( ( rule__MappingDefinition__Group_8__0 )? )
             {
-            // InternalCftLanguage.g:1892:1: ( ( rule__MappingDefinition__Group_8__0 )? )
-            // InternalCftLanguage.g:1893:2: ( rule__MappingDefinition__Group_8__0 )?
+            // InternalCftLanguage.g:2402:1: ( ( rule__MappingDefinition__Group_8__0 )? )
+            // InternalCftLanguage.g:2403:2: ( rule__MappingDefinition__Group_8__0 )?
             {
              before(grammarAccess.getMappingDefinitionAccess().getGroup_8()); 
-            // InternalCftLanguage.g:1894:2: ( rule__MappingDefinition__Group_8__0 )?
-            int alt20=2;
-            int LA20_0 = input.LA(1);
+            // InternalCftLanguage.g:2404:2: ( rule__MappingDefinition__Group_8__0 )?
+            int alt25=2;
+            int LA25_0 = input.LA(1);
 
-            if ( (LA20_0==17) ) {
-                alt20=1;
+            if ( (LA25_0==18) ) {
+                alt25=1;
             }
-            switch (alt20) {
+            switch (alt25) {
                 case 1 :
-                    // InternalCftLanguage.g:1894:3: rule__MappingDefinition__Group_8__0
+                    // InternalCftLanguage.g:2404:3: rule__MappingDefinition__Group_8__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__MappingDefinition__Group_8__0();
@@ -5963,14 +7627,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group_5__0"
-    // InternalCftLanguage.g:1903:1: rule__MappingDefinition__Group_5__0 : rule__MappingDefinition__Group_5__0__Impl rule__MappingDefinition__Group_5__1 ;
+    // InternalCftLanguage.g:2413:1: rule__MappingDefinition__Group_5__0 : rule__MappingDefinition__Group_5__0__Impl rule__MappingDefinition__Group_5__1 ;
     public final void rule__MappingDefinition__Group_5__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1907:1: ( rule__MappingDefinition__Group_5__0__Impl rule__MappingDefinition__Group_5__1 )
-            // InternalCftLanguage.g:1908:2: rule__MappingDefinition__Group_5__0__Impl rule__MappingDefinition__Group_5__1
+            // InternalCftLanguage.g:2417:1: ( rule__MappingDefinition__Group_5__0__Impl rule__MappingDefinition__Group_5__1 )
+            // InternalCftLanguage.g:2418:2: rule__MappingDefinition__Group_5__0__Impl rule__MappingDefinition__Group_5__1
             {
             pushFollow(FOLLOW_3);
             rule__MappingDefinition__Group_5__0__Impl();
@@ -6001,20 +7665,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group_5__0__Impl"
-    // InternalCftLanguage.g:1915:1: rule__MappingDefinition__Group_5__0__Impl : ( ',' ) ;
+    // InternalCftLanguage.g:2425:1: rule__MappingDefinition__Group_5__0__Impl : ( ',' ) ;
     public final void rule__MappingDefinition__Group_5__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1919:1: ( ( ',' ) )
-            // InternalCftLanguage.g:1920:1: ( ',' )
+            // InternalCftLanguage.g:2429:1: ( ( ',' ) )
+            // InternalCftLanguage.g:2430:1: ( ',' )
             {
-            // InternalCftLanguage.g:1920:1: ( ',' )
-            // InternalCftLanguage.g:1921:2: ','
+            // InternalCftLanguage.g:2430:1: ( ',' )
+            // InternalCftLanguage.g:2431:2: ','
             {
              before(grammarAccess.getMappingDefinitionAccess().getCommaKeyword_5_0()); 
-            match(input,29,FOLLOW_2); 
+            match(input,32,FOLLOW_2); 
              after(grammarAccess.getMappingDefinitionAccess().getCommaKeyword_5_0()); 
 
             }
@@ -6038,14 +7702,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group_5__1"
-    // InternalCftLanguage.g:1930:1: rule__MappingDefinition__Group_5__1 : rule__MappingDefinition__Group_5__1__Impl ;
+    // InternalCftLanguage.g:2440:1: rule__MappingDefinition__Group_5__1 : rule__MappingDefinition__Group_5__1__Impl ;
     public final void rule__MappingDefinition__Group_5__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1934:1: ( rule__MappingDefinition__Group_5__1__Impl )
-            // InternalCftLanguage.g:1935:2: rule__MappingDefinition__Group_5__1__Impl
+            // InternalCftLanguage.g:2444:1: ( rule__MappingDefinition__Group_5__1__Impl )
+            // InternalCftLanguage.g:2445:2: rule__MappingDefinition__Group_5__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__MappingDefinition__Group_5__1__Impl();
@@ -6071,21 +7735,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group_5__1__Impl"
-    // InternalCftLanguage.g:1941:1: rule__MappingDefinition__Group_5__1__Impl : ( ( rule__MappingDefinition__ParametersAssignment_5_1 ) ) ;
+    // InternalCftLanguage.g:2451:1: rule__MappingDefinition__Group_5__1__Impl : ( ( rule__MappingDefinition__ParametersAssignment_5_1 ) ) ;
     public final void rule__MappingDefinition__Group_5__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1945:1: ( ( ( rule__MappingDefinition__ParametersAssignment_5_1 ) ) )
-            // InternalCftLanguage.g:1946:1: ( ( rule__MappingDefinition__ParametersAssignment_5_1 ) )
+            // InternalCftLanguage.g:2455:1: ( ( ( rule__MappingDefinition__ParametersAssignment_5_1 ) ) )
+            // InternalCftLanguage.g:2456:1: ( ( rule__MappingDefinition__ParametersAssignment_5_1 ) )
             {
-            // InternalCftLanguage.g:1946:1: ( ( rule__MappingDefinition__ParametersAssignment_5_1 ) )
-            // InternalCftLanguage.g:1947:2: ( rule__MappingDefinition__ParametersAssignment_5_1 )
+            // InternalCftLanguage.g:2456:1: ( ( rule__MappingDefinition__ParametersAssignment_5_1 ) )
+            // InternalCftLanguage.g:2457:2: ( rule__MappingDefinition__ParametersAssignment_5_1 )
             {
              before(grammarAccess.getMappingDefinitionAccess().getParametersAssignment_5_1()); 
-            // InternalCftLanguage.g:1948:2: ( rule__MappingDefinition__ParametersAssignment_5_1 )
-            // InternalCftLanguage.g:1948:3: rule__MappingDefinition__ParametersAssignment_5_1
+            // InternalCftLanguage.g:2458:2: ( rule__MappingDefinition__ParametersAssignment_5_1 )
+            // InternalCftLanguage.g:2458:3: rule__MappingDefinition__ParametersAssignment_5_1
             {
             pushFollow(FOLLOW_2);
             rule__MappingDefinition__ParametersAssignment_5_1();
@@ -6118,16 +7782,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group_8__0"
-    // InternalCftLanguage.g:1957:1: rule__MappingDefinition__Group_8__0 : rule__MappingDefinition__Group_8__0__Impl rule__MappingDefinition__Group_8__1 ;
+    // InternalCftLanguage.g:2467:1: rule__MappingDefinition__Group_8__0 : rule__MappingDefinition__Group_8__0__Impl rule__MappingDefinition__Group_8__1 ;
     public final void rule__MappingDefinition__Group_8__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1961:1: ( rule__MappingDefinition__Group_8__0__Impl rule__MappingDefinition__Group_8__1 )
-            // InternalCftLanguage.g:1962:2: rule__MappingDefinition__Group_8__0__Impl rule__MappingDefinition__Group_8__1
+            // InternalCftLanguage.g:2471:1: ( rule__MappingDefinition__Group_8__0__Impl rule__MappingDefinition__Group_8__1 )
+            // InternalCftLanguage.g:2472:2: rule__MappingDefinition__Group_8__0__Impl rule__MappingDefinition__Group_8__1
             {
-            pushFollow(FOLLOW_26);
+            pushFollow(FOLLOW_28);
             rule__MappingDefinition__Group_8__0__Impl();
 
             state._fsp--;
@@ -6156,20 +7820,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group_8__0__Impl"
-    // InternalCftLanguage.g:1969:1: rule__MappingDefinition__Group_8__0__Impl : ( '{' ) ;
+    // InternalCftLanguage.g:2479:1: rule__MappingDefinition__Group_8__0__Impl : ( '{' ) ;
     public final void rule__MappingDefinition__Group_8__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1973:1: ( ( '{' ) )
-            // InternalCftLanguage.g:1974:1: ( '{' )
+            // InternalCftLanguage.g:2483:1: ( ( '{' ) )
+            // InternalCftLanguage.g:2484:1: ( '{' )
             {
-            // InternalCftLanguage.g:1974:1: ( '{' )
-            // InternalCftLanguage.g:1975:2: '{'
+            // InternalCftLanguage.g:2484:1: ( '{' )
+            // InternalCftLanguage.g:2485:2: '{'
             {
              before(grammarAccess.getMappingDefinitionAccess().getLeftCurlyBracketKeyword_8_0()); 
-            match(input,17,FOLLOW_2); 
+            match(input,18,FOLLOW_2); 
              after(grammarAccess.getMappingDefinitionAccess().getLeftCurlyBracketKeyword_8_0()); 
 
             }
@@ -6193,16 +7857,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group_8__1"
-    // InternalCftLanguage.g:1984:1: rule__MappingDefinition__Group_8__1 : rule__MappingDefinition__Group_8__1__Impl rule__MappingDefinition__Group_8__2 ;
+    // InternalCftLanguage.g:2494:1: rule__MappingDefinition__Group_8__1 : rule__MappingDefinition__Group_8__1__Impl rule__MappingDefinition__Group_8__2 ;
     public final void rule__MappingDefinition__Group_8__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:1988:1: ( rule__MappingDefinition__Group_8__1__Impl rule__MappingDefinition__Group_8__2 )
-            // InternalCftLanguage.g:1989:2: rule__MappingDefinition__Group_8__1__Impl rule__MappingDefinition__Group_8__2
+            // InternalCftLanguage.g:2498:1: ( rule__MappingDefinition__Group_8__1__Impl rule__MappingDefinition__Group_8__2 )
+            // InternalCftLanguage.g:2499:2: rule__MappingDefinition__Group_8__1__Impl rule__MappingDefinition__Group_8__2
             {
-            pushFollow(FOLLOW_26);
+            pushFollow(FOLLOW_28);
             rule__MappingDefinition__Group_8__1__Impl();
 
             state._fsp--;
@@ -6231,35 +7895,35 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group_8__1__Impl"
-    // InternalCftLanguage.g:1996:1: rule__MappingDefinition__Group_8__1__Impl : ( ( rule__MappingDefinition__Group_8_1__0 )* ) ;
+    // InternalCftLanguage.g:2506:1: rule__MappingDefinition__Group_8__1__Impl : ( ( rule__MappingDefinition__Group_8_1__0 )* ) ;
     public final void rule__MappingDefinition__Group_8__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2000:1: ( ( ( rule__MappingDefinition__Group_8_1__0 )* ) )
-            // InternalCftLanguage.g:2001:1: ( ( rule__MappingDefinition__Group_8_1__0 )* )
+            // InternalCftLanguage.g:2510:1: ( ( ( rule__MappingDefinition__Group_8_1__0 )* ) )
+            // InternalCftLanguage.g:2511:1: ( ( rule__MappingDefinition__Group_8_1__0 )* )
             {
-            // InternalCftLanguage.g:2001:1: ( ( rule__MappingDefinition__Group_8_1__0 )* )
-            // InternalCftLanguage.g:2002:2: ( rule__MappingDefinition__Group_8_1__0 )*
+            // InternalCftLanguage.g:2511:1: ( ( rule__MappingDefinition__Group_8_1__0 )* )
+            // InternalCftLanguage.g:2512:2: ( rule__MappingDefinition__Group_8_1__0 )*
             {
              before(grammarAccess.getMappingDefinitionAccess().getGroup_8_1()); 
-            // InternalCftLanguage.g:2003:2: ( rule__MappingDefinition__Group_8_1__0 )*
-            loop21:
+            // InternalCftLanguage.g:2513:2: ( rule__MappingDefinition__Group_8_1__0 )*
+            loop26:
             do {
-                int alt21=2;
-                int LA21_0 = input.LA(1);
+                int alt26=2;
+                int LA26_0 = input.LA(1);
 
-                if ( (LA21_0==RULE_ID||LA21_0==30) ) {
-                    alt21=1;
+                if ( ((LA26_0>=RULE_ID && LA26_0<=RULE_OF_INT)||LA26_0==33) ) {
+                    alt26=1;
                 }
 
 
-                switch (alt21) {
+                switch (alt26) {
                 case 1 :
-                    // InternalCftLanguage.g:2003:3: rule__MappingDefinition__Group_8_1__0
+                    // InternalCftLanguage.g:2513:3: rule__MappingDefinition__Group_8_1__0
                     {
-                    pushFollow(FOLLOW_27);
+                    pushFollow(FOLLOW_29);
                     rule__MappingDefinition__Group_8_1__0();
 
                     state._fsp--;
@@ -6269,7 +7933,7 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
                     break;
 
                 default :
-                    break loop21;
+                    break loop26;
                 }
             } while (true);
 
@@ -6296,14 +7960,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group_8__2"
-    // InternalCftLanguage.g:2011:1: rule__MappingDefinition__Group_8__2 : rule__MappingDefinition__Group_8__2__Impl ;
+    // InternalCftLanguage.g:2521:1: rule__MappingDefinition__Group_8__2 : rule__MappingDefinition__Group_8__2__Impl ;
     public final void rule__MappingDefinition__Group_8__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2015:1: ( rule__MappingDefinition__Group_8__2__Impl )
-            // InternalCftLanguage.g:2016:2: rule__MappingDefinition__Group_8__2__Impl
+            // InternalCftLanguage.g:2525:1: ( rule__MappingDefinition__Group_8__2__Impl )
+            // InternalCftLanguage.g:2526:2: rule__MappingDefinition__Group_8__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__MappingDefinition__Group_8__2__Impl();
@@ -6329,20 +7993,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group_8__2__Impl"
-    // InternalCftLanguage.g:2022:1: rule__MappingDefinition__Group_8__2__Impl : ( '}' ) ;
+    // InternalCftLanguage.g:2532:1: rule__MappingDefinition__Group_8__2__Impl : ( '}' ) ;
     public final void rule__MappingDefinition__Group_8__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2026:1: ( ( '}' ) )
-            // InternalCftLanguage.g:2027:1: ( '}' )
+            // InternalCftLanguage.g:2536:1: ( ( '}' ) )
+            // InternalCftLanguage.g:2537:1: ( '}' )
             {
-            // InternalCftLanguage.g:2027:1: ( '}' )
-            // InternalCftLanguage.g:2028:2: '}'
+            // InternalCftLanguage.g:2537:1: ( '}' )
+            // InternalCftLanguage.g:2538:2: '}'
             {
              before(grammarAccess.getMappingDefinitionAccess().getRightCurlyBracketKeyword_8_2()); 
-            match(input,18,FOLLOW_2); 
+            match(input,19,FOLLOW_2); 
              after(grammarAccess.getMappingDefinitionAccess().getRightCurlyBracketKeyword_8_2()); 
 
             }
@@ -6366,14 +8030,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group_8_1__0"
-    // InternalCftLanguage.g:2038:1: rule__MappingDefinition__Group_8_1__0 : rule__MappingDefinition__Group_8_1__0__Impl rule__MappingDefinition__Group_8_1__1 ;
+    // InternalCftLanguage.g:2548:1: rule__MappingDefinition__Group_8_1__0 : rule__MappingDefinition__Group_8_1__0__Impl rule__MappingDefinition__Group_8_1__1 ;
     public final void rule__MappingDefinition__Group_8_1__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2042:1: ( rule__MappingDefinition__Group_8_1__0__Impl rule__MappingDefinition__Group_8_1__1 )
-            // InternalCftLanguage.g:2043:2: rule__MappingDefinition__Group_8_1__0__Impl rule__MappingDefinition__Group_8_1__1
+            // InternalCftLanguage.g:2552:1: ( rule__MappingDefinition__Group_8_1__0__Impl rule__MappingDefinition__Group_8_1__1 )
+            // InternalCftLanguage.g:2553:2: rule__MappingDefinition__Group_8_1__0__Impl rule__MappingDefinition__Group_8_1__1
             {
             pushFollow(FOLLOW_7);
             rule__MappingDefinition__Group_8_1__0__Impl();
@@ -6404,21 +8068,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group_8_1__0__Impl"
-    // InternalCftLanguage.g:2050:1: rule__MappingDefinition__Group_8_1__0__Impl : ( ( rule__MappingDefinition__Alternatives_8_1_0 ) ) ;
+    // InternalCftLanguage.g:2560:1: rule__MappingDefinition__Group_8_1__0__Impl : ( ( rule__MappingDefinition__Alternatives_8_1_0 ) ) ;
     public final void rule__MappingDefinition__Group_8_1__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2054:1: ( ( ( rule__MappingDefinition__Alternatives_8_1_0 ) ) )
-            // InternalCftLanguage.g:2055:1: ( ( rule__MappingDefinition__Alternatives_8_1_0 ) )
+            // InternalCftLanguage.g:2564:1: ( ( ( rule__MappingDefinition__Alternatives_8_1_0 ) ) )
+            // InternalCftLanguage.g:2565:1: ( ( rule__MappingDefinition__Alternatives_8_1_0 ) )
             {
-            // InternalCftLanguage.g:2055:1: ( ( rule__MappingDefinition__Alternatives_8_1_0 ) )
-            // InternalCftLanguage.g:2056:2: ( rule__MappingDefinition__Alternatives_8_1_0 )
+            // InternalCftLanguage.g:2565:1: ( ( rule__MappingDefinition__Alternatives_8_1_0 ) )
+            // InternalCftLanguage.g:2566:2: ( rule__MappingDefinition__Alternatives_8_1_0 )
             {
              before(grammarAccess.getMappingDefinitionAccess().getAlternatives_8_1_0()); 
-            // InternalCftLanguage.g:2057:2: ( rule__MappingDefinition__Alternatives_8_1_0 )
-            // InternalCftLanguage.g:2057:3: rule__MappingDefinition__Alternatives_8_1_0
+            // InternalCftLanguage.g:2567:2: ( rule__MappingDefinition__Alternatives_8_1_0 )
+            // InternalCftLanguage.g:2567:3: rule__MappingDefinition__Alternatives_8_1_0
             {
             pushFollow(FOLLOW_2);
             rule__MappingDefinition__Alternatives_8_1_0();
@@ -6451,14 +8115,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group_8_1__1"
-    // InternalCftLanguage.g:2065:1: rule__MappingDefinition__Group_8_1__1 : rule__MappingDefinition__Group_8_1__1__Impl ;
+    // InternalCftLanguage.g:2575:1: rule__MappingDefinition__Group_8_1__1 : rule__MappingDefinition__Group_8_1__1__Impl ;
     public final void rule__MappingDefinition__Group_8_1__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2069:1: ( rule__MappingDefinition__Group_8_1__1__Impl )
-            // InternalCftLanguage.g:2070:2: rule__MappingDefinition__Group_8_1__1__Impl
+            // InternalCftLanguage.g:2579:1: ( rule__MappingDefinition__Group_8_1__1__Impl )
+            // InternalCftLanguage.g:2580:2: rule__MappingDefinition__Group_8_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__MappingDefinition__Group_8_1__1__Impl();
@@ -6484,20 +8148,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__Group_8_1__1__Impl"
-    // InternalCftLanguage.g:2076:1: rule__MappingDefinition__Group_8_1__1__Impl : ( ';' ) ;
+    // InternalCftLanguage.g:2586:1: rule__MappingDefinition__Group_8_1__1__Impl : ( ';' ) ;
     public final void rule__MappingDefinition__Group_8_1__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2080:1: ( ( ';' ) )
-            // InternalCftLanguage.g:2081:1: ( ';' )
+            // InternalCftLanguage.g:2590:1: ( ( ';' ) )
+            // InternalCftLanguage.g:2591:1: ( ';' )
             {
-            // InternalCftLanguage.g:2081:1: ( ';' )
-            // InternalCftLanguage.g:2082:2: ';'
+            // InternalCftLanguage.g:2591:1: ( ';' )
+            // InternalCftLanguage.g:2592:2: ';'
             {
              before(grammarAccess.getMappingDefinitionAccess().getSemicolonKeyword_8_1_1()); 
-            match(input,14,FOLLOW_2); 
+            match(input,15,FOLLOW_2); 
              after(grammarAccess.getMappingDefinitionAccess().getSemicolonKeyword_8_1_1()); 
 
             }
@@ -6521,14 +8185,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__Group__0"
-    // InternalCftLanguage.g:2092:1: rule__LookupDefinition__Group__0 : rule__LookupDefinition__Group__0__Impl rule__LookupDefinition__Group__1 ;
+    // InternalCftLanguage.g:2602:1: rule__LookupDefinition__Group__0 : rule__LookupDefinition__Group__0__Impl rule__LookupDefinition__Group__1 ;
     public final void rule__LookupDefinition__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2096:1: ( rule__LookupDefinition__Group__0__Impl rule__LookupDefinition__Group__1 )
-            // InternalCftLanguage.g:2097:2: rule__LookupDefinition__Group__0__Impl rule__LookupDefinition__Group__1
+            // InternalCftLanguage.g:2606:1: ( rule__LookupDefinition__Group__0__Impl rule__LookupDefinition__Group__1 )
+            // InternalCftLanguage.g:2607:2: rule__LookupDefinition__Group__0__Impl rule__LookupDefinition__Group__1
             {
             pushFollow(FOLLOW_3);
             rule__LookupDefinition__Group__0__Impl();
@@ -6559,20 +8223,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__Group__0__Impl"
-    // InternalCftLanguage.g:2104:1: rule__LookupDefinition__Group__0__Impl : ( 'lookup' ) ;
+    // InternalCftLanguage.g:2614:1: rule__LookupDefinition__Group__0__Impl : ( 'lookup' ) ;
     public final void rule__LookupDefinition__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2108:1: ( ( 'lookup' ) )
-            // InternalCftLanguage.g:2109:1: ( 'lookup' )
+            // InternalCftLanguage.g:2618:1: ( ( 'lookup' ) )
+            // InternalCftLanguage.g:2619:1: ( 'lookup' )
             {
-            // InternalCftLanguage.g:2109:1: ( 'lookup' )
-            // InternalCftLanguage.g:2110:2: 'lookup'
+            // InternalCftLanguage.g:2619:1: ( 'lookup' )
+            // InternalCftLanguage.g:2620:2: 'lookup'
             {
              before(grammarAccess.getLookupDefinitionAccess().getLookupKeyword_0()); 
-            match(input,30,FOLLOW_2); 
+            match(input,33,FOLLOW_2); 
              after(grammarAccess.getLookupDefinitionAccess().getLookupKeyword_0()); 
 
             }
@@ -6596,16 +8260,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__Group__1"
-    // InternalCftLanguage.g:2119:1: rule__LookupDefinition__Group__1 : rule__LookupDefinition__Group__1__Impl rule__LookupDefinition__Group__2 ;
+    // InternalCftLanguage.g:2629:1: rule__LookupDefinition__Group__1 : rule__LookupDefinition__Group__1__Impl rule__LookupDefinition__Group__2 ;
     public final void rule__LookupDefinition__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2123:1: ( rule__LookupDefinition__Group__1__Impl rule__LookupDefinition__Group__2 )
-            // InternalCftLanguage.g:2124:2: rule__LookupDefinition__Group__1__Impl rule__LookupDefinition__Group__2
+            // InternalCftLanguage.g:2633:1: ( rule__LookupDefinition__Group__1__Impl rule__LookupDefinition__Group__2 )
+            // InternalCftLanguage.g:2634:2: rule__LookupDefinition__Group__1__Impl rule__LookupDefinition__Group__2
             {
-            pushFollow(FOLLOW_22);
+            pushFollow(FOLLOW_24);
             rule__LookupDefinition__Group__1__Impl();
 
             state._fsp--;
@@ -6634,21 +8298,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__Group__1__Impl"
-    // InternalCftLanguage.g:2131:1: rule__LookupDefinition__Group__1__Impl : ( ( rule__LookupDefinition__MappingAssignment_1 ) ) ;
+    // InternalCftLanguage.g:2641:1: rule__LookupDefinition__Group__1__Impl : ( ( rule__LookupDefinition__MappingAssignment_1 ) ) ;
     public final void rule__LookupDefinition__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2135:1: ( ( ( rule__LookupDefinition__MappingAssignment_1 ) ) )
-            // InternalCftLanguage.g:2136:1: ( ( rule__LookupDefinition__MappingAssignment_1 ) )
+            // InternalCftLanguage.g:2645:1: ( ( ( rule__LookupDefinition__MappingAssignment_1 ) ) )
+            // InternalCftLanguage.g:2646:1: ( ( rule__LookupDefinition__MappingAssignment_1 ) )
             {
-            // InternalCftLanguage.g:2136:1: ( ( rule__LookupDefinition__MappingAssignment_1 ) )
-            // InternalCftLanguage.g:2137:2: ( rule__LookupDefinition__MappingAssignment_1 )
+            // InternalCftLanguage.g:2646:1: ( ( rule__LookupDefinition__MappingAssignment_1 ) )
+            // InternalCftLanguage.g:2647:2: ( rule__LookupDefinition__MappingAssignment_1 )
             {
              before(grammarAccess.getLookupDefinitionAccess().getMappingAssignment_1()); 
-            // InternalCftLanguage.g:2138:2: ( rule__LookupDefinition__MappingAssignment_1 )
-            // InternalCftLanguage.g:2138:3: rule__LookupDefinition__MappingAssignment_1
+            // InternalCftLanguage.g:2648:2: ( rule__LookupDefinition__MappingAssignment_1 )
+            // InternalCftLanguage.g:2648:3: rule__LookupDefinition__MappingAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__LookupDefinition__MappingAssignment_1();
@@ -6681,14 +8345,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__Group__2"
-    // InternalCftLanguage.g:2146:1: rule__LookupDefinition__Group__2 : rule__LookupDefinition__Group__2__Impl rule__LookupDefinition__Group__3 ;
+    // InternalCftLanguage.g:2656:1: rule__LookupDefinition__Group__2 : rule__LookupDefinition__Group__2__Impl rule__LookupDefinition__Group__3 ;
     public final void rule__LookupDefinition__Group__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2150:1: ( rule__LookupDefinition__Group__2__Impl rule__LookupDefinition__Group__3 )
-            // InternalCftLanguage.g:2151:2: rule__LookupDefinition__Group__2__Impl rule__LookupDefinition__Group__3
+            // InternalCftLanguage.g:2660:1: ( rule__LookupDefinition__Group__2__Impl rule__LookupDefinition__Group__3 )
+            // InternalCftLanguage.g:2661:2: rule__LookupDefinition__Group__2__Impl rule__LookupDefinition__Group__3
             {
             pushFollow(FOLLOW_3);
             rule__LookupDefinition__Group__2__Impl();
@@ -6719,20 +8383,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__Group__2__Impl"
-    // InternalCftLanguage.g:2158:1: rule__LookupDefinition__Group__2__Impl : ( '(' ) ;
+    // InternalCftLanguage.g:2668:1: rule__LookupDefinition__Group__2__Impl : ( '(' ) ;
     public final void rule__LookupDefinition__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2162:1: ( ( '(' ) )
-            // InternalCftLanguage.g:2163:1: ( '(' )
+            // InternalCftLanguage.g:2672:1: ( ( '(' ) )
+            // InternalCftLanguage.g:2673:1: ( '(' )
             {
-            // InternalCftLanguage.g:2163:1: ( '(' )
-            // InternalCftLanguage.g:2164:2: '('
+            // InternalCftLanguage.g:2673:1: ( '(' )
+            // InternalCftLanguage.g:2674:2: '('
             {
              before(grammarAccess.getLookupDefinitionAccess().getLeftParenthesisKeyword_2()); 
-            match(input,27,FOLLOW_2); 
+            match(input,30,FOLLOW_2); 
              after(grammarAccess.getLookupDefinitionAccess().getLeftParenthesisKeyword_2()); 
 
             }
@@ -6756,16 +8420,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__Group__3"
-    // InternalCftLanguage.g:2173:1: rule__LookupDefinition__Group__3 : rule__LookupDefinition__Group__3__Impl rule__LookupDefinition__Group__4 ;
+    // InternalCftLanguage.g:2683:1: rule__LookupDefinition__Group__3 : rule__LookupDefinition__Group__3__Impl rule__LookupDefinition__Group__4 ;
     public final void rule__LookupDefinition__Group__3() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2177:1: ( rule__LookupDefinition__Group__3__Impl rule__LookupDefinition__Group__4 )
-            // InternalCftLanguage.g:2178:2: rule__LookupDefinition__Group__3__Impl rule__LookupDefinition__Group__4
+            // InternalCftLanguage.g:2687:1: ( rule__LookupDefinition__Group__3__Impl rule__LookupDefinition__Group__4 )
+            // InternalCftLanguage.g:2688:2: rule__LookupDefinition__Group__3__Impl rule__LookupDefinition__Group__4
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_25);
             rule__LookupDefinition__Group__3__Impl();
 
             state._fsp--;
@@ -6794,21 +8458,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__Group__3__Impl"
-    // InternalCftLanguage.g:2185:1: rule__LookupDefinition__Group__3__Impl : ( ( rule__LookupDefinition__ArgumentsAssignment_3 ) ) ;
+    // InternalCftLanguage.g:2695:1: rule__LookupDefinition__Group__3__Impl : ( ( rule__LookupDefinition__ArgumentsAssignment_3 ) ) ;
     public final void rule__LookupDefinition__Group__3__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2189:1: ( ( ( rule__LookupDefinition__ArgumentsAssignment_3 ) ) )
-            // InternalCftLanguage.g:2190:1: ( ( rule__LookupDefinition__ArgumentsAssignment_3 ) )
+            // InternalCftLanguage.g:2699:1: ( ( ( rule__LookupDefinition__ArgumentsAssignment_3 ) ) )
+            // InternalCftLanguage.g:2700:1: ( ( rule__LookupDefinition__ArgumentsAssignment_3 ) )
             {
-            // InternalCftLanguage.g:2190:1: ( ( rule__LookupDefinition__ArgumentsAssignment_3 ) )
-            // InternalCftLanguage.g:2191:2: ( rule__LookupDefinition__ArgumentsAssignment_3 )
+            // InternalCftLanguage.g:2700:1: ( ( rule__LookupDefinition__ArgumentsAssignment_3 ) )
+            // InternalCftLanguage.g:2701:2: ( rule__LookupDefinition__ArgumentsAssignment_3 )
             {
              before(grammarAccess.getLookupDefinitionAccess().getArgumentsAssignment_3()); 
-            // InternalCftLanguage.g:2192:2: ( rule__LookupDefinition__ArgumentsAssignment_3 )
-            // InternalCftLanguage.g:2192:3: rule__LookupDefinition__ArgumentsAssignment_3
+            // InternalCftLanguage.g:2702:2: ( rule__LookupDefinition__ArgumentsAssignment_3 )
+            // InternalCftLanguage.g:2702:3: rule__LookupDefinition__ArgumentsAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__LookupDefinition__ArgumentsAssignment_3();
@@ -6841,16 +8505,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__Group__4"
-    // InternalCftLanguage.g:2200:1: rule__LookupDefinition__Group__4 : rule__LookupDefinition__Group__4__Impl rule__LookupDefinition__Group__5 ;
+    // InternalCftLanguage.g:2710:1: rule__LookupDefinition__Group__4 : rule__LookupDefinition__Group__4__Impl rule__LookupDefinition__Group__5 ;
     public final void rule__LookupDefinition__Group__4() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2204:1: ( rule__LookupDefinition__Group__4__Impl rule__LookupDefinition__Group__5 )
-            // InternalCftLanguage.g:2205:2: rule__LookupDefinition__Group__4__Impl rule__LookupDefinition__Group__5
+            // InternalCftLanguage.g:2714:1: ( rule__LookupDefinition__Group__4__Impl rule__LookupDefinition__Group__5 )
+            // InternalCftLanguage.g:2715:2: rule__LookupDefinition__Group__4__Impl rule__LookupDefinition__Group__5
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_25);
             rule__LookupDefinition__Group__4__Impl();
 
             state._fsp--;
@@ -6879,35 +8543,35 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__Group__4__Impl"
-    // InternalCftLanguage.g:2212:1: rule__LookupDefinition__Group__4__Impl : ( ( rule__LookupDefinition__Group_4__0 )* ) ;
+    // InternalCftLanguage.g:2722:1: rule__LookupDefinition__Group__4__Impl : ( ( rule__LookupDefinition__Group_4__0 )* ) ;
     public final void rule__LookupDefinition__Group__4__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2216:1: ( ( ( rule__LookupDefinition__Group_4__0 )* ) )
-            // InternalCftLanguage.g:2217:1: ( ( rule__LookupDefinition__Group_4__0 )* )
+            // InternalCftLanguage.g:2726:1: ( ( ( rule__LookupDefinition__Group_4__0 )* ) )
+            // InternalCftLanguage.g:2727:1: ( ( rule__LookupDefinition__Group_4__0 )* )
             {
-            // InternalCftLanguage.g:2217:1: ( ( rule__LookupDefinition__Group_4__0 )* )
-            // InternalCftLanguage.g:2218:2: ( rule__LookupDefinition__Group_4__0 )*
+            // InternalCftLanguage.g:2727:1: ( ( rule__LookupDefinition__Group_4__0 )* )
+            // InternalCftLanguage.g:2728:2: ( rule__LookupDefinition__Group_4__0 )*
             {
              before(grammarAccess.getLookupDefinitionAccess().getGroup_4()); 
-            // InternalCftLanguage.g:2219:2: ( rule__LookupDefinition__Group_4__0 )*
-            loop22:
+            // InternalCftLanguage.g:2729:2: ( rule__LookupDefinition__Group_4__0 )*
+            loop27:
             do {
-                int alt22=2;
-                int LA22_0 = input.LA(1);
+                int alt27=2;
+                int LA27_0 = input.LA(1);
 
-                if ( (LA22_0==29) ) {
-                    alt22=1;
+                if ( (LA27_0==32) ) {
+                    alt27=1;
                 }
 
 
-                switch (alt22) {
+                switch (alt27) {
                 case 1 :
-                    // InternalCftLanguage.g:2219:3: rule__LookupDefinition__Group_4__0
+                    // InternalCftLanguage.g:2729:3: rule__LookupDefinition__Group_4__0
                     {
-                    pushFollow(FOLLOW_24);
+                    pushFollow(FOLLOW_26);
                     rule__LookupDefinition__Group_4__0();
 
                     state._fsp--;
@@ -6917,7 +8581,7 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
                     break;
 
                 default :
-                    break loop22;
+                    break loop27;
                 }
             } while (true);
 
@@ -6944,16 +8608,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__Group__5"
-    // InternalCftLanguage.g:2227:1: rule__LookupDefinition__Group__5 : rule__LookupDefinition__Group__5__Impl rule__LookupDefinition__Group__6 ;
+    // InternalCftLanguage.g:2737:1: rule__LookupDefinition__Group__5 : rule__LookupDefinition__Group__5__Impl rule__LookupDefinition__Group__6 ;
     public final void rule__LookupDefinition__Group__5() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2231:1: ( rule__LookupDefinition__Group__5__Impl rule__LookupDefinition__Group__6 )
-            // InternalCftLanguage.g:2232:2: rule__LookupDefinition__Group__5__Impl rule__LookupDefinition__Group__6
+            // InternalCftLanguage.g:2741:1: ( rule__LookupDefinition__Group__5__Impl rule__LookupDefinition__Group__6 )
+            // InternalCftLanguage.g:2742:2: rule__LookupDefinition__Group__5__Impl rule__LookupDefinition__Group__6
             {
-            pushFollow(FOLLOW_28);
+            pushFollow(FOLLOW_30);
             rule__LookupDefinition__Group__5__Impl();
 
             state._fsp--;
@@ -6982,20 +8646,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__Group__5__Impl"
-    // InternalCftLanguage.g:2239:1: rule__LookupDefinition__Group__5__Impl : ( ')' ) ;
+    // InternalCftLanguage.g:2749:1: rule__LookupDefinition__Group__5__Impl : ( ')' ) ;
     public final void rule__LookupDefinition__Group__5__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2243:1: ( ( ')' ) )
-            // InternalCftLanguage.g:2244:1: ( ')' )
+            // InternalCftLanguage.g:2753:1: ( ( ')' ) )
+            // InternalCftLanguage.g:2754:1: ( ')' )
             {
-            // InternalCftLanguage.g:2244:1: ( ')' )
-            // InternalCftLanguage.g:2245:2: ')'
+            // InternalCftLanguage.g:2754:1: ( ')' )
+            // InternalCftLanguage.g:2755:2: ')'
             {
              before(grammarAccess.getLookupDefinitionAccess().getRightParenthesisKeyword_5()); 
-            match(input,28,FOLLOW_2); 
+            match(input,31,FOLLOW_2); 
              after(grammarAccess.getLookupDefinitionAccess().getRightParenthesisKeyword_5()); 
 
             }
@@ -7019,14 +8683,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__Group__6"
-    // InternalCftLanguage.g:2254:1: rule__LookupDefinition__Group__6 : rule__LookupDefinition__Group__6__Impl rule__LookupDefinition__Group__7 ;
+    // InternalCftLanguage.g:2764:1: rule__LookupDefinition__Group__6 : rule__LookupDefinition__Group__6__Impl rule__LookupDefinition__Group__7 ;
     public final void rule__LookupDefinition__Group__6() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2258:1: ( rule__LookupDefinition__Group__6__Impl rule__LookupDefinition__Group__7 )
-            // InternalCftLanguage.g:2259:2: rule__LookupDefinition__Group__6__Impl rule__LookupDefinition__Group__7
+            // InternalCftLanguage.g:2768:1: ( rule__LookupDefinition__Group__6__Impl rule__LookupDefinition__Group__7 )
+            // InternalCftLanguage.g:2769:2: rule__LookupDefinition__Group__6__Impl rule__LookupDefinition__Group__7
             {
             pushFollow(FOLLOW_3);
             rule__LookupDefinition__Group__6__Impl();
@@ -7057,20 +8721,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__Group__6__Impl"
-    // InternalCftLanguage.g:2266:1: rule__LookupDefinition__Group__6__Impl : ( 'as' ) ;
+    // InternalCftLanguage.g:2776:1: rule__LookupDefinition__Group__6__Impl : ( 'as' ) ;
     public final void rule__LookupDefinition__Group__6__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2270:1: ( ( 'as' ) )
-            // InternalCftLanguage.g:2271:1: ( 'as' )
+            // InternalCftLanguage.g:2780:1: ( ( 'as' ) )
+            // InternalCftLanguage.g:2781:1: ( 'as' )
             {
-            // InternalCftLanguage.g:2271:1: ( 'as' )
-            // InternalCftLanguage.g:2272:2: 'as'
+            // InternalCftLanguage.g:2781:1: ( 'as' )
+            // InternalCftLanguage.g:2782:2: 'as'
             {
              before(grammarAccess.getLookupDefinitionAccess().getAsKeyword_6()); 
-            match(input,31,FOLLOW_2); 
+            match(input,34,FOLLOW_2); 
              after(grammarAccess.getLookupDefinitionAccess().getAsKeyword_6()); 
 
             }
@@ -7094,14 +8758,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__Group__7"
-    // InternalCftLanguage.g:2281:1: rule__LookupDefinition__Group__7 : rule__LookupDefinition__Group__7__Impl ;
+    // InternalCftLanguage.g:2791:1: rule__LookupDefinition__Group__7 : rule__LookupDefinition__Group__7__Impl ;
     public final void rule__LookupDefinition__Group__7() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2285:1: ( rule__LookupDefinition__Group__7__Impl )
-            // InternalCftLanguage.g:2286:2: rule__LookupDefinition__Group__7__Impl
+            // InternalCftLanguage.g:2795:1: ( rule__LookupDefinition__Group__7__Impl )
+            // InternalCftLanguage.g:2796:2: rule__LookupDefinition__Group__7__Impl
             {
             pushFollow(FOLLOW_2);
             rule__LookupDefinition__Group__7__Impl();
@@ -7127,21 +8791,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__Group__7__Impl"
-    // InternalCftLanguage.g:2292:1: rule__LookupDefinition__Group__7__Impl : ( ( rule__LookupDefinition__NameAssignment_7 ) ) ;
+    // InternalCftLanguage.g:2802:1: rule__LookupDefinition__Group__7__Impl : ( ( rule__LookupDefinition__NameAssignment_7 ) ) ;
     public final void rule__LookupDefinition__Group__7__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2296:1: ( ( ( rule__LookupDefinition__NameAssignment_7 ) ) )
-            // InternalCftLanguage.g:2297:1: ( ( rule__LookupDefinition__NameAssignment_7 ) )
+            // InternalCftLanguage.g:2806:1: ( ( ( rule__LookupDefinition__NameAssignment_7 ) ) )
+            // InternalCftLanguage.g:2807:1: ( ( rule__LookupDefinition__NameAssignment_7 ) )
             {
-            // InternalCftLanguage.g:2297:1: ( ( rule__LookupDefinition__NameAssignment_7 ) )
-            // InternalCftLanguage.g:2298:2: ( rule__LookupDefinition__NameAssignment_7 )
+            // InternalCftLanguage.g:2807:1: ( ( rule__LookupDefinition__NameAssignment_7 ) )
+            // InternalCftLanguage.g:2808:2: ( rule__LookupDefinition__NameAssignment_7 )
             {
              before(grammarAccess.getLookupDefinitionAccess().getNameAssignment_7()); 
-            // InternalCftLanguage.g:2299:2: ( rule__LookupDefinition__NameAssignment_7 )
-            // InternalCftLanguage.g:2299:3: rule__LookupDefinition__NameAssignment_7
+            // InternalCftLanguage.g:2809:2: ( rule__LookupDefinition__NameAssignment_7 )
+            // InternalCftLanguage.g:2809:3: rule__LookupDefinition__NameAssignment_7
             {
             pushFollow(FOLLOW_2);
             rule__LookupDefinition__NameAssignment_7();
@@ -7174,14 +8838,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__Group_4__0"
-    // InternalCftLanguage.g:2308:1: rule__LookupDefinition__Group_4__0 : rule__LookupDefinition__Group_4__0__Impl rule__LookupDefinition__Group_4__1 ;
+    // InternalCftLanguage.g:2818:1: rule__LookupDefinition__Group_4__0 : rule__LookupDefinition__Group_4__0__Impl rule__LookupDefinition__Group_4__1 ;
     public final void rule__LookupDefinition__Group_4__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2312:1: ( rule__LookupDefinition__Group_4__0__Impl rule__LookupDefinition__Group_4__1 )
-            // InternalCftLanguage.g:2313:2: rule__LookupDefinition__Group_4__0__Impl rule__LookupDefinition__Group_4__1
+            // InternalCftLanguage.g:2822:1: ( rule__LookupDefinition__Group_4__0__Impl rule__LookupDefinition__Group_4__1 )
+            // InternalCftLanguage.g:2823:2: rule__LookupDefinition__Group_4__0__Impl rule__LookupDefinition__Group_4__1
             {
             pushFollow(FOLLOW_3);
             rule__LookupDefinition__Group_4__0__Impl();
@@ -7212,20 +8876,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__Group_4__0__Impl"
-    // InternalCftLanguage.g:2320:1: rule__LookupDefinition__Group_4__0__Impl : ( ',' ) ;
+    // InternalCftLanguage.g:2830:1: rule__LookupDefinition__Group_4__0__Impl : ( ',' ) ;
     public final void rule__LookupDefinition__Group_4__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2324:1: ( ( ',' ) )
-            // InternalCftLanguage.g:2325:1: ( ',' )
+            // InternalCftLanguage.g:2834:1: ( ( ',' ) )
+            // InternalCftLanguage.g:2835:1: ( ',' )
             {
-            // InternalCftLanguage.g:2325:1: ( ',' )
-            // InternalCftLanguage.g:2326:2: ','
+            // InternalCftLanguage.g:2835:1: ( ',' )
+            // InternalCftLanguage.g:2836:2: ','
             {
              before(grammarAccess.getLookupDefinitionAccess().getCommaKeyword_4_0()); 
-            match(input,29,FOLLOW_2); 
+            match(input,32,FOLLOW_2); 
              after(grammarAccess.getLookupDefinitionAccess().getCommaKeyword_4_0()); 
 
             }
@@ -7249,14 +8913,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__Group_4__1"
-    // InternalCftLanguage.g:2335:1: rule__LookupDefinition__Group_4__1 : rule__LookupDefinition__Group_4__1__Impl ;
+    // InternalCftLanguage.g:2845:1: rule__LookupDefinition__Group_4__1 : rule__LookupDefinition__Group_4__1__Impl ;
     public final void rule__LookupDefinition__Group_4__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2339:1: ( rule__LookupDefinition__Group_4__1__Impl )
-            // InternalCftLanguage.g:2340:2: rule__LookupDefinition__Group_4__1__Impl
+            // InternalCftLanguage.g:2849:1: ( rule__LookupDefinition__Group_4__1__Impl )
+            // InternalCftLanguage.g:2850:2: rule__LookupDefinition__Group_4__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__LookupDefinition__Group_4__1__Impl();
@@ -7282,21 +8946,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__Group_4__1__Impl"
-    // InternalCftLanguage.g:2346:1: rule__LookupDefinition__Group_4__1__Impl : ( ( rule__LookupDefinition__ArgumentsAssignment_4_1 ) ) ;
+    // InternalCftLanguage.g:2856:1: rule__LookupDefinition__Group_4__1__Impl : ( ( rule__LookupDefinition__ArgumentsAssignment_4_1 ) ) ;
     public final void rule__LookupDefinition__Group_4__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2350:1: ( ( ( rule__LookupDefinition__ArgumentsAssignment_4_1 ) ) )
-            // InternalCftLanguage.g:2351:1: ( ( rule__LookupDefinition__ArgumentsAssignment_4_1 ) )
+            // InternalCftLanguage.g:2860:1: ( ( ( rule__LookupDefinition__ArgumentsAssignment_4_1 ) ) )
+            // InternalCftLanguage.g:2861:1: ( ( rule__LookupDefinition__ArgumentsAssignment_4_1 ) )
             {
-            // InternalCftLanguage.g:2351:1: ( ( rule__LookupDefinition__ArgumentsAssignment_4_1 ) )
-            // InternalCftLanguage.g:2352:2: ( rule__LookupDefinition__ArgumentsAssignment_4_1 )
+            // InternalCftLanguage.g:2861:1: ( ( rule__LookupDefinition__ArgumentsAssignment_4_1 ) )
+            // InternalCftLanguage.g:2862:2: ( rule__LookupDefinition__ArgumentsAssignment_4_1 )
             {
              before(grammarAccess.getLookupDefinitionAccess().getArgumentsAssignment_4_1()); 
-            // InternalCftLanguage.g:2353:2: ( rule__LookupDefinition__ArgumentsAssignment_4_1 )
-            // InternalCftLanguage.g:2353:3: rule__LookupDefinition__ArgumentsAssignment_4_1
+            // InternalCftLanguage.g:2863:2: ( rule__LookupDefinition__ArgumentsAssignment_4_1 )
+            // InternalCftLanguage.g:2863:3: rule__LookupDefinition__ArgumentsAssignment_4_1
             {
             pushFollow(FOLLOW_2);
             rule__LookupDefinition__ArgumentsAssignment_4_1();
@@ -7329,16 +8993,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__Assignment__Group__0"
-    // InternalCftLanguage.g:2362:1: rule__Assignment__Group__0 : rule__Assignment__Group__0__Impl rule__Assignment__Group__1 ;
+    // InternalCftLanguage.g:2872:1: rule__Assignment__Group__0 : rule__Assignment__Group__0__Impl rule__Assignment__Group__1 ;
     public final void rule__Assignment__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2366:1: ( rule__Assignment__Group__0__Impl rule__Assignment__Group__1 )
-            // InternalCftLanguage.g:2367:2: rule__Assignment__Group__0__Impl rule__Assignment__Group__1
+            // InternalCftLanguage.g:2876:1: ( rule__Assignment__Group__0__Impl rule__Assignment__Group__1 )
+            // InternalCftLanguage.g:2877:2: rule__Assignment__Group__0__Impl rule__Assignment__Group__1
             {
-            pushFollow(FOLLOW_29);
+            pushFollow(FOLLOW_31);
             rule__Assignment__Group__0__Impl();
 
             state._fsp--;
@@ -7367,21 +9031,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__Assignment__Group__0__Impl"
-    // InternalCftLanguage.g:2374:1: rule__Assignment__Group__0__Impl : ( ( rule__Assignment__InputAssignment_0 ) ) ;
+    // InternalCftLanguage.g:2884:1: rule__Assignment__Group__0__Impl : ( ( rule__Assignment__InputAssignment_0 ) ) ;
     public final void rule__Assignment__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2378:1: ( ( ( rule__Assignment__InputAssignment_0 ) ) )
-            // InternalCftLanguage.g:2379:1: ( ( rule__Assignment__InputAssignment_0 ) )
+            // InternalCftLanguage.g:2888:1: ( ( ( rule__Assignment__InputAssignment_0 ) ) )
+            // InternalCftLanguage.g:2889:1: ( ( rule__Assignment__InputAssignment_0 ) )
             {
-            // InternalCftLanguage.g:2379:1: ( ( rule__Assignment__InputAssignment_0 ) )
-            // InternalCftLanguage.g:2380:2: ( rule__Assignment__InputAssignment_0 )
+            // InternalCftLanguage.g:2889:1: ( ( rule__Assignment__InputAssignment_0 ) )
+            // InternalCftLanguage.g:2890:2: ( rule__Assignment__InputAssignment_0 )
             {
              before(grammarAccess.getAssignmentAccess().getInputAssignment_0()); 
-            // InternalCftLanguage.g:2381:2: ( rule__Assignment__InputAssignment_0 )
-            // InternalCftLanguage.g:2381:3: rule__Assignment__InputAssignment_0
+            // InternalCftLanguage.g:2891:2: ( rule__Assignment__InputAssignment_0 )
+            // InternalCftLanguage.g:2891:3: rule__Assignment__InputAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__Assignment__InputAssignment_0();
@@ -7414,16 +9078,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__Assignment__Group__1"
-    // InternalCftLanguage.g:2389:1: rule__Assignment__Group__1 : rule__Assignment__Group__1__Impl rule__Assignment__Group__2 ;
+    // InternalCftLanguage.g:2899:1: rule__Assignment__Group__1 : rule__Assignment__Group__1__Impl rule__Assignment__Group__2 ;
     public final void rule__Assignment__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2393:1: ( rule__Assignment__Group__1__Impl rule__Assignment__Group__2 )
-            // InternalCftLanguage.g:2394:2: rule__Assignment__Group__1__Impl rule__Assignment__Group__2
+            // InternalCftLanguage.g:2903:1: ( rule__Assignment__Group__1__Impl rule__Assignment__Group__2 )
+            // InternalCftLanguage.g:2904:2: rule__Assignment__Group__1__Impl rule__Assignment__Group__2
             {
-            pushFollow(FOLLOW_30);
+            pushFollow(FOLLOW_32);
             rule__Assignment__Group__1__Impl();
 
             state._fsp--;
@@ -7452,21 +9116,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__Assignment__Group__1__Impl"
-    // InternalCftLanguage.g:2401:1: rule__Assignment__Group__1__Impl : ( ( rule__Assignment__Alternatives_1 ) ) ;
+    // InternalCftLanguage.g:2911:1: rule__Assignment__Group__1__Impl : ( ( rule__Assignment__Alternatives_1 ) ) ;
     public final void rule__Assignment__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2405:1: ( ( ( rule__Assignment__Alternatives_1 ) ) )
-            // InternalCftLanguage.g:2406:1: ( ( rule__Assignment__Alternatives_1 ) )
+            // InternalCftLanguage.g:2915:1: ( ( ( rule__Assignment__Alternatives_1 ) ) )
+            // InternalCftLanguage.g:2916:1: ( ( rule__Assignment__Alternatives_1 ) )
             {
-            // InternalCftLanguage.g:2406:1: ( ( rule__Assignment__Alternatives_1 ) )
-            // InternalCftLanguage.g:2407:2: ( rule__Assignment__Alternatives_1 )
+            // InternalCftLanguage.g:2916:1: ( ( rule__Assignment__Alternatives_1 ) )
+            // InternalCftLanguage.g:2917:2: ( rule__Assignment__Alternatives_1 )
             {
              before(grammarAccess.getAssignmentAccess().getAlternatives_1()); 
-            // InternalCftLanguage.g:2408:2: ( rule__Assignment__Alternatives_1 )
-            // InternalCftLanguage.g:2408:3: rule__Assignment__Alternatives_1
+            // InternalCftLanguage.g:2918:2: ( rule__Assignment__Alternatives_1 )
+            // InternalCftLanguage.g:2918:3: rule__Assignment__Alternatives_1
             {
             pushFollow(FOLLOW_2);
             rule__Assignment__Alternatives_1();
@@ -7499,14 +9163,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__Assignment__Group__2"
-    // InternalCftLanguage.g:2416:1: rule__Assignment__Group__2 : rule__Assignment__Group__2__Impl ;
+    // InternalCftLanguage.g:2926:1: rule__Assignment__Group__2 : rule__Assignment__Group__2__Impl ;
     public final void rule__Assignment__Group__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2420:1: ( rule__Assignment__Group__2__Impl )
-            // InternalCftLanguage.g:2421:2: rule__Assignment__Group__2__Impl
+            // InternalCftLanguage.g:2930:1: ( rule__Assignment__Group__2__Impl )
+            // InternalCftLanguage.g:2931:2: rule__Assignment__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assignment__Group__2__Impl();
@@ -7532,21 +9196,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__Assignment__Group__2__Impl"
-    // InternalCftLanguage.g:2427:1: rule__Assignment__Group__2__Impl : ( ( rule__Assignment__OutputAssignment_2 ) ) ;
+    // InternalCftLanguage.g:2937:1: rule__Assignment__Group__2__Impl : ( ( rule__Assignment__OutputAssignment_2 ) ) ;
     public final void rule__Assignment__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2431:1: ( ( ( rule__Assignment__OutputAssignment_2 ) ) )
-            // InternalCftLanguage.g:2432:1: ( ( rule__Assignment__OutputAssignment_2 ) )
+            // InternalCftLanguage.g:2941:1: ( ( ( rule__Assignment__OutputAssignment_2 ) ) )
+            // InternalCftLanguage.g:2942:1: ( ( rule__Assignment__OutputAssignment_2 ) )
             {
-            // InternalCftLanguage.g:2432:1: ( ( rule__Assignment__OutputAssignment_2 ) )
-            // InternalCftLanguage.g:2433:2: ( rule__Assignment__OutputAssignment_2 )
+            // InternalCftLanguage.g:2942:1: ( ( rule__Assignment__OutputAssignment_2 ) )
+            // InternalCftLanguage.g:2943:2: ( rule__Assignment__OutputAssignment_2 )
             {
              before(grammarAccess.getAssignmentAccess().getOutputAssignment_2()); 
-            // InternalCftLanguage.g:2434:2: ( rule__Assignment__OutputAssignment_2 )
-            // InternalCftLanguage.g:2434:3: rule__Assignment__OutputAssignment_2
+            // InternalCftLanguage.g:2944:2: ( rule__Assignment__OutputAssignment_2 )
+            // InternalCftLanguage.g:2944:3: rule__Assignment__OutputAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__Assignment__OutputAssignment_2();
@@ -7579,16 +9243,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__EventReference__Group__0"
-    // InternalCftLanguage.g:2443:1: rule__EventReference__Group__0 : rule__EventReference__Group__0__Impl rule__EventReference__Group__1 ;
+    // InternalCftLanguage.g:2953:1: rule__EventReference__Group__0 : rule__EventReference__Group__0__Impl rule__EventReference__Group__1 ;
     public final void rule__EventReference__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2447:1: ( rule__EventReference__Group__0__Impl rule__EventReference__Group__1 )
-            // InternalCftLanguage.g:2448:2: rule__EventReference__Group__0__Impl rule__EventReference__Group__1
+            // InternalCftLanguage.g:2957:1: ( rule__EventReference__Group__0__Impl rule__EventReference__Group__1 )
+            // InternalCftLanguage.g:2958:2: rule__EventReference__Group__0__Impl rule__EventReference__Group__1
             {
-            pushFollow(FOLLOW_31);
+            pushFollow(FOLLOW_33);
             rule__EventReference__Group__0__Impl();
 
             state._fsp--;
@@ -7617,21 +9281,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__EventReference__Group__0__Impl"
-    // InternalCftLanguage.g:2455:1: rule__EventReference__Group__0__Impl : ( ( rule__EventReference__ComponentAssignment_0 ) ) ;
+    // InternalCftLanguage.g:2965:1: rule__EventReference__Group__0__Impl : ( ( rule__EventReference__ComponentAssignment_0 ) ) ;
     public final void rule__EventReference__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2459:1: ( ( ( rule__EventReference__ComponentAssignment_0 ) ) )
-            // InternalCftLanguage.g:2460:1: ( ( rule__EventReference__ComponentAssignment_0 ) )
+            // InternalCftLanguage.g:2969:1: ( ( ( rule__EventReference__ComponentAssignment_0 ) ) )
+            // InternalCftLanguage.g:2970:1: ( ( rule__EventReference__ComponentAssignment_0 ) )
             {
-            // InternalCftLanguage.g:2460:1: ( ( rule__EventReference__ComponentAssignment_0 ) )
-            // InternalCftLanguage.g:2461:2: ( rule__EventReference__ComponentAssignment_0 )
+            // InternalCftLanguage.g:2970:1: ( ( rule__EventReference__ComponentAssignment_0 ) )
+            // InternalCftLanguage.g:2971:2: ( rule__EventReference__ComponentAssignment_0 )
             {
              before(grammarAccess.getEventReferenceAccess().getComponentAssignment_0()); 
-            // InternalCftLanguage.g:2462:2: ( rule__EventReference__ComponentAssignment_0 )
-            // InternalCftLanguage.g:2462:3: rule__EventReference__ComponentAssignment_0
+            // InternalCftLanguage.g:2972:2: ( rule__EventReference__ComponentAssignment_0 )
+            // InternalCftLanguage.g:2972:3: rule__EventReference__ComponentAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__EventReference__ComponentAssignment_0();
@@ -7664,14 +9328,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__EventReference__Group__1"
-    // InternalCftLanguage.g:2470:1: rule__EventReference__Group__1 : rule__EventReference__Group__1__Impl rule__EventReference__Group__2 ;
+    // InternalCftLanguage.g:2980:1: rule__EventReference__Group__1 : rule__EventReference__Group__1__Impl rule__EventReference__Group__2 ;
     public final void rule__EventReference__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2474:1: ( rule__EventReference__Group__1__Impl rule__EventReference__Group__2 )
-            // InternalCftLanguage.g:2475:2: rule__EventReference__Group__1__Impl rule__EventReference__Group__2
+            // InternalCftLanguage.g:2984:1: ( rule__EventReference__Group__1__Impl rule__EventReference__Group__2 )
+            // InternalCftLanguage.g:2985:2: rule__EventReference__Group__1__Impl rule__EventReference__Group__2
             {
             pushFollow(FOLLOW_3);
             rule__EventReference__Group__1__Impl();
@@ -7702,20 +9366,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__EventReference__Group__1__Impl"
-    // InternalCftLanguage.g:2482:1: rule__EventReference__Group__1__Impl : ( '.' ) ;
+    // InternalCftLanguage.g:2992:1: rule__EventReference__Group__1__Impl : ( '.' ) ;
     public final void rule__EventReference__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2486:1: ( ( '.' ) )
-            // InternalCftLanguage.g:2487:1: ( '.' )
+            // InternalCftLanguage.g:2996:1: ( ( '.' ) )
+            // InternalCftLanguage.g:2997:1: ( '.' )
             {
-            // InternalCftLanguage.g:2487:1: ( '.' )
-            // InternalCftLanguage.g:2488:2: '.'
+            // InternalCftLanguage.g:2997:1: ( '.' )
+            // InternalCftLanguage.g:2998:2: '.'
             {
              before(grammarAccess.getEventReferenceAccess().getFullStopKeyword_1()); 
-            match(input,32,FOLLOW_2); 
+            match(input,35,FOLLOW_2); 
              after(grammarAccess.getEventReferenceAccess().getFullStopKeyword_1()); 
 
             }
@@ -7739,14 +9403,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__EventReference__Group__2"
-    // InternalCftLanguage.g:2497:1: rule__EventReference__Group__2 : rule__EventReference__Group__2__Impl ;
+    // InternalCftLanguage.g:3007:1: rule__EventReference__Group__2 : rule__EventReference__Group__2__Impl ;
     public final void rule__EventReference__Group__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2501:1: ( rule__EventReference__Group__2__Impl )
-            // InternalCftLanguage.g:2502:2: rule__EventReference__Group__2__Impl
+            // InternalCftLanguage.g:3011:1: ( rule__EventReference__Group__2__Impl )
+            // InternalCftLanguage.g:3012:2: rule__EventReference__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__EventReference__Group__2__Impl();
@@ -7772,21 +9436,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__EventReference__Group__2__Impl"
-    // InternalCftLanguage.g:2508:1: rule__EventReference__Group__2__Impl : ( ( rule__EventReference__EventAssignment_2 ) ) ;
+    // InternalCftLanguage.g:3018:1: rule__EventReference__Group__2__Impl : ( ( rule__EventReference__EventAssignment_2 ) ) ;
     public final void rule__EventReference__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2512:1: ( ( ( rule__EventReference__EventAssignment_2 ) ) )
-            // InternalCftLanguage.g:2513:1: ( ( rule__EventReference__EventAssignment_2 ) )
+            // InternalCftLanguage.g:3022:1: ( ( ( rule__EventReference__EventAssignment_2 ) ) )
+            // InternalCftLanguage.g:3023:1: ( ( rule__EventReference__EventAssignment_2 ) )
             {
-            // InternalCftLanguage.g:2513:1: ( ( rule__EventReference__EventAssignment_2 ) )
-            // InternalCftLanguage.g:2514:2: ( rule__EventReference__EventAssignment_2 )
+            // InternalCftLanguage.g:3023:1: ( ( rule__EventReference__EventAssignment_2 ) )
+            // InternalCftLanguage.g:3024:2: ( rule__EventReference__EventAssignment_2 )
             {
              before(grammarAccess.getEventReferenceAccess().getEventAssignment_2()); 
-            // InternalCftLanguage.g:2515:2: ( rule__EventReference__EventAssignment_2 )
-            // InternalCftLanguage.g:2515:3: rule__EventReference__EventAssignment_2
+            // InternalCftLanguage.g:3025:2: ( rule__EventReference__EventAssignment_2 )
+            // InternalCftLanguage.g:3025:3: rule__EventReference__EventAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__EventReference__EventAssignment_2();
@@ -7819,14 +9483,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentInstance__Group__0"
-    // InternalCftLanguage.g:2524:1: rule__ComponentInstance__Group__0 : rule__ComponentInstance__Group__0__Impl rule__ComponentInstance__Group__1 ;
+    // InternalCftLanguage.g:3034:1: rule__ComponentInstance__Group__0 : rule__ComponentInstance__Group__0__Impl rule__ComponentInstance__Group__1 ;
     public final void rule__ComponentInstance__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2528:1: ( rule__ComponentInstance__Group__0__Impl rule__ComponentInstance__Group__1 )
-            // InternalCftLanguage.g:2529:2: rule__ComponentInstance__Group__0__Impl rule__ComponentInstance__Group__1
+            // InternalCftLanguage.g:3038:1: ( rule__ComponentInstance__Group__0__Impl rule__ComponentInstance__Group__1 )
+            // InternalCftLanguage.g:3039:2: rule__ComponentInstance__Group__0__Impl rule__ComponentInstance__Group__1
             {
             pushFollow(FOLLOW_3);
             rule__ComponentInstance__Group__0__Impl();
@@ -7857,20 +9521,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentInstance__Group__0__Impl"
-    // InternalCftLanguage.g:2536:1: rule__ComponentInstance__Group__0__Impl : ( '=>' ) ;
+    // InternalCftLanguage.g:3046:1: rule__ComponentInstance__Group__0__Impl : ( '=>' ) ;
     public final void rule__ComponentInstance__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2540:1: ( ( '=>' ) )
-            // InternalCftLanguage.g:2541:1: ( '=>' )
+            // InternalCftLanguage.g:3050:1: ( ( '=>' ) )
+            // InternalCftLanguage.g:3051:1: ( '=>' )
             {
-            // InternalCftLanguage.g:2541:1: ( '=>' )
-            // InternalCftLanguage.g:2542:2: '=>'
+            // InternalCftLanguage.g:3051:1: ( '=>' )
+            // InternalCftLanguage.g:3052:2: '=>'
             {
              before(grammarAccess.getComponentInstanceAccess().getEqualsSignGreaterThanSignKeyword_0()); 
-            match(input,33,FOLLOW_2); 
+            match(input,36,FOLLOW_2); 
              after(grammarAccess.getComponentInstanceAccess().getEqualsSignGreaterThanSignKeyword_0()); 
 
             }
@@ -7894,16 +9558,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentInstance__Group__1"
-    // InternalCftLanguage.g:2551:1: rule__ComponentInstance__Group__1 : rule__ComponentInstance__Group__1__Impl rule__ComponentInstance__Group__2 ;
+    // InternalCftLanguage.g:3061:1: rule__ComponentInstance__Group__1 : rule__ComponentInstance__Group__1__Impl rule__ComponentInstance__Group__2 ;
     public final void rule__ComponentInstance__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2555:1: ( rule__ComponentInstance__Group__1__Impl rule__ComponentInstance__Group__2 )
-            // InternalCftLanguage.g:2556:2: rule__ComponentInstance__Group__1__Impl rule__ComponentInstance__Group__2
+            // InternalCftLanguage.g:3065:1: ( rule__ComponentInstance__Group__1__Impl rule__ComponentInstance__Group__2 )
+            // InternalCftLanguage.g:3066:2: rule__ComponentInstance__Group__1__Impl rule__ComponentInstance__Group__2
             {
-            pushFollow(FOLLOW_3);
+            pushFollow(FOLLOW_34);
             rule__ComponentInstance__Group__1__Impl();
 
             state._fsp--;
@@ -7932,21 +9596,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentInstance__Group__1__Impl"
-    // InternalCftLanguage.g:2563:1: rule__ComponentInstance__Group__1__Impl : ( ( rule__ComponentInstance__ComponentTypeAssignment_1 ) ) ;
+    // InternalCftLanguage.g:3073:1: rule__ComponentInstance__Group__1__Impl : ( ( rule__ComponentInstance__ComponentTypeAssignment_1 ) ) ;
     public final void rule__ComponentInstance__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2567:1: ( ( ( rule__ComponentInstance__ComponentTypeAssignment_1 ) ) )
-            // InternalCftLanguage.g:2568:1: ( ( rule__ComponentInstance__ComponentTypeAssignment_1 ) )
+            // InternalCftLanguage.g:3077:1: ( ( ( rule__ComponentInstance__ComponentTypeAssignment_1 ) ) )
+            // InternalCftLanguage.g:3078:1: ( ( rule__ComponentInstance__ComponentTypeAssignment_1 ) )
             {
-            // InternalCftLanguage.g:2568:1: ( ( rule__ComponentInstance__ComponentTypeAssignment_1 ) )
-            // InternalCftLanguage.g:2569:2: ( rule__ComponentInstance__ComponentTypeAssignment_1 )
+            // InternalCftLanguage.g:3078:1: ( ( rule__ComponentInstance__ComponentTypeAssignment_1 ) )
+            // InternalCftLanguage.g:3079:2: ( rule__ComponentInstance__ComponentTypeAssignment_1 )
             {
              before(grammarAccess.getComponentInstanceAccess().getComponentTypeAssignment_1()); 
-            // InternalCftLanguage.g:2570:2: ( rule__ComponentInstance__ComponentTypeAssignment_1 )
-            // InternalCftLanguage.g:2570:3: rule__ComponentInstance__ComponentTypeAssignment_1
+            // InternalCftLanguage.g:3080:2: ( rule__ComponentInstance__ComponentTypeAssignment_1 )
+            // InternalCftLanguage.g:3080:3: rule__ComponentInstance__ComponentTypeAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__ComponentInstance__ComponentTypeAssignment_1();
@@ -7979,14 +9643,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentInstance__Group__2"
-    // InternalCftLanguage.g:2578:1: rule__ComponentInstance__Group__2 : rule__ComponentInstance__Group__2__Impl ;
+    // InternalCftLanguage.g:3088:1: rule__ComponentInstance__Group__2 : rule__ComponentInstance__Group__2__Impl ;
     public final void rule__ComponentInstance__Group__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2582:1: ( rule__ComponentInstance__Group__2__Impl )
-            // InternalCftLanguage.g:2583:2: rule__ComponentInstance__Group__2__Impl
+            // InternalCftLanguage.g:3092:1: ( rule__ComponentInstance__Group__2__Impl )
+            // InternalCftLanguage.g:3093:2: rule__ComponentInstance__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ComponentInstance__Group__2__Impl();
@@ -8012,29 +9676,29 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentInstance__Group__2__Impl"
-    // InternalCftLanguage.g:2589:1: rule__ComponentInstance__Group__2__Impl : ( ( rule__ComponentInstance__NameAssignment_2 )? ) ;
+    // InternalCftLanguage.g:3099:1: rule__ComponentInstance__Group__2__Impl : ( ( rule__ComponentInstance__NameAssignment_2 )? ) ;
     public final void rule__ComponentInstance__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2593:1: ( ( ( rule__ComponentInstance__NameAssignment_2 )? ) )
-            // InternalCftLanguage.g:2594:1: ( ( rule__ComponentInstance__NameAssignment_2 )? )
+            // InternalCftLanguage.g:3103:1: ( ( ( rule__ComponentInstance__NameAssignment_2 )? ) )
+            // InternalCftLanguage.g:3104:1: ( ( rule__ComponentInstance__NameAssignment_2 )? )
             {
-            // InternalCftLanguage.g:2594:1: ( ( rule__ComponentInstance__NameAssignment_2 )? )
-            // InternalCftLanguage.g:2595:2: ( rule__ComponentInstance__NameAssignment_2 )?
+            // InternalCftLanguage.g:3104:1: ( ( rule__ComponentInstance__NameAssignment_2 )? )
+            // InternalCftLanguage.g:3105:2: ( rule__ComponentInstance__NameAssignment_2 )?
             {
              before(grammarAccess.getComponentInstanceAccess().getNameAssignment_2()); 
-            // InternalCftLanguage.g:2596:2: ( rule__ComponentInstance__NameAssignment_2 )?
-            int alt23=2;
-            int LA23_0 = input.LA(1);
+            // InternalCftLanguage.g:3106:2: ( rule__ComponentInstance__NameAssignment_2 )?
+            int alt28=2;
+            int LA28_0 = input.LA(1);
 
-            if ( (LA23_0==RULE_ID) ) {
-                alt23=1;
+            if ( (LA28_0==RULE_ID) ) {
+                alt28=1;
             }
-            switch (alt23) {
+            switch (alt28) {
                 case 1 :
-                    // InternalCftLanguage.g:2596:3: rule__ComponentInstance__NameAssignment_2
+                    // InternalCftLanguage.g:3106:3: rule__ComponentInstance__NameAssignment_2
                     {
                     pushFollow(FOLLOW_2);
                     rule__ComponentInstance__NameAssignment_2();
@@ -8070,16 +9734,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__QualifiedName__Group__0"
-    // InternalCftLanguage.g:2605:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
+    // InternalCftLanguage.g:3115:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
     public final void rule__QualifiedName__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2609:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
-            // InternalCftLanguage.g:2610:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
+            // InternalCftLanguage.g:3119:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
+            // InternalCftLanguage.g:3120:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
             {
-            pushFollow(FOLLOW_31);
+            pushFollow(FOLLOW_33);
             rule__QualifiedName__Group__0__Impl();
 
             state._fsp--;
@@ -8108,21 +9772,25 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__QualifiedName__Group__0__Impl"
-    // InternalCftLanguage.g:2617:1: rule__QualifiedName__Group__0__Impl : ( RULE_ID ) ;
+    // InternalCftLanguage.g:3127:1: rule__QualifiedName__Group__0__Impl : ( ruleValidId ) ;
     public final void rule__QualifiedName__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2621:1: ( ( RULE_ID ) )
-            // InternalCftLanguage.g:2622:1: ( RULE_ID )
+            // InternalCftLanguage.g:3131:1: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:3132:1: ( ruleValidId )
             {
-            // InternalCftLanguage.g:2622:1: ( RULE_ID )
-            // InternalCftLanguage.g:2623:2: RULE_ID
+            // InternalCftLanguage.g:3132:1: ( ruleValidId )
+            // InternalCftLanguage.g:3133:2: ruleValidId
             {
-             before(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_0()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_0()); 
+             before(grammarAccess.getQualifiedNameAccess().getValidIdParserRuleCall_0()); 
+            pushFollow(FOLLOW_2);
+            ruleValidId();
+
+            state._fsp--;
+
+             after(grammarAccess.getQualifiedNameAccess().getValidIdParserRuleCall_0()); 
 
             }
 
@@ -8145,14 +9813,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__QualifiedName__Group__1"
-    // InternalCftLanguage.g:2632:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl ;
+    // InternalCftLanguage.g:3142:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl ;
     public final void rule__QualifiedName__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2636:1: ( rule__QualifiedName__Group__1__Impl )
-            // InternalCftLanguage.g:2637:2: rule__QualifiedName__Group__1__Impl
+            // InternalCftLanguage.g:3146:1: ( rule__QualifiedName__Group__1__Impl )
+            // InternalCftLanguage.g:3147:2: rule__QualifiedName__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedName__Group__1__Impl();
@@ -8178,41 +9846,41 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__QualifiedName__Group__1__Impl"
-    // InternalCftLanguage.g:2643:1: rule__QualifiedName__Group__1__Impl : ( ( rule__QualifiedName__Group_1__0 )* ) ;
+    // InternalCftLanguage.g:3153:1: rule__QualifiedName__Group__1__Impl : ( ( rule__QualifiedName__Group_1__0 )* ) ;
     public final void rule__QualifiedName__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2647:1: ( ( ( rule__QualifiedName__Group_1__0 )* ) )
-            // InternalCftLanguage.g:2648:1: ( ( rule__QualifiedName__Group_1__0 )* )
+            // InternalCftLanguage.g:3157:1: ( ( ( rule__QualifiedName__Group_1__0 )* ) )
+            // InternalCftLanguage.g:3158:1: ( ( rule__QualifiedName__Group_1__0 )* )
             {
-            // InternalCftLanguage.g:2648:1: ( ( rule__QualifiedName__Group_1__0 )* )
-            // InternalCftLanguage.g:2649:2: ( rule__QualifiedName__Group_1__0 )*
+            // InternalCftLanguage.g:3158:1: ( ( rule__QualifiedName__Group_1__0 )* )
+            // InternalCftLanguage.g:3159:2: ( rule__QualifiedName__Group_1__0 )*
             {
              before(grammarAccess.getQualifiedNameAccess().getGroup_1()); 
-            // InternalCftLanguage.g:2650:2: ( rule__QualifiedName__Group_1__0 )*
-            loop24:
+            // InternalCftLanguage.g:3160:2: ( rule__QualifiedName__Group_1__0 )*
+            loop29:
             do {
-                int alt24=2;
-                int LA24_0 = input.LA(1);
+                int alt29=2;
+                int LA29_0 = input.LA(1);
 
-                if ( (LA24_0==32) ) {
-                    int LA24_2 = input.LA(2);
+                if ( (LA29_0==35) ) {
+                    int LA29_2 = input.LA(2);
 
-                    if ( (LA24_2==RULE_ID) ) {
-                        alt24=1;
+                    if ( ((LA29_2>=RULE_ID && LA29_2<=RULE_OF_INT)) ) {
+                        alt29=1;
                     }
 
 
                 }
 
 
-                switch (alt24) {
+                switch (alt29) {
                 case 1 :
-                    // InternalCftLanguage.g:2650:3: rule__QualifiedName__Group_1__0
+                    // InternalCftLanguage.g:3160:3: rule__QualifiedName__Group_1__0
                     {
-                    pushFollow(FOLLOW_32);
+                    pushFollow(FOLLOW_35);
                     rule__QualifiedName__Group_1__0();
 
                     state._fsp--;
@@ -8222,7 +9890,7 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
                     break;
 
                 default :
-                    break loop24;
+                    break loop29;
                 }
             } while (true);
 
@@ -8249,14 +9917,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__0"
-    // InternalCftLanguage.g:2659:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
+    // InternalCftLanguage.g:3169:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
     public final void rule__QualifiedName__Group_1__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2663:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
-            // InternalCftLanguage.g:2664:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
+            // InternalCftLanguage.g:3173:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
+            // InternalCftLanguage.g:3174:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
             {
             pushFollow(FOLLOW_3);
             rule__QualifiedName__Group_1__0__Impl();
@@ -8287,20 +9955,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__0__Impl"
-    // InternalCftLanguage.g:2671:1: rule__QualifiedName__Group_1__0__Impl : ( '.' ) ;
+    // InternalCftLanguage.g:3181:1: rule__QualifiedName__Group_1__0__Impl : ( '.' ) ;
     public final void rule__QualifiedName__Group_1__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2675:1: ( ( '.' ) )
-            // InternalCftLanguage.g:2676:1: ( '.' )
+            // InternalCftLanguage.g:3185:1: ( ( '.' ) )
+            // InternalCftLanguage.g:3186:1: ( '.' )
             {
-            // InternalCftLanguage.g:2676:1: ( '.' )
-            // InternalCftLanguage.g:2677:2: '.'
+            // InternalCftLanguage.g:3186:1: ( '.' )
+            // InternalCftLanguage.g:3187:2: '.'
             {
              before(grammarAccess.getQualifiedNameAccess().getFullStopKeyword_1_0()); 
-            match(input,32,FOLLOW_2); 
+            match(input,35,FOLLOW_2); 
              after(grammarAccess.getQualifiedNameAccess().getFullStopKeyword_1_0()); 
 
             }
@@ -8324,14 +9992,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__1"
-    // InternalCftLanguage.g:2686:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl ;
+    // InternalCftLanguage.g:3196:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl ;
     public final void rule__QualifiedName__Group_1__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2690:1: ( rule__QualifiedName__Group_1__1__Impl )
-            // InternalCftLanguage.g:2691:2: rule__QualifiedName__Group_1__1__Impl
+            // InternalCftLanguage.g:3200:1: ( rule__QualifiedName__Group_1__1__Impl )
+            // InternalCftLanguage.g:3201:2: rule__QualifiedName__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedName__Group_1__1__Impl();
@@ -8357,21 +10025,25 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__1__Impl"
-    // InternalCftLanguage.g:2697:1: rule__QualifiedName__Group_1__1__Impl : ( RULE_ID ) ;
+    // InternalCftLanguage.g:3207:1: rule__QualifiedName__Group_1__1__Impl : ( ruleValidId ) ;
     public final void rule__QualifiedName__Group_1__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2701:1: ( ( RULE_ID ) )
-            // InternalCftLanguage.g:2702:1: ( RULE_ID )
+            // InternalCftLanguage.g:3211:1: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:3212:1: ( ruleValidId )
             {
-            // InternalCftLanguage.g:2702:1: ( RULE_ID )
-            // InternalCftLanguage.g:2703:2: RULE_ID
+            // InternalCftLanguage.g:3212:1: ( ruleValidId )
+            // InternalCftLanguage.g:3213:2: ruleValidId
             {
-             before(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1()); 
+             before(grammarAccess.getQualifiedNameAccess().getValidIdParserRuleCall_1_1()); 
+            pushFollow(FOLLOW_2);
+            ruleValidId();
+
+            state._fsp--;
+
+             after(grammarAccess.getQualifiedNameAccess().getValidIdParserRuleCall_1_1()); 
 
             }
 
@@ -8394,16 +10066,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__0"
-    // InternalCftLanguage.g:2713:1: rule__QualifiedNameWithWildcard__Group__0 : rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 ;
+    // InternalCftLanguage.g:3223:1: rule__QualifiedNameWithWildcard__Group__0 : rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 ;
     public final void rule__QualifiedNameWithWildcard__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2717:1: ( rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 )
-            // InternalCftLanguage.g:2718:2: rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1
+            // InternalCftLanguage.g:3227:1: ( rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 )
+            // InternalCftLanguage.g:3228:2: rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1
             {
-            pushFollow(FOLLOW_31);
+            pushFollow(FOLLOW_33);
             rule__QualifiedNameWithWildcard__Group__0__Impl();
 
             state._fsp--;
@@ -8432,17 +10104,17 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__0__Impl"
-    // InternalCftLanguage.g:2725:1: rule__QualifiedNameWithWildcard__Group__0__Impl : ( ruleQualifiedName ) ;
+    // InternalCftLanguage.g:3235:1: rule__QualifiedNameWithWildcard__Group__0__Impl : ( ruleQualifiedName ) ;
     public final void rule__QualifiedNameWithWildcard__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2729:1: ( ( ruleQualifiedName ) )
-            // InternalCftLanguage.g:2730:1: ( ruleQualifiedName )
+            // InternalCftLanguage.g:3239:1: ( ( ruleQualifiedName ) )
+            // InternalCftLanguage.g:3240:1: ( ruleQualifiedName )
             {
-            // InternalCftLanguage.g:2730:1: ( ruleQualifiedName )
-            // InternalCftLanguage.g:2731:2: ruleQualifiedName
+            // InternalCftLanguage.g:3240:1: ( ruleQualifiedName )
+            // InternalCftLanguage.g:3241:2: ruleQualifiedName
             {
              before(grammarAccess.getQualifiedNameWithWildcardAccess().getQualifiedNameParserRuleCall_0()); 
             pushFollow(FOLLOW_2);
@@ -8473,14 +10145,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__1"
-    // InternalCftLanguage.g:2740:1: rule__QualifiedNameWithWildcard__Group__1 : rule__QualifiedNameWithWildcard__Group__1__Impl ;
+    // InternalCftLanguage.g:3250:1: rule__QualifiedNameWithWildcard__Group__1 : rule__QualifiedNameWithWildcard__Group__1__Impl ;
     public final void rule__QualifiedNameWithWildcard__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2744:1: ( rule__QualifiedNameWithWildcard__Group__1__Impl )
-            // InternalCftLanguage.g:2745:2: rule__QualifiedNameWithWildcard__Group__1__Impl
+            // InternalCftLanguage.g:3254:1: ( rule__QualifiedNameWithWildcard__Group__1__Impl )
+            // InternalCftLanguage.g:3255:2: rule__QualifiedNameWithWildcard__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedNameWithWildcard__Group__1__Impl();
@@ -8506,29 +10178,29 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__1__Impl"
-    // InternalCftLanguage.g:2751:1: rule__QualifiedNameWithWildcard__Group__1__Impl : ( ( rule__QualifiedNameWithWildcard__Group_1__0 )? ) ;
+    // InternalCftLanguage.g:3261:1: rule__QualifiedNameWithWildcard__Group__1__Impl : ( ( rule__QualifiedNameWithWildcard__Group_1__0 )? ) ;
     public final void rule__QualifiedNameWithWildcard__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2755:1: ( ( ( rule__QualifiedNameWithWildcard__Group_1__0 )? ) )
-            // InternalCftLanguage.g:2756:1: ( ( rule__QualifiedNameWithWildcard__Group_1__0 )? )
+            // InternalCftLanguage.g:3265:1: ( ( ( rule__QualifiedNameWithWildcard__Group_1__0 )? ) )
+            // InternalCftLanguage.g:3266:1: ( ( rule__QualifiedNameWithWildcard__Group_1__0 )? )
             {
-            // InternalCftLanguage.g:2756:1: ( ( rule__QualifiedNameWithWildcard__Group_1__0 )? )
-            // InternalCftLanguage.g:2757:2: ( rule__QualifiedNameWithWildcard__Group_1__0 )?
+            // InternalCftLanguage.g:3266:1: ( ( rule__QualifiedNameWithWildcard__Group_1__0 )? )
+            // InternalCftLanguage.g:3267:2: ( rule__QualifiedNameWithWildcard__Group_1__0 )?
             {
              before(grammarAccess.getQualifiedNameWithWildcardAccess().getGroup_1()); 
-            // InternalCftLanguage.g:2758:2: ( rule__QualifiedNameWithWildcard__Group_1__0 )?
-            int alt25=2;
-            int LA25_0 = input.LA(1);
+            // InternalCftLanguage.g:3268:2: ( rule__QualifiedNameWithWildcard__Group_1__0 )?
+            int alt30=2;
+            int LA30_0 = input.LA(1);
 
-            if ( (LA25_0==32) ) {
-                alt25=1;
+            if ( (LA30_0==35) ) {
+                alt30=1;
             }
-            switch (alt25) {
+            switch (alt30) {
                 case 1 :
-                    // InternalCftLanguage.g:2758:3: rule__QualifiedNameWithWildcard__Group_1__0
+                    // InternalCftLanguage.g:3268:3: rule__QualifiedNameWithWildcard__Group_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__QualifiedNameWithWildcard__Group_1__0();
@@ -8564,16 +10236,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group_1__0"
-    // InternalCftLanguage.g:2767:1: rule__QualifiedNameWithWildcard__Group_1__0 : rule__QualifiedNameWithWildcard__Group_1__0__Impl rule__QualifiedNameWithWildcard__Group_1__1 ;
+    // InternalCftLanguage.g:3277:1: rule__QualifiedNameWithWildcard__Group_1__0 : rule__QualifiedNameWithWildcard__Group_1__0__Impl rule__QualifiedNameWithWildcard__Group_1__1 ;
     public final void rule__QualifiedNameWithWildcard__Group_1__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2771:1: ( rule__QualifiedNameWithWildcard__Group_1__0__Impl rule__QualifiedNameWithWildcard__Group_1__1 )
-            // InternalCftLanguage.g:2772:2: rule__QualifiedNameWithWildcard__Group_1__0__Impl rule__QualifiedNameWithWildcard__Group_1__1
+            // InternalCftLanguage.g:3281:1: ( rule__QualifiedNameWithWildcard__Group_1__0__Impl rule__QualifiedNameWithWildcard__Group_1__1 )
+            // InternalCftLanguage.g:3282:2: rule__QualifiedNameWithWildcard__Group_1__0__Impl rule__QualifiedNameWithWildcard__Group_1__1
             {
-            pushFollow(FOLLOW_33);
+            pushFollow(FOLLOW_36);
             rule__QualifiedNameWithWildcard__Group_1__0__Impl();
 
             state._fsp--;
@@ -8602,20 +10274,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group_1__0__Impl"
-    // InternalCftLanguage.g:2779:1: rule__QualifiedNameWithWildcard__Group_1__0__Impl : ( '.' ) ;
+    // InternalCftLanguage.g:3289:1: rule__QualifiedNameWithWildcard__Group_1__0__Impl : ( '.' ) ;
     public final void rule__QualifiedNameWithWildcard__Group_1__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2783:1: ( ( '.' ) )
-            // InternalCftLanguage.g:2784:1: ( '.' )
+            // InternalCftLanguage.g:3293:1: ( ( '.' ) )
+            // InternalCftLanguage.g:3294:1: ( '.' )
             {
-            // InternalCftLanguage.g:2784:1: ( '.' )
-            // InternalCftLanguage.g:2785:2: '.'
+            // InternalCftLanguage.g:3294:1: ( '.' )
+            // InternalCftLanguage.g:3295:2: '.'
             {
              before(grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1_0()); 
-            match(input,32,FOLLOW_2); 
+            match(input,35,FOLLOW_2); 
              after(grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1_0()); 
 
             }
@@ -8639,14 +10311,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group_1__1"
-    // InternalCftLanguage.g:2794:1: rule__QualifiedNameWithWildcard__Group_1__1 : rule__QualifiedNameWithWildcard__Group_1__1__Impl ;
+    // InternalCftLanguage.g:3304:1: rule__QualifiedNameWithWildcard__Group_1__1 : rule__QualifiedNameWithWildcard__Group_1__1__Impl ;
     public final void rule__QualifiedNameWithWildcard__Group_1__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2798:1: ( rule__QualifiedNameWithWildcard__Group_1__1__Impl )
-            // InternalCftLanguage.g:2799:2: rule__QualifiedNameWithWildcard__Group_1__1__Impl
+            // InternalCftLanguage.g:3308:1: ( rule__QualifiedNameWithWildcard__Group_1__1__Impl )
+            // InternalCftLanguage.g:3309:2: rule__QualifiedNameWithWildcard__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedNameWithWildcard__Group_1__1__Impl();
@@ -8672,20 +10344,20 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group_1__1__Impl"
-    // InternalCftLanguage.g:2805:1: rule__QualifiedNameWithWildcard__Group_1__1__Impl : ( '*' ) ;
+    // InternalCftLanguage.g:3315:1: rule__QualifiedNameWithWildcard__Group_1__1__Impl : ( '*' ) ;
     public final void rule__QualifiedNameWithWildcard__Group_1__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2809:1: ( ( '*' ) )
-            // InternalCftLanguage.g:2810:1: ( '*' )
+            // InternalCftLanguage.g:3319:1: ( ( '*' ) )
+            // InternalCftLanguage.g:3320:1: ( '*' )
             {
-            // InternalCftLanguage.g:2810:1: ( '*' )
-            // InternalCftLanguage.g:2811:2: '*'
+            // InternalCftLanguage.g:3320:1: ( '*' )
+            // InternalCftLanguage.g:3321:2: '*'
             {
              before(grammarAccess.getQualifiedNameWithWildcardAccess().getAsteriskKeyword_1_1()); 
-            match(input,34,FOLLOW_2); 
+            match(input,37,FOLLOW_2); 
              after(grammarAccess.getQualifiedNameWithWildcardAccess().getAsteriskKeyword_1_1()); 
 
             }
@@ -8709,29 +10381,29 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__UnorderedGroup_3"
-    // InternalCftLanguage.g:2821:1: rule__ComponentDefinition__UnorderedGroup_3 : ( rule__ComponentDefinition__UnorderedGroup_3__0 )? ;
+    // InternalCftLanguage.g:3331:1: rule__ComponentDefinition__UnorderedGroup_3 : ( rule__ComponentDefinition__UnorderedGroup_3__0 )? ;
     public final void rule__ComponentDefinition__UnorderedGroup_3() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                         getUnorderedGroupHelper().enter(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3());
                 
         try {
-            // InternalCftLanguage.g:2826:1: ( ( rule__ComponentDefinition__UnorderedGroup_3__0 )? )
-            // InternalCftLanguage.g:2827:2: ( rule__ComponentDefinition__UnorderedGroup_3__0 )?
+            // InternalCftLanguage.g:3336:1: ( ( rule__ComponentDefinition__UnorderedGroup_3__0 )? )
+            // InternalCftLanguage.g:3337:2: ( rule__ComponentDefinition__UnorderedGroup_3__0 )?
             {
-            // InternalCftLanguage.g:2827:2: ( rule__ComponentDefinition__UnorderedGroup_3__0 )?
-            int alt26=2;
-            int LA26_0 = input.LA(1);
+            // InternalCftLanguage.g:3337:2: ( rule__ComponentDefinition__UnorderedGroup_3__0 )?
+            int alt31=2;
+            int LA31_0 = input.LA(1);
 
-            if ( LA26_0 == 19 && getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 0) ) {
-                alt26=1;
+            if ( LA31_0 == 20 && getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 0) ) {
+                alt31=1;
             }
-            else if ( LA26_0 == 20 && getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 1) ) {
-                alt26=1;
+            else if ( LA31_0 == 21 && getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 1) ) {
+                alt31=1;
             }
-            switch (alt26) {
+            switch (alt31) {
                 case 1 :
-                    // InternalCftLanguage.g:2827:2: rule__ComponentDefinition__UnorderedGroup_3__0
+                    // InternalCftLanguage.g:3337:2: rule__ComponentDefinition__UnorderedGroup_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__ComponentDefinition__UnorderedGroup_3__0();
@@ -8764,44 +10436,44 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__UnorderedGroup_3__Impl"
-    // InternalCftLanguage.g:2835:1: rule__ComponentDefinition__UnorderedGroup_3__Impl : ( ({...}? => ( ( ( rule__ComponentDefinition__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__ComponentDefinition__Group_3_1__0 ) ) ) ) ) ;
+    // InternalCftLanguage.g:3345:1: rule__ComponentDefinition__UnorderedGroup_3__Impl : ( ({...}? => ( ( ( rule__ComponentDefinition__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__ComponentDefinition__Group_3_1__0 ) ) ) ) ) ;
     public final void rule__ComponentDefinition__UnorderedGroup_3__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                         boolean selected = false;
                 
         try {
-            // InternalCftLanguage.g:2840:1: ( ( ({...}? => ( ( ( rule__ComponentDefinition__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__ComponentDefinition__Group_3_1__0 ) ) ) ) ) )
-            // InternalCftLanguage.g:2841:3: ( ({...}? => ( ( ( rule__ComponentDefinition__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__ComponentDefinition__Group_3_1__0 ) ) ) ) )
+            // InternalCftLanguage.g:3350:1: ( ( ({...}? => ( ( ( rule__ComponentDefinition__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__ComponentDefinition__Group_3_1__0 ) ) ) ) ) )
+            // InternalCftLanguage.g:3351:3: ( ({...}? => ( ( ( rule__ComponentDefinition__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__ComponentDefinition__Group_3_1__0 ) ) ) ) )
             {
-            // InternalCftLanguage.g:2841:3: ( ({...}? => ( ( ( rule__ComponentDefinition__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__ComponentDefinition__Group_3_1__0 ) ) ) ) )
-            int alt27=2;
-            int LA27_0 = input.LA(1);
+            // InternalCftLanguage.g:3351:3: ( ({...}? => ( ( ( rule__ComponentDefinition__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__ComponentDefinition__Group_3_1__0 ) ) ) ) )
+            int alt32=2;
+            int LA32_0 = input.LA(1);
 
-            if ( LA27_0 == 19 && getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 0) ) {
-                alt27=1;
+            if ( LA32_0 == 20 && getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 0) ) {
+                alt32=1;
             }
-            else if ( LA27_0 == 20 && getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 1) ) {
-                alt27=2;
+            else if ( LA32_0 == 21 && getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 1) ) {
+                alt32=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 27, 0, input);
+                    new NoViableAltException("", 32, 0, input);
 
                 throw nvae;
             }
-            switch (alt27) {
+            switch (alt32) {
                 case 1 :
-                    // InternalCftLanguage.g:2842:3: ({...}? => ( ( ( rule__ComponentDefinition__Group_3_0__0 ) ) ) )
+                    // InternalCftLanguage.g:3352:3: ({...}? => ( ( ( rule__ComponentDefinition__Group_3_0__0 ) ) ) )
                     {
-                    // InternalCftLanguage.g:2842:3: ({...}? => ( ( ( rule__ComponentDefinition__Group_3_0__0 ) ) ) )
-                    // InternalCftLanguage.g:2843:4: {...}? => ( ( ( rule__ComponentDefinition__Group_3_0__0 ) ) )
+                    // InternalCftLanguage.g:3352:3: ({...}? => ( ( ( rule__ComponentDefinition__Group_3_0__0 ) ) ) )
+                    // InternalCftLanguage.g:3353:4: {...}? => ( ( ( rule__ComponentDefinition__Group_3_0__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 0) ) {
                         throw new FailedPredicateException(input, "rule__ComponentDefinition__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 0)");
                     }
-                    // InternalCftLanguage.g:2843:115: ( ( ( rule__ComponentDefinition__Group_3_0__0 ) ) )
-                    // InternalCftLanguage.g:2844:5: ( ( rule__ComponentDefinition__Group_3_0__0 ) )
+                    // InternalCftLanguage.g:3353:115: ( ( ( rule__ComponentDefinition__Group_3_0__0 ) ) )
+                    // InternalCftLanguage.g:3354:5: ( ( rule__ComponentDefinition__Group_3_0__0 ) )
                     {
 
                                                         getUnorderedGroupHelper().select(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 0);
@@ -8809,12 +10481,12 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
                                                         selected = true;
                                                 
-                    // InternalCftLanguage.g:2850:5: ( ( rule__ComponentDefinition__Group_3_0__0 ) )
-                    // InternalCftLanguage.g:2851:6: ( rule__ComponentDefinition__Group_3_0__0 )
+                    // InternalCftLanguage.g:3360:5: ( ( rule__ComponentDefinition__Group_3_0__0 ) )
+                    // InternalCftLanguage.g:3361:6: ( rule__ComponentDefinition__Group_3_0__0 )
                     {
                      before(grammarAccess.getComponentDefinitionAccess().getGroup_3_0()); 
-                    // InternalCftLanguage.g:2852:6: ( rule__ComponentDefinition__Group_3_0__0 )
-                    // InternalCftLanguage.g:2852:7: rule__ComponentDefinition__Group_3_0__0
+                    // InternalCftLanguage.g:3362:6: ( rule__ComponentDefinition__Group_3_0__0 )
+                    // InternalCftLanguage.g:3362:7: rule__ComponentDefinition__Group_3_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__ComponentDefinition__Group_3_0__0();
@@ -8838,16 +10510,16 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
                     }
                     break;
                 case 2 :
-                    // InternalCftLanguage.g:2857:3: ({...}? => ( ( ( rule__ComponentDefinition__Group_3_1__0 ) ) ) )
+                    // InternalCftLanguage.g:3367:3: ({...}? => ( ( ( rule__ComponentDefinition__Group_3_1__0 ) ) ) )
                     {
-                    // InternalCftLanguage.g:2857:3: ({...}? => ( ( ( rule__ComponentDefinition__Group_3_1__0 ) ) ) )
-                    // InternalCftLanguage.g:2858:4: {...}? => ( ( ( rule__ComponentDefinition__Group_3_1__0 ) ) )
+                    // InternalCftLanguage.g:3367:3: ({...}? => ( ( ( rule__ComponentDefinition__Group_3_1__0 ) ) ) )
+                    // InternalCftLanguage.g:3368:4: {...}? => ( ( ( rule__ComponentDefinition__Group_3_1__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 1) ) {
                         throw new FailedPredicateException(input, "rule__ComponentDefinition__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 1)");
                     }
-                    // InternalCftLanguage.g:2858:115: ( ( ( rule__ComponentDefinition__Group_3_1__0 ) ) )
-                    // InternalCftLanguage.g:2859:5: ( ( rule__ComponentDefinition__Group_3_1__0 ) )
+                    // InternalCftLanguage.g:3368:115: ( ( ( rule__ComponentDefinition__Group_3_1__0 ) ) )
+                    // InternalCftLanguage.g:3369:5: ( ( rule__ComponentDefinition__Group_3_1__0 ) )
                     {
 
                                                         getUnorderedGroupHelper().select(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 1);
@@ -8855,12 +10527,12 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
                                                         selected = true;
                                                 
-                    // InternalCftLanguage.g:2865:5: ( ( rule__ComponentDefinition__Group_3_1__0 ) )
-                    // InternalCftLanguage.g:2866:6: ( rule__ComponentDefinition__Group_3_1__0 )
+                    // InternalCftLanguage.g:3375:5: ( ( rule__ComponentDefinition__Group_3_1__0 ) )
+                    // InternalCftLanguage.g:3376:6: ( rule__ComponentDefinition__Group_3_1__0 )
                     {
                      before(grammarAccess.getComponentDefinitionAccess().getGroup_3_1()); 
-                    // InternalCftLanguage.g:2867:6: ( rule__ComponentDefinition__Group_3_1__0 )
-                    // InternalCftLanguage.g:2867:7: rule__ComponentDefinition__Group_3_1__0
+                    // InternalCftLanguage.g:3377:6: ( rule__ComponentDefinition__Group_3_1__0 )
+                    // InternalCftLanguage.g:3377:7: rule__ComponentDefinition__Group_3_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__ComponentDefinition__Group_3_1__0();
@@ -8907,33 +10579,33 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__UnorderedGroup_3__0"
-    // InternalCftLanguage.g:2880:1: rule__ComponentDefinition__UnorderedGroup_3__0 : rule__ComponentDefinition__UnorderedGroup_3__Impl ( rule__ComponentDefinition__UnorderedGroup_3__1 )? ;
+    // InternalCftLanguage.g:3390:1: rule__ComponentDefinition__UnorderedGroup_3__0 : rule__ComponentDefinition__UnorderedGroup_3__Impl ( rule__ComponentDefinition__UnorderedGroup_3__1 )? ;
     public final void rule__ComponentDefinition__UnorderedGroup_3__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2884:1: ( rule__ComponentDefinition__UnorderedGroup_3__Impl ( rule__ComponentDefinition__UnorderedGroup_3__1 )? )
-            // InternalCftLanguage.g:2885:2: rule__ComponentDefinition__UnorderedGroup_3__Impl ( rule__ComponentDefinition__UnorderedGroup_3__1 )?
+            // InternalCftLanguage.g:3394:1: ( rule__ComponentDefinition__UnorderedGroup_3__Impl ( rule__ComponentDefinition__UnorderedGroup_3__1 )? )
+            // InternalCftLanguage.g:3395:2: rule__ComponentDefinition__UnorderedGroup_3__Impl ( rule__ComponentDefinition__UnorderedGroup_3__1 )?
             {
-            pushFollow(FOLLOW_34);
+            pushFollow(FOLLOW_37);
             rule__ComponentDefinition__UnorderedGroup_3__Impl();
 
             state._fsp--;
 
-            // InternalCftLanguage.g:2886:2: ( rule__ComponentDefinition__UnorderedGroup_3__1 )?
-            int alt28=2;
-            int LA28_0 = input.LA(1);
+            // InternalCftLanguage.g:3396:2: ( rule__ComponentDefinition__UnorderedGroup_3__1 )?
+            int alt33=2;
+            int LA33_0 = input.LA(1);
 
-            if ( LA28_0 == 19 && getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 0) ) {
-                alt28=1;
+            if ( LA33_0 == 20 && getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 0) ) {
+                alt33=1;
             }
-            else if ( LA28_0 == 20 && getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 1) ) {
-                alt28=1;
+            else if ( LA33_0 == 21 && getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 1) ) {
+                alt33=1;
             }
-            switch (alt28) {
+            switch (alt33) {
                 case 1 :
-                    // InternalCftLanguage.g:2886:2: rule__ComponentDefinition__UnorderedGroup_3__1
+                    // InternalCftLanguage.g:3396:2: rule__ComponentDefinition__UnorderedGroup_3__1
                     {
                     pushFollow(FOLLOW_2);
                     rule__ComponentDefinition__UnorderedGroup_3__1();
@@ -8965,14 +10637,14 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__UnorderedGroup_3__1"
-    // InternalCftLanguage.g:2892:1: rule__ComponentDefinition__UnorderedGroup_3__1 : rule__ComponentDefinition__UnorderedGroup_3__Impl ;
+    // InternalCftLanguage.g:3402:1: rule__ComponentDefinition__UnorderedGroup_3__1 : rule__ComponentDefinition__UnorderedGroup_3__Impl ;
     public final void rule__ComponentDefinition__UnorderedGroup_3__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2896:1: ( rule__ComponentDefinition__UnorderedGroup_3__Impl )
-            // InternalCftLanguage.g:2897:2: rule__ComponentDefinition__UnorderedGroup_3__Impl
+            // InternalCftLanguage.g:3406:1: ( rule__ComponentDefinition__UnorderedGroup_3__Impl )
+            // InternalCftLanguage.g:3407:2: rule__ComponentDefinition__UnorderedGroup_3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ComponentDefinition__UnorderedGroup_3__Impl();
@@ -8998,17 +10670,17 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__CftModel__PackageNameAssignment_1"
-    // InternalCftLanguage.g:2904:1: rule__CftModel__PackageNameAssignment_1 : ( ruleQualifiedName ) ;
+    // InternalCftLanguage.g:3414:1: rule__CftModel__PackageNameAssignment_1 : ( ruleQualifiedName ) ;
     public final void rule__CftModel__PackageNameAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2908:1: ( ( ruleQualifiedName ) )
-            // InternalCftLanguage.g:2909:2: ( ruleQualifiedName )
+            // InternalCftLanguage.g:3418:1: ( ( ruleQualifiedName ) )
+            // InternalCftLanguage.g:3419:2: ( ruleQualifiedName )
             {
-            // InternalCftLanguage.g:2909:2: ( ruleQualifiedName )
-            // InternalCftLanguage.g:2910:3: ruleQualifiedName
+            // InternalCftLanguage.g:3419:2: ( ruleQualifiedName )
+            // InternalCftLanguage.g:3420:3: ruleQualifiedName
             {
              before(grammarAccess.getCftModelAccess().getPackageNameQualifiedNameParserRuleCall_1_0()); 
             pushFollow(FOLLOW_2);
@@ -9039,17 +10711,17 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__CftModel__ImportsAssignment_3"
-    // InternalCftLanguage.g:2919:1: rule__CftModel__ImportsAssignment_3 : ( ruleImportDeclaration ) ;
+    // InternalCftLanguage.g:3429:1: rule__CftModel__ImportsAssignment_3 : ( ruleImportDeclaration ) ;
     public final void rule__CftModel__ImportsAssignment_3() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2923:1: ( ( ruleImportDeclaration ) )
-            // InternalCftLanguage.g:2924:2: ( ruleImportDeclaration )
+            // InternalCftLanguage.g:3433:1: ( ( ruleImportDeclaration ) )
+            // InternalCftLanguage.g:3434:2: ( ruleImportDeclaration )
             {
-            // InternalCftLanguage.g:2924:2: ( ruleImportDeclaration )
-            // InternalCftLanguage.g:2925:3: ruleImportDeclaration
+            // InternalCftLanguage.g:3434:2: ( ruleImportDeclaration )
+            // InternalCftLanguage.g:3435:3: ruleImportDeclaration
             {
              before(grammarAccess.getCftModelAccess().getImportsImportDeclarationParserRuleCall_3_0()); 
             pushFollow(FOLLOW_2);
@@ -9080,17 +10752,17 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__CftModel__ComponentDefinitionsAssignment_4_0"
-    // InternalCftLanguage.g:2934:1: rule__CftModel__ComponentDefinitionsAssignment_4_0 : ( ruleComponentDefinition ) ;
+    // InternalCftLanguage.g:3444:1: rule__CftModel__ComponentDefinitionsAssignment_4_0 : ( ruleComponentDefinition ) ;
     public final void rule__CftModel__ComponentDefinitionsAssignment_4_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2938:1: ( ( ruleComponentDefinition ) )
-            // InternalCftLanguage.g:2939:2: ( ruleComponentDefinition )
+            // InternalCftLanguage.g:3448:1: ( ( ruleComponentDefinition ) )
+            // InternalCftLanguage.g:3449:2: ( ruleComponentDefinition )
             {
-            // InternalCftLanguage.g:2939:2: ( ruleComponentDefinition )
-            // InternalCftLanguage.g:2940:3: ruleComponentDefinition
+            // InternalCftLanguage.g:3449:2: ( ruleComponentDefinition )
+            // InternalCftLanguage.g:3450:3: ruleComponentDefinition
             {
              before(grammarAccess.getCftModelAccess().getComponentDefinitionsComponentDefinitionParserRuleCall_4_0_0()); 
             pushFollow(FOLLOW_2);
@@ -9121,17 +10793,17 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__CftModel__TransformationDefinitionsAssignment_4_1"
-    // InternalCftLanguage.g:2949:1: rule__CftModel__TransformationDefinitionsAssignment_4_1 : ( ruleTransformationDefinition ) ;
+    // InternalCftLanguage.g:3459:1: rule__CftModel__TransformationDefinitionsAssignment_4_1 : ( ruleTransformationDefinition ) ;
     public final void rule__CftModel__TransformationDefinitionsAssignment_4_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2953:1: ( ( ruleTransformationDefinition ) )
-            // InternalCftLanguage.g:2954:2: ( ruleTransformationDefinition )
+            // InternalCftLanguage.g:3463:1: ( ( ruleTransformationDefinition ) )
+            // InternalCftLanguage.g:3464:2: ( ruleTransformationDefinition )
             {
-            // InternalCftLanguage.g:2954:2: ( ruleTransformationDefinition )
-            // InternalCftLanguage.g:2955:3: ruleTransformationDefinition
+            // InternalCftLanguage.g:3464:2: ( ruleTransformationDefinition )
+            // InternalCftLanguage.g:3465:3: ruleTransformationDefinition
             {
              before(grammarAccess.getCftModelAccess().getTransformationDefinitionsTransformationDefinitionParserRuleCall_4_1_0()); 
             pushFollow(FOLLOW_2);
@@ -9162,17 +10834,17 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ImportDeclaration__ImportedNamespaceAssignment_1"
-    // InternalCftLanguage.g:2964:1: rule__ImportDeclaration__ImportedNamespaceAssignment_1 : ( ruleQualifiedNameWithWildcard ) ;
+    // InternalCftLanguage.g:3474:1: rule__ImportDeclaration__ImportedNamespaceAssignment_1 : ( ruleQualifiedNameWithWildcard ) ;
     public final void rule__ImportDeclaration__ImportedNamespaceAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2968:1: ( ( ruleQualifiedNameWithWildcard ) )
-            // InternalCftLanguage.g:2969:2: ( ruleQualifiedNameWithWildcard )
+            // InternalCftLanguage.g:3478:1: ( ( ruleQualifiedNameWithWildcard ) )
+            // InternalCftLanguage.g:3479:2: ( ruleQualifiedNameWithWildcard )
             {
-            // InternalCftLanguage.g:2969:2: ( ruleQualifiedNameWithWildcard )
-            // InternalCftLanguage.g:2970:3: ruleQualifiedNameWithWildcard
+            // InternalCftLanguage.g:3479:2: ( ruleQualifiedNameWithWildcard )
+            // InternalCftLanguage.g:3480:3: ruleQualifiedNameWithWildcard
             {
              before(grammarAccess.getImportDeclarationAccess().getImportedNamespaceQualifiedNameWithWildcardParserRuleCall_1_0()); 
             pushFollow(FOLLOW_2);
@@ -9203,21 +10875,25 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__NameAssignment_1"
-    // InternalCftLanguage.g:2979:1: rule__ComponentDefinition__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalCftLanguage.g:3489:1: rule__ComponentDefinition__NameAssignment_1 : ( ruleValidId ) ;
     public final void rule__ComponentDefinition__NameAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2983:1: ( ( RULE_ID ) )
-            // InternalCftLanguage.g:2984:2: ( RULE_ID )
+            // InternalCftLanguage.g:3493:1: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:3494:2: ( ruleValidId )
             {
-            // InternalCftLanguage.g:2984:2: ( RULE_ID )
-            // InternalCftLanguage.g:2985:3: RULE_ID
+            // InternalCftLanguage.g:3494:2: ( ruleValidId )
+            // InternalCftLanguage.g:3495:3: ruleValidId
             {
-             before(grammarAccess.getComponentDefinitionAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getComponentDefinitionAccess().getNameIDTerminalRuleCall_1_0()); 
+             before(grammarAccess.getComponentDefinitionAccess().getNameValidIdParserRuleCall_1_0()); 
+            pushFollow(FOLLOW_2);
+            ruleValidId();
+
+            state._fsp--;
+
+             after(grammarAccess.getComponentDefinitionAccess().getNameValidIdParserRuleCall_1_0()); 
 
             }
 
@@ -9240,17 +10916,17 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__InputEventsAssignment_3_0_1"
-    // InternalCftLanguage.g:2994:1: rule__ComponentDefinition__InputEventsAssignment_3_0_1 : ( ruleInputEvent ) ;
+    // InternalCftLanguage.g:3504:1: rule__ComponentDefinition__InputEventsAssignment_3_0_1 : ( ruleInputEvent ) ;
     public final void rule__ComponentDefinition__InputEventsAssignment_3_0_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:2998:1: ( ( ruleInputEvent ) )
-            // InternalCftLanguage.g:2999:2: ( ruleInputEvent )
+            // InternalCftLanguage.g:3508:1: ( ( ruleInputEvent ) )
+            // InternalCftLanguage.g:3509:2: ( ruleInputEvent )
             {
-            // InternalCftLanguage.g:2999:2: ( ruleInputEvent )
-            // InternalCftLanguage.g:3000:3: ruleInputEvent
+            // InternalCftLanguage.g:3509:2: ( ruleInputEvent )
+            // InternalCftLanguage.g:3510:3: ruleInputEvent
             {
              before(grammarAccess.getComponentDefinitionAccess().getInputEventsInputEventParserRuleCall_3_0_1_0()); 
             pushFollow(FOLLOW_2);
@@ -9281,25 +10957,29 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__OutputEventsAssignment_3_1_1"
-    // InternalCftLanguage.g:3009:1: rule__ComponentDefinition__OutputEventsAssignment_3_1_1 : ( ( RULE_ID ) ) ;
+    // InternalCftLanguage.g:3519:1: rule__ComponentDefinition__OutputEventsAssignment_3_1_1 : ( ( ruleValidId ) ) ;
     public final void rule__ComponentDefinition__OutputEventsAssignment_3_1_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3013:1: ( ( ( RULE_ID ) ) )
-            // InternalCftLanguage.g:3014:2: ( ( RULE_ID ) )
+            // InternalCftLanguage.g:3523:1: ( ( ( ruleValidId ) ) )
+            // InternalCftLanguage.g:3524:2: ( ( ruleValidId ) )
             {
-            // InternalCftLanguage.g:3014:2: ( ( RULE_ID ) )
-            // InternalCftLanguage.g:3015:3: ( RULE_ID )
+            // InternalCftLanguage.g:3524:2: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:3525:3: ( ruleValidId )
             {
              before(grammarAccess.getComponentDefinitionAccess().getOutputEventsEventDeclarationCrossReference_3_1_1_0()); 
-            // InternalCftLanguage.g:3016:3: ( RULE_ID )
-            // InternalCftLanguage.g:3017:4: RULE_ID
+            // InternalCftLanguage.g:3526:3: ( ruleValidId )
+            // InternalCftLanguage.g:3527:4: ruleValidId
             {
-             before(grammarAccess.getComponentDefinitionAccess().getOutputEventsEventDeclarationIDTerminalRuleCall_3_1_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getComponentDefinitionAccess().getOutputEventsEventDeclarationIDTerminalRuleCall_3_1_1_0_1()); 
+             before(grammarAccess.getComponentDefinitionAccess().getOutputEventsEventDeclarationValidIdParserRuleCall_3_1_1_0_1()); 
+            pushFollow(FOLLOW_2);
+            ruleValidId();
+
+            state._fsp--;
+
+             after(grammarAccess.getComponentDefinitionAccess().getOutputEventsEventDeclarationValidIdParserRuleCall_3_1_1_0_1()); 
 
             }
 
@@ -9326,17 +11006,17 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentDefinition__EventDefinitionsAssignment_4_0"
-    // InternalCftLanguage.g:3028:1: rule__ComponentDefinition__EventDefinitionsAssignment_4_0 : ( ruleEventDefinition ) ;
+    // InternalCftLanguage.g:3538:1: rule__ComponentDefinition__EventDefinitionsAssignment_4_0 : ( ruleEventDefinition ) ;
     public final void rule__ComponentDefinition__EventDefinitionsAssignment_4_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3032:1: ( ( ruleEventDefinition ) )
-            // InternalCftLanguage.g:3033:2: ( ruleEventDefinition )
+            // InternalCftLanguage.g:3542:1: ( ( ruleEventDefinition ) )
+            // InternalCftLanguage.g:3543:2: ( ruleEventDefinition )
             {
-            // InternalCftLanguage.g:3033:2: ( ruleEventDefinition )
-            // InternalCftLanguage.g:3034:3: ruleEventDefinition
+            // InternalCftLanguage.g:3543:2: ( ruleEventDefinition )
+            // InternalCftLanguage.g:3544:3: ruleEventDefinition
             {
              before(grammarAccess.getComponentDefinitionAccess().getEventDefinitionsEventDefinitionParserRuleCall_4_0_0()); 
             pushFollow(FOLLOW_2);
@@ -9367,21 +11047,25 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__InputEvent__NameAssignment_0"
-    // InternalCftLanguage.g:3043:1: rule__InputEvent__NameAssignment_0 : ( RULE_ID ) ;
+    // InternalCftLanguage.g:3553:1: rule__InputEvent__NameAssignment_0 : ( ruleValidId ) ;
     public final void rule__InputEvent__NameAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3047:1: ( ( RULE_ID ) )
-            // InternalCftLanguage.g:3048:2: ( RULE_ID )
+            // InternalCftLanguage.g:3557:1: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:3558:2: ( ruleValidId )
             {
-            // InternalCftLanguage.g:3048:2: ( RULE_ID )
-            // InternalCftLanguage.g:3049:3: RULE_ID
+            // InternalCftLanguage.g:3558:2: ( ruleValidId )
+            // InternalCftLanguage.g:3559:3: ruleValidId
             {
-             before(grammarAccess.getInputEventAccess().getNameIDTerminalRuleCall_0_0()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getInputEventAccess().getNameIDTerminalRuleCall_0_0()); 
+             before(grammarAccess.getInputEventAccess().getNameValidIdParserRuleCall_0_0()); 
+            pushFollow(FOLLOW_2);
+            ruleValidId();
+
+            state._fsp--;
+
+             after(grammarAccess.getInputEventAccess().getNameValidIdParserRuleCall_0_0()); 
 
             }
 
@@ -9404,24 +11088,24 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__InputEvent__MultipleAssignment_1"
-    // InternalCftLanguage.g:3058:1: rule__InputEvent__MultipleAssignment_1 : ( ( '[]' ) ) ;
+    // InternalCftLanguage.g:3568:1: rule__InputEvent__MultipleAssignment_1 : ( ( '[]' ) ) ;
     public final void rule__InputEvent__MultipleAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3062:1: ( ( ( '[]' ) ) )
-            // InternalCftLanguage.g:3063:2: ( ( '[]' ) )
+            // InternalCftLanguage.g:3572:1: ( ( ( '[]' ) ) )
+            // InternalCftLanguage.g:3573:2: ( ( '[]' ) )
             {
-            // InternalCftLanguage.g:3063:2: ( ( '[]' ) )
-            // InternalCftLanguage.g:3064:3: ( '[]' )
+            // InternalCftLanguage.g:3573:2: ( ( '[]' ) )
+            // InternalCftLanguage.g:3574:3: ( '[]' )
             {
              before(grammarAccess.getInputEventAccess().getMultipleLeftSquareBracketRightSquareBracketKeyword_1_0()); 
-            // InternalCftLanguage.g:3065:3: ( '[]' )
-            // InternalCftLanguage.g:3066:4: '[]'
+            // InternalCftLanguage.g:3575:3: ( '[]' )
+            // InternalCftLanguage.g:3576:4: '[]'
             {
              before(grammarAccess.getInputEventAccess().getMultipleLeftSquareBracketRightSquareBracketKeyword_1_0()); 
-            match(input,35,FOLLOW_2); 
+            match(input,38,FOLLOW_2); 
              after(grammarAccess.getInputEventAccess().getMultipleLeftSquareBracketRightSquareBracketKeyword_1_0()); 
 
             }
@@ -9449,21 +11133,25 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__BasicEventDefinition__NameAssignment_0"
-    // InternalCftLanguage.g:3077:1: rule__BasicEventDefinition__NameAssignment_0 : ( RULE_ID ) ;
+    // InternalCftLanguage.g:3587:1: rule__BasicEventDefinition__NameAssignment_0 : ( ruleValidId ) ;
     public final void rule__BasicEventDefinition__NameAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3081:1: ( ( RULE_ID ) )
-            // InternalCftLanguage.g:3082:2: ( RULE_ID )
+            // InternalCftLanguage.g:3591:1: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:3592:2: ( ruleValidId )
             {
-            // InternalCftLanguage.g:3082:2: ( RULE_ID )
-            // InternalCftLanguage.g:3083:3: RULE_ID
+            // InternalCftLanguage.g:3592:2: ( ruleValidId )
+            // InternalCftLanguage.g:3593:3: ruleValidId
             {
-             before(grammarAccess.getBasicEventDefinitionAccess().getNameIDTerminalRuleCall_0_0()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getBasicEventDefinitionAccess().getNameIDTerminalRuleCall_0_0()); 
+             before(grammarAccess.getBasicEventDefinitionAccess().getNameValidIdParserRuleCall_0_0()); 
+            pushFollow(FOLLOW_2);
+            ruleValidId();
+
+            state._fsp--;
+
+             after(grammarAccess.getBasicEventDefinitionAccess().getNameValidIdParserRuleCall_0_0()); 
 
             }
 
@@ -9485,22 +11173,26 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
     // $ANTLR end "rule__BasicEventDefinition__NameAssignment_0"
 
 
-    // $ANTLR start "rule__BasicEventDefinition__RateAssignment_3"
-    // InternalCftLanguage.g:3092:1: rule__BasicEventDefinition__RateAssignment_3 : ( RULE_DOULBE ) ;
-    public final void rule__BasicEventDefinition__RateAssignment_3() throws RecognitionException {
+    // $ANTLR start "rule__BasicEventDefinition__DistributionAssignment_1"
+    // InternalCftLanguage.g:3602:1: rule__BasicEventDefinition__DistributionAssignment_1 : ( ruleDistribution ) ;
+    public final void rule__BasicEventDefinition__DistributionAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3096:1: ( ( RULE_DOULBE ) )
-            // InternalCftLanguage.g:3097:2: ( RULE_DOULBE )
+            // InternalCftLanguage.g:3606:1: ( ( ruleDistribution ) )
+            // InternalCftLanguage.g:3607:2: ( ruleDistribution )
             {
-            // InternalCftLanguage.g:3097:2: ( RULE_DOULBE )
-            // InternalCftLanguage.g:3098:3: RULE_DOULBE
+            // InternalCftLanguage.g:3607:2: ( ruleDistribution )
+            // InternalCftLanguage.g:3608:3: ruleDistribution
             {
-             before(grammarAccess.getBasicEventDefinitionAccess().getRateDOULBETerminalRuleCall_3_0()); 
-            match(input,RULE_DOULBE,FOLLOW_2); 
-             after(grammarAccess.getBasicEventDefinitionAccess().getRateDOULBETerminalRuleCall_3_0()); 
+             before(grammarAccess.getBasicEventDefinitionAccess().getDistributionDistributionParserRuleCall_1_0()); 
+            pushFollow(FOLLOW_2);
+            ruleDistribution();
+
+            state._fsp--;
+
+             after(grammarAccess.getBasicEventDefinitionAccess().getDistributionDistributionParserRuleCall_1_0()); 
 
             }
 
@@ -9519,25 +11211,29 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__BasicEventDefinition__RateAssignment_3"
+    // $ANTLR end "rule__BasicEventDefinition__DistributionAssignment_1"
 
 
-    // $ANTLR start "rule__AndGate__NameAssignment_0"
-    // InternalCftLanguage.g:3107:1: rule__AndGate__NameAssignment_0 : ( RULE_ID ) ;
-    public final void rule__AndGate__NameAssignment_0() throws RecognitionException {
+    // $ANTLR start "rule__ConstantDistribution__PAssignment_2"
+    // InternalCftLanguage.g:3617:1: rule__ConstantDistribution__PAssignment_2 : ( ruleDouble ) ;
+    public final void rule__ConstantDistribution__PAssignment_2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3111:1: ( ( RULE_ID ) )
-            // InternalCftLanguage.g:3112:2: ( RULE_ID )
+            // InternalCftLanguage.g:3621:1: ( ( ruleDouble ) )
+            // InternalCftLanguage.g:3622:2: ( ruleDouble )
             {
-            // InternalCftLanguage.g:3112:2: ( RULE_ID )
-            // InternalCftLanguage.g:3113:3: RULE_ID
+            // InternalCftLanguage.g:3622:2: ( ruleDouble )
+            // InternalCftLanguage.g:3623:3: ruleDouble
             {
-             before(grammarAccess.getAndGateAccess().getNameIDTerminalRuleCall_0_0()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getAndGateAccess().getNameIDTerminalRuleCall_0_0()); 
+             before(grammarAccess.getConstantDistributionAccess().getPDoubleParserRuleCall_2_0()); 
+            pushFollow(FOLLOW_2);
+            ruleDouble();
+
+            state._fsp--;
+
+             after(grammarAccess.getConstantDistributionAccess().getPDoubleParserRuleCall_2_0()); 
 
             }
 
@@ -9556,33 +11252,119 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__AndGate__NameAssignment_0"
+    // $ANTLR end "rule__ConstantDistribution__PAssignment_2"
 
 
-    // $ANTLR start "rule__AndGate__InputEventsAssignment_2"
-    // InternalCftLanguage.g:3122:1: rule__AndGate__InputEventsAssignment_2 : ( ( RULE_ID ) ) ;
-    public final void rule__AndGate__InputEventsAssignment_2() throws RecognitionException {
+    // $ANTLR start "rule__ExponentialDistribution__LambdaAssignment_2"
+    // InternalCftLanguage.g:3632:1: rule__ExponentialDistribution__LambdaAssignment_2 : ( ruleDouble ) ;
+    public final void rule__ExponentialDistribution__LambdaAssignment_2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3126:1: ( ( ( RULE_ID ) ) )
-            // InternalCftLanguage.g:3127:2: ( ( RULE_ID ) )
+            // InternalCftLanguage.g:3636:1: ( ( ruleDouble ) )
+            // InternalCftLanguage.g:3637:2: ( ruleDouble )
             {
-            // InternalCftLanguage.g:3127:2: ( ( RULE_ID ) )
-            // InternalCftLanguage.g:3128:3: ( RULE_ID )
+            // InternalCftLanguage.g:3637:2: ( ruleDouble )
+            // InternalCftLanguage.g:3638:3: ruleDouble
             {
-             before(grammarAccess.getAndGateAccess().getInputEventsEventDeclarationCrossReference_2_0()); 
-            // InternalCftLanguage.g:3129:3: ( RULE_ID )
-            // InternalCftLanguage.g:3130:4: RULE_ID
+             before(grammarAccess.getExponentialDistributionAccess().getLambdaDoubleParserRuleCall_2_0()); 
+            pushFollow(FOLLOW_2);
+            ruleDouble();
+
+            state._fsp--;
+
+             after(grammarAccess.getExponentialDistributionAccess().getLambdaDoubleParserRuleCall_2_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__ExponentialDistribution__LambdaAssignment_2"
+
+
+    // $ANTLR start "rule__AndGateDefinition__NameAssignment_0"
+    // InternalCftLanguage.g:3647:1: rule__AndGateDefinition__NameAssignment_0 : ( ruleValidId ) ;
+    public final void rule__AndGateDefinition__NameAssignment_0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:3651:1: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:3652:2: ( ruleValidId )
             {
-             before(grammarAccess.getAndGateAccess().getInputEventsEventDeclarationIDTerminalRuleCall_2_0_1()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getAndGateAccess().getInputEventsEventDeclarationIDTerminalRuleCall_2_0_1()); 
+            // InternalCftLanguage.g:3652:2: ( ruleValidId )
+            // InternalCftLanguage.g:3653:3: ruleValidId
+            {
+             before(grammarAccess.getAndGateDefinitionAccess().getNameValidIdParserRuleCall_0_0()); 
+            pushFollow(FOLLOW_2);
+            ruleValidId();
+
+            state._fsp--;
+
+             after(grammarAccess.getAndGateDefinitionAccess().getNameValidIdParserRuleCall_0_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__AndGateDefinition__NameAssignment_0"
+
+
+    // $ANTLR start "rule__AndGateDefinition__InputEventsAssignment_2"
+    // InternalCftLanguage.g:3662:1: rule__AndGateDefinition__InputEventsAssignment_2 : ( ( ruleValidId ) ) ;
+    public final void rule__AndGateDefinition__InputEventsAssignment_2() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:3666:1: ( ( ( ruleValidId ) ) )
+            // InternalCftLanguage.g:3667:2: ( ( ruleValidId ) )
+            {
+            // InternalCftLanguage.g:3667:2: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:3668:3: ( ruleValidId )
+            {
+             before(grammarAccess.getAndGateDefinitionAccess().getInputEventsEventDeclarationCrossReference_2_0()); 
+            // InternalCftLanguage.g:3669:3: ( ruleValidId )
+            // InternalCftLanguage.g:3670:4: ruleValidId
+            {
+             before(grammarAccess.getAndGateDefinitionAccess().getInputEventsEventDeclarationValidIdParserRuleCall_2_0_1()); 
+            pushFollow(FOLLOW_2);
+            ruleValidId();
+
+            state._fsp--;
+
+             after(grammarAccess.getAndGateDefinitionAccess().getInputEventsEventDeclarationValidIdParserRuleCall_2_0_1()); 
 
             }
 
-             after(grammarAccess.getAndGateAccess().getInputEventsEventDeclarationCrossReference_2_0()); 
+             after(grammarAccess.getAndGateDefinitionAccess().getInputEventsEventDeclarationCrossReference_2_0()); 
 
             }
 
@@ -9601,25 +11383,29 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__AndGate__InputEventsAssignment_2"
+    // $ANTLR end "rule__AndGateDefinition__InputEventsAssignment_2"
 
 
-    // $ANTLR start "rule__OrGate__NameAssignment_0"
-    // InternalCftLanguage.g:3141:1: rule__OrGate__NameAssignment_0 : ( RULE_ID ) ;
-    public final void rule__OrGate__NameAssignment_0() throws RecognitionException {
+    // $ANTLR start "rule__OrGateDefinition__NameAssignment_0"
+    // InternalCftLanguage.g:3681:1: rule__OrGateDefinition__NameAssignment_0 : ( ruleValidId ) ;
+    public final void rule__OrGateDefinition__NameAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3145:1: ( ( RULE_ID ) )
-            // InternalCftLanguage.g:3146:2: ( RULE_ID )
+            // InternalCftLanguage.g:3685:1: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:3686:2: ( ruleValidId )
             {
-            // InternalCftLanguage.g:3146:2: ( RULE_ID )
-            // InternalCftLanguage.g:3147:3: RULE_ID
+            // InternalCftLanguage.g:3686:2: ( ruleValidId )
+            // InternalCftLanguage.g:3687:3: ruleValidId
             {
-             before(grammarAccess.getOrGateAccess().getNameIDTerminalRuleCall_0_0()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getOrGateAccess().getNameIDTerminalRuleCall_0_0()); 
+             before(grammarAccess.getOrGateDefinitionAccess().getNameValidIdParserRuleCall_0_0()); 
+            pushFollow(FOLLOW_2);
+            ruleValidId();
+
+            state._fsp--;
+
+             after(grammarAccess.getOrGateDefinitionAccess().getNameValidIdParserRuleCall_0_0()); 
 
             }
 
@@ -9638,33 +11424,37 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__OrGate__NameAssignment_0"
+    // $ANTLR end "rule__OrGateDefinition__NameAssignment_0"
 
 
-    // $ANTLR start "rule__OrGate__InputEventsAssignment_2"
-    // InternalCftLanguage.g:3156:1: rule__OrGate__InputEventsAssignment_2 : ( ( RULE_ID ) ) ;
-    public final void rule__OrGate__InputEventsAssignment_2() throws RecognitionException {
+    // $ANTLR start "rule__OrGateDefinition__InputEventsAssignment_2"
+    // InternalCftLanguage.g:3696:1: rule__OrGateDefinition__InputEventsAssignment_2 : ( ( ruleValidId ) ) ;
+    public final void rule__OrGateDefinition__InputEventsAssignment_2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3160:1: ( ( ( RULE_ID ) ) )
-            // InternalCftLanguage.g:3161:2: ( ( RULE_ID ) )
+            // InternalCftLanguage.g:3700:1: ( ( ( ruleValidId ) ) )
+            // InternalCftLanguage.g:3701:2: ( ( ruleValidId ) )
             {
-            // InternalCftLanguage.g:3161:2: ( ( RULE_ID ) )
-            // InternalCftLanguage.g:3162:3: ( RULE_ID )
+            // InternalCftLanguage.g:3701:2: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:3702:3: ( ruleValidId )
             {
-             before(grammarAccess.getOrGateAccess().getInputEventsEventDeclarationCrossReference_2_0()); 
-            // InternalCftLanguage.g:3163:3: ( RULE_ID )
-            // InternalCftLanguage.g:3164:4: RULE_ID
+             before(grammarAccess.getOrGateDefinitionAccess().getInputEventsEventDeclarationCrossReference_2_0()); 
+            // InternalCftLanguage.g:3703:3: ( ruleValidId )
+            // InternalCftLanguage.g:3704:4: ruleValidId
             {
-             before(grammarAccess.getOrGateAccess().getInputEventsEventDeclarationIDTerminalRuleCall_2_0_1()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getOrGateAccess().getInputEventsEventDeclarationIDTerminalRuleCall_2_0_1()); 
+             before(grammarAccess.getOrGateDefinitionAccess().getInputEventsEventDeclarationValidIdParserRuleCall_2_0_1()); 
+            pushFollow(FOLLOW_2);
+            ruleValidId();
+
+            state._fsp--;
+
+             after(grammarAccess.getOrGateDefinitionAccess().getInputEventsEventDeclarationValidIdParserRuleCall_2_0_1()); 
 
             }
 
-             after(grammarAccess.getOrGateAccess().getInputEventsEventDeclarationCrossReference_2_0()); 
+             after(grammarAccess.getOrGateDefinitionAccess().getInputEventsEventDeclarationCrossReference_2_0()); 
 
             }
 
@@ -9683,25 +11473,230 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
         }
         return ;
     }
-    // $ANTLR end "rule__OrGate__InputEventsAssignment_2"
+    // $ANTLR end "rule__OrGateDefinition__InputEventsAssignment_2"
+
+
+    // $ANTLR start "rule__KOfMGateDefinition__NameAssignment_0"
+    // InternalCftLanguage.g:3715:1: rule__KOfMGateDefinition__NameAssignment_0 : ( ruleValidId ) ;
+    public final void rule__KOfMGateDefinition__NameAssignment_0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:3719:1: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:3720:2: ( ruleValidId )
+            {
+            // InternalCftLanguage.g:3720:2: ( ruleValidId )
+            // InternalCftLanguage.g:3721:3: ruleValidId
+            {
+             before(grammarAccess.getKOfMGateDefinitionAccess().getNameValidIdParserRuleCall_0_0()); 
+            pushFollow(FOLLOW_2);
+            ruleValidId();
+
+            state._fsp--;
+
+             after(grammarAccess.getKOfMGateDefinitionAccess().getNameValidIdParserRuleCall_0_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__KOfMGateDefinition__NameAssignment_0"
+
+
+    // $ANTLR start "rule__KOfMGateDefinition__KAssignment_1"
+    // InternalCftLanguage.g:3730:1: rule__KOfMGateDefinition__KAssignment_1 : ( RULE_INT ) ;
+    public final void rule__KOfMGateDefinition__KAssignment_1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:3734:1: ( ( RULE_INT ) )
+            // InternalCftLanguage.g:3735:2: ( RULE_INT )
+            {
+            // InternalCftLanguage.g:3735:2: ( RULE_INT )
+            // InternalCftLanguage.g:3736:3: RULE_INT
+            {
+             before(grammarAccess.getKOfMGateDefinitionAccess().getKINTTerminalRuleCall_1_0()); 
+            match(input,RULE_INT,FOLLOW_2); 
+             after(grammarAccess.getKOfMGateDefinitionAccess().getKINTTerminalRuleCall_1_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__KOfMGateDefinition__KAssignment_1"
+
+
+    // $ANTLR start "rule__KOfMGateDefinition__MAssignment_2_0_1"
+    // InternalCftLanguage.g:3745:1: rule__KOfMGateDefinition__MAssignment_2_0_1 : ( RULE_INT ) ;
+    public final void rule__KOfMGateDefinition__MAssignment_2_0_1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:3749:1: ( ( RULE_INT ) )
+            // InternalCftLanguage.g:3750:2: ( RULE_INT )
+            {
+            // InternalCftLanguage.g:3750:2: ( RULE_INT )
+            // InternalCftLanguage.g:3751:3: RULE_INT
+            {
+             before(grammarAccess.getKOfMGateDefinitionAccess().getMINTTerminalRuleCall_2_0_1_0()); 
+            match(input,RULE_INT,FOLLOW_2); 
+             after(grammarAccess.getKOfMGateDefinitionAccess().getMINTTerminalRuleCall_2_0_1_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__KOfMGateDefinition__MAssignment_2_0_1"
+
+
+    // $ANTLR start "rule__KOfMGateDefinition__MAssignment_2_1"
+    // InternalCftLanguage.g:3760:1: rule__KOfMGateDefinition__MAssignment_2_1 : ( RULE_OF_INT ) ;
+    public final void rule__KOfMGateDefinition__MAssignment_2_1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:3764:1: ( ( RULE_OF_INT ) )
+            // InternalCftLanguage.g:3765:2: ( RULE_OF_INT )
+            {
+            // InternalCftLanguage.g:3765:2: ( RULE_OF_INT )
+            // InternalCftLanguage.g:3766:3: RULE_OF_INT
+            {
+             before(grammarAccess.getKOfMGateDefinitionAccess().getMOF_INTTerminalRuleCall_2_1_0()); 
+            match(input,RULE_OF_INT,FOLLOW_2); 
+             after(grammarAccess.getKOfMGateDefinitionAccess().getMOF_INTTerminalRuleCall_2_1_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__KOfMGateDefinition__MAssignment_2_1"
+
+
+    // $ANTLR start "rule__KOfMGateDefinition__InputEventsAssignment_3"
+    // InternalCftLanguage.g:3775:1: rule__KOfMGateDefinition__InputEventsAssignment_3 : ( ( ruleValidId ) ) ;
+    public final void rule__KOfMGateDefinition__InputEventsAssignment_3() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalCftLanguage.g:3779:1: ( ( ( ruleValidId ) ) )
+            // InternalCftLanguage.g:3780:2: ( ( ruleValidId ) )
+            {
+            // InternalCftLanguage.g:3780:2: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:3781:3: ( ruleValidId )
+            {
+             before(grammarAccess.getKOfMGateDefinitionAccess().getInputEventsEventDeclarationCrossReference_3_0()); 
+            // InternalCftLanguage.g:3782:3: ( ruleValidId )
+            // InternalCftLanguage.g:3783:4: ruleValidId
+            {
+             before(grammarAccess.getKOfMGateDefinitionAccess().getInputEventsEventDeclarationValidIdParserRuleCall_3_0_1()); 
+            pushFollow(FOLLOW_2);
+            ruleValidId();
+
+            state._fsp--;
+
+             after(grammarAccess.getKOfMGateDefinitionAccess().getInputEventsEventDeclarationValidIdParserRuleCall_3_0_1()); 
+
+            }
+
+             after(grammarAccess.getKOfMGateDefinitionAccess().getInputEventsEventDeclarationCrossReference_3_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__KOfMGateDefinition__InputEventsAssignment_3"
 
 
     // $ANTLR start "rule__TransformationDefinition__NameAssignment_1"
-    // InternalCftLanguage.g:3175:1: rule__TransformationDefinition__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalCftLanguage.g:3794:1: rule__TransformationDefinition__NameAssignment_1 : ( ruleValidId ) ;
     public final void rule__TransformationDefinition__NameAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3179:1: ( ( RULE_ID ) )
-            // InternalCftLanguage.g:3180:2: ( RULE_ID )
+            // InternalCftLanguage.g:3798:1: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:3799:2: ( ruleValidId )
             {
-            // InternalCftLanguage.g:3180:2: ( RULE_ID )
-            // InternalCftLanguage.g:3181:3: RULE_ID
+            // InternalCftLanguage.g:3799:2: ( ruleValidId )
+            // InternalCftLanguage.g:3800:3: ruleValidId
             {
-             before(grammarAccess.getTransformationDefinitionAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getTransformationDefinitionAccess().getNameIDTerminalRuleCall_1_0()); 
+             before(grammarAccess.getTransformationDefinitionAccess().getNameValidIdParserRuleCall_1_0()); 
+            pushFollow(FOLLOW_2);
+            ruleValidId();
+
+            state._fsp--;
+
+             after(grammarAccess.getTransformationDefinitionAccess().getNameValidIdParserRuleCall_1_0()); 
 
             }
 
@@ -9724,17 +11719,17 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__TransformationDefinition__MappingDefinitionsAssignment_3"
-    // InternalCftLanguage.g:3190:1: rule__TransformationDefinition__MappingDefinitionsAssignment_3 : ( ruleMappingDefinition ) ;
+    // InternalCftLanguage.g:3809:1: rule__TransformationDefinition__MappingDefinitionsAssignment_3 : ( ruleMappingDefinition ) ;
     public final void rule__TransformationDefinition__MappingDefinitionsAssignment_3() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3194:1: ( ( ruleMappingDefinition ) )
-            // InternalCftLanguage.g:3195:2: ( ruleMappingDefinition )
+            // InternalCftLanguage.g:3813:1: ( ( ruleMappingDefinition ) )
+            // InternalCftLanguage.g:3814:2: ( ruleMappingDefinition )
             {
-            // InternalCftLanguage.g:3195:2: ( ruleMappingDefinition )
-            // InternalCftLanguage.g:3196:3: ruleMappingDefinition
+            // InternalCftLanguage.g:3814:2: ( ruleMappingDefinition )
+            // InternalCftLanguage.g:3815:3: ruleMappingDefinition
             {
              before(grammarAccess.getTransformationDefinitionAccess().getMappingDefinitionsMappingDefinitionParserRuleCall_3_0()); 
             pushFollow(FOLLOW_2);
@@ -9765,24 +11760,24 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__TopLevelAssignment_0"
-    // InternalCftLanguage.g:3205:1: rule__MappingDefinition__TopLevelAssignment_0 : ( ( 'toplevel' ) ) ;
+    // InternalCftLanguage.g:3824:1: rule__MappingDefinition__TopLevelAssignment_0 : ( ( 'toplevel' ) ) ;
     public final void rule__MappingDefinition__TopLevelAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3209:1: ( ( ( 'toplevel' ) ) )
-            // InternalCftLanguage.g:3210:2: ( ( 'toplevel' ) )
+            // InternalCftLanguage.g:3828:1: ( ( ( 'toplevel' ) ) )
+            // InternalCftLanguage.g:3829:2: ( ( 'toplevel' ) )
             {
-            // InternalCftLanguage.g:3210:2: ( ( 'toplevel' ) )
-            // InternalCftLanguage.g:3211:3: ( 'toplevel' )
+            // InternalCftLanguage.g:3829:2: ( ( 'toplevel' ) )
+            // InternalCftLanguage.g:3830:3: ( 'toplevel' )
             {
              before(grammarAccess.getMappingDefinitionAccess().getTopLevelToplevelKeyword_0_0()); 
-            // InternalCftLanguage.g:3212:3: ( 'toplevel' )
-            // InternalCftLanguage.g:3213:4: 'toplevel'
+            // InternalCftLanguage.g:3831:3: ( 'toplevel' )
+            // InternalCftLanguage.g:3832:4: 'toplevel'
             {
              before(grammarAccess.getMappingDefinitionAccess().getTopLevelToplevelKeyword_0_0()); 
-            match(input,36,FOLLOW_2); 
+            match(input,39,FOLLOW_2); 
              after(grammarAccess.getMappingDefinitionAccess().getTopLevelToplevelKeyword_0_0()); 
 
             }
@@ -9810,21 +11805,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__PatternAssignment_2"
-    // InternalCftLanguage.g:3224:1: rule__MappingDefinition__PatternAssignment_2 : ( ( ruleQualifiedName ) ) ;
+    // InternalCftLanguage.g:3843:1: rule__MappingDefinition__PatternAssignment_2 : ( ( ruleQualifiedName ) ) ;
     public final void rule__MappingDefinition__PatternAssignment_2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3228:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalCftLanguage.g:3229:2: ( ( ruleQualifiedName ) )
+            // InternalCftLanguage.g:3847:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalCftLanguage.g:3848:2: ( ( ruleQualifiedName ) )
             {
-            // InternalCftLanguage.g:3229:2: ( ( ruleQualifiedName ) )
-            // InternalCftLanguage.g:3230:3: ( ruleQualifiedName )
+            // InternalCftLanguage.g:3848:2: ( ( ruleQualifiedName ) )
+            // InternalCftLanguage.g:3849:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getMappingDefinitionAccess().getPatternPatternCrossReference_2_0()); 
-            // InternalCftLanguage.g:3231:3: ( ruleQualifiedName )
-            // InternalCftLanguage.g:3232:4: ruleQualifiedName
+            // InternalCftLanguage.g:3850:3: ( ruleQualifiedName )
+            // InternalCftLanguage.g:3851:4: ruleQualifiedName
             {
              before(grammarAccess.getMappingDefinitionAccess().getPatternPatternQualifiedNameParserRuleCall_2_0_1()); 
             pushFollow(FOLLOW_2);
@@ -9859,17 +11854,17 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__ParametersAssignment_4"
-    // InternalCftLanguage.g:3243:1: rule__MappingDefinition__ParametersAssignment_4 : ( ruleMappingParameter ) ;
+    // InternalCftLanguage.g:3862:1: rule__MappingDefinition__ParametersAssignment_4 : ( ruleMappingParameter ) ;
     public final void rule__MappingDefinition__ParametersAssignment_4() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3247:1: ( ( ruleMappingParameter ) )
-            // InternalCftLanguage.g:3248:2: ( ruleMappingParameter )
+            // InternalCftLanguage.g:3866:1: ( ( ruleMappingParameter ) )
+            // InternalCftLanguage.g:3867:2: ( ruleMappingParameter )
             {
-            // InternalCftLanguage.g:3248:2: ( ruleMappingParameter )
-            // InternalCftLanguage.g:3249:3: ruleMappingParameter
+            // InternalCftLanguage.g:3867:2: ( ruleMappingParameter )
+            // InternalCftLanguage.g:3868:3: ruleMappingParameter
             {
              before(grammarAccess.getMappingDefinitionAccess().getParametersMappingParameterParserRuleCall_4_0()); 
             pushFollow(FOLLOW_2);
@@ -9900,17 +11895,17 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__ParametersAssignment_5_1"
-    // InternalCftLanguage.g:3258:1: rule__MappingDefinition__ParametersAssignment_5_1 : ( ruleMappingParameter ) ;
+    // InternalCftLanguage.g:3877:1: rule__MappingDefinition__ParametersAssignment_5_1 : ( ruleMappingParameter ) ;
     public final void rule__MappingDefinition__ParametersAssignment_5_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3262:1: ( ( ruleMappingParameter ) )
-            // InternalCftLanguage.g:3263:2: ( ruleMappingParameter )
+            // InternalCftLanguage.g:3881:1: ( ( ruleMappingParameter ) )
+            // InternalCftLanguage.g:3882:2: ( ruleMappingParameter )
             {
-            // InternalCftLanguage.g:3263:2: ( ruleMappingParameter )
-            // InternalCftLanguage.g:3264:3: ruleMappingParameter
+            // InternalCftLanguage.g:3882:2: ( ruleMappingParameter )
+            // InternalCftLanguage.g:3883:3: ruleMappingParameter
             {
              before(grammarAccess.getMappingDefinitionAccess().getParametersMappingParameterParserRuleCall_5_1_0()); 
             pushFollow(FOLLOW_2);
@@ -9941,17 +11936,17 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__ComponentInstanceAssignment_7"
-    // InternalCftLanguage.g:3273:1: rule__MappingDefinition__ComponentInstanceAssignment_7 : ( ruleComponentInstance ) ;
+    // InternalCftLanguage.g:3892:1: rule__MappingDefinition__ComponentInstanceAssignment_7 : ( ruleComponentInstance ) ;
     public final void rule__MappingDefinition__ComponentInstanceAssignment_7() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3277:1: ( ( ruleComponentInstance ) )
-            // InternalCftLanguage.g:3278:2: ( ruleComponentInstance )
+            // InternalCftLanguage.g:3896:1: ( ( ruleComponentInstance ) )
+            // InternalCftLanguage.g:3897:2: ( ruleComponentInstance )
             {
-            // InternalCftLanguage.g:3278:2: ( ruleComponentInstance )
-            // InternalCftLanguage.g:3279:3: ruleComponentInstance
+            // InternalCftLanguage.g:3897:2: ( ruleComponentInstance )
+            // InternalCftLanguage.g:3898:3: ruleComponentInstance
             {
              before(grammarAccess.getMappingDefinitionAccess().getComponentInstanceComponentInstanceParserRuleCall_7_0()); 
             pushFollow(FOLLOW_2);
@@ -9982,17 +11977,17 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__LookupDefinitionsAssignment_8_1_0_0"
-    // InternalCftLanguage.g:3288:1: rule__MappingDefinition__LookupDefinitionsAssignment_8_1_0_0 : ( ruleLookupDefinition ) ;
+    // InternalCftLanguage.g:3907:1: rule__MappingDefinition__LookupDefinitionsAssignment_8_1_0_0 : ( ruleLookupDefinition ) ;
     public final void rule__MappingDefinition__LookupDefinitionsAssignment_8_1_0_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3292:1: ( ( ruleLookupDefinition ) )
-            // InternalCftLanguage.g:3293:2: ( ruleLookupDefinition )
+            // InternalCftLanguage.g:3911:1: ( ( ruleLookupDefinition ) )
+            // InternalCftLanguage.g:3912:2: ( ruleLookupDefinition )
             {
-            // InternalCftLanguage.g:3293:2: ( ruleLookupDefinition )
-            // InternalCftLanguage.g:3294:3: ruleLookupDefinition
+            // InternalCftLanguage.g:3912:2: ( ruleLookupDefinition )
+            // InternalCftLanguage.g:3913:3: ruleLookupDefinition
             {
              before(grammarAccess.getMappingDefinitionAccess().getLookupDefinitionsLookupDefinitionParserRuleCall_8_1_0_0_0()); 
             pushFollow(FOLLOW_2);
@@ -10023,17 +12018,17 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingDefinition__AssignmentsAssignment_8_1_0_1"
-    // InternalCftLanguage.g:3303:1: rule__MappingDefinition__AssignmentsAssignment_8_1_0_1 : ( ruleAssignment ) ;
+    // InternalCftLanguage.g:3922:1: rule__MappingDefinition__AssignmentsAssignment_8_1_0_1 : ( ruleAssignment ) ;
     public final void rule__MappingDefinition__AssignmentsAssignment_8_1_0_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3307:1: ( ( ruleAssignment ) )
-            // InternalCftLanguage.g:3308:2: ( ruleAssignment )
+            // InternalCftLanguage.g:3926:1: ( ( ruleAssignment ) )
+            // InternalCftLanguage.g:3927:2: ( ruleAssignment )
             {
-            // InternalCftLanguage.g:3308:2: ( ruleAssignment )
-            // InternalCftLanguage.g:3309:3: ruleAssignment
+            // InternalCftLanguage.g:3927:2: ( ruleAssignment )
+            // InternalCftLanguage.g:3928:3: ruleAssignment
             {
              before(grammarAccess.getMappingDefinitionAccess().getAssignmentsAssignmentParserRuleCall_8_1_0_1_0()); 
             pushFollow(FOLLOW_2);
@@ -10064,21 +12059,25 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__MappingParameter__NameAssignment"
-    // InternalCftLanguage.g:3318:1: rule__MappingParameter__NameAssignment : ( RULE_ID ) ;
+    // InternalCftLanguage.g:3937:1: rule__MappingParameter__NameAssignment : ( ruleValidId ) ;
     public final void rule__MappingParameter__NameAssignment() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3322:1: ( ( RULE_ID ) )
-            // InternalCftLanguage.g:3323:2: ( RULE_ID )
+            // InternalCftLanguage.g:3941:1: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:3942:2: ( ruleValidId )
             {
-            // InternalCftLanguage.g:3323:2: ( RULE_ID )
-            // InternalCftLanguage.g:3324:3: RULE_ID
+            // InternalCftLanguage.g:3942:2: ( ruleValidId )
+            // InternalCftLanguage.g:3943:3: ruleValidId
             {
-             before(grammarAccess.getMappingParameterAccess().getNameIDTerminalRuleCall_0()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getMappingParameterAccess().getNameIDTerminalRuleCall_0()); 
+             before(grammarAccess.getMappingParameterAccess().getNameValidIdParserRuleCall_0()); 
+            pushFollow(FOLLOW_2);
+            ruleValidId();
+
+            state._fsp--;
+
+             after(grammarAccess.getMappingParameterAccess().getNameValidIdParserRuleCall_0()); 
 
             }
 
@@ -10101,25 +12100,29 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__MappingAssignment_1"
-    // InternalCftLanguage.g:3333:1: rule__LookupDefinition__MappingAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalCftLanguage.g:3952:1: rule__LookupDefinition__MappingAssignment_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__LookupDefinition__MappingAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3337:1: ( ( ( RULE_ID ) ) )
-            // InternalCftLanguage.g:3338:2: ( ( RULE_ID ) )
+            // InternalCftLanguage.g:3956:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalCftLanguage.g:3957:2: ( ( ruleQualifiedName ) )
             {
-            // InternalCftLanguage.g:3338:2: ( ( RULE_ID ) )
-            // InternalCftLanguage.g:3339:3: ( RULE_ID )
+            // InternalCftLanguage.g:3957:2: ( ( ruleQualifiedName ) )
+            // InternalCftLanguage.g:3958:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getLookupDefinitionAccess().getMappingMappingDefinitionCrossReference_1_0()); 
-            // InternalCftLanguage.g:3340:3: ( RULE_ID )
-            // InternalCftLanguage.g:3341:4: RULE_ID
+            // InternalCftLanguage.g:3959:3: ( ruleQualifiedName )
+            // InternalCftLanguage.g:3960:4: ruleQualifiedName
             {
-             before(grammarAccess.getLookupDefinitionAccess().getMappingMappingDefinitionIDTerminalRuleCall_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getLookupDefinitionAccess().getMappingMappingDefinitionIDTerminalRuleCall_1_0_1()); 
+             before(grammarAccess.getLookupDefinitionAccess().getMappingMappingDefinitionQualifiedNameParserRuleCall_1_0_1()); 
+            pushFollow(FOLLOW_2);
+            ruleQualifiedName();
+
+            state._fsp--;
+
+             after(grammarAccess.getLookupDefinitionAccess().getMappingMappingDefinitionQualifiedNameParserRuleCall_1_0_1()); 
 
             }
 
@@ -10146,25 +12149,29 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__ArgumentsAssignment_3"
-    // InternalCftLanguage.g:3352:1: rule__LookupDefinition__ArgumentsAssignment_3 : ( ( RULE_ID ) ) ;
+    // InternalCftLanguage.g:3971:1: rule__LookupDefinition__ArgumentsAssignment_3 : ( ( ruleValidId ) ) ;
     public final void rule__LookupDefinition__ArgumentsAssignment_3() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3356:1: ( ( ( RULE_ID ) ) )
-            // InternalCftLanguage.g:3357:2: ( ( RULE_ID ) )
+            // InternalCftLanguage.g:3975:1: ( ( ( ruleValidId ) ) )
+            // InternalCftLanguage.g:3976:2: ( ( ruleValidId ) )
             {
-            // InternalCftLanguage.g:3357:2: ( ( RULE_ID ) )
-            // InternalCftLanguage.g:3358:3: ( RULE_ID )
+            // InternalCftLanguage.g:3976:2: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:3977:3: ( ruleValidId )
             {
              before(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterCrossReference_3_0()); 
-            // InternalCftLanguage.g:3359:3: ( RULE_ID )
-            // InternalCftLanguage.g:3360:4: RULE_ID
+            // InternalCftLanguage.g:3978:3: ( ruleValidId )
+            // InternalCftLanguage.g:3979:4: ruleValidId
             {
-             before(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterIDTerminalRuleCall_3_0_1()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterIDTerminalRuleCall_3_0_1()); 
+             before(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterValidIdParserRuleCall_3_0_1()); 
+            pushFollow(FOLLOW_2);
+            ruleValidId();
+
+            state._fsp--;
+
+             after(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterValidIdParserRuleCall_3_0_1()); 
 
             }
 
@@ -10191,25 +12198,29 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__ArgumentsAssignment_4_1"
-    // InternalCftLanguage.g:3371:1: rule__LookupDefinition__ArgumentsAssignment_4_1 : ( ( RULE_ID ) ) ;
+    // InternalCftLanguage.g:3990:1: rule__LookupDefinition__ArgumentsAssignment_4_1 : ( ( ruleValidId ) ) ;
     public final void rule__LookupDefinition__ArgumentsAssignment_4_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3375:1: ( ( ( RULE_ID ) ) )
-            // InternalCftLanguage.g:3376:2: ( ( RULE_ID ) )
+            // InternalCftLanguage.g:3994:1: ( ( ( ruleValidId ) ) )
+            // InternalCftLanguage.g:3995:2: ( ( ruleValidId ) )
             {
-            // InternalCftLanguage.g:3376:2: ( ( RULE_ID ) )
-            // InternalCftLanguage.g:3377:3: ( RULE_ID )
+            // InternalCftLanguage.g:3995:2: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:3996:3: ( ruleValidId )
             {
              before(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterCrossReference_4_1_0()); 
-            // InternalCftLanguage.g:3378:3: ( RULE_ID )
-            // InternalCftLanguage.g:3379:4: RULE_ID
+            // InternalCftLanguage.g:3997:3: ( ruleValidId )
+            // InternalCftLanguage.g:3998:4: ruleValidId
             {
-             before(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterIDTerminalRuleCall_4_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterIDTerminalRuleCall_4_1_0_1()); 
+             before(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterValidIdParserRuleCall_4_1_0_1()); 
+            pushFollow(FOLLOW_2);
+            ruleValidId();
+
+            state._fsp--;
+
+             after(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterValidIdParserRuleCall_4_1_0_1()); 
 
             }
 
@@ -10236,21 +12247,25 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__LookupDefinition__NameAssignment_7"
-    // InternalCftLanguage.g:3390:1: rule__LookupDefinition__NameAssignment_7 : ( RULE_ID ) ;
+    // InternalCftLanguage.g:4009:1: rule__LookupDefinition__NameAssignment_7 : ( ruleValidId ) ;
     public final void rule__LookupDefinition__NameAssignment_7() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3394:1: ( ( RULE_ID ) )
-            // InternalCftLanguage.g:3395:2: ( RULE_ID )
+            // InternalCftLanguage.g:4013:1: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:4014:2: ( ruleValidId )
             {
-            // InternalCftLanguage.g:3395:2: ( RULE_ID )
-            // InternalCftLanguage.g:3396:3: RULE_ID
+            // InternalCftLanguage.g:4014:2: ( ruleValidId )
+            // InternalCftLanguage.g:4015:3: ruleValidId
             {
-             before(grammarAccess.getLookupDefinitionAccess().getNameIDTerminalRuleCall_7_0()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getLookupDefinitionAccess().getNameIDTerminalRuleCall_7_0()); 
+             before(grammarAccess.getLookupDefinitionAccess().getNameValidIdParserRuleCall_7_0()); 
+            pushFollow(FOLLOW_2);
+            ruleValidId();
+
+            state._fsp--;
+
+             after(grammarAccess.getLookupDefinitionAccess().getNameValidIdParserRuleCall_7_0()); 
 
             }
 
@@ -10273,17 +12288,17 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__Assignment__InputAssignment_0"
-    // InternalCftLanguage.g:3405:1: rule__Assignment__InputAssignment_0 : ( ruleEventReference ) ;
+    // InternalCftLanguage.g:4024:1: rule__Assignment__InputAssignment_0 : ( ruleEventReference ) ;
     public final void rule__Assignment__InputAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3409:1: ( ( ruleEventReference ) )
-            // InternalCftLanguage.g:3410:2: ( ruleEventReference )
+            // InternalCftLanguage.g:4028:1: ( ( ruleEventReference ) )
+            // InternalCftLanguage.g:4029:2: ( ruleEventReference )
             {
-            // InternalCftLanguage.g:3410:2: ( ruleEventReference )
-            // InternalCftLanguage.g:3411:3: ruleEventReference
+            // InternalCftLanguage.g:4029:2: ( ruleEventReference )
+            // InternalCftLanguage.g:4030:3: ruleEventReference
             {
              before(grammarAccess.getAssignmentAccess().getInputEventReferenceParserRuleCall_0_0()); 
             pushFollow(FOLLOW_2);
@@ -10314,24 +12329,24 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__Assignment__MultipleAssignment_1_0"
-    // InternalCftLanguage.g:3420:1: rule__Assignment__MultipleAssignment_1_0 : ( ( '+=' ) ) ;
+    // InternalCftLanguage.g:4039:1: rule__Assignment__MultipleAssignment_1_0 : ( ( '+=' ) ) ;
     public final void rule__Assignment__MultipleAssignment_1_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3424:1: ( ( ( '+=' ) ) )
-            // InternalCftLanguage.g:3425:2: ( ( '+=' ) )
+            // InternalCftLanguage.g:4043:1: ( ( ( '+=' ) ) )
+            // InternalCftLanguage.g:4044:2: ( ( '+=' ) )
             {
-            // InternalCftLanguage.g:3425:2: ( ( '+=' ) )
-            // InternalCftLanguage.g:3426:3: ( '+=' )
+            // InternalCftLanguage.g:4044:2: ( ( '+=' ) )
+            // InternalCftLanguage.g:4045:3: ( '+=' )
             {
              before(grammarAccess.getAssignmentAccess().getMultiplePlusSignEqualsSignKeyword_1_0_0()); 
-            // InternalCftLanguage.g:3427:3: ( '+=' )
-            // InternalCftLanguage.g:3428:4: '+='
+            // InternalCftLanguage.g:4046:3: ( '+=' )
+            // InternalCftLanguage.g:4047:4: '+='
             {
              before(grammarAccess.getAssignmentAccess().getMultiplePlusSignEqualsSignKeyword_1_0_0()); 
-            match(input,37,FOLLOW_2); 
+            match(input,40,FOLLOW_2); 
              after(grammarAccess.getAssignmentAccess().getMultiplePlusSignEqualsSignKeyword_1_0_0()); 
 
             }
@@ -10359,17 +12374,17 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__Assignment__OutputAssignment_2"
-    // InternalCftLanguage.g:3439:1: rule__Assignment__OutputAssignment_2 : ( ruleEventReference ) ;
+    // InternalCftLanguage.g:4058:1: rule__Assignment__OutputAssignment_2 : ( ruleEventReference ) ;
     public final void rule__Assignment__OutputAssignment_2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3443:1: ( ( ruleEventReference ) )
-            // InternalCftLanguage.g:3444:2: ( ruleEventReference )
+            // InternalCftLanguage.g:4062:1: ( ( ruleEventReference ) )
+            // InternalCftLanguage.g:4063:2: ( ruleEventReference )
             {
-            // InternalCftLanguage.g:3444:2: ( ruleEventReference )
-            // InternalCftLanguage.g:3445:3: ruleEventReference
+            // InternalCftLanguage.g:4063:2: ( ruleEventReference )
+            // InternalCftLanguage.g:4064:3: ruleEventReference
             {
              before(grammarAccess.getAssignmentAccess().getOutputEventReferenceParserRuleCall_2_0()); 
             pushFollow(FOLLOW_2);
@@ -10400,25 +12415,29 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__EventReference__ComponentAssignment_0"
-    // InternalCftLanguage.g:3454:1: rule__EventReference__ComponentAssignment_0 : ( ( RULE_ID ) ) ;
+    // InternalCftLanguage.g:4073:1: rule__EventReference__ComponentAssignment_0 : ( ( ruleValidId ) ) ;
     public final void rule__EventReference__ComponentAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3458:1: ( ( ( RULE_ID ) ) )
-            // InternalCftLanguage.g:3459:2: ( ( RULE_ID ) )
+            // InternalCftLanguage.g:4077:1: ( ( ( ruleValidId ) ) )
+            // InternalCftLanguage.g:4078:2: ( ( ruleValidId ) )
             {
-            // InternalCftLanguage.g:3459:2: ( ( RULE_ID ) )
-            // InternalCftLanguage.g:3460:3: ( RULE_ID )
+            // InternalCftLanguage.g:4078:2: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:4079:3: ( ruleValidId )
             {
              before(grammarAccess.getEventReferenceAccess().getComponentVariableCrossReference_0_0()); 
-            // InternalCftLanguage.g:3461:3: ( RULE_ID )
-            // InternalCftLanguage.g:3462:4: RULE_ID
+            // InternalCftLanguage.g:4080:3: ( ruleValidId )
+            // InternalCftLanguage.g:4081:4: ruleValidId
             {
-             before(grammarAccess.getEventReferenceAccess().getComponentVariableIDTerminalRuleCall_0_0_1()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getEventReferenceAccess().getComponentVariableIDTerminalRuleCall_0_0_1()); 
+             before(grammarAccess.getEventReferenceAccess().getComponentVariableValidIdParserRuleCall_0_0_1()); 
+            pushFollow(FOLLOW_2);
+            ruleValidId();
+
+            state._fsp--;
+
+             after(grammarAccess.getEventReferenceAccess().getComponentVariableValidIdParserRuleCall_0_0_1()); 
 
             }
 
@@ -10445,25 +12464,29 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__EventReference__EventAssignment_2"
-    // InternalCftLanguage.g:3473:1: rule__EventReference__EventAssignment_2 : ( ( RULE_ID ) ) ;
+    // InternalCftLanguage.g:4092:1: rule__EventReference__EventAssignment_2 : ( ( ruleValidId ) ) ;
     public final void rule__EventReference__EventAssignment_2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3477:1: ( ( ( RULE_ID ) ) )
-            // InternalCftLanguage.g:3478:2: ( ( RULE_ID ) )
+            // InternalCftLanguage.g:4096:1: ( ( ( ruleValidId ) ) )
+            // InternalCftLanguage.g:4097:2: ( ( ruleValidId ) )
             {
-            // InternalCftLanguage.g:3478:2: ( ( RULE_ID ) )
-            // InternalCftLanguage.g:3479:3: ( RULE_ID )
+            // InternalCftLanguage.g:4097:2: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:4098:3: ( ruleValidId )
             {
              before(grammarAccess.getEventReferenceAccess().getEventEventDeclarationCrossReference_2_0()); 
-            // InternalCftLanguage.g:3480:3: ( RULE_ID )
-            // InternalCftLanguage.g:3481:4: RULE_ID
+            // InternalCftLanguage.g:4099:3: ( ruleValidId )
+            // InternalCftLanguage.g:4100:4: ruleValidId
             {
-             before(grammarAccess.getEventReferenceAccess().getEventEventDeclarationIDTerminalRuleCall_2_0_1()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getEventReferenceAccess().getEventEventDeclarationIDTerminalRuleCall_2_0_1()); 
+             before(grammarAccess.getEventReferenceAccess().getEventEventDeclarationValidIdParserRuleCall_2_0_1()); 
+            pushFollow(FOLLOW_2);
+            ruleValidId();
+
+            state._fsp--;
+
+             after(grammarAccess.getEventReferenceAccess().getEventEventDeclarationValidIdParserRuleCall_2_0_1()); 
 
             }
 
@@ -10490,21 +12513,21 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentInstance__ComponentTypeAssignment_1"
-    // InternalCftLanguage.g:3492:1: rule__ComponentInstance__ComponentTypeAssignment_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalCftLanguage.g:4111:1: rule__ComponentInstance__ComponentTypeAssignment_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__ComponentInstance__ComponentTypeAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3496:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalCftLanguage.g:3497:2: ( ( ruleQualifiedName ) )
+            // InternalCftLanguage.g:4115:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalCftLanguage.g:4116:2: ( ( ruleQualifiedName ) )
             {
-            // InternalCftLanguage.g:3497:2: ( ( ruleQualifiedName ) )
-            // InternalCftLanguage.g:3498:3: ( ruleQualifiedName )
+            // InternalCftLanguage.g:4116:2: ( ( ruleQualifiedName ) )
+            // InternalCftLanguage.g:4117:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getComponentInstanceAccess().getComponentTypeComponentDefinitionCrossReference_1_0()); 
-            // InternalCftLanguage.g:3499:3: ( ruleQualifiedName )
-            // InternalCftLanguage.g:3500:4: ruleQualifiedName
+            // InternalCftLanguage.g:4118:3: ( ruleQualifiedName )
+            // InternalCftLanguage.g:4119:4: ruleQualifiedName
             {
              before(grammarAccess.getComponentInstanceAccess().getComponentTypeComponentDefinitionQualifiedNameParserRuleCall_1_0_1()); 
             pushFollow(FOLLOW_2);
@@ -10539,17 +12562,17 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
 
     // $ANTLR start "rule__ComponentInstance__NameAssignment_2"
-    // InternalCftLanguage.g:3511:1: rule__ComponentInstance__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalCftLanguage.g:4130:1: rule__ComponentInstance__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__ComponentInstance__NameAssignment_2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalCftLanguage.g:3515:1: ( ( RULE_ID ) )
-            // InternalCftLanguage.g:3516:2: ( RULE_ID )
+            // InternalCftLanguage.g:4134:1: ( ( RULE_ID ) )
+            // InternalCftLanguage.g:4135:2: ( RULE_ID )
             {
-            // InternalCftLanguage.g:3516:2: ( RULE_ID )
-            // InternalCftLanguage.g:3517:3: RULE_ID
+            // InternalCftLanguage.g:4135:2: ( RULE_ID )
+            // InternalCftLanguage.g:4136:3: RULE_ID
             {
              before(grammarAccess.getComponentInstanceAccess().getNameIDTerminalRuleCall_2_0()); 
             match(input,RULE_ID,FOLLOW_2); 
@@ -10581,37 +12604,40 @@ public class InternalCftLanguageParser extends AbstractInternalContentAssistPars
 
     public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
     public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x000000000201C000L});
-    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000008002L});
-    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000002010002L});
-    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000020000L});
-    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000180000L});
-    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000040010L});
-    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000004010L});
-    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000001004040000L});
-    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000001004000002L});
-    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000001004000000L});
-    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000030000000L});
-    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000020000002L});
-    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000200020000L});
-    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000040040010L});
-    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000040000012L});
-    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000002000001000L});
-    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000040000010L});
-    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000100000002L});
-    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000000180002L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000000030L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000010038000L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000010002L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000010020002L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000008000L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000300000L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000080030L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000000032L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000008030L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000004000000000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000001400000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x00000000000000C0L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000004000000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000008000020L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000008020080000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000008020000002L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000008020000000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000180000000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000100000002L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000001000040000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000200080030L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000200000032L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000400000000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000010000002000L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000200000030L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000800000000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000000800000002L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000000000300002L});
 
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/.CftLanguageIdeModule.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/.CftLanguageIdeModule.xtendbin
index 728a6549..b146c48b 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/.CftLanguageIdeModule.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/.CftLanguageIdeModule.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/.CftLanguageIdeSetup.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/.CftLanguageIdeSetup.xtendbin
index 9bb35edd..8fc21e17 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/.CftLanguageIdeSetup.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/.CftLanguageIdeSetup.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/AbstractCftLanguageProposalProvider.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/AbstractCftLanguageProposalProvider.java
index 89cd0833..7d5c8f8e 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/AbstractCftLanguageProposalProvider.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/AbstractCftLanguageProposalProvider.java
@@ -54,19 +54,37 @@ public abstract class AbstractCftLanguageProposalProvider extends TerminalsPropo
         public void completeBasicEventDefinition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
         }
-        public void completeBasicEventDefinition_Rate(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeBasicEventDefinition_Distribution(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
         }
-        public void completeAndGate_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeConstantDistribution_P(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
         }
-        public void completeAndGate_InputEvents(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeExponentialDistribution_Lambda(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeAndGateDefinition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeAndGateDefinition_InputEvents(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeOrGateDefinition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeOrGateDefinition_InputEvents(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
         }
-        public void completeOrGate_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeKOfMGateDefinition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeKOfMGateDefinition_K(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
         }
-        public void completeOrGate_InputEvents(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeKOfMGateDefinition_M(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeKOfMGateDefinition_InputEvents(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
         }
         public void completeTransformationDefinition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
@@ -136,9 +154,6 @@ public abstract class AbstractCftLanguageProposalProvider extends TerminalsPropo
         public void complete_ComponentDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 // subclasses may override
         }
-        public void complete_EventDeclaration(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-                // subclasses may override
-        }
         public void complete_InputEvent(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 // subclasses may override
         }
@@ -148,13 +163,25 @@ public abstract class AbstractCftLanguageProposalProvider extends TerminalsPropo
         public void complete_BasicEventDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 // subclasses may override
         }
+        public void complete_Distribution(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_ConstantDistribution(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_ExponentialDistribution(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
         public void complete_GateDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 // subclasses may override
         }
-        public void complete_AndGate(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_AndGateDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_OrGateDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 // subclasses may override
         }
-        public void complete_OrGate(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_KOfMGateDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 // subclasses may override
         }
         public void complete_TransformationDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
@@ -187,7 +214,16 @@ public abstract class AbstractCftLanguageProposalProvider extends TerminalsPropo
         public void complete_QualifiedNameWithWildcard(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 // subclasses may override
         }
-        public void complete_DOULBE(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_ValidId(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_Double(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_OF_INT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_T_DOUBLE(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 // subclasses may override
         }
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/CftLanguageUiModule.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/CftLanguageUiModule.xtend
index 9aa9ba9c..6558d759 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/CftLanguageUiModule.xtend
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/CftLanguageUiModule.xtend
@@ -3,11 +3,22 @@
  */
 package hu.bme.mit.inf.dslreasoner.faulttree.components.ui
 
+import hu.bme.mit.inf.dslreasoner.faulttree.components.ui.syntaxcoloring.CftLanguageSemanticHighlightingCalculator
+import hu.bme.mit.inf.dslreasoner.faulttree.components.ui.syntaxcoloring.CftLanguageTokenToAttributeIdMapper
 import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
+import org.eclipse.xtext.ide.editor.syntaxcoloring.AbstractAntlrTokenToAttributeIdMapper
+import org.eclipse.xtext.ide.editor.syntaxcoloring.ISemanticHighlightingCalculator
 
 /**
  * Use this class to register components to be used within the Eclipse IDE.
  */
 @FinalFieldsConstructor
 class CftLanguageUiModule extends AbstractCftLanguageUiModule {
+        def Class<? extends AbstractAntlrTokenToAttributeIdMapper> bindAbstractAntlrTokenToAttributeIdMapper() {
+                CftLanguageTokenToAttributeIdMapper
+        }
+        
+        def Class<? extends ISemanticHighlightingCalculator> bindISemanticHighlightingCalculator() {
+                CftLanguageSemanticHighlightingCalculator
+        }
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/CftLanguageLabelProvider.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/CftLanguageLabelProvider.xtend
index a6ea8f90..f111c553 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/CftLanguageLabelProvider.xtend
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/CftLanguageLabelProvider.xtend
@@ -4,6 +4,7 @@
 package hu.bme.mit.inf.dslreasoner.faulttree.components.ui.labeling
 
 import com.google.inject.Inject
+import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.MappingDefinition
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider
 import org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider
 
@@ -19,13 +20,7 @@ class CftLanguageLabelProvider extends DefaultEObjectLabelProvider {
                 super(delegate);
         }
 
-        // Labels and icons can be computed like this:
-        
-//      def text(Greeting ele) {
-//              'A greeting to ' + ele.name
-//      }
-//
-//      def image(Greeting ele) {
-//              'Greeting.gif'
-//      }
+        def text(MappingDefinition mappingDefinition) {
+                mappingDefinition.pattern?.name
+        }
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/CftLanguageOutlineTreeProvider.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/CftLanguageOutlineTreeProvider.xtend
index 5ffa82ad..3a75a639 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/CftLanguageOutlineTreeProvider.xtend
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/CftLanguageOutlineTreeProvider.xtend
@@ -3,6 +3,8 @@
  */
 package hu.bme.mit.inf.dslreasoner.faulttree.components.ui.outline
 
+import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.MappingDefinition
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDefinition
 import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider
 
 /**
@@ -11,5 +13,11 @@ import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider
  * See https://www.eclipse.org/Xtext/documentation/310_eclipse_support.html#outline
  */
 class CftLanguageOutlineTreeProvider extends DefaultOutlineTreeProvider {
-
+        def _isLeaf(EventDefinition eventDefinition) {
+                true
+        }
+        
+        def _isLeaf(MappingDefinition mappingDefinition) {
+                true
+        }
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageSemanticHighlightingCalculator.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageSemanticHighlightingCalculator.xtend
new file mode 100644
index 00000000..47c9ebdf
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageSemanticHighlightingCalculator.xtend
@@ -0,0 +1,24 @@
+package hu.bme.mit.inf.dslreasoner.faulttree.components.ui.syntaxcoloring
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition
+import org.eclipse.emf.ecore.EObject
+import org.eclipse.xtext.ide.editor.syntaxcoloring.DefaultSemanticHighlightingCalculator
+import org.eclipse.xtext.ide.editor.syntaxcoloring.IHighlightedPositionAcceptor
+import org.eclipse.xtext.util.CancelIndicator
+
+import static hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage.Literals.*
+import static org.eclipse.xtext.ui.editor.syntaxcoloring.DefaultHighlightingConfiguration.*
+
+class CftLanguageSemanticHighlightingCalculator extends DefaultSemanticHighlightingCalculator {
+        protected dispatch def highlightElement(KOfMGateDefinition gate, IHighlightedPositionAcceptor acceptor,
+                CancelIndicator cancelIndicator) {
+                acceptor.highlightFeature(gate, KOF_MGATE_DEFINITION__K, KEYWORD_ID)
+                acceptor.highlightFeature(gate, KOF_MGATE_DEFINITION__M, KEYWORD_ID)
+                false
+        }
+        
+        protected dispatch def highlightElement(EObject eObject, IHighlightedPositionAcceptor acceptor,
+                CancelIndicator cancelIndicator) {
+                super.highlightElement(eObject, acceptor, cancelIndicator)
+        }
+}
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageTokenToAttributeIdMapper.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageTokenToAttributeIdMapper.xtend
new file mode 100644
index 00000000..4656d0a0
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageTokenToAttributeIdMapper.xtend
@@ -0,0 +1,15 @@
+package hu.bme.mit.inf.dslreasoner.faulttree.components.ui.syntaxcoloring
+
+import org.eclipse.xtext.ide.editor.syntaxcoloring.DefaultAntlrTokenToAttributeIdMapper
+import org.eclipse.xtext.ide.editor.syntaxcoloring.HighlightingStyles
+
+class CftLanguageTokenToAttributeIdMapper extends DefaultAntlrTokenToAttributeIdMapper {
+        override protected calculateId(String tokenName, int tokenType) {
+                switch (tokenName) {
+                        case "RULE_T_DOUBLE":
+                                HighlightingStyles.NUMBER_ID
+                        default:
+                                super.calculateId(tokenName, tokenType) 
+                }
+        }
+}
\ No newline at end of file
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/.CftLanguageUiModule.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/.CftLanguageUiModule.xtendbin
index 7eb6190d..ff2238f7 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/.CftLanguageUiModule.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/.CftLanguageUiModule.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/CftLanguageUiModule.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/CftLanguageUiModule.java
index 4f1409d9..be796ba2 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/CftLanguageUiModule.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/CftLanguageUiModule.java
@@ -4,8 +4,12 @@
 package hu.bme.mit.inf.dslreasoner.faulttree.components.ui;
 
 import hu.bme.mit.inf.dslreasoner.faulttree.components.ui.AbstractCftLanguageUiModule;
+import hu.bme.mit.inf.dslreasoner.faulttree.components.ui.syntaxcoloring.CftLanguageSemanticHighlightingCalculator;
+import hu.bme.mit.inf.dslreasoner.faulttree.components.ui.syntaxcoloring.CftLanguageTokenToAttributeIdMapper;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.AbstractAntlrTokenToAttributeIdMapper;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.ISemanticHighlightingCalculator;
 
 /**
  * Use this class to register components to be used within the Eclipse IDE.
@@ -13,6 +17,14 @@ import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor;
 @FinalFieldsConstructor
 @SuppressWarnings("all")
 public class CftLanguageUiModule extends AbstractCftLanguageUiModule {
+  public Class<? extends AbstractAntlrTokenToAttributeIdMapper> bindAbstractAntlrTokenToAttributeIdMapper() {
+    return CftLanguageTokenToAttributeIdMapper.class;
+  }
+  
+  public Class<? extends ISemanticHighlightingCalculator> bindISemanticHighlightingCalculator() {
+    return CftLanguageSemanticHighlightingCalculator.class;
+  }
+  
   public CftLanguageUiModule(final AbstractUIPlugin plugin) {
     super(plugin);
   }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/.CftLanguageProposalProvider.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/.CftLanguageProposalProvider.xtendbin
index a6a68b91..c62e6652 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/.CftLanguageProposalProvider.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/.CftLanguageProposalProvider.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageDescriptionLabelProvider.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageDescriptionLabelProvider.xtendbin
index e2a540db..21bd15b6 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageDescriptionLabelProvider.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageDescriptionLabelProvider.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageLabelProvider.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageLabelProvider.xtendbin
index 58dd1f71..ae92f324 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageLabelProvider.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageLabelProvider.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/CftLanguageLabelProvider.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/CftLanguageLabelProvider.java
index 3a03868d..103bb114 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/CftLanguageLabelProvider.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/CftLanguageLabelProvider.java
@@ -4,7 +4,9 @@
 package hu.bme.mit.inf.dslreasoner.faulttree.components.ui.labeling;
 
 import com.google.inject.Inject;
+import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.MappingDefinition;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.viatra.query.patternlanguage.emf.vql.Pattern;
 import org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider;
 
 /**
@@ -18,4 +20,13 @@ public class CftLanguageLabelProvider extends DefaultEObjectLabelProvider {
   public CftLanguageLabelProvider(final AdapterFactoryLabelProvider delegate) {
     super(delegate);
   }
+  
+  public String text(final MappingDefinition mappingDefinition) {
+    Pattern _pattern = mappingDefinition.getPattern();
+    String _name = null;
+    if (_pattern!=null) {
+      _name=_pattern.getName();
+    }
+    return _name;
+  }
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/.CftLanguageOutlineTreeProvider.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/.CftLanguageOutlineTreeProvider.xtendbin
index b785c6e2..91137ae1 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/.CftLanguageOutlineTreeProvider.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/.CftLanguageOutlineTreeProvider.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/CftLanguageOutlineTreeProvider.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/CftLanguageOutlineTreeProvider.java
index 76ea64c4..b8da3d93 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/CftLanguageOutlineTreeProvider.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/CftLanguageOutlineTreeProvider.java
@@ -3,6 +3,8 @@
  */
 package hu.bme.mit.inf.dslreasoner.faulttree.components.ui.outline;
 
+import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.MappingDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDefinition;
 import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider;
 
 /**
@@ -12,4 +14,11 @@ import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider;
  */
 @SuppressWarnings("all")
 public class CftLanguageOutlineTreeProvider extends DefaultOutlineTreeProvider {
+  public boolean _isLeaf(final EventDefinition eventDefinition) {
+    return true;
+  }
+  
+  public boolean _isLeaf(final MappingDefinition mappingDefinition) {
+    return true;
+  }
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/quickfix/.CftLanguageQuickfixProvider.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/quickfix/.CftLanguageQuickfixProvider.xtendbin
index d199f277..637b4e7e 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/quickfix/.CftLanguageQuickfixProvider.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/quickfix/.CftLanguageQuickfixProvider.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.CftLanguageSemanticHighlightingCalculator.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.CftLanguageSemanticHighlightingCalculator.xtendbin
new file mode 100644
index 00000000..81585f8b
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.CftLanguageSemanticHighlightingCalculator.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.CftLanguageTokenToAttributeIdMapper.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.CftLanguageTokenToAttributeIdMapper.xtendbin
new file mode 100644
index 00000000..d8af5320
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.CftLanguageTokenToAttributeIdMapper.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.gitignore
new file mode 100644
index 00000000..3fdf4894
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.gitignore
@@ -0,0 +1,2 @@
+/.CftLanguageSemanticHighlightingCalculator.java._trace
+/.CftLanguageTokenToAttributeIdMapper.java._trace
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageSemanticHighlightingCalculator.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageSemanticHighlightingCalculator.java
new file mode 100644
index 00000000..268faba3
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageSemanticHighlightingCalculator.java
@@ -0,0 +1,38 @@
+package hu.bme.mit.inf.dslreasoner.faulttree.components.ui.syntaxcoloring;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition;
+import java.util.Arrays;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.DefaultSemanticHighlightingCalculator;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.IHighlightedPositionAcceptor;
+import org.eclipse.xtext.ui.editor.syntaxcoloring.DefaultHighlightingConfiguration;
+import org.eclipse.xtext.util.CancelIndicator;
+
+@SuppressWarnings("all")
+public class CftLanguageSemanticHighlightingCalculator extends DefaultSemanticHighlightingCalculator {
+  protected boolean _highlightElement(final KOfMGateDefinition gate, final IHighlightedPositionAcceptor acceptor, final CancelIndicator cancelIndicator) {
+    boolean _xblockexpression = false;
+    {
+      this.highlightFeature(acceptor, gate, CftPackage.Literals.KOF_MGATE_DEFINITION__K, DefaultHighlightingConfiguration.KEYWORD_ID);
+      this.highlightFeature(acceptor, gate, CftPackage.Literals.KOF_MGATE_DEFINITION__M, DefaultHighlightingConfiguration.KEYWORD_ID);
+      _xblockexpression = false;
+    }
+    return _xblockexpression;
+  }
+  
+  protected boolean _highlightElement(final EObject eObject, final IHighlightedPositionAcceptor acceptor, final CancelIndicator cancelIndicator) {
+    return super.highlightElement(eObject, acceptor, cancelIndicator);
+  }
+  
+  protected boolean highlightElement(final EObject gate, final IHighlightedPositionAcceptor acceptor, final CancelIndicator cancelIndicator) {
+    if (gate instanceof KOfMGateDefinition) {
+      return _highlightElement((KOfMGateDefinition)gate, acceptor, cancelIndicator);
+    } else if (gate != null) {
+      return _highlightElement(gate, acceptor, cancelIndicator);
+    } else {
+      throw new IllegalArgumentException("Unhandled parameter types: " +
+        Arrays.<Object>asList(gate, acceptor, cancelIndicator).toString());
+    }
+  }
+}
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageTokenToAttributeIdMapper.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageTokenToAttributeIdMapper.java
new file mode 100644
index 00000000..9ad4afda
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageTokenToAttributeIdMapper.java
@@ -0,0 +1,25 @@
+package hu.bme.mit.inf.dslreasoner.faulttree.components.ui.syntaxcoloring;
+
+import org.eclipse.xtext.ide.editor.syntaxcoloring.DefaultAntlrTokenToAttributeIdMapper;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.HighlightingStyles;
+
+@SuppressWarnings("all")
+public class CftLanguageTokenToAttributeIdMapper extends DefaultAntlrTokenToAttributeIdMapper {
+  @Override
+  protected String calculateId(final String tokenName, final int tokenType) {
+    String _switchResult = null;
+    if (tokenName != null) {
+      switch (tokenName) {
+        case "RULE_T_DOUBLE":
+          _switchResult = HighlightingStyles.NUMBER_ID;
+          break;
+        default:
+          _switchResult = super.calculateId(tokenName, tokenType);
+          break;
+      }
+    } else {
+      _switchResult = super.calculateId(tokenName, tokenType);
+    }
+    return _switchResult;
+  }
+}
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/META-INF/MANIFEST.MF b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/META-INF/MANIFEST.MF
index 66be4b49..8511add4 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/META-INF/MANIFEST.MF
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/META-INF/MANIFEST.MF
@@ -9,13 +9,14 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.xbase,
  org.eclipse.equinox.common;bundle-version="3.5.0",
- org.eclipse.viatra.query.patternlanguage.emf,
  org.eclipse.emf.ecore,
  org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
  org.eclipse.xtext.util,
  org.eclipse.emf.common,
  org.eclipse.xtend.lib;bundle-version="2.14.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
+ org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.eclipse.viatra.query.patternlanguage.emf;visibility:=reexport,
+ hu.bme.mit.inf.dslreasoner.faulttree.model;visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: hu.bme.mit.inf.dslreasoner.faulttree.components,
  hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage,
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.ecore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.ecore
index a86e503e..ecfaa84b 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.ecore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.ecore
@@ -7,38 +7,14 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1"
         eType="#//ImportDeclaration" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="componentDefinitions" upperBound="-1"
-        eType="#//ComponentDefinition" containment="true"/>
+        eType="ecore:EClass platform:/resource/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore#//ComponentDefinition"
+        containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="transformationDefinitions"
         upperBound="-1" eType="#//TransformationDefinition" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ImportDeclaration">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="importedNamespace" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ComponentDefinition">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="inputEvents" upperBound="-1"
-        eType="#//InputEvent" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outputEvents" unique="false"
-        upperBound="-1" eType="#//EventDeclaration"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eventDefinitions" upperBound="-1"
-        eType="#//EventDefinition" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EventDeclaration">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="InputEvent" eSuperTypes="#//EventDeclaration">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiple" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EventDefinition" eSuperTypes="#//EventDeclaration"/>
-  <eClassifiers xsi:type="ecore:EClass" name="BasicEventDefinition" eSuperTypes="#//EventDefinition">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rate" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GateDefinition" eSuperTypes="#//EventDefinition">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="inputEvents" unique="false"
-        upperBound="-1" eType="#//EventDeclaration"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AndGate" eSuperTypes="#//GateDefinition"/>
-  <eClassifiers xsi:type="ecore:EClass" name="OrGate" eSuperTypes="#//GateDefinition"/>
   <eClassifiers xsi:type="ecore:EClass" name="TransformationDefinition">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="mappingDefinitions" upperBound="-1"
@@ -76,9 +52,9 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="EventReference">
     <eStructuralFeatures xsi:type="ecore:EReference" name="component" eType="#//Variable"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="event" eType="#//EventDeclaration"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="event" eType="ecore:EClass platform:/resource/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore#//EventDeclaration"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ComponentInstance" eSuperTypes="#//Variable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="componentType" eType="#//ComponentDefinition"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="componentType" eType="ecore:EClass platform:/resource/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore#//ComponentDefinition"/>
   </eClassifiers>
 </ecore:EPackage>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.genmodel b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.genmodel
index c2208adc..1b857035 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.genmodel
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/model/generated/CftLanguage.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.16.0" modelDirectory="/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen"
     modelPluginID="hu.bme.mit.inf.dslreasoner.faulttree.components" forceOverwrite="true"
     modelName="CftLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.16" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.viatra.query.patternlanguage.emf/model/PatternLanguage.genmodel#//vql">
+    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.16" usedGenPackages="platform:/resource/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.genmodel#//cft platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.viatra.query.patternlanguage.emf/model/PatternLanguage.genmodel#//vql">
   <genPackages prefix="CftLanguage" basePackage="hu.bme.mit.inf.dslreasoner.faulttree.components"
       disposableProviderFactory="true" fileExtensions="cft" ecorePackage="CftLanguage.ecore#/">
     <genClasses ecoreClass="CftLanguage.ecore#//CftModel">
@@ -15,27 +15,6 @@
     <genClasses ecoreClass="CftLanguage.ecore#//ImportDeclaration">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CftLanguage.ecore#//ImportDeclaration/importedNamespace"/>
     </genClasses>
-    <genClasses ecoreClass="CftLanguage.ecore#//ComponentDefinition">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CftLanguage.ecore#//ComponentDefinition/name"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CftLanguage.ecore#//ComponentDefinition/inputEvents"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference CftLanguage.ecore#//ComponentDefinition/outputEvents"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CftLanguage.ecore#//ComponentDefinition/eventDefinitions"/>
-    </genClasses>
-    <genClasses ecoreClass="CftLanguage.ecore#//EventDeclaration">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CftLanguage.ecore#//EventDeclaration/name"/>
-    </genClasses>
-    <genClasses ecoreClass="CftLanguage.ecore#//InputEvent">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CftLanguage.ecore#//InputEvent/multiple"/>
-    </genClasses>
-    <genClasses ecoreClass="CftLanguage.ecore#//EventDefinition"/>
-    <genClasses ecoreClass="CftLanguage.ecore#//BasicEventDefinition">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CftLanguage.ecore#//BasicEventDefinition/rate"/>
-    </genClasses>
-    <genClasses ecoreClass="CftLanguage.ecore#//GateDefinition">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference CftLanguage.ecore#//GateDefinition/inputEvents"/>
-    </genClasses>
-    <genClasses ecoreClass="CftLanguage.ecore#//AndGate"/>
-    <genClasses ecoreClass="CftLanguage.ecore#//OrGate"/>
     <genClasses ecoreClass="CftLanguage.ecore#//TransformationDefinition">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CftLanguage.ecore#//TransformationDefinition/name"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CftLanguage.ecore#//TransformationDefinition/mappingDefinitions"/>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/CftLanguage.xtextbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/CftLanguage.xtextbin
index b39c9074..6eb4d2c2 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/CftLanguage.xtextbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/CftLanguage.xtextbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/AndGate.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/AndGate.java
deleted file mode 100644
index 6d197233..00000000
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/AndGate.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.16.0
- */
-package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>And Gate</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage#getAndGate()
- * @model
- * @generated
- */
-public interface AndGate extends GateDefinition
-{
-} // AndGate
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/BasicEventDefinition.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/BasicEventDefinition.java
deleted file mode 100644
index 9a564a57..00000000
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/BasicEventDefinition.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * generated by Xtext 2.16.0
- */
-package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Basic Event Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.BasicEventDefinition#getRate <em>Rate</em>}</li>
- * </ul>
- *
- * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage#getBasicEventDefinition()
- * @model
- * @generated
- */
-public interface BasicEventDefinition extends EventDefinition
-{
-  /**
-   * Returns the value of the '<em><b>Rate</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Rate</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Rate</em>' attribute.
-   * @see #setRate(double)
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage#getBasicEventDefinition_Rate()
-   * @model
-   * @generated
-   */
-  double getRate();
-
-  /**
-   * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.BasicEventDefinition#getRate <em>Rate</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Rate</em>' attribute.
-   * @see #getRate()
-   * @generated
-   */
-  void setRate(double value);
-
-} // BasicEventDefinition
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/CftLanguageFactory.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/CftLanguageFactory.java
index 07c5786f..3420d578 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/CftLanguageFactory.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/CftLanguageFactory.java
@@ -42,78 +42,6 @@ public interface CftLanguageFactory extends EFactory
   ImportDeclaration createImportDeclaration();
 
   /**
-   * Returns a new object of class '<em>Component Definition</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Component Definition</em>'.
-   * @generated
-   */
-  ComponentDefinition createComponentDefinition();
-
-  /**
-   * Returns a new object of class '<em>Event Declaration</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Event Declaration</em>'.
-   * @generated
-   */
-  EventDeclaration createEventDeclaration();
-
-  /**
-   * Returns a new object of class '<em>Input Event</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Input Event</em>'.
-   * @generated
-   */
-  InputEvent createInputEvent();
-
-  /**
-   * Returns a new object of class '<em>Event Definition</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Event Definition</em>'.
-   * @generated
-   */
-  EventDefinition createEventDefinition();
-
-  /**
-   * Returns a new object of class '<em>Basic Event Definition</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Basic Event Definition</em>'.
-   * @generated
-   */
-  BasicEventDefinition createBasicEventDefinition();
-
-  /**
-   * Returns a new object of class '<em>Gate Definition</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Gate Definition</em>'.
-   * @generated
-   */
-  GateDefinition createGateDefinition();
-
-  /**
-   * Returns a new object of class '<em>And Gate</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>And Gate</em>'.
-   * @generated
-   */
-  AndGate createAndGate();
-
-  /**
-   * Returns a new object of class '<em>Or Gate</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Or Gate</em>'.
-   * @generated
-   */
-  OrGate createOrGate();
-
-  /**
    * Returns a new object of class '<em>Transformation Definition</em>'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/CftLanguagePackage.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/CftLanguagePackage.java
index 405a8691..7aab46c2 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/CftLanguagePackage.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/CftLanguagePackage.java
@@ -141,302 +141,6 @@ public interface CftLanguagePackage extends EPackage
   int IMPORT_DECLARATION_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.ComponentDefinitionImpl <em>Component Definition</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.ComponentDefinitionImpl
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getComponentDefinition()
-   * @generated
-   */
-  int COMPONENT_DEFINITION = 2;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int COMPONENT_DEFINITION__NAME = 0;
-
-  /**
-   * The feature id for the '<em><b>Input Events</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int COMPONENT_DEFINITION__INPUT_EVENTS = 1;
-
-  /**
-   * The feature id for the '<em><b>Output Events</b></em>' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int COMPONENT_DEFINITION__OUTPUT_EVENTS = 2;
-
-  /**
-   * The feature id for the '<em><b>Event Definitions</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int COMPONENT_DEFINITION__EVENT_DEFINITIONS = 3;
-
-  /**
-   * The number of structural features of the '<em>Component Definition</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int COMPONENT_DEFINITION_FEATURE_COUNT = 4;
-
-  /**
-   * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.EventDeclarationImpl <em>Event Declaration</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.EventDeclarationImpl
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getEventDeclaration()
-   * @generated
-   */
-  int EVENT_DECLARATION = 3;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EVENT_DECLARATION__NAME = 0;
-
-  /**
-   * The number of structural features of the '<em>Event Declaration</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EVENT_DECLARATION_FEATURE_COUNT = 1;
-
-  /**
-   * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.InputEventImpl <em>Input Event</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.InputEventImpl
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getInputEvent()
-   * @generated
-   */
-  int INPUT_EVENT = 4;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int INPUT_EVENT__NAME = EVENT_DECLARATION__NAME;
-
-  /**
-   * The feature id for the '<em><b>Multiple</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int INPUT_EVENT__MULTIPLE = EVENT_DECLARATION_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>Input Event</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int INPUT_EVENT_FEATURE_COUNT = EVENT_DECLARATION_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.EventDefinitionImpl <em>Event Definition</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.EventDefinitionImpl
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getEventDefinition()
-   * @generated
-   */
-  int EVENT_DEFINITION = 5;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EVENT_DEFINITION__NAME = EVENT_DECLARATION__NAME;
-
-  /**
-   * The number of structural features of the '<em>Event Definition</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EVENT_DEFINITION_FEATURE_COUNT = EVENT_DECLARATION_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.BasicEventDefinitionImpl <em>Basic Event Definition</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.BasicEventDefinitionImpl
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getBasicEventDefinition()
-   * @generated
-   */
-  int BASIC_EVENT_DEFINITION = 6;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BASIC_EVENT_DEFINITION__NAME = EVENT_DEFINITION__NAME;
-
-  /**
-   * The feature id for the '<em><b>Rate</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BASIC_EVENT_DEFINITION__RATE = EVENT_DEFINITION_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>Basic Event Definition</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BASIC_EVENT_DEFINITION_FEATURE_COUNT = EVENT_DEFINITION_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.GateDefinitionImpl <em>Gate Definition</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.GateDefinitionImpl
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getGateDefinition()
-   * @generated
-   */
-  int GATE_DEFINITION = 7;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int GATE_DEFINITION__NAME = EVENT_DEFINITION__NAME;
-
-  /**
-   * The feature id for the '<em><b>Input Events</b></em>' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int GATE_DEFINITION__INPUT_EVENTS = EVENT_DEFINITION_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>Gate Definition</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int GATE_DEFINITION_FEATURE_COUNT = EVENT_DEFINITION_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.AndGateImpl <em>And Gate</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.AndGateImpl
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getAndGate()
-   * @generated
-   */
-  int AND_GATE = 8;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int AND_GATE__NAME = GATE_DEFINITION__NAME;
-
-  /**
-   * The feature id for the '<em><b>Input Events</b></em>' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int AND_GATE__INPUT_EVENTS = GATE_DEFINITION__INPUT_EVENTS;
-
-  /**
-   * The number of structural features of the '<em>And Gate</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int AND_GATE_FEATURE_COUNT = GATE_DEFINITION_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.OrGateImpl <em>Or Gate</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.OrGateImpl
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getOrGate()
-   * @generated
-   */
-  int OR_GATE = 9;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OR_GATE__NAME = GATE_DEFINITION__NAME;
-
-  /**
-   * The feature id for the '<em><b>Input Events</b></em>' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OR_GATE__INPUT_EVENTS = GATE_DEFINITION__INPUT_EVENTS;
-
-  /**
-   * The number of structural features of the '<em>Or Gate</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OR_GATE_FEATURE_COUNT = GATE_DEFINITION_FEATURE_COUNT + 0;
-
-  /**
    * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.TransformationDefinitionImpl <em>Transformation Definition</em>}' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
@@ -444,7 +148,7 @@ public interface CftLanguagePackage extends EPackage
    * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getTransformationDefinition()
    * @generated
    */
-  int TRANSFORMATION_DEFINITION = 10;
+  int TRANSFORMATION_DEFINITION = 2;
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -481,7 +185,7 @@ public interface CftLanguagePackage extends EPackage
    * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getMappingDefinition()
    * @generated
    */
-  int MAPPING_DEFINITION = 11;
+  int MAPPING_DEFINITION = 3;
 
   /**
    * The feature id for the '<em><b>Top Level</b></em>' attribute.
@@ -554,7 +258,7 @@ public interface CftLanguagePackage extends EPackage
    * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getMappingParameter()
    * @generated
    */
-  int MAPPING_PARAMETER = 12;
+  int MAPPING_PARAMETER = 4;
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -582,7 +286,7 @@ public interface CftLanguagePackage extends EPackage
    * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getVariable()
    * @generated
    */
-  int VARIABLE = 14;
+  int VARIABLE = 6;
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -610,7 +314,7 @@ public interface CftLanguagePackage extends EPackage
    * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getLookupDefinition()
    * @generated
    */
-  int LOOKUP_DEFINITION = 13;
+  int LOOKUP_DEFINITION = 5;
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -656,7 +360,7 @@ public interface CftLanguagePackage extends EPackage
    * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getAssignment()
    * @generated
    */
-  int ASSIGNMENT = 15;
+  int ASSIGNMENT = 7;
 
   /**
    * The feature id for the '<em><b>Input</b></em>' containment reference.
@@ -702,7 +406,7 @@ public interface CftLanguagePackage extends EPackage
    * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getEventReference()
    * @generated
    */
-  int EVENT_REFERENCE = 16;
+  int EVENT_REFERENCE = 8;
 
   /**
    * The feature id for the '<em><b>Component</b></em>' reference.
@@ -739,7 +443,7 @@ public interface CftLanguagePackage extends EPackage
    * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getComponentInstance()
    * @generated
    */
-  int COMPONENT_INSTANCE = 17;
+  int COMPONENT_INSTANCE = 9;
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -845,174 +549,6 @@ public interface CftLanguagePackage extends EPackage
   EAttribute getImportDeclaration_ImportedNamespace();
 
   /**
-   * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition <em>Component Definition</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Component Definition</em>'.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition
-   * @generated
-   */
-  EClass getComponentDefinition();
-
-  /**
-   * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition#getName()
-   * @see #getComponentDefinition()
-   * @generated
-   */
-  EAttribute getComponentDefinition_Name();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition#getInputEvents <em>Input Events</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Input Events</em>'.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition#getInputEvents()
-   * @see #getComponentDefinition()
-   * @generated
-   */
-  EReference getComponentDefinition_InputEvents();
-
-  /**
-   * Returns the meta object for the reference list '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition#getOutputEvents <em>Output Events</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference list '<em>Output Events</em>'.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition#getOutputEvents()
-   * @see #getComponentDefinition()
-   * @generated
-   */
-  EReference getComponentDefinition_OutputEvents();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition#getEventDefinitions <em>Event Definitions</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Event Definitions</em>'.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition#getEventDefinitions()
-   * @see #getComponentDefinition()
-   * @generated
-   */
-  EReference getComponentDefinition_EventDefinitions();
-
-  /**
-   * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDeclaration <em>Event Declaration</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Event Declaration</em>'.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDeclaration
-   * @generated
-   */
-  EClass getEventDeclaration();
-
-  /**
-   * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDeclaration#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDeclaration#getName()
-   * @see #getEventDeclaration()
-   * @generated
-   */
-  EAttribute getEventDeclaration_Name();
-
-  /**
-   * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.InputEvent <em>Input Event</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Input Event</em>'.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.InputEvent
-   * @generated
-   */
-  EClass getInputEvent();
-
-  /**
-   * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.InputEvent#isMultiple <em>Multiple</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Multiple</em>'.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.InputEvent#isMultiple()
-   * @see #getInputEvent()
-   * @generated
-   */
-  EAttribute getInputEvent_Multiple();
-
-  /**
-   * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDefinition <em>Event Definition</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Event Definition</em>'.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDefinition
-   * @generated
-   */
-  EClass getEventDefinition();
-
-  /**
-   * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.BasicEventDefinition <em>Basic Event Definition</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Basic Event Definition</em>'.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.BasicEventDefinition
-   * @generated
-   */
-  EClass getBasicEventDefinition();
-
-  /**
-   * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.BasicEventDefinition#getRate <em>Rate</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Rate</em>'.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.BasicEventDefinition#getRate()
-   * @see #getBasicEventDefinition()
-   * @generated
-   */
-  EAttribute getBasicEventDefinition_Rate();
-
-  /**
-   * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.GateDefinition <em>Gate Definition</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Gate Definition</em>'.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.GateDefinition
-   * @generated
-   */
-  EClass getGateDefinition();
-
-  /**
-   * Returns the meta object for the reference list '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.GateDefinition#getInputEvents <em>Input Events</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference list '<em>Input Events</em>'.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.GateDefinition#getInputEvents()
-   * @see #getGateDefinition()
-   * @generated
-   */
-  EReference getGateDefinition_InputEvents();
-
-  /**
-   * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.AndGate <em>And Gate</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>And Gate</em>'.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.AndGate
-   * @generated
-   */
-  EClass getAndGate();
-
-  /**
-   * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.OrGate <em>Or Gate</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Or Gate</em>'.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.OrGate
-   * @generated
-   */
-  EClass getOrGate();
-
-  /**
    * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.TransformationDefinition <em>Transformation Definition</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
@@ -1374,150 +910,6 @@ public interface CftLanguagePackage extends EPackage
     EAttribute IMPORT_DECLARATION__IMPORTED_NAMESPACE = eINSTANCE.getImportDeclaration_ImportedNamespace();
 
     /**
-     * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.ComponentDefinitionImpl <em>Component Definition</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.ComponentDefinitionImpl
-     * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getComponentDefinition()
-     * @generated
-     */
-    EClass COMPONENT_DEFINITION = eINSTANCE.getComponentDefinition();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute COMPONENT_DEFINITION__NAME = eINSTANCE.getComponentDefinition_Name();
-
-    /**
-     * The meta object literal for the '<em><b>Input Events</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference COMPONENT_DEFINITION__INPUT_EVENTS = eINSTANCE.getComponentDefinition_InputEvents();
-
-    /**
-     * The meta object literal for the '<em><b>Output Events</b></em>' reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference COMPONENT_DEFINITION__OUTPUT_EVENTS = eINSTANCE.getComponentDefinition_OutputEvents();
-
-    /**
-     * The meta object literal for the '<em><b>Event Definitions</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference COMPONENT_DEFINITION__EVENT_DEFINITIONS = eINSTANCE.getComponentDefinition_EventDefinitions();
-
-    /**
-     * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.EventDeclarationImpl <em>Event Declaration</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.EventDeclarationImpl
-     * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getEventDeclaration()
-     * @generated
-     */
-    EClass EVENT_DECLARATION = eINSTANCE.getEventDeclaration();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute EVENT_DECLARATION__NAME = eINSTANCE.getEventDeclaration_Name();
-
-    /**
-     * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.InputEventImpl <em>Input Event</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.InputEventImpl
-     * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getInputEvent()
-     * @generated
-     */
-    EClass INPUT_EVENT = eINSTANCE.getInputEvent();
-
-    /**
-     * The meta object literal for the '<em><b>Multiple</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute INPUT_EVENT__MULTIPLE = eINSTANCE.getInputEvent_Multiple();
-
-    /**
-     * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.EventDefinitionImpl <em>Event Definition</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.EventDefinitionImpl
-     * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getEventDefinition()
-     * @generated
-     */
-    EClass EVENT_DEFINITION = eINSTANCE.getEventDefinition();
-
-    /**
-     * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.BasicEventDefinitionImpl <em>Basic Event Definition</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.BasicEventDefinitionImpl
-     * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getBasicEventDefinition()
-     * @generated
-     */
-    EClass BASIC_EVENT_DEFINITION = eINSTANCE.getBasicEventDefinition();
-
-    /**
-     * The meta object literal for the '<em><b>Rate</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute BASIC_EVENT_DEFINITION__RATE = eINSTANCE.getBasicEventDefinition_Rate();
-
-    /**
-     * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.GateDefinitionImpl <em>Gate Definition</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.GateDefinitionImpl
-     * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getGateDefinition()
-     * @generated
-     */
-    EClass GATE_DEFINITION = eINSTANCE.getGateDefinition();
-
-    /**
-     * The meta object literal for the '<em><b>Input Events</b></em>' reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference GATE_DEFINITION__INPUT_EVENTS = eINSTANCE.getGateDefinition_InputEvents();
-
-    /**
-     * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.AndGateImpl <em>And Gate</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.AndGateImpl
-     * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getAndGate()
-     * @generated
-     */
-    EClass AND_GATE = eINSTANCE.getAndGate();
-
-    /**
-     * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.OrGateImpl <em>Or Gate</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.OrGateImpl
-     * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.CftLanguagePackageImpl#getOrGate()
-     * @generated
-     */
-    EClass OR_GATE = eINSTANCE.getOrGate();
-
-    /**
      * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.TransformationDefinitionImpl <em>Transformation Definition</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/CftModel.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/CftModel.java
index 5291e747..0b384084 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/CftModel.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/CftModel.java
@@ -3,6 +3,8 @@
  */
 package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage;
 
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition;
+
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EObject;
@@ -72,7 +74,7 @@ public interface CftModel extends EObject
 
   /**
    * Returns the value of the '<em><b>Component Definitions</b></em>' containment reference list.
-   * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition}.
+   * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition}.
    * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Component Definitions</em>' containment reference list isn't clear,
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/ComponentDefinition.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/ComponentDefinition.java
deleted file mode 100644
index dae78e7e..00000000
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/ComponentDefinition.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * generated by Xtext 2.16.0
- */
-package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Component Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition#getName <em>Name</em>}</li>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition#getInputEvents <em>Input Events</em>}</li>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition#getOutputEvents <em>Output Events</em>}</li>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition#getEventDefinitions <em>Event Definitions</em>}</li>
- * </ul>
- *
- * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage#getComponentDefinition()
- * @model
- * @generated
- */
-public interface ComponentDefinition extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage#getComponentDefinition_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-  void setName(String value);
-
-  /**
-   * Returns the value of the '<em><b>Input Events</b></em>' containment reference list.
-   * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.InputEvent}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Input Events</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Input Events</em>' containment reference list.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage#getComponentDefinition_InputEvents()
-   * @model containment="true"
-   * @generated
-   */
-  EList<InputEvent> getInputEvents();
-
-  /**
-   * Returns the value of the '<em><b>Output Events</b></em>' reference list.
-   * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDeclaration}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Output Events</em>' reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Output Events</em>' reference list.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage#getComponentDefinition_OutputEvents()
-   * @model
-   * @generated
-   */
-  EList<EventDeclaration> getOutputEvents();
-
-  /**
-   * Returns the value of the '<em><b>Event Definitions</b></em>' containment reference list.
-   * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDefinition}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Event Definitions</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Event Definitions</em>' containment reference list.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage#getComponentDefinition_EventDefinitions()
-   * @model containment="true"
-   * @generated
-   */
-  EList<EventDefinition> getEventDefinitions();
-
-} // ComponentDefinition
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/ComponentInstance.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/ComponentInstance.java
index f9f0f57b..0c80849d 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/ComponentInstance.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/ComponentInstance.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage;
 
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/EventDeclaration.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/EventDeclaration.java
deleted file mode 100644
index c03c117e..00000000
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/EventDeclaration.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * generated by Xtext 2.16.0
- */
-package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Event Declaration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDeclaration#getName <em>Name</em>}</li>
- * </ul>
- *
- * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage#getEventDeclaration()
- * @model
- * @generated
- */
-public interface EventDeclaration extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage#getEventDeclaration_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDeclaration#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-  void setName(String value);
-
-} // EventDeclaration
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/EventDefinition.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/EventDefinition.java
deleted file mode 100644
index 0d4f7f95..00000000
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/EventDefinition.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.16.0
- */
-package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Event Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage#getEventDefinition()
- * @model
- * @generated
- */
-public interface EventDefinition extends EventDeclaration
-{
-} // EventDefinition
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/EventReference.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/EventReference.java
index b351b185..bf7b7263 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/EventReference.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/EventReference.java
@@ -3,6 +3,8 @@
  */
 package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage;
 
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration;
+
 import org.eclipse.emf.ecore.EObject;
 
 /**
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/GateDefinition.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/GateDefinition.java
deleted file mode 100644
index 3020f2ca..00000000
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/GateDefinition.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * generated by Xtext 2.16.0
- */
-package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Gate Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.GateDefinition#getInputEvents <em>Input Events</em>}</li>
- * </ul>
- *
- * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage#getGateDefinition()
- * @model
- * @generated
- */
-public interface GateDefinition extends EventDefinition
-{
-  /**
-   * Returns the value of the '<em><b>Input Events</b></em>' reference list.
-   * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDeclaration}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Input Events</em>' reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Input Events</em>' reference list.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage#getGateDefinition_InputEvents()
-   * @model
-   * @generated
-   */
-  EList<EventDeclaration> getInputEvents();
-
-} // GateDefinition
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/InputEvent.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/InputEvent.java
deleted file mode 100644
index 4269fa10..00000000
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/InputEvent.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * generated by Xtext 2.16.0
- */
-package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Input Event</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.InputEvent#isMultiple <em>Multiple</em>}</li>
- * </ul>
- *
- * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage#getInputEvent()
- * @model
- * @generated
- */
-public interface InputEvent extends EventDeclaration
-{
-  /**
-   * Returns the value of the '<em><b>Multiple</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Multiple</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Multiple</em>' attribute.
-   * @see #setMultiple(boolean)
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage#getInputEvent_Multiple()
-   * @model
-   * @generated
-   */
-  boolean isMultiple();
-
-  /**
-   * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.InputEvent#isMultiple <em>Multiple</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Multiple</em>' attribute.
-   * @see #isMultiple()
-   * @generated
-   */
-  void setMultiple(boolean value);
-
-} // InputEvent
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/OrGate.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/OrGate.java
deleted file mode 100644
index 44a2bc07..00000000
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/OrGate.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.16.0
- */
-package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Or Gate</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage#getOrGate()
- * @model
- * @generated
- */
-public interface OrGate extends GateDefinition
-{
-} // OrGate
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/AndGateImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/AndGateImpl.java
deleted file mode 100644
index d38a9fcd..00000000
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/AndGateImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * generated by Xtext 2.16.0
- */
-package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl;
-
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.AndGate;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>And Gate</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class AndGateImpl extends GateDefinitionImpl implements AndGate
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected AndGateImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return CftLanguagePackage.Literals.AND_GATE;
-  }
-
-} //AndGateImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/BasicEventDefinitionImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/BasicEventDefinitionImpl.java
deleted file mode 100644
index 34c865c3..00000000
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/BasicEventDefinitionImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * generated by Xtext 2.16.0
- */
-package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl;
-
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.BasicEventDefinition;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Basic Event Definition</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.BasicEventDefinitionImpl#getRate <em>Rate</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class BasicEventDefinitionImpl extends EventDefinitionImpl implements BasicEventDefinition
-{
-  /**
-   * The default value of the '{@link #getRate() <em>Rate</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getRate()
-   * @generated
-   * @ordered
-   */
-  protected static final double RATE_EDEFAULT = 0.0;
-
-  /**
-   * The cached value of the '{@link #getRate() <em>Rate</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getRate()
-   * @generated
-   * @ordered
-   */
-  protected double rate = RATE_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected BasicEventDefinitionImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return CftLanguagePackage.Literals.BASIC_EVENT_DEFINITION;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public double getRate()
-  {
-    return rate;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setRate(double newRate)
-  {
-    double oldRate = rate;
-    rate = newRate;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, CftLanguagePackage.BASIC_EVENT_DEFINITION__RATE, oldRate, rate));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.BASIC_EVENT_DEFINITION__RATE:
-        return getRate();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.BASIC_EVENT_DEFINITION__RATE:
-        setRate((Double)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.BASIC_EVENT_DEFINITION__RATE:
-        setRate(RATE_EDEFAULT);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.BASIC_EVENT_DEFINITION__RATE:
-        return rate != RATE_EDEFAULT;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuilder result = new StringBuilder(super.toString());
-    result.append(" (rate: ");
-    result.append(rate);
-    result.append(')');
-    return result.toString();
-  }
-
-} //BasicEventDefinitionImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/CftLanguageFactoryImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/CftLanguageFactoryImpl.java
index 04b066b2..db604384 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/CftLanguageFactoryImpl.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/CftLanguageFactoryImpl.java
@@ -67,14 +67,6 @@ public class CftLanguageFactoryImpl extends EFactoryImpl implements CftLanguageF
     {
       case CftLanguagePackage.CFT_MODEL: return createCftModel();
       case CftLanguagePackage.IMPORT_DECLARATION: return createImportDeclaration();
-      case CftLanguagePackage.COMPONENT_DEFINITION: return createComponentDefinition();
-      case CftLanguagePackage.EVENT_DECLARATION: return createEventDeclaration();
-      case CftLanguagePackage.INPUT_EVENT: return createInputEvent();
-      case CftLanguagePackage.EVENT_DEFINITION: return createEventDefinition();
-      case CftLanguagePackage.BASIC_EVENT_DEFINITION: return createBasicEventDefinition();
-      case CftLanguagePackage.GATE_DEFINITION: return createGateDefinition();
-      case CftLanguagePackage.AND_GATE: return createAndGate();
-      case CftLanguagePackage.OR_GATE: return createOrGate();
       case CftLanguagePackage.TRANSFORMATION_DEFINITION: return createTransformationDefinition();
       case CftLanguagePackage.MAPPING_DEFINITION: return createMappingDefinition();
       case CftLanguagePackage.MAPPING_PARAMETER: return createMappingParameter();
@@ -118,102 +110,6 @@ public class CftLanguageFactoryImpl extends EFactoryImpl implements CftLanguageF
    * @generated
    */
   @Override
-  public ComponentDefinition createComponentDefinition()
-  {
-    ComponentDefinitionImpl componentDefinition = new ComponentDefinitionImpl();
-    return componentDefinition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EventDeclaration createEventDeclaration()
-  {
-    EventDeclarationImpl eventDeclaration = new EventDeclarationImpl();
-    return eventDeclaration;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public InputEvent createInputEvent()
-  {
-    InputEventImpl inputEvent = new InputEventImpl();
-    return inputEvent;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EventDefinition createEventDefinition()
-  {
-    EventDefinitionImpl eventDefinition = new EventDefinitionImpl();
-    return eventDefinition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public BasicEventDefinition createBasicEventDefinition()
-  {
-    BasicEventDefinitionImpl basicEventDefinition = new BasicEventDefinitionImpl();
-    return basicEventDefinition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public GateDefinition createGateDefinition()
-  {
-    GateDefinitionImpl gateDefinition = new GateDefinitionImpl();
-    return gateDefinition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public AndGate createAndGate()
-  {
-    AndGateImpl andGate = new AndGateImpl();
-    return andGate;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public OrGate createOrGate()
-  {
-    OrGateImpl orGate = new OrGateImpl();
-    return orGate;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
   public TransformationDefinition createTransformationDefinition()
   {
     TransformationDefinitionImpl transformationDefinition = new TransformationDefinitionImpl();
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/CftLanguagePackageImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/CftLanguagePackageImpl.java
index 95520ab8..d4e06dde 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/CftLanguagePackageImpl.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/CftLanguagePackageImpl.java
@@ -3,27 +3,23 @@
  */
 package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl;
 
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.AndGate;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.Assignment;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.BasicEventDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguageFactory;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftModel;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentInstance;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDeclaration;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventReference;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.GateDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ImportDeclaration;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.InputEvent;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.LookupDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.MappingDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.MappingParameter;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.OrGate;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.TransformationDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.Variable;
 
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage;
+
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
@@ -67,62 +63,6 @@ public class CftLanguagePackageImpl extends EPackageImpl implements CftLanguageP
    * <!-- end-user-doc -->
    * @generated
    */
-  private EClass componentDefinitionEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass eventDeclarationEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass inputEventEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass eventDefinitionEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass basicEventDefinitionEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass gateDefinitionEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass andGateEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass orGateEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
   private EClass transformationDefinitionEClass = null;
 
   /**
@@ -224,8 +164,10 @@ public class CftLanguagePackageImpl extends EPackageImpl implements CftLanguageP
     isInited = true;
 
     // Initialize simple dependencies
+    CftPackage.eINSTANCE.eClass();
     EcorePackage.eINSTANCE.eClass();
     PatternLanguagePackage.eINSTANCE.eClass();
+    FtPackage.eINSTANCE.eClass();
     XtypePackage.eINSTANCE.eClass();
     TypesPackage.eINSTANCE.eClass();
     XbasePackage.eINSTANCE.eClass();
@@ -327,182 +269,6 @@ public class CftLanguagePackageImpl extends EPackageImpl implements CftLanguageP
    * @generated
    */
   @Override
-  public EClass getComponentDefinition()
-  {
-    return componentDefinitionEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EAttribute getComponentDefinition_Name()
-  {
-    return (EAttribute)componentDefinitionEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EReference getComponentDefinition_InputEvents()
-  {
-    return (EReference)componentDefinitionEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EReference getComponentDefinition_OutputEvents()
-  {
-    return (EReference)componentDefinitionEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EReference getComponentDefinition_EventDefinitions()
-  {
-    return (EReference)componentDefinitionEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EClass getEventDeclaration()
-  {
-    return eventDeclarationEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EAttribute getEventDeclaration_Name()
-  {
-    return (EAttribute)eventDeclarationEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EClass getInputEvent()
-  {
-    return inputEventEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EAttribute getInputEvent_Multiple()
-  {
-    return (EAttribute)inputEventEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EClass getEventDefinition()
-  {
-    return eventDefinitionEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EClass getBasicEventDefinition()
-  {
-    return basicEventDefinitionEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EAttribute getBasicEventDefinition_Rate()
-  {
-    return (EAttribute)basicEventDefinitionEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EClass getGateDefinition()
-  {
-    return gateDefinitionEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EReference getGateDefinition_InputEvents()
-  {
-    return (EReference)gateDefinitionEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EClass getAndGate()
-  {
-    return andGateEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EClass getOrGate()
-  {
-    return orGateEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
   public EClass getTransformationDefinition()
   {
     return transformationDefinitionEClass;
@@ -823,30 +589,6 @@ public class CftLanguagePackageImpl extends EPackageImpl implements CftLanguageP
     importDeclarationEClass = createEClass(IMPORT_DECLARATION);
     createEAttribute(importDeclarationEClass, IMPORT_DECLARATION__IMPORTED_NAMESPACE);
 
-    componentDefinitionEClass = createEClass(COMPONENT_DEFINITION);
-    createEAttribute(componentDefinitionEClass, COMPONENT_DEFINITION__NAME);
-    createEReference(componentDefinitionEClass, COMPONENT_DEFINITION__INPUT_EVENTS);
-    createEReference(componentDefinitionEClass, COMPONENT_DEFINITION__OUTPUT_EVENTS);
-    createEReference(componentDefinitionEClass, COMPONENT_DEFINITION__EVENT_DEFINITIONS);
-
-    eventDeclarationEClass = createEClass(EVENT_DECLARATION);
-    createEAttribute(eventDeclarationEClass, EVENT_DECLARATION__NAME);
-
-    inputEventEClass = createEClass(INPUT_EVENT);
-    createEAttribute(inputEventEClass, INPUT_EVENT__MULTIPLE);
-
-    eventDefinitionEClass = createEClass(EVENT_DEFINITION);
-
-    basicEventDefinitionEClass = createEClass(BASIC_EVENT_DEFINITION);
-    createEAttribute(basicEventDefinitionEClass, BASIC_EVENT_DEFINITION__RATE);
-
-    gateDefinitionEClass = createEClass(GATE_DEFINITION);
-    createEReference(gateDefinitionEClass, GATE_DEFINITION__INPUT_EVENTS);
-
-    andGateEClass = createEClass(AND_GATE);
-
-    orGateEClass = createEClass(OR_GATE);
-
     transformationDefinitionEClass = createEClass(TRANSFORMATION_DEFINITION);
     createEAttribute(transformationDefinitionEClass, TRANSFORMATION_DEFINITION__NAME);
     createEReference(transformationDefinitionEClass, TRANSFORMATION_DEFINITION__MAPPING_DEFINITIONS);
@@ -908,6 +650,7 @@ public class CftLanguagePackageImpl extends EPackageImpl implements CftLanguageP
 
     // Obtain other dependent packages
     EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+    CftPackage theCftPackage = (CftPackage)EPackage.Registry.INSTANCE.getEPackage(CftPackage.eNS_URI);
     PatternLanguagePackage thePatternLanguagePackage = (PatternLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(PatternLanguagePackage.eNS_URI);
 
     // Create type parameters
@@ -915,12 +658,6 @@ public class CftLanguagePackageImpl extends EPackageImpl implements CftLanguageP
     // Set bounds for type parameters
 
     // Add supertypes to classes
-    inputEventEClass.getESuperTypes().add(this.getEventDeclaration());
-    eventDefinitionEClass.getESuperTypes().add(this.getEventDeclaration());
-    basicEventDefinitionEClass.getESuperTypes().add(this.getEventDefinition());
-    gateDefinitionEClass.getESuperTypes().add(this.getEventDefinition());
-    andGateEClass.getESuperTypes().add(this.getGateDefinition());
-    orGateEClass.getESuperTypes().add(this.getGateDefinition());
     lookupDefinitionEClass.getESuperTypes().add(this.getVariable());
     componentInstanceEClass.getESuperTypes().add(this.getVariable());
 
@@ -928,36 +665,12 @@ public class CftLanguagePackageImpl extends EPackageImpl implements CftLanguageP
     initEClass(cftModelEClass, CftModel.class, "CftModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getCftModel_PackageName(), theEcorePackage.getEString(), "packageName", null, 0, 1, CftModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getCftModel_Imports(), this.getImportDeclaration(), null, "imports", null, 0, -1, CftModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCftModel_ComponentDefinitions(), this.getComponentDefinition(), null, "componentDefinitions", null, 0, -1, CftModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCftModel_ComponentDefinitions(), theCftPackage.getComponentDefinition(), null, "componentDefinitions", null, 0, -1, CftModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getCftModel_TransformationDefinitions(), this.getTransformationDefinition(), null, "transformationDefinitions", null, 0, -1, CftModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(importDeclarationEClass, ImportDeclaration.class, "ImportDeclaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getImportDeclaration_ImportedNamespace(), theEcorePackage.getEString(), "importedNamespace", null, 0, 1, ImportDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(componentDefinitionEClass, ComponentDefinition.class, "ComponentDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getComponentDefinition_Name(), theEcorePackage.getEString(), "name", null, 0, 1, ComponentDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getComponentDefinition_InputEvents(), this.getInputEvent(), null, "inputEvents", null, 0, -1, ComponentDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getComponentDefinition_OutputEvents(), this.getEventDeclaration(), null, "outputEvents", null, 0, -1, ComponentDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getComponentDefinition_EventDefinitions(), this.getEventDefinition(), null, "eventDefinitions", null, 0, -1, ComponentDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(eventDeclarationEClass, EventDeclaration.class, "EventDeclaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getEventDeclaration_Name(), theEcorePackage.getEString(), "name", null, 0, 1, EventDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(inputEventEClass, InputEvent.class, "InputEvent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getInputEvent_Multiple(), theEcorePackage.getEBoolean(), "multiple", null, 0, 1, InputEvent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(eventDefinitionEClass, EventDefinition.class, "EventDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(basicEventDefinitionEClass, BasicEventDefinition.class, "BasicEventDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getBasicEventDefinition_Rate(), theEcorePackage.getEDouble(), "rate", null, 0, 1, BasicEventDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(gateDefinitionEClass, GateDefinition.class, "GateDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getGateDefinition_InputEvents(), this.getEventDeclaration(), null, "inputEvents", null, 0, -1, GateDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(andGateEClass, AndGate.class, "AndGate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(orGateEClass, OrGate.class, "OrGate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
     initEClass(transformationDefinitionEClass, TransformationDefinition.class, "TransformationDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getTransformationDefinition_Name(), theEcorePackage.getEString(), "name", null, 0, 1, TransformationDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getTransformationDefinition_MappingDefinitions(), this.getMappingDefinition(), null, "mappingDefinitions", null, 0, -1, TransformationDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -987,10 +700,10 @@ public class CftLanguagePackageImpl extends EPackageImpl implements CftLanguageP
 
     initEClass(eventReferenceEClass, EventReference.class, "EventReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getEventReference_Component(), this.getVariable(), null, "component", null, 0, 1, EventReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getEventReference_Event(), this.getEventDeclaration(), null, "event", null, 0, 1, EventReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getEventReference_Event(), theCftPackage.getEventDeclaration(), null, "event", null, 0, 1, EventReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(componentInstanceEClass, ComponentInstance.class, "ComponentInstance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getComponentInstance_ComponentType(), this.getComponentDefinition(), null, "componentType", null, 0, 1, ComponentInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getComponentInstance_ComponentType(), theCftPackage.getComponentDefinition(), null, "componentType", null, 0, 1, ComponentInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Create resource
     createResource(eNS_URI);
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/CftModelImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/CftModelImpl.java
index b51f54ab..1a5a8c16 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/CftModelImpl.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/CftModelImpl.java
@@ -5,10 +5,11 @@ package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl;
 
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftModel;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ImportDeclaration;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.TransformationDefinition;
 
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition;
+
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/ComponentDefinitionImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/ComponentDefinitionImpl.java
deleted file mode 100644
index 4633d839..00000000
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/ComponentDefinitionImpl.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/**
- * generated by Xtext 2.16.0
- */
-package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl;
-
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDeclaration;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDefinition;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.InputEvent;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Component Definition</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.ComponentDefinitionImpl#getName <em>Name</em>}</li>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.ComponentDefinitionImpl#getInputEvents <em>Input Events</em>}</li>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.ComponentDefinitionImpl#getOutputEvents <em>Output Events</em>}</li>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.ComponentDefinitionImpl#getEventDefinitions <em>Event Definitions</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class ComponentDefinitionImpl extends MinimalEObjectImpl.Container implements ComponentDefinition
-{
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getInputEvents() <em>Input Events</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getInputEvents()
-   * @generated
-   * @ordered
-   */
-  protected EList<InputEvent> inputEvents;
-
-  /**
-   * The cached value of the '{@link #getOutputEvents() <em>Output Events</em>}' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getOutputEvents()
-   * @generated
-   * @ordered
-   */
-  protected EList<EventDeclaration> outputEvents;
-
-  /**
-   * The cached value of the '{@link #getEventDefinitions() <em>Event Definitions</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEventDefinitions()
-   * @generated
-   * @ordered
-   */
-  protected EList<EventDefinition> eventDefinitions;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ComponentDefinitionImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return CftLanguagePackage.Literals.COMPONENT_DEFINITION;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, CftLanguagePackage.COMPONENT_DEFINITION__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EList<InputEvent> getInputEvents()
-  {
-    if (inputEvents == null)
-    {
-      inputEvents = new EObjectContainmentEList<InputEvent>(InputEvent.class, this, CftLanguagePackage.COMPONENT_DEFINITION__INPUT_EVENTS);
-    }
-    return inputEvents;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EList<EventDeclaration> getOutputEvents()
-  {
-    if (outputEvents == null)
-    {
-      outputEvents = new EObjectResolvingEList<EventDeclaration>(EventDeclaration.class, this, CftLanguagePackage.COMPONENT_DEFINITION__OUTPUT_EVENTS);
-    }
-    return outputEvents;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EList<EventDefinition> getEventDefinitions()
-  {
-    if (eventDefinitions == null)
-    {
-      eventDefinitions = new EObjectContainmentEList<EventDefinition>(EventDefinition.class, this, CftLanguagePackage.COMPONENT_DEFINITION__EVENT_DEFINITIONS);
-    }
-    return eventDefinitions;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.COMPONENT_DEFINITION__INPUT_EVENTS:
-        return ((InternalEList<?>)getInputEvents()).basicRemove(otherEnd, msgs);
-      case CftLanguagePackage.COMPONENT_DEFINITION__EVENT_DEFINITIONS:
-        return ((InternalEList<?>)getEventDefinitions()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.COMPONENT_DEFINITION__NAME:
-        return getName();
-      case CftLanguagePackage.COMPONENT_DEFINITION__INPUT_EVENTS:
-        return getInputEvents();
-      case CftLanguagePackage.COMPONENT_DEFINITION__OUTPUT_EVENTS:
-        return getOutputEvents();
-      case CftLanguagePackage.COMPONENT_DEFINITION__EVENT_DEFINITIONS:
-        return getEventDefinitions();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.COMPONENT_DEFINITION__NAME:
-        setName((String)newValue);
-        return;
-      case CftLanguagePackage.COMPONENT_DEFINITION__INPUT_EVENTS:
-        getInputEvents().clear();
-        getInputEvents().addAll((Collection<? extends InputEvent>)newValue);
-        return;
-      case CftLanguagePackage.COMPONENT_DEFINITION__OUTPUT_EVENTS:
-        getOutputEvents().clear();
-        getOutputEvents().addAll((Collection<? extends EventDeclaration>)newValue);
-        return;
-      case CftLanguagePackage.COMPONENT_DEFINITION__EVENT_DEFINITIONS:
-        getEventDefinitions().clear();
-        getEventDefinitions().addAll((Collection<? extends EventDefinition>)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.COMPONENT_DEFINITION__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case CftLanguagePackage.COMPONENT_DEFINITION__INPUT_EVENTS:
-        getInputEvents().clear();
-        return;
-      case CftLanguagePackage.COMPONENT_DEFINITION__OUTPUT_EVENTS:
-        getOutputEvents().clear();
-        return;
-      case CftLanguagePackage.COMPONENT_DEFINITION__EVENT_DEFINITIONS:
-        getEventDefinitions().clear();
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.COMPONENT_DEFINITION__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case CftLanguagePackage.COMPONENT_DEFINITION__INPUT_EVENTS:
-        return inputEvents != null && !inputEvents.isEmpty();
-      case CftLanguagePackage.COMPONENT_DEFINITION__OUTPUT_EVENTS:
-        return outputEvents != null && !outputEvents.isEmpty();
-      case CftLanguagePackage.COMPONENT_DEFINITION__EVENT_DEFINITIONS:
-        return eventDefinitions != null && !eventDefinitions.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuilder result = new StringBuilder(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-} //ComponentDefinitionImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/ComponentInstanceImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/ComponentInstanceImpl.java
index 5966e55c..d1c22199 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/ComponentInstanceImpl.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/ComponentInstanceImpl.java
@@ -4,9 +4,10 @@
 package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl;
 
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentInstance;
 
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition;
+
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.ecore.EClass;
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/EventDeclarationImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/EventDeclarationImpl.java
deleted file mode 100644
index c9964c20..00000000
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/EventDeclarationImpl.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/**
- * generated by Xtext 2.16.0
- */
-package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl;
-
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDeclaration;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Event Declaration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.EventDeclarationImpl#getName <em>Name</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class EventDeclarationImpl extends MinimalEObjectImpl.Container implements EventDeclaration
-{
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EventDeclarationImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return CftLanguagePackage.Literals.EVENT_DECLARATION;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, CftLanguagePackage.EVENT_DECLARATION__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.EVENT_DECLARATION__NAME:
-        return getName();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.EVENT_DECLARATION__NAME:
-        setName((String)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.EVENT_DECLARATION__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.EVENT_DECLARATION__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuilder result = new StringBuilder(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-} //EventDeclarationImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/EventDefinitionImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/EventDefinitionImpl.java
deleted file mode 100644
index 0c03504b..00000000
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/EventDefinitionImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * generated by Xtext 2.16.0
- */
-package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl;
-
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDefinition;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Event Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class EventDefinitionImpl extends EventDeclarationImpl implements EventDefinition
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EventDefinitionImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return CftLanguagePackage.Literals.EVENT_DEFINITION;
-  }
-
-} //EventDefinitionImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/EventReferenceImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/EventReferenceImpl.java
index f10ae8a2..2f4835a3 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/EventReferenceImpl.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/EventReferenceImpl.java
@@ -4,10 +4,11 @@
 package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl;
 
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDeclaration;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventReference;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.Variable;
 
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration;
+
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.ecore.EClass;
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/GateDefinitionImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/GateDefinitionImpl.java
deleted file mode 100644
index 76b12fc2..00000000
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/GateDefinitionImpl.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * generated by Xtext 2.16.0
- */
-package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl;
-
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDeclaration;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.GateDefinition;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Gate Definition</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.GateDefinitionImpl#getInputEvents <em>Input Events</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class GateDefinitionImpl extends EventDefinitionImpl implements GateDefinition
-{
-  /**
-   * The cached value of the '{@link #getInputEvents() <em>Input Events</em>}' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getInputEvents()
-   * @generated
-   * @ordered
-   */
-  protected EList<EventDeclaration> inputEvents;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected GateDefinitionImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return CftLanguagePackage.Literals.GATE_DEFINITION;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EList<EventDeclaration> getInputEvents()
-  {
-    if (inputEvents == null)
-    {
-      inputEvents = new EObjectResolvingEList<EventDeclaration>(EventDeclaration.class, this, CftLanguagePackage.GATE_DEFINITION__INPUT_EVENTS);
-    }
-    return inputEvents;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.GATE_DEFINITION__INPUT_EVENTS:
-        return getInputEvents();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.GATE_DEFINITION__INPUT_EVENTS:
-        getInputEvents().clear();
-        getInputEvents().addAll((Collection<? extends EventDeclaration>)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.GATE_DEFINITION__INPUT_EVENTS:
-        getInputEvents().clear();
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.GATE_DEFINITION__INPUT_EVENTS:
-        return inputEvents != null && !inputEvents.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-} //GateDefinitionImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/InputEventImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/InputEventImpl.java
deleted file mode 100644
index edb03bdc..00000000
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/InputEventImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * generated by Xtext 2.16.0
- */
-package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl;
-
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.InputEvent;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Input Event</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl.InputEventImpl#isMultiple <em>Multiple</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class InputEventImpl extends EventDeclarationImpl implements InputEvent
-{
-  /**
-   * The default value of the '{@link #isMultiple() <em>Multiple</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isMultiple()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean MULTIPLE_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isMultiple() <em>Multiple</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isMultiple()
-   * @generated
-   * @ordered
-   */
-  protected boolean multiple = MULTIPLE_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected InputEventImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return CftLanguagePackage.Literals.INPUT_EVENT;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean isMultiple()
-  {
-    return multiple;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setMultiple(boolean newMultiple)
-  {
-    boolean oldMultiple = multiple;
-    multiple = newMultiple;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, CftLanguagePackage.INPUT_EVENT__MULTIPLE, oldMultiple, multiple));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.INPUT_EVENT__MULTIPLE:
-        return isMultiple();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.INPUT_EVENT__MULTIPLE:
-        setMultiple((Boolean)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.INPUT_EVENT__MULTIPLE:
-        setMultiple(MULTIPLE_EDEFAULT);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case CftLanguagePackage.INPUT_EVENT__MULTIPLE:
-        return multiple != MULTIPLE_EDEFAULT;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuilder result = new StringBuilder(super.toString());
-    result.append(" (multiple: ");
-    result.append(multiple);
-    result.append(')');
-    return result.toString();
-  }
-
-} //InputEventImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/OrGateImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/OrGateImpl.java
deleted file mode 100644
index eaaf1686..00000000
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/impl/OrGateImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * generated by Xtext 2.16.0
- */
-package hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.impl;
-
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.OrGate;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Or Gate</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class OrGateImpl extends GateDefinitionImpl implements OrGate
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected OrGateImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return CftLanguagePackage.Literals.OR_GATE;
-  }
-
-} //OrGateImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/util/CftLanguageAdapterFactory.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/util/CftLanguageAdapterFactory.java
index 035b1191..99fa656d 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/util/CftLanguageAdapterFactory.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/util/CftLanguageAdapterFactory.java
@@ -86,46 +86,6 @@ public class CftLanguageAdapterFactory extends AdapterFactoryImpl
         return createImportDeclarationAdapter();
       }
       @Override
-      public Adapter caseComponentDefinition(ComponentDefinition object)
-      {
-        return createComponentDefinitionAdapter();
-      }
-      @Override
-      public Adapter caseEventDeclaration(EventDeclaration object)
-      {
-        return createEventDeclarationAdapter();
-      }
-      @Override
-      public Adapter caseInputEvent(InputEvent object)
-      {
-        return createInputEventAdapter();
-      }
-      @Override
-      public Adapter caseEventDefinition(EventDefinition object)
-      {
-        return createEventDefinitionAdapter();
-      }
-      @Override
-      public Adapter caseBasicEventDefinition(BasicEventDefinition object)
-      {
-        return createBasicEventDefinitionAdapter();
-      }
-      @Override
-      public Adapter caseGateDefinition(GateDefinition object)
-      {
-        return createGateDefinitionAdapter();
-      }
-      @Override
-      public Adapter caseAndGate(AndGate object)
-      {
-        return createAndGateAdapter();
-      }
-      @Override
-      public Adapter caseOrGate(OrGate object)
-      {
-        return createOrGateAdapter();
-      }
-      @Override
       public Adapter caseTransformationDefinition(TransformationDefinition object)
       {
         return createTransformationDefinitionAdapter();
@@ -218,126 +178,6 @@ public class CftLanguageAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition <em>Component Definition</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition
-   * @generated
-   */
-  public Adapter createComponentDefinitionAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDeclaration <em>Event Declaration</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDeclaration
-   * @generated
-   */
-  public Adapter createEventDeclarationAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.InputEvent <em>Input Event</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.InputEvent
-   * @generated
-   */
-  public Adapter createInputEventAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDefinition <em>Event Definition</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDefinition
-   * @generated
-   */
-  public Adapter createEventDefinitionAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.BasicEventDefinition <em>Basic Event Definition</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.BasicEventDefinition
-   * @generated
-   */
-  public Adapter createBasicEventDefinitionAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.GateDefinition <em>Gate Definition</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.GateDefinition
-   * @generated
-   */
-  public Adapter createGateDefinitionAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.AndGate <em>And Gate</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.AndGate
-   * @generated
-   */
-  public Adapter createAndGateAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.OrGate <em>Or Gate</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.OrGate
-   * @generated
-   */
-  public Adapter createOrGateAdapter()
-  {
-    return null;
-  }
-
-  /**
    * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.TransformationDefinition <em>Transformation Definition</em>}'.
    * <!-- begin-user-doc -->
    * This default implementation returns null so that we can easily ignore cases;
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/util/CftLanguageSwitch.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/util/CftLanguageSwitch.java
index 29266601..b3de106b 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/util/CftLanguageSwitch.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/cftLanguage/util/CftLanguageSwitch.java
@@ -87,74 +87,6 @@ public class CftLanguageSwitch<T> extends Switch<T>
         if (result == null) result = defaultCase(theEObject);
         return result;
       }
-      case CftLanguagePackage.COMPONENT_DEFINITION:
-      {
-        ComponentDefinition componentDefinition = (ComponentDefinition)theEObject;
-        T result = caseComponentDefinition(componentDefinition);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case CftLanguagePackage.EVENT_DECLARATION:
-      {
-        EventDeclaration eventDeclaration = (EventDeclaration)theEObject;
-        T result = caseEventDeclaration(eventDeclaration);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case CftLanguagePackage.INPUT_EVENT:
-      {
-        InputEvent inputEvent = (InputEvent)theEObject;
-        T result = caseInputEvent(inputEvent);
-        if (result == null) result = caseEventDeclaration(inputEvent);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case CftLanguagePackage.EVENT_DEFINITION:
-      {
-        EventDefinition eventDefinition = (EventDefinition)theEObject;
-        T result = caseEventDefinition(eventDefinition);
-        if (result == null) result = caseEventDeclaration(eventDefinition);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case CftLanguagePackage.BASIC_EVENT_DEFINITION:
-      {
-        BasicEventDefinition basicEventDefinition = (BasicEventDefinition)theEObject;
-        T result = caseBasicEventDefinition(basicEventDefinition);
-        if (result == null) result = caseEventDefinition(basicEventDefinition);
-        if (result == null) result = caseEventDeclaration(basicEventDefinition);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case CftLanguagePackage.GATE_DEFINITION:
-      {
-        GateDefinition gateDefinition = (GateDefinition)theEObject;
-        T result = caseGateDefinition(gateDefinition);
-        if (result == null) result = caseEventDefinition(gateDefinition);
-        if (result == null) result = caseEventDeclaration(gateDefinition);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case CftLanguagePackage.AND_GATE:
-      {
-        AndGate andGate = (AndGate)theEObject;
-        T result = caseAndGate(andGate);
-        if (result == null) result = caseGateDefinition(andGate);
-        if (result == null) result = caseEventDefinition(andGate);
-        if (result == null) result = caseEventDeclaration(andGate);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case CftLanguagePackage.OR_GATE:
-      {
-        OrGate orGate = (OrGate)theEObject;
-        T result = caseOrGate(orGate);
-        if (result == null) result = caseGateDefinition(orGate);
-        if (result == null) result = caseEventDefinition(orGate);
-        if (result == null) result = caseEventDeclaration(orGate);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
       case CftLanguagePackage.TRANSFORMATION_DEFINITION:
       {
         TransformationDefinition transformationDefinition = (TransformationDefinition)theEObject;
@@ -250,134 +182,6 @@ public class CftLanguageSwitch<T> extends Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Component Definition</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Component Definition</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseComponentDefinition(ComponentDefinition object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Event Declaration</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Event Declaration</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseEventDeclaration(EventDeclaration object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Input Event</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Input Event</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseInputEvent(InputEvent object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Event Definition</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Event Definition</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseEventDefinition(EventDefinition object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Basic Event Definition</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Basic Event Definition</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseBasicEventDefinition(BasicEventDefinition object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Gate Definition</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Gate Definition</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseGateDefinition(GateDefinition object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>And Gate</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>And Gate</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseAndGate(AndGate object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Or Gate</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Or Gate</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseOrGate(OrGate object)
-  {
-    return null;
-  }
-
-  /**
    * Returns the result of interpreting the object as an instance of '<em>Transformation Definition</em>'.
    * <!-- begin-user-doc -->
    * This implementation returns null;
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguage.g b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguage.g
index ff509b0a..2d1b9490 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguage.g
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguage.g
@@ -238,19 +238,20 @@ ruleComponentDefinition returns [EObject current=null]
                 }
                 (
                         (
-                                lv_name_1_0=RULE_ID
                                 {
-                                        newLeafNode(lv_name_1_0, grammarAccess.getComponentDefinitionAccess().getNameIDTerminalRuleCall_1_0());
+                                        newCompositeNode(grammarAccess.getComponentDefinitionAccess().getNameValidIdParserRuleCall_1_0());
                                 }
+                                lv_name_1_0=ruleValidId
                                 {
                                         if ($current==null) {
-                                                $current = createModelElement(grammarAccess.getComponentDefinitionRule());
+                                                $current = createModelElementForParent(grammarAccess.getComponentDefinitionRule());
                                         }
-                                        setWithLastConsumed(
+                                        set(
                                                 $current,
                                                 "name",
                                                 lv_name_1_0,
-                                                "org.eclipse.xtext.common.Terminals.ID");
+                                                "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
                 )
@@ -319,9 +320,12 @@ ruleComponentDefinition returns [EObject current=null]
                                                                                                 $current = createModelElement(grammarAccess.getComponentDefinitionRule());
                                                                                         }
                                                                                 }
-                                                                                otherlv_8=RULE_ID
                                                                                 {
-                                                                                        newLeafNode(otherlv_8, grammarAccess.getComponentDefinitionAccess().getOutputEventsEventDeclarationCrossReference_3_1_1_0());
+                                                                                        newCompositeNode(grammarAccess.getComponentDefinitionAccess().getOutputEventsEventDeclarationCrossReference_3_1_1_0());
+                                                                                }
+                                                                                ruleValidId
+                                                                                {
+                                                                                        afterParserOrEnumRuleCall();
                                                                                 }
                                                                         )
                                                                 )*
@@ -392,19 +396,20 @@ ruleInputEvent returns [EObject current=null]
         (
                 (
                         (
-                                lv_name_0_0=RULE_ID
                                 {
-                                        newLeafNode(lv_name_0_0, grammarAccess.getInputEventAccess().getNameIDTerminalRuleCall_0_0());
+                                        newCompositeNode(grammarAccess.getInputEventAccess().getNameValidIdParserRuleCall_0_0());
                                 }
+                                lv_name_0_0=ruleValidId
                                 {
                                         if ($current==null) {
-                                                $current = createModelElement(grammarAccess.getInputEventRule());
+                                                $current = createModelElementForParent(grammarAccess.getInputEventRule());
                                         }
-                                        setWithLastConsumed(
+                                        set(
                                                 $current,
                                                 "name",
                                                 lv_name_0_0,
-                                                "org.eclipse.xtext.common.Terminals.ID");
+                                                "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
                 )
@@ -479,45 +484,167 @@ ruleBasicEventDefinition returns [EObject current=null]
         (
                 (
                         (
-                                lv_name_0_0=RULE_ID
                                 {
-                                        newLeafNode(lv_name_0_0, grammarAccess.getBasicEventDefinitionAccess().getNameIDTerminalRuleCall_0_0());
+                                        newCompositeNode(grammarAccess.getBasicEventDefinitionAccess().getNameValidIdParserRuleCall_0_0());
                                 }
+                                lv_name_0_0=ruleValidId
                                 {
                                         if ($current==null) {
-                                                $current = createModelElement(grammarAccess.getBasicEventDefinitionRule());
+                                                $current = createModelElementForParent(grammarAccess.getBasicEventDefinitionRule());
                                         }
-                                        setWithLastConsumed(
+                                        set(
                                                 $current,
                                                 "name",
                                                 lv_name_0_0,
-                                                "org.eclipse.xtext.common.Terminals.ID");
+                                                "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                                        afterParserOrEnumRuleCall();
+                                }
+                        )
+                )
+                (
+                        (
+                                {
+                                        newCompositeNode(grammarAccess.getBasicEventDefinitionAccess().getDistributionDistributionParserRuleCall_1_0());
+                                }
+                                lv_distribution_1_0=ruleDistribution
+                                {
+                                        if ($current==null) {
+                                                $current = createModelElementForParent(grammarAccess.getBasicEventDefinitionRule());
+                                        }
+                                        set(
+                                                $current,
+                                                "distribution",
+                                                lv_distribution_1_0,
+                                                "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.Distribution");
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
                 )
-                otherlv_1='lambda'
+        )
+;
+
+// Entry rule entryRuleDistribution
+entryRuleDistribution returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getDistributionRule()); }
+        iv_ruleDistribution=ruleDistribution
+        { $current=$iv_ruleDistribution.current; }
+        EOF;
+
+// Rule Distribution
+ruleDistribution returns [EObject current=null]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                {
+                        newCompositeNode(grammarAccess.getDistributionAccess().getConstantDistributionParserRuleCall_0());
+                }
+                this_ConstantDistribution_0=ruleConstantDistribution
+                {
+                        $current = $this_ConstantDistribution_0.current;
+                        afterParserOrEnumRuleCall();
+                }
+                    |
+                {
+                        newCompositeNode(grammarAccess.getDistributionAccess().getExponentialDistributionParserRuleCall_1());
+                }
+                this_ExponentialDistribution_1=ruleExponentialDistribution
+                {
+                        $current = $this_ExponentialDistribution_1.current;
+                        afterParserOrEnumRuleCall();
+                }
+        )
+;
+
+// Entry rule entryRuleConstantDistribution
+entryRuleConstantDistribution returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getConstantDistributionRule()); }
+        iv_ruleConstantDistribution=ruleConstantDistribution
+        { $current=$iv_ruleConstantDistribution.current; }
+        EOF;
+
+// Rule ConstantDistribution
+ruleConstantDistribution returns [EObject current=null]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                otherlv_0='p'
                 {
-                        newLeafNode(otherlv_1, grammarAccess.getBasicEventDefinitionAccess().getLambdaKeyword_1());
+                        newLeafNode(otherlv_0, grammarAccess.getConstantDistributionAccess().getPKeyword_0());
                 }
-                otherlv_2='='
+                otherlv_1='='
                 {
-                        newLeafNode(otherlv_2, grammarAccess.getBasicEventDefinitionAccess().getEqualsSignKeyword_2());
+                        newLeafNode(otherlv_1, grammarAccess.getConstantDistributionAccess().getEqualsSignKeyword_1());
                 }
                 (
                         (
-                                lv_rate_3_0=RULE_DOULBE
                                 {
-                                        newLeafNode(lv_rate_3_0, grammarAccess.getBasicEventDefinitionAccess().getRateDOULBETerminalRuleCall_3_0());
+                                        newCompositeNode(grammarAccess.getConstantDistributionAccess().getPDoubleParserRuleCall_2_0());
                                 }
+                                lv_p_2_0=ruleDouble
                                 {
                                         if ($current==null) {
-                                                $current = createModelElement(grammarAccess.getBasicEventDefinitionRule());
+                                                $current = createModelElementForParent(grammarAccess.getConstantDistributionRule());
                                         }
-                                        setWithLastConsumed(
+                                        set(
+                                                $current,
+                                                "p",
+                                                lv_p_2_0,
+                                                "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.Double");
+                                        afterParserOrEnumRuleCall();
+                                }
+                        )
+                )
+        )
+;
+
+// Entry rule entryRuleExponentialDistribution
+entryRuleExponentialDistribution returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getExponentialDistributionRule()); }
+        iv_ruleExponentialDistribution=ruleExponentialDistribution
+        { $current=$iv_ruleExponentialDistribution.current; }
+        EOF;
+
+// Rule ExponentialDistribution
+ruleExponentialDistribution returns [EObject current=null]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                otherlv_0='lambda'
+                {
+                        newLeafNode(otherlv_0, grammarAccess.getExponentialDistributionAccess().getLambdaKeyword_0());
+                }
+                otherlv_1='='
+                {
+                        newLeafNode(otherlv_1, grammarAccess.getExponentialDistributionAccess().getEqualsSignKeyword_1());
+                }
+                (
+                        (
+                                {
+                                        newCompositeNode(grammarAccess.getExponentialDistributionAccess().getLambdaDoubleParserRuleCall_2_0());
+                                }
+                                lv_lambda_2_0=ruleDouble
+                                {
+                                        if ($current==null) {
+                                                $current = createModelElementForParent(grammarAccess.getExponentialDistributionRule());
+                                        }
+                                        set(
                                                 $current,
-                                                "rate",
-                                                lv_rate_3_0,
-                                                "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.DOULBE");
+                                                "lambda",
+                                                lv_lambda_2_0,
+                                                "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.Double");
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
                 )
@@ -541,34 +668,43 @@ ruleGateDefinition returns [EObject current=null]
 }:
         (
                 {
-                        newCompositeNode(grammarAccess.getGateDefinitionAccess().getAndGateParserRuleCall_0());
+                        newCompositeNode(grammarAccess.getGateDefinitionAccess().getAndGateDefinitionParserRuleCall_0());
+                }
+                this_AndGateDefinition_0=ruleAndGateDefinition
+                {
+                        $current = $this_AndGateDefinition_0.current;
+                        afterParserOrEnumRuleCall();
+                }
+                    |
+                {
+                        newCompositeNode(grammarAccess.getGateDefinitionAccess().getOrGateDefinitionParserRuleCall_1());
                 }
-                this_AndGate_0=ruleAndGate
+                this_OrGateDefinition_1=ruleOrGateDefinition
                 {
-                        $current = $this_AndGate_0.current;
+                        $current = $this_OrGateDefinition_1.current;
                         afterParserOrEnumRuleCall();
                 }
                     |
                 {
-                        newCompositeNode(grammarAccess.getGateDefinitionAccess().getOrGateParserRuleCall_1());
+                        newCompositeNode(grammarAccess.getGateDefinitionAccess().getKOfMGateDefinitionParserRuleCall_2());
                 }
-                this_OrGate_1=ruleOrGate
+                this_KOfMGateDefinition_2=ruleKOfMGateDefinition
                 {
-                        $current = $this_OrGate_1.current;
+                        $current = $this_KOfMGateDefinition_2.current;
                         afterParserOrEnumRuleCall();
                 }
         )
 ;
 
-// Entry rule entryRuleAndGate
-entryRuleAndGate returns [EObject current=null]:
-        { newCompositeNode(grammarAccess.getAndGateRule()); }
-        iv_ruleAndGate=ruleAndGate
-        { $current=$iv_ruleAndGate.current; }
+// Entry rule entryRuleAndGateDefinition
+entryRuleAndGateDefinition returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getAndGateDefinitionRule()); }
+        iv_ruleAndGateDefinition=ruleAndGateDefinition
+        { $current=$iv_ruleAndGateDefinition.current; }
         EOF;
 
-// Rule AndGate
-ruleAndGate returns [EObject current=null]
+// Rule AndGateDefinition
+ruleAndGateDefinition returns [EObject current=null]
 @init {
         enterRule();
 }
@@ -578,51 +714,55 @@ ruleAndGate returns [EObject current=null]
         (
                 (
                         (
-                                lv_name_0_0=RULE_ID
                                 {
-                                        newLeafNode(lv_name_0_0, grammarAccess.getAndGateAccess().getNameIDTerminalRuleCall_0_0());
+                                        newCompositeNode(grammarAccess.getAndGateDefinitionAccess().getNameValidIdParserRuleCall_0_0());
                                 }
+                                lv_name_0_0=ruleValidId
                                 {
                                         if ($current==null) {
-                                                $current = createModelElement(grammarAccess.getAndGateRule());
+                                                $current = createModelElementForParent(grammarAccess.getAndGateDefinitionRule());
                                         }
-                                        setWithLastConsumed(
+                                        set(
                                                 $current,
                                                 "name",
                                                 lv_name_0_0,
-                                                "org.eclipse.xtext.common.Terminals.ID");
+                                                "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
                 )
                 otherlv_1='and'
                 {
-                        newLeafNode(otherlv_1, grammarAccess.getAndGateAccess().getAndKeyword_1());
+                        newLeafNode(otherlv_1, grammarAccess.getAndGateDefinitionAccess().getAndKeyword_1());
                 }
                 (
                         (
                                 {
                                         if ($current==null) {
-                                                $current = createModelElement(grammarAccess.getAndGateRule());
+                                                $current = createModelElement(grammarAccess.getAndGateDefinitionRule());
                                         }
                                 }
-                                otherlv_2=RULE_ID
                                 {
-                                        newLeafNode(otherlv_2, grammarAccess.getAndGateAccess().getInputEventsEventDeclarationCrossReference_2_0());
+                                        newCompositeNode(grammarAccess.getAndGateDefinitionAccess().getInputEventsEventDeclarationCrossReference_2_0());
+                                }
+                                ruleValidId
+                                {
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
                 )*
         )
 ;
 
-// Entry rule entryRuleOrGate
-entryRuleOrGate returns [EObject current=null]:
-        { newCompositeNode(grammarAccess.getOrGateRule()); }
-        iv_ruleOrGate=ruleOrGate
-        { $current=$iv_ruleOrGate.current; }
+// Entry rule entryRuleOrGateDefinition
+entryRuleOrGateDefinition returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getOrGateDefinitionRule()); }
+        iv_ruleOrGateDefinition=ruleOrGateDefinition
+        { $current=$iv_ruleOrGateDefinition.current; }
         EOF;
 
-// Rule OrGate
-ruleOrGate returns [EObject current=null]
+// Rule OrGateDefinition
+ruleOrGateDefinition returns [EObject current=null]
 @init {
         enterRule();
 }
@@ -632,36 +772,157 @@ ruleOrGate returns [EObject current=null]
         (
                 (
                         (
-                                lv_name_0_0=RULE_ID
                                 {
-                                        newLeafNode(lv_name_0_0, grammarAccess.getOrGateAccess().getNameIDTerminalRuleCall_0_0());
+                                        newCompositeNode(grammarAccess.getOrGateDefinitionAccess().getNameValidIdParserRuleCall_0_0());
                                 }
+                                lv_name_0_0=ruleValidId
                                 {
                                         if ($current==null) {
-                                                $current = createModelElement(grammarAccess.getOrGateRule());
+                                                $current = createModelElementForParent(grammarAccess.getOrGateDefinitionRule());
                                         }
-                                        setWithLastConsumed(
+                                        set(
                                                 $current,
                                                 "name",
                                                 lv_name_0_0,
-                                                "org.eclipse.xtext.common.Terminals.ID");
+                                                "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
                 )
                 otherlv_1='or'
                 {
-                        newLeafNode(otherlv_1, grammarAccess.getOrGateAccess().getOrKeyword_1());
+                        newLeafNode(otherlv_1, grammarAccess.getOrGateDefinitionAccess().getOrKeyword_1());
                 }
                 (
                         (
                                 {
                                         if ($current==null) {
-                                                $current = createModelElement(grammarAccess.getOrGateRule());
+                                                $current = createModelElement(grammarAccess.getOrGateDefinitionRule());
                                         }
                                 }
-                                otherlv_2=RULE_ID
                                 {
-                                        newLeafNode(otherlv_2, grammarAccess.getOrGateAccess().getInputEventsEventDeclarationCrossReference_2_0());
+                                        newCompositeNode(grammarAccess.getOrGateDefinitionAccess().getInputEventsEventDeclarationCrossReference_2_0());
+                                }
+                                ruleValidId
+                                {
+                                        afterParserOrEnumRuleCall();
+                                }
+                        )
+                )*
+        )
+;
+
+// Entry rule entryRuleKOfMGateDefinition
+entryRuleKOfMGateDefinition returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getKOfMGateDefinitionRule()); }
+        iv_ruleKOfMGateDefinition=ruleKOfMGateDefinition
+        { $current=$iv_ruleKOfMGateDefinition.current; }
+        EOF;
+
+// Rule KOfMGateDefinition
+ruleKOfMGateDefinition returns [EObject current=null]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                (
+                        (
+                                {
+                                        newCompositeNode(grammarAccess.getKOfMGateDefinitionAccess().getNameValidIdParserRuleCall_0_0());
+                                }
+                                lv_name_0_0=ruleValidId
+                                {
+                                        if ($current==null) {
+                                                $current = createModelElementForParent(grammarAccess.getKOfMGateDefinitionRule());
+                                        }
+                                        set(
+                                                $current,
+                                                "name",
+                                                lv_name_0_0,
+                                                "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                                        afterParserOrEnumRuleCall();
+                                }
+                        )
+                )
+                (
+                        (
+                                lv_k_1_0=RULE_INT
+                                {
+                                        newLeafNode(lv_k_1_0, grammarAccess.getKOfMGateDefinitionAccess().getKINTTerminalRuleCall_1_0());
+                                }
+                                {
+                                        if ($current==null) {
+                                                $current = createModelElement(grammarAccess.getKOfMGateDefinitionRule());
+                                        }
+                                        setWithLastConsumed(
+                                                $current,
+                                                "k",
+                                                lv_k_1_0,
+                                                "org.eclipse.xtext.common.Terminals.INT");
+                                }
+                        )
+                )
+                (
+                        (
+                                otherlv_2='of'
+                                {
+                                        newLeafNode(otherlv_2, grammarAccess.getKOfMGateDefinitionAccess().getOfKeyword_2_0_0());
+                                }
+                                (
+                                        (
+                                                lv_m_3_0=RULE_INT
+                                                {
+                                                        newLeafNode(lv_m_3_0, grammarAccess.getKOfMGateDefinitionAccess().getMINTTerminalRuleCall_2_0_1_0());
+                                                }
+                                                {
+                                                        if ($current==null) {
+                                                                $current = createModelElement(grammarAccess.getKOfMGateDefinitionRule());
+                                                        }
+                                                        setWithLastConsumed(
+                                                                $current,
+                                                                "m",
+                                                                lv_m_3_0,
+                                                                "org.eclipse.xtext.common.Terminals.INT");
+                                                }
+                                        )
+                                )
+                        )
+                            |
+                        (
+                                (
+                                        lv_m_4_0=RULE_OF_INT
+                                        {
+                                                newLeafNode(lv_m_4_0, grammarAccess.getKOfMGateDefinitionAccess().getMOF_INTTerminalRuleCall_2_1_0());
+                                        }
+                                        {
+                                                if ($current==null) {
+                                                        $current = createModelElement(grammarAccess.getKOfMGateDefinitionRule());
+                                                }
+                                                setWithLastConsumed(
+                                                        $current,
+                                                        "m",
+                                                        lv_m_4_0,
+                                                        "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.OF_INT");
+                                        }
+                                )
+                        )
+                )
+                (
+                        (
+                                {
+                                        if ($current==null) {
+                                                $current = createModelElement(grammarAccess.getKOfMGateDefinitionRule());
+                                        }
+                                }
+                                {
+                                        newCompositeNode(grammarAccess.getKOfMGateDefinitionAccess().getInputEventsEventDeclarationCrossReference_3_0());
+                                }
+                                ruleValidId
+                                {
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
                 )*
@@ -690,19 +951,20 @@ ruleTransformationDefinition returns [EObject current=null]
                 }
                 (
                         (
-                                lv_name_1_0=RULE_ID
                                 {
-                                        newLeafNode(lv_name_1_0, grammarAccess.getTransformationDefinitionAccess().getNameIDTerminalRuleCall_1_0());
+                                        newCompositeNode(grammarAccess.getTransformationDefinitionAccess().getNameValidIdParserRuleCall_1_0());
                                 }
+                                lv_name_1_0=ruleValidId
                                 {
                                         if ($current==null) {
-                                                $current = createModelElement(grammarAccess.getTransformationDefinitionRule());
+                                                $current = createModelElementForParent(grammarAccess.getTransformationDefinitionRule());
                                         }
-                                        setWithLastConsumed(
+                                        set(
                                                 $current,
                                                 "name",
                                                 lv_name_1_0,
-                                                "org.eclipse.xtext.common.Terminals.ID");
+                                                "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
                 )
@@ -934,19 +1196,20 @@ ruleMappingParameter returns [EObject current=null]
 }:
         (
                 (
-                        lv_name_0_0=RULE_ID
                         {
-                                newLeafNode(lv_name_0_0, grammarAccess.getMappingParameterAccess().getNameIDTerminalRuleCall_0());
+                                newCompositeNode(grammarAccess.getMappingParameterAccess().getNameValidIdParserRuleCall_0());
                         }
+                        lv_name_0_0=ruleValidId
                         {
                                 if ($current==null) {
-                                        $current = createModelElement(grammarAccess.getMappingParameterRule());
+                                        $current = createModelElementForParent(grammarAccess.getMappingParameterRule());
                                 }
-                                setWithLastConsumed(
+                                set(
                                         $current,
                                         "name",
                                         lv_name_0_0,
-                                        "org.eclipse.xtext.common.Terminals.ID");
+                                        "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                                afterParserOrEnumRuleCall();
                         }
                 )
         )
@@ -979,9 +1242,12 @@ ruleLookupDefinition returns [EObject current=null]
                                                 $current = createModelElement(grammarAccess.getLookupDefinitionRule());
                                         }
                                 }
-                                otherlv_1=RULE_ID
                                 {
-                                        newLeafNode(otherlv_1, grammarAccess.getLookupDefinitionAccess().getMappingMappingDefinitionCrossReference_1_0());
+                                        newCompositeNode(grammarAccess.getLookupDefinitionAccess().getMappingMappingDefinitionCrossReference_1_0());
+                                }
+                                ruleQualifiedName
+                                {
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
                 )
@@ -996,9 +1262,12 @@ ruleLookupDefinition returns [EObject current=null]
                                                 $current = createModelElement(grammarAccess.getLookupDefinitionRule());
                                         }
                                 }
-                                otherlv_3=RULE_ID
                                 {
-                                        newLeafNode(otherlv_3, grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterCrossReference_3_0());
+                                        newCompositeNode(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterCrossReference_3_0());
+                                }
+                                ruleValidId
+                                {
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
                 )
@@ -1014,9 +1283,12 @@ ruleLookupDefinition returns [EObject current=null]
                                                         $current = createModelElement(grammarAccess.getLookupDefinitionRule());
                                                 }
                                         }
-                                        otherlv_5=RULE_ID
                                         {
-                                                newLeafNode(otherlv_5, grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterCrossReference_4_1_0());
+                                                newCompositeNode(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterCrossReference_4_1_0());
+                                        }
+                                        ruleValidId
+                                        {
+                                                afterParserOrEnumRuleCall();
                                         }
                                 )
                         )
@@ -1031,19 +1303,20 @@ ruleLookupDefinition returns [EObject current=null]
                 }
                 (
                         (
-                                lv_name_8_0=RULE_ID
                                 {
-                                        newLeafNode(lv_name_8_0, grammarAccess.getLookupDefinitionAccess().getNameIDTerminalRuleCall_7_0());
+                                        newCompositeNode(grammarAccess.getLookupDefinitionAccess().getNameValidIdParserRuleCall_7_0());
                                 }
+                                lv_name_8_0=ruleValidId
                                 {
                                         if ($current==null) {
-                                                $current = createModelElement(grammarAccess.getLookupDefinitionRule());
+                                                $current = createModelElementForParent(grammarAccess.getLookupDefinitionRule());
                                         }
-                                        setWithLastConsumed(
+                                        set(
                                                 $current,
                                                 "name",
                                                 lv_name_8_0,
-                                                "org.eclipse.xtext.common.Terminals.ID");
+                                                "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
                 )
@@ -1151,9 +1424,12 @@ ruleEventReference returns [EObject current=null]
                                                 $current = createModelElement(grammarAccess.getEventReferenceRule());
                                         }
                                 }
-                                otherlv_0=RULE_ID
                                 {
-                                        newLeafNode(otherlv_0, grammarAccess.getEventReferenceAccess().getComponentVariableCrossReference_0_0());
+                                        newCompositeNode(grammarAccess.getEventReferenceAccess().getComponentVariableCrossReference_0_0());
+                                }
+                                ruleValidId
+                                {
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
                 )
@@ -1168,9 +1444,12 @@ ruleEventReference returns [EObject current=null]
                                                 $current = createModelElement(grammarAccess.getEventReferenceRule());
                                         }
                                 }
-                                otherlv_2=RULE_ID
                                 {
-                                        newLeafNode(otherlv_2, grammarAccess.getEventReferenceAccess().getEventEventDeclarationCrossReference_2_0());
+                                        newCompositeNode(grammarAccess.getEventReferenceAccess().getEventEventDeclarationCrossReference_2_0());
+                                }
+                                ruleValidId
+                                {
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
                 )
@@ -1250,12 +1529,15 @@ ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT
         leaveRule();
 }:
         (
-                this_ID_0=RULE_ID
                 {
-                        $current.merge(this_ID_0);
+                        newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIdParserRuleCall_0());
                 }
+                this_ValidId_0=ruleValidId
                 {
-                        newLeafNode(this_ID_0, grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_0());
+                        $current.merge(this_ValidId_0);
+                }
+                {
+                        afterParserOrEnumRuleCall();
                 }
                 (
                         kw='.'
@@ -1263,12 +1545,15 @@ ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT
                                 $current.merge(kw);
                                 newLeafNode(kw, grammarAccess.getQualifiedNameAccess().getFullStopKeyword_1_0());
                         }
-                        this_ID_2=RULE_ID
                         {
-                                $current.merge(this_ID_2);
+                                newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIdParserRuleCall_1_1());
+                        }
+                        this_ValidId_2=ruleValidId
+                        {
+                                $current.merge(this_ValidId_2);
                         }
                         {
-                                newLeafNode(this_ID_2, grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1());
+                                afterParserOrEnumRuleCall();
                         }
                 )*
         )
@@ -1315,7 +1600,77 @@ ruleQualifiedNameWithWildcard returns [AntlrDatatypeRuleToken current=new AntlrD
         )
 ;
 
-RULE_DOULBE : ('0'..'9')+ ('.' ('0'..'9')+|('.' ('0'..'9')+)? ('e'|'E') ('+'|'-')? ('0'..'9')+);
+// Entry rule entryRuleValidId
+entryRuleValidId returns [String current=null]:
+        { newCompositeNode(grammarAccess.getValidIdRule()); }
+        iv_ruleValidId=ruleValidId
+        { $current=$iv_ruleValidId.current.getText(); }
+        EOF;
+
+// Rule ValidId
+ruleValidId returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                this_ID_0=RULE_ID
+                {
+                        $current.merge(this_ID_0);
+                }
+                {
+                        newLeafNode(this_ID_0, grammarAccess.getValidIdAccess().getIDTerminalRuleCall_0());
+                }
+                    |
+                this_OF_INT_1=RULE_OF_INT
+                {
+                        $current.merge(this_OF_INT_1);
+                }
+                {
+                        newLeafNode(this_OF_INT_1, grammarAccess.getValidIdAccess().getOF_INTTerminalRuleCall_1());
+                }
+        )
+;
+
+// Entry rule entryRuleDouble
+entryRuleDouble returns [String current=null]:
+        { newCompositeNode(grammarAccess.getDoubleRule()); }
+        iv_ruleDouble=ruleDouble
+        { $current=$iv_ruleDouble.current.getText(); }
+        EOF;
+
+// Rule Double
+ruleDouble returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                this_INT_0=RULE_INT
+                {
+                        $current.merge(this_INT_0);
+                }
+                {
+                        newLeafNode(this_INT_0, grammarAccess.getDoubleAccess().getINTTerminalRuleCall_0());
+                }
+                    |
+                this_T_DOUBLE_1=RULE_T_DOUBLE
+                {
+                        $current.merge(this_T_DOUBLE_1);
+                }
+                {
+                        newLeafNode(this_T_DOUBLE_1, grammarAccess.getDoubleAccess().getT_DOUBLETerminalRuleCall_1());
+                }
+        )
+;
+
+RULE_OF_INT : 'o' 'f' ('0'..'9')+;
+
+RULE_T_DOUBLE : ('0'..'9')+ ('.' ('0'..'9')+|('.' ('0'..'9')+)? ('e'|'E') ('+'|'-')? ('0'..'9')+);
 
 RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguage.tokens b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguage.tokens
index 1c8b296f..2183a28f 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguage.tokens
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguage.tokens
@@ -1,38 +1,40 @@
-'('=28
-')'=30
-'*'=37
-'+='=33
-','=29
-'.'=35
-':='=34
-';'=13
-'='=22
-'=>'=36
-'[]'=20
-'and'=23
-'as'=32
-'cft'=15
-'import'=14
-'in'=17
-'lambda'=21
-'lookup'=31
-'mapping'=27
-'or'=24
-'out'=18
-'package'=12
-'toplevel'=26
-'transformation'=25
-'{'=16
-'}'=19
-RULE_ANY_OTHER=11
-RULE_DOULBE=5
-RULE_ID=4
-RULE_INT=6
-RULE_ML_COMMENT=8
-RULE_SL_COMMENT=9
-RULE_STRING=7
-RULE_WS=10
-T__12=12
+'('=31
+')'=33
+'*'=40
+'+='=36
+','=32
+'.'=38
+':='=37
+';'=14
+'='=23
+'=>'=39
+'[]'=21
+'and'=25
+'as'=35
+'cft'=16
+'import'=15
+'in'=18
+'lambda'=24
+'lookup'=34
+'mapping'=30
+'of'=27
+'or'=26
+'out'=19
+'p'=22
+'package'=13
+'toplevel'=29
+'transformation'=28
+'{'=17
+'}'=20
+RULE_ANY_OTHER=12
+RULE_ID=6
+RULE_INT=4
+RULE_ML_COMMENT=9
+RULE_OF_INT=5
+RULE_SL_COMMENT=10
+RULE_STRING=8
+RULE_T_DOUBLE=7
+RULE_WS=11
 T__13=13
 T__14=14
 T__15=15
@@ -58,3 +60,6 @@ T__34=34
 T__35=35
 T__36=36
 T__37=37
+T__38=38
+T__39=39
+T__40=40
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguageLexer.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguageLexer.java
index 22a96234..d7e9807d 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguageLexer.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguageLexer.java
@@ -12,17 +12,19 @@ import java.util.ArrayList;
 
 @SuppressWarnings("all")
 public class InternalCftLanguageLexer extends Lexer {
-    public static final int RULE_STRING=7;
-    public static final int RULE_SL_COMMENT=9;
+    public static final int RULE_STRING=8;
+    public static final int RULE_SL_COMMENT=10;
     public static final int T__19=19;
     public static final int T__15=15;
     public static final int T__37=37;
     public static final int T__16=16;
+    public static final int T__38=38;
     public static final int T__17=17;
+    public static final int T__39=39;
     public static final int T__18=18;
     public static final int T__33=33;
-    public static final int T__12=12;
     public static final int T__34=34;
+    public static final int RULE_T_DOUBLE=7;
     public static final int T__13=13;
     public static final int T__35=35;
     public static final int T__14=14;
@@ -31,20 +33,21 @@ public class InternalCftLanguageLexer extends Lexer {
     public static final int T__30=30;
     public static final int T__31=31;
     public static final int T__32=32;
-    public static final int RULE_ID=4;
-    public static final int RULE_WS=10;
-    public static final int RULE_DOULBE=5;
-    public static final int RULE_ANY_OTHER=11;
+    public static final int RULE_OF_INT=5;
+    public static final int RULE_ID=6;
+    public static final int RULE_WS=11;
+    public static final int RULE_ANY_OTHER=12;
     public static final int T__26=26;
     public static final int T__27=27;
     public static final int T__28=28;
-    public static final int RULE_INT=6;
+    public static final int RULE_INT=4;
     public static final int T__29=29;
     public static final int T__22=22;
-    public static final int RULE_ML_COMMENT=8;
+    public static final int RULE_ML_COMMENT=9;
     public static final int T__23=23;
     public static final int T__24=24;
     public static final int T__25=25;
+    public static final int T__40=40;
     public static final int T__20=20;
     public static final int T__21=21;
 
@@ -61,10 +64,10 @@ public class InternalCftLanguageLexer extends Lexer {
     }
     public String getGrammarFileName() { return "InternalCftLanguage.g"; }
 
-    // $ANTLR start "T__12"
-    public final void mT__12() throws RecognitionException {
+    // $ANTLR start "T__13"
+    public final void mT__13() throws RecognitionException {
         try {
-            int _type = T__12;
+            int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
             // InternalCftLanguage.g:11:7: ( 'package' )
             // InternalCftLanguage.g:11:9: 'package'
@@ -80,26 +83,6 @@ public class InternalCftLanguageLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end "T__12"
-
-    // $ANTLR start "T__13"
-    public final void mT__13() throws RecognitionException {
-        try {
-            int _type = T__13;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:12:7: ( ';' )
-            // InternalCftLanguage.g:12:9: ';'
-            {
-            match(';'); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
     // $ANTLR end "T__13"
 
     // $ANTLR start "T__14"
@@ -107,11 +90,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:13:7: ( 'import' )
-            // InternalCftLanguage.g:13:9: 'import'
+            // InternalCftLanguage.g:12:7: ( ';' )
+            // InternalCftLanguage.g:12:9: ';'
             {
-            match("import"); 
-
+            match(';'); 
 
             }
 
@@ -128,10 +110,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:14:7: ( 'cft' )
-            // InternalCftLanguage.g:14:9: 'cft'
+            // InternalCftLanguage.g:13:7: ( 'import' )
+            // InternalCftLanguage.g:13:9: 'import'
             {
-            match("cft"); 
+            match("import"); 
 
 
             }
@@ -149,10 +131,11 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:15:7: ( '{' )
-            // InternalCftLanguage.g:15:9: '{'
+            // InternalCftLanguage.g:14:7: ( 'cft' )
+            // InternalCftLanguage.g:14:9: 'cft'
             {
-            match('{'); 
+            match("cft"); 
+
 
             }
 
@@ -169,11 +152,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:16:7: ( 'in' )
-            // InternalCftLanguage.g:16:9: 'in'
+            // InternalCftLanguage.g:15:7: ( '{' )
+            // InternalCftLanguage.g:15:9: '{'
             {
-            match("in"); 
-
+            match('{'); 
 
             }
 
@@ -190,10 +172,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:17:7: ( 'out' )
-            // InternalCftLanguage.g:17:9: 'out'
+            // InternalCftLanguage.g:16:7: ( 'in' )
+            // InternalCftLanguage.g:16:9: 'in'
             {
-            match("out"); 
+            match("in"); 
 
 
             }
@@ -211,10 +193,11 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:18:7: ( '}' )
-            // InternalCftLanguage.g:18:9: '}'
+            // InternalCftLanguage.g:17:7: ( 'out' )
+            // InternalCftLanguage.g:17:9: 'out'
             {
-            match('}'); 
+            match("out"); 
+
 
             }
 
@@ -231,11 +214,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:19:7: ( '[]' )
-            // InternalCftLanguage.g:19:9: '[]'
+            // InternalCftLanguage.g:18:7: ( '}' )
+            // InternalCftLanguage.g:18:9: '}'
             {
-            match("[]"); 
-
+            match('}'); 
 
             }
 
@@ -252,10 +234,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:20:7: ( 'lambda' )
-            // InternalCftLanguage.g:20:9: 'lambda'
+            // InternalCftLanguage.g:19:7: ( '[]' )
+            // InternalCftLanguage.g:19:9: '[]'
             {
-            match("lambda"); 
+            match("[]"); 
 
 
             }
@@ -273,10 +255,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:21:7: ( '=' )
-            // InternalCftLanguage.g:21:9: '='
+            // InternalCftLanguage.g:20:7: ( 'p' )
+            // InternalCftLanguage.g:20:9: 'p'
             {
-            match('='); 
+            match('p'); 
 
             }
 
@@ -293,11 +275,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:22:7: ( 'and' )
-            // InternalCftLanguage.g:22:9: 'and'
+            // InternalCftLanguage.g:21:7: ( '=' )
+            // InternalCftLanguage.g:21:9: '='
             {
-            match("and"); 
-
+            match('='); 
 
             }
 
@@ -314,10 +295,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:23:7: ( 'or' )
-            // InternalCftLanguage.g:23:9: 'or'
+            // InternalCftLanguage.g:22:7: ( 'lambda' )
+            // InternalCftLanguage.g:22:9: 'lambda'
             {
-            match("or"); 
+            match("lambda"); 
 
 
             }
@@ -335,10 +316,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:24:7: ( 'transformation' )
-            // InternalCftLanguage.g:24:9: 'transformation'
+            // InternalCftLanguage.g:23:7: ( 'and' )
+            // InternalCftLanguage.g:23:9: 'and'
             {
-            match("transformation"); 
+            match("and"); 
 
 
             }
@@ -356,10 +337,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:25:7: ( 'toplevel' )
-            // InternalCftLanguage.g:25:9: 'toplevel'
+            // InternalCftLanguage.g:24:7: ( 'or' )
+            // InternalCftLanguage.g:24:9: 'or'
             {
-            match("toplevel"); 
+            match("or"); 
 
 
             }
@@ -377,10 +358,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:26:7: ( 'mapping' )
-            // InternalCftLanguage.g:26:9: 'mapping'
+            // InternalCftLanguage.g:25:7: ( 'of' )
+            // InternalCftLanguage.g:25:9: 'of'
             {
-            match("mapping"); 
+            match("of"); 
 
 
             }
@@ -398,10 +379,11 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:27:7: ( '(' )
-            // InternalCftLanguage.g:27:9: '('
+            // InternalCftLanguage.g:26:7: ( 'transformation' )
+            // InternalCftLanguage.g:26:9: 'transformation'
             {
-            match('('); 
+            match("transformation"); 
+
 
             }
 
@@ -418,10 +400,11 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:28:7: ( ',' )
-            // InternalCftLanguage.g:28:9: ','
+            // InternalCftLanguage.g:27:7: ( 'toplevel' )
+            // InternalCftLanguage.g:27:9: 'toplevel'
             {
-            match(','); 
+            match("toplevel"); 
+
 
             }
 
@@ -438,10 +421,11 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:29:7: ( ')' )
-            // InternalCftLanguage.g:29:9: ')'
+            // InternalCftLanguage.g:28:7: ( 'mapping' )
+            // InternalCftLanguage.g:28:9: 'mapping'
             {
-            match(')'); 
+            match("mapping"); 
+
 
             }
 
@@ -458,11 +442,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:30:7: ( 'lookup' )
-            // InternalCftLanguage.g:30:9: 'lookup'
+            // InternalCftLanguage.g:29:7: ( '(' )
+            // InternalCftLanguage.g:29:9: '('
             {
-            match("lookup"); 
-
+            match('('); 
 
             }
 
@@ -479,11 +462,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:31:7: ( 'as' )
-            // InternalCftLanguage.g:31:9: 'as'
+            // InternalCftLanguage.g:30:7: ( ',' )
+            // InternalCftLanguage.g:30:9: ','
             {
-            match("as"); 
-
+            match(','); 
 
             }
 
@@ -500,11 +482,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:32:7: ( '+=' )
-            // InternalCftLanguage.g:32:9: '+='
+            // InternalCftLanguage.g:31:7: ( ')' )
+            // InternalCftLanguage.g:31:9: ')'
             {
-            match("+="); 
-
+            match(')'); 
 
             }
 
@@ -521,10 +502,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:33:7: ( ':=' )
-            // InternalCftLanguage.g:33:9: ':='
+            // InternalCftLanguage.g:32:7: ( 'lookup' )
+            // InternalCftLanguage.g:32:9: 'lookup'
             {
-            match(":="); 
+            match("lookup"); 
 
 
             }
@@ -542,10 +523,11 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:34:7: ( '.' )
-            // InternalCftLanguage.g:34:9: '.'
+            // InternalCftLanguage.g:33:7: ( 'as' )
+            // InternalCftLanguage.g:33:9: 'as'
             {
-            match('.'); 
+            match("as"); 
+
 
             }
 
@@ -562,10 +544,10 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:35:7: ( '=>' )
-            // InternalCftLanguage.g:35:9: '=>'
+            // InternalCftLanguage.g:34:7: ( '+=' )
+            // InternalCftLanguage.g:34:9: '+='
             {
-            match("=>"); 
+            match("+="); 
 
 
             }
@@ -583,10 +565,11 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:36:7: ( '*' )
-            // InternalCftLanguage.g:36:9: '*'
+            // InternalCftLanguage.g:35:7: ( ':=' )
+            // InternalCftLanguage.g:35:9: ':='
             {
-            match('*'); 
+            match(":="); 
+
 
             }
 
@@ -598,15 +581,78 @@ public class InternalCftLanguageLexer extends Lexer {
     }
     // $ANTLR end "T__37"
 
-    // $ANTLR start "RULE_DOULBE"
-    public final void mRULE_DOULBE() throws RecognitionException {
+    // $ANTLR start "T__38"
+    public final void mT__38() throws RecognitionException {
+        try {
+            int _type = T__38;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalCftLanguage.g:36:7: ( '.' )
+            // InternalCftLanguage.g:36:9: '.'
+            {
+            match('.'); 
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__38"
+
+    // $ANTLR start "T__39"
+    public final void mT__39() throws RecognitionException {
         try {
-            int _type = RULE_DOULBE;
+            int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:1318:13: ( ( '0' .. '9' )+ ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ ) )
-            // InternalCftLanguage.g:1318:15: ( '0' .. '9' )+ ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )
+            // InternalCftLanguage.g:37:7: ( '=>' )
+            // InternalCftLanguage.g:37:9: '=>'
             {
-            // InternalCftLanguage.g:1318:15: ( '0' .. '9' )+
+            match("=>"); 
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__39"
+
+    // $ANTLR start "T__40"
+    public final void mT__40() throws RecognitionException {
+        try {
+            int _type = T__40;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalCftLanguage.g:38:7: ( '*' )
+            // InternalCftLanguage.g:38:9: '*'
+            {
+            match('*'); 
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__40"
+
+    // $ANTLR start "RULE_OF_INT"
+    public final void mRULE_OF_INT() throws RecognitionException {
+        try {
+            int _type = RULE_OF_INT;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalCftLanguage.g:1671:13: ( 'o' 'f' ( '0' .. '9' )+ )
+            // InternalCftLanguage.g:1671:15: 'o' 'f' ( '0' .. '9' )+
+            {
+            match('o'); 
+            match('f'); 
+            // InternalCftLanguage.g:1671:23: ( '0' .. '9' )+
             int cnt1=0;
             loop1:
             do {
@@ -620,7 +666,7 @@ public class InternalCftLanguageLexer extends Lexer {
 
                 switch (alt1) {
                 case 1 :
-                    // InternalCftLanguage.g:1318:16: '0' .. '9'
+                    // InternalCftLanguage.g:1671:24: '0' .. '9'
                     {
                     matchRange('0','9'); 
 
@@ -636,29 +682,78 @@ public class InternalCftLanguageLexer extends Lexer {
                 cnt1++;
             } while (true);
 
-            // InternalCftLanguage.g:1318:27: ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )
-            int alt7=2;
-            alt7 = dfa7.predict(input);
-            switch (alt7) {
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "RULE_OF_INT"
+
+    // $ANTLR start "RULE_T_DOUBLE"
+    public final void mRULE_T_DOUBLE() throws RecognitionException {
+        try {
+            int _type = RULE_T_DOUBLE;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalCftLanguage.g:1673:15: ( ( '0' .. '9' )+ ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ ) )
+            // InternalCftLanguage.g:1673:17: ( '0' .. '9' )+ ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )
+            {
+            // InternalCftLanguage.g:1673:17: ( '0' .. '9' )+
+            int cnt2=0;
+            loop2:
+            do {
+                int alt2=2;
+                int LA2_0 = input.LA(1);
+
+                if ( ((LA2_0>='0' && LA2_0<='9')) ) {
+                    alt2=1;
+                }
+
+
+                switch (alt2) {
+                case 1 :
+                    // InternalCftLanguage.g:1673:18: '0' .. '9'
+                    {
+                    matchRange('0','9'); 
+
+                    }
+                    break;
+
+                default :
+                    if ( cnt2 >= 1 ) break loop2;
+                        EarlyExitException eee =
+                            new EarlyExitException(2, input);
+                        throw eee;
+                }
+                cnt2++;
+            } while (true);
+
+            // InternalCftLanguage.g:1673:29: ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )
+            int alt8=2;
+            alt8 = dfa8.predict(input);
+            switch (alt8) {
                 case 1 :
-                    // InternalCftLanguage.g:1318:28: '.' ( '0' .. '9' )+
+                    // InternalCftLanguage.g:1673:30: '.' ( '0' .. '9' )+
                     {
                     match('.'); 
-                    // InternalCftLanguage.g:1318:32: ( '0' .. '9' )+
-                    int cnt2=0;
-                    loop2:
+                    // InternalCftLanguage.g:1673:34: ( '0' .. '9' )+
+                    int cnt3=0;
+                    loop3:
                     do {
-                        int alt2=2;
-                        int LA2_0 = input.LA(1);
+                        int alt3=2;
+                        int LA3_0 = input.LA(1);
 
-                        if ( ((LA2_0>='0' && LA2_0<='9')) ) {
-                            alt2=1;
+                        if ( ((LA3_0>='0' && LA3_0<='9')) ) {
+                            alt3=1;
                         }
 
 
-                        switch (alt2) {
+                        switch (alt3) {
                         case 1 :
-                            // InternalCftLanguage.g:1318:33: '0' .. '9'
+                            // InternalCftLanguage.g:1673:35: '0' .. '9'
                             {
                             matchRange('0','9'); 
 
@@ -666,47 +761,47 @@ public class InternalCftLanguageLexer extends Lexer {
                             break;
 
                         default :
-                            if ( cnt2 >= 1 ) break loop2;
+                            if ( cnt3 >= 1 ) break loop3;
                                 EarlyExitException eee =
-                                    new EarlyExitException(2, input);
+                                    new EarlyExitException(3, input);
                                 throw eee;
                         }
-                        cnt2++;
+                        cnt3++;
                     } while (true);
 
 
                     }
                     break;
                 case 2 :
-                    // InternalCftLanguage.g:1318:44: ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
+                    // InternalCftLanguage.g:1673:46: ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
                     {
-                    // InternalCftLanguage.g:1318:44: ( '.' ( '0' .. '9' )+ )?
-                    int alt4=2;
-                    int LA4_0 = input.LA(1);
+                    // InternalCftLanguage.g:1673:46: ( '.' ( '0' .. '9' )+ )?
+                    int alt5=2;
+                    int LA5_0 = input.LA(1);
 
-                    if ( (LA4_0=='.') ) {
-                        alt4=1;
+                    if ( (LA5_0=='.') ) {
+                        alt5=1;
                     }
-                    switch (alt4) {
+                    switch (alt5) {
                         case 1 :
-                            // InternalCftLanguage.g:1318:45: '.' ( '0' .. '9' )+
+                            // InternalCftLanguage.g:1673:47: '.' ( '0' .. '9' )+
                             {
                             match('.'); 
-                            // InternalCftLanguage.g:1318:49: ( '0' .. '9' )+
-                            int cnt3=0;
-                            loop3:
+                            // InternalCftLanguage.g:1673:51: ( '0' .. '9' )+
+                            int cnt4=0;
+                            loop4:
                             do {
-                                int alt3=2;
-                                int LA3_0 = input.LA(1);
+                                int alt4=2;
+                                int LA4_0 = input.LA(1);
 
-                                if ( ((LA3_0>='0' && LA3_0<='9')) ) {
-                                    alt3=1;
+                                if ( ((LA4_0>='0' && LA4_0<='9')) ) {
+                                    alt4=1;
                                 }
 
 
-                                switch (alt3) {
+                                switch (alt4) {
                                 case 1 :
-                                    // InternalCftLanguage.g:1318:50: '0' .. '9'
+                                    // InternalCftLanguage.g:1673:52: '0' .. '9'
                                     {
                                     matchRange('0','9'); 
 
@@ -714,12 +809,12 @@ public class InternalCftLanguageLexer extends Lexer {
                                     break;
 
                                 default :
-                                    if ( cnt3 >= 1 ) break loop3;
+                                    if ( cnt4 >= 1 ) break loop4;
                                         EarlyExitException eee =
-                                            new EarlyExitException(3, input);
+                                            new EarlyExitException(4, input);
                                         throw eee;
                                 }
-                                cnt3++;
+                                cnt4++;
                             } while (true);
 
 
@@ -737,14 +832,14 @@ public class InternalCftLanguageLexer extends Lexer {
                         recover(mse);
                         throw mse;}
 
-                    // InternalCftLanguage.g:1318:73: ( '+' | '-' )?
-                    int alt5=2;
-                    int LA5_0 = input.LA(1);
+                    // InternalCftLanguage.g:1673:75: ( '+' | '-' )?
+                    int alt6=2;
+                    int LA6_0 = input.LA(1);
 
-                    if ( (LA5_0=='+'||LA5_0=='-') ) {
-                        alt5=1;
+                    if ( (LA6_0=='+'||LA6_0=='-') ) {
+                        alt6=1;
                     }
-                    switch (alt5) {
+                    switch (alt6) {
                         case 1 :
                             // InternalCftLanguage.g:
                             {
@@ -763,21 +858,21 @@ public class InternalCftLanguageLexer extends Lexer {
 
                     }
 
-                    // InternalCftLanguage.g:1318:84: ( '0' .. '9' )+
-                    int cnt6=0;
-                    loop6:
+                    // InternalCftLanguage.g:1673:86: ( '0' .. '9' )+
+                    int cnt7=0;
+                    loop7:
                     do {
-                        int alt6=2;
-                        int LA6_0 = input.LA(1);
+                        int alt7=2;
+                        int LA7_0 = input.LA(1);
 
-                        if ( ((LA6_0>='0' && LA6_0<='9')) ) {
-                            alt6=1;
+                        if ( ((LA7_0>='0' && LA7_0<='9')) ) {
+                            alt7=1;
                         }
 
 
-                        switch (alt6) {
+                        switch (alt7) {
                         case 1 :
-                            // InternalCftLanguage.g:1318:85: '0' .. '9'
+                            // InternalCftLanguage.g:1673:87: '0' .. '9'
                             {
                             matchRange('0','9'); 
 
@@ -785,12 +880,12 @@ public class InternalCftLanguageLexer extends Lexer {
                             break;
 
                         default :
-                            if ( cnt6 >= 1 ) break loop6;
+                            if ( cnt7 >= 1 ) break loop7;
                                 EarlyExitException eee =
-                                    new EarlyExitException(6, input);
+                                    new EarlyExitException(7, input);
                                 throw eee;
                         }
-                        cnt6++;
+                        cnt7++;
                     } while (true);
 
 
@@ -808,26 +903,26 @@ public class InternalCftLanguageLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end "RULE_DOULBE"
+    // $ANTLR end "RULE_T_DOUBLE"
 
     // $ANTLR start "RULE_ID"
     public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:1320:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // InternalCftLanguage.g:1320:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalCftLanguage.g:1675:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalCftLanguage.g:1675:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // InternalCftLanguage.g:1320:11: ( '^' )?
-            int alt8=2;
-            int LA8_0 = input.LA(1);
+            // InternalCftLanguage.g:1675:11: ( '^' )?
+            int alt9=2;
+            int LA9_0 = input.LA(1);
 
-            if ( (LA8_0=='^') ) {
-                alt8=1;
+            if ( (LA9_0=='^') ) {
+                alt9=1;
             }
-            switch (alt8) {
+            switch (alt9) {
                 case 1 :
-                    // InternalCftLanguage.g:1320:11: '^'
+                    // InternalCftLanguage.g:1675:11: '^'
                     {
                     match('^'); 
 
@@ -845,18 +940,18 @@ public class InternalCftLanguageLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // InternalCftLanguage.g:1320:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
-            loop9:
+            // InternalCftLanguage.g:1675:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            loop10:
             do {
-                int alt9=2;
-                int LA9_0 = input.LA(1);
+                int alt10=2;
+                int LA10_0 = input.LA(1);
 
-                if ( ((LA9_0>='0' && LA9_0<='9')||(LA9_0>='A' && LA9_0<='Z')||LA9_0=='_'||(LA9_0>='a' && LA9_0<='z')) ) {
-                    alt9=1;
+                if ( ((LA10_0>='0' && LA10_0<='9')||(LA10_0>='A' && LA10_0<='Z')||LA10_0=='_'||(LA10_0>='a' && LA10_0<='z')) ) {
+                    alt10=1;
                 }
 
 
-                switch (alt9) {
+                switch (alt10) {
                 case 1 :
                     // InternalCftLanguage.g:
                     {
@@ -874,7 +969,7 @@ public class InternalCftLanguageLexer extends Lexer {
                     break;
 
                 default :
-                    break loop9;
+                    break loop10;
                 }
             } while (true);
 
@@ -894,24 +989,24 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:1322:10: ( ( '0' .. '9' )+ )
-            // InternalCftLanguage.g:1322:12: ( '0' .. '9' )+
+            // InternalCftLanguage.g:1677:10: ( ( '0' .. '9' )+ )
+            // InternalCftLanguage.g:1677:12: ( '0' .. '9' )+
             {
-            // InternalCftLanguage.g:1322:12: ( '0' .. '9' )+
-            int cnt10=0;
-            loop10:
+            // InternalCftLanguage.g:1677:12: ( '0' .. '9' )+
+            int cnt11=0;
+            loop11:
             do {
-                int alt10=2;
-                int LA10_0 = input.LA(1);
+                int alt11=2;
+                int LA11_0 = input.LA(1);
 
-                if ( ((LA10_0>='0' && LA10_0<='9')) ) {
-                    alt10=1;
+                if ( ((LA11_0>='0' && LA11_0<='9')) ) {
+                    alt11=1;
                 }
 
 
-                switch (alt10) {
+                switch (alt11) {
                 case 1 :
-                    // InternalCftLanguage.g:1322:13: '0' .. '9'
+                    // InternalCftLanguage.g:1677:13: '0' .. '9'
                     {
                     matchRange('0','9'); 
 
@@ -919,12 +1014,12 @@ public class InternalCftLanguageLexer extends Lexer {
                     break;
 
                 default :
-                    if ( cnt10 >= 1 ) break loop10;
+                    if ( cnt11 >= 1 ) break loop11;
                         EarlyExitException eee =
-                            new EarlyExitException(10, input);
+                            new EarlyExitException(11, input);
                         throw eee;
                 }
-                cnt10++;
+                cnt11++;
             } while (true);
 
 
@@ -943,47 +1038,47 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:1324:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // InternalCftLanguage.g:1324:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalCftLanguage.g:1679:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalCftLanguage.g:1679:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // InternalCftLanguage.g:1324:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
-            int alt13=2;
-            int LA13_0 = input.LA(1);
+            // InternalCftLanguage.g:1679:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            int alt14=2;
+            int LA14_0 = input.LA(1);
 
-            if ( (LA13_0=='\"') ) {
-                alt13=1;
+            if ( (LA14_0=='\"') ) {
+                alt14=1;
             }
-            else if ( (LA13_0=='\'') ) {
-                alt13=2;
+            else if ( (LA14_0=='\'') ) {
+                alt14=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 13, 0, input);
+                    new NoViableAltException("", 14, 0, input);
 
                 throw nvae;
             }
-            switch (alt13) {
+            switch (alt14) {
                 case 1 :
-                    // InternalCftLanguage.g:1324:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalCftLanguage.g:1679:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // InternalCftLanguage.g:1324:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
-                    loop11:
+                    // InternalCftLanguage.g:1679:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    loop12:
                     do {
-                        int alt11=3;
-                        int LA11_0 = input.LA(1);
+                        int alt12=3;
+                        int LA12_0 = input.LA(1);
 
-                        if ( (LA11_0=='\\') ) {
-                            alt11=1;
+                        if ( (LA12_0=='\\') ) {
+                            alt12=1;
                         }
-                        else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA11_0>=']' && LA11_0<='\uFFFF')) ) {
-                            alt11=2;
+                        else if ( ((LA12_0>='\u0000' && LA12_0<='!')||(LA12_0>='#' && LA12_0<='[')||(LA12_0>=']' && LA12_0<='\uFFFF')) ) {
+                            alt12=2;
                         }
 
 
-                        switch (alt11) {
+                        switch (alt12) {
                         case 1 :
-                            // InternalCftLanguage.g:1324:21: '\\\\' .
+                            // InternalCftLanguage.g:1679:21: '\\\\' .
                             {
                             match('\\'); 
                             matchAny(); 
@@ -991,7 +1086,7 @@ public class InternalCftLanguageLexer extends Lexer {
                             }
                             break;
                         case 2 :
-                            // InternalCftLanguage.g:1324:28: ~ ( ( '\\\\' | '\"' ) )
+                            // InternalCftLanguage.g:1679:28: ~ ( ( '\\\\' | '\"' ) )
                             {
                             if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                                 input.consume();
@@ -1007,7 +1102,7 @@ public class InternalCftLanguageLexer extends Lexer {
                             break;
 
                         default :
-                            break loop11;
+                            break loop12;
                         }
                     } while (true);
 
@@ -1016,26 +1111,26 @@ public class InternalCftLanguageLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalCftLanguage.g:1324:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalCftLanguage.g:1679:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // InternalCftLanguage.g:1324:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
-                    loop12:
+                    // InternalCftLanguage.g:1679:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    loop13:
                     do {
-                        int alt12=3;
-                        int LA12_0 = input.LA(1);
+                        int alt13=3;
+                        int LA13_0 = input.LA(1);
 
-                        if ( (LA12_0=='\\') ) {
-                            alt12=1;
+                        if ( (LA13_0=='\\') ) {
+                            alt13=1;
                         }
-                        else if ( ((LA12_0>='\u0000' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='[')||(LA12_0>=']' && LA12_0<='\uFFFF')) ) {
-                            alt12=2;
+                        else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA13_0>=']' && LA13_0<='\uFFFF')) ) {
+                            alt13=2;
                         }
 
 
-                        switch (alt12) {
+                        switch (alt13) {
                         case 1 :
-                            // InternalCftLanguage.g:1324:54: '\\\\' .
+                            // InternalCftLanguage.g:1679:54: '\\\\' .
                             {
                             match('\\'); 
                             matchAny(); 
@@ -1043,7 +1138,7 @@ public class InternalCftLanguageLexer extends Lexer {
                             }
                             break;
                         case 2 :
-                            // InternalCftLanguage.g:1324:61: ~ ( ( '\\\\' | '\\'' ) )
+                            // InternalCftLanguage.g:1679:61: ~ ( ( '\\\\' | '\\'' ) )
                             {
                             if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                                 input.consume();
@@ -1059,7 +1154,7 @@ public class InternalCftLanguageLexer extends Lexer {
                             break;
 
                         default :
-                            break loop12;
+                            break loop13;
                         }
                     } while (true);
 
@@ -1086,37 +1181,37 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:1326:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // InternalCftLanguage.g:1326:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalCftLanguage.g:1681:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalCftLanguage.g:1681:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // InternalCftLanguage.g:1326:24: ( options {greedy=false; } : . )*
-            loop14:
+            // InternalCftLanguage.g:1681:24: ( options {greedy=false; } : . )*
+            loop15:
             do {
-                int alt14=2;
-                int LA14_0 = input.LA(1);
+                int alt15=2;
+                int LA15_0 = input.LA(1);
 
-                if ( (LA14_0=='*') ) {
-                    int LA14_1 = input.LA(2);
+                if ( (LA15_0=='*') ) {
+                    int LA15_1 = input.LA(2);
 
-                    if ( (LA14_1=='/') ) {
-                        alt14=2;
+                    if ( (LA15_1=='/') ) {
+                        alt15=2;
                     }
-                    else if ( ((LA14_1>='\u0000' && LA14_1<='.')||(LA14_1>='0' && LA14_1<='\uFFFF')) ) {
-                        alt14=1;
+                    else if ( ((LA15_1>='\u0000' && LA15_1<='.')||(LA15_1>='0' && LA15_1<='\uFFFF')) ) {
+                        alt15=1;
                     }
 
 
                 }
-                else if ( ((LA14_0>='\u0000' && LA14_0<=')')||(LA14_0>='+' && LA14_0<='\uFFFF')) ) {
-                    alt14=1;
+                else if ( ((LA15_0>='\u0000' && LA15_0<=')')||(LA15_0>='+' && LA15_0<='\uFFFF')) ) {
+                    alt15=1;
                 }
 
 
-                switch (alt14) {
+                switch (alt15) {
                 case 1 :
-                    // InternalCftLanguage.g:1326:52: .
+                    // InternalCftLanguage.g:1681:52: .
                     {
                     matchAny(); 
 
@@ -1124,7 +1219,7 @@ public class InternalCftLanguageLexer extends Lexer {
                     break;
 
                 default :
-                    break loop14;
+                    break loop15;
                 }
             } while (true);
 
@@ -1146,25 +1241,25 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:1328:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // InternalCftLanguage.g:1328:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalCftLanguage.g:1683:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalCftLanguage.g:1683:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // InternalCftLanguage.g:1328:24: (~ ( ( '\\n' | '\\r' ) ) )*
-            loop15:
+            // InternalCftLanguage.g:1683:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            loop16:
             do {
-                int alt15=2;
-                int LA15_0 = input.LA(1);
+                int alt16=2;
+                int LA16_0 = input.LA(1);
 
-                if ( ((LA15_0>='\u0000' && LA15_0<='\t')||(LA15_0>='\u000B' && LA15_0<='\f')||(LA15_0>='\u000E' && LA15_0<='\uFFFF')) ) {
-                    alt15=1;
+                if ( ((LA16_0>='\u0000' && LA16_0<='\t')||(LA16_0>='\u000B' && LA16_0<='\f')||(LA16_0>='\u000E' && LA16_0<='\uFFFF')) ) {
+                    alt16=1;
                 }
 
 
-                switch (alt15) {
+                switch (alt16) {
                 case 1 :
-                    // InternalCftLanguage.g:1328:24: ~ ( ( '\\n' | '\\r' ) )
+                    // InternalCftLanguage.g:1683:24: ~ ( ( '\\n' | '\\r' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -1180,31 +1275,31 @@ public class InternalCftLanguageLexer extends Lexer {
                     break;
 
                 default :
-                    break loop15;
+                    break loop16;
                 }
             } while (true);
 
-            // InternalCftLanguage.g:1328:40: ( ( '\\r' )? '\\n' )?
-            int alt17=2;
-            int LA17_0 = input.LA(1);
+            // InternalCftLanguage.g:1683:40: ( ( '\\r' )? '\\n' )?
+            int alt18=2;
+            int LA18_0 = input.LA(1);
 
-            if ( (LA17_0=='\n'||LA17_0=='\r') ) {
-                alt17=1;
+            if ( (LA18_0=='\n'||LA18_0=='\r') ) {
+                alt18=1;
             }
-            switch (alt17) {
+            switch (alt18) {
                 case 1 :
-                    // InternalCftLanguage.g:1328:41: ( '\\r' )? '\\n'
+                    // InternalCftLanguage.g:1683:41: ( '\\r' )? '\\n'
                     {
-                    // InternalCftLanguage.g:1328:41: ( '\\r' )?
-                    int alt16=2;
-                    int LA16_0 = input.LA(1);
+                    // InternalCftLanguage.g:1683:41: ( '\\r' )?
+                    int alt17=2;
+                    int LA17_0 = input.LA(1);
 
-                    if ( (LA16_0=='\r') ) {
-                        alt16=1;
+                    if ( (LA17_0=='\r') ) {
+                        alt17=1;
                     }
-                    switch (alt16) {
+                    switch (alt17) {
                         case 1 :
-                            // InternalCftLanguage.g:1328:41: '\\r'
+                            // InternalCftLanguage.g:1683:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1236,22 +1331,22 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:1330:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // InternalCftLanguage.g:1330:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalCftLanguage.g:1685:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalCftLanguage.g:1685:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // InternalCftLanguage.g:1330:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
-            int cnt18=0;
-            loop18:
+            // InternalCftLanguage.g:1685:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            int cnt19=0;
+            loop19:
             do {
-                int alt18=2;
-                int LA18_0 = input.LA(1);
+                int alt19=2;
+                int LA19_0 = input.LA(1);
 
-                if ( ((LA18_0>='\t' && LA18_0<='\n')||LA18_0=='\r'||LA18_0==' ') ) {
-                    alt18=1;
+                if ( ((LA19_0>='\t' && LA19_0<='\n')||LA19_0=='\r'||LA19_0==' ') ) {
+                    alt19=1;
                 }
 
 
-                switch (alt18) {
+                switch (alt19) {
                 case 1 :
                     // InternalCftLanguage.g:
                     {
@@ -1269,12 +1364,12 @@ public class InternalCftLanguageLexer extends Lexer {
                     break;
 
                 default :
-                    if ( cnt18 >= 1 ) break loop18;
+                    if ( cnt19 >= 1 ) break loop19;
                         EarlyExitException eee =
-                            new EarlyExitException(18, input);
+                            new EarlyExitException(19, input);
                         throw eee;
                 }
-                cnt18++;
+                cnt19++;
             } while (true);
 
 
@@ -1293,8 +1388,8 @@ public class InternalCftLanguageLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalCftLanguage.g:1332:16: ( . )
-            // InternalCftLanguage.g:1332:18: .
+            // InternalCftLanguage.g:1687:16: ( . )
+            // InternalCftLanguage.g:1687:18: .
             {
             matchAny(); 
 
@@ -1309,243 +1404,264 @@ public class InternalCftLanguageLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // InternalCftLanguage.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | RULE_DOULBE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt19=34;
-        alt19 = dfa19.predict(input);
-        switch (alt19) {
+        // InternalCftLanguage.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | RULE_OF_INT | RULE_T_DOUBLE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        int alt20=37;
+        alt20 = dfa20.predict(input);
+        switch (alt20) {
             case 1 :
-                // InternalCftLanguage.g:1:10: T__12
+                // InternalCftLanguage.g:1:10: T__13
                 {
-                mT__12(); 
+                mT__13(); 
 
                 }
                 break;
             case 2 :
-                // InternalCftLanguage.g:1:16: T__13
+                // InternalCftLanguage.g:1:16: T__14
                 {
-                mT__13(); 
+                mT__14(); 
 
                 }
                 break;
             case 3 :
-                // InternalCftLanguage.g:1:22: T__14
+                // InternalCftLanguage.g:1:22: T__15
                 {
-                mT__14(); 
+                mT__15(); 
 
                 }
                 break;
             case 4 :
-                // InternalCftLanguage.g:1:28: T__15
+                // InternalCftLanguage.g:1:28: T__16
                 {
-                mT__15(); 
+                mT__16(); 
 
                 }
                 break;
             case 5 :
-                // InternalCftLanguage.g:1:34: T__16
+                // InternalCftLanguage.g:1:34: T__17
                 {
-                mT__16(); 
+                mT__17(); 
 
                 }
                 break;
             case 6 :
-                // InternalCftLanguage.g:1:40: T__17
+                // InternalCftLanguage.g:1:40: T__18
                 {
-                mT__17(); 
+                mT__18(); 
 
                 }
                 break;
             case 7 :
-                // InternalCftLanguage.g:1:46: T__18
+                // InternalCftLanguage.g:1:46: T__19
                 {
-                mT__18(); 
+                mT__19(); 
 
                 }
                 break;
             case 8 :
-                // InternalCftLanguage.g:1:52: T__19
+                // InternalCftLanguage.g:1:52: T__20
                 {
-                mT__19(); 
+                mT__20(); 
 
                 }
                 break;
             case 9 :
-                // InternalCftLanguage.g:1:58: T__20
+                // InternalCftLanguage.g:1:58: T__21
                 {
-                mT__20(); 
+                mT__21(); 
 
                 }
                 break;
             case 10 :
-                // InternalCftLanguage.g:1:64: T__21
+                // InternalCftLanguage.g:1:64: T__22
                 {
-                mT__21(); 
+                mT__22(); 
 
                 }
                 break;
             case 11 :
-                // InternalCftLanguage.g:1:70: T__22
+                // InternalCftLanguage.g:1:70: T__23
                 {
-                mT__22(); 
+                mT__23(); 
 
                 }
                 break;
             case 12 :
-                // InternalCftLanguage.g:1:76: T__23
+                // InternalCftLanguage.g:1:76: T__24
                 {
-                mT__23(); 
+                mT__24(); 
 
                 }
                 break;
             case 13 :
-                // InternalCftLanguage.g:1:82: T__24
+                // InternalCftLanguage.g:1:82: T__25
                 {
-                mT__24(); 
+                mT__25(); 
 
                 }
                 break;
             case 14 :
-                // InternalCftLanguage.g:1:88: T__25
+                // InternalCftLanguage.g:1:88: T__26
                 {
-                mT__25(); 
+                mT__26(); 
 
                 }
                 break;
             case 15 :
-                // InternalCftLanguage.g:1:94: T__26
+                // InternalCftLanguage.g:1:94: T__27
                 {
-                mT__26(); 
+                mT__27(); 
 
                 }
                 break;
             case 16 :
-                // InternalCftLanguage.g:1:100: T__27
+                // InternalCftLanguage.g:1:100: T__28
                 {
-                mT__27(); 
+                mT__28(); 
 
                 }
                 break;
             case 17 :
-                // InternalCftLanguage.g:1:106: T__28
+                // InternalCftLanguage.g:1:106: T__29
                 {
-                mT__28(); 
+                mT__29(); 
 
                 }
                 break;
             case 18 :
-                // InternalCftLanguage.g:1:112: T__29
+                // InternalCftLanguage.g:1:112: T__30
                 {
-                mT__29(); 
+                mT__30(); 
 
                 }
                 break;
             case 19 :
-                // InternalCftLanguage.g:1:118: T__30
+                // InternalCftLanguage.g:1:118: T__31
                 {
-                mT__30(); 
+                mT__31(); 
 
                 }
                 break;
             case 20 :
-                // InternalCftLanguage.g:1:124: T__31
+                // InternalCftLanguage.g:1:124: T__32
                 {
-                mT__31(); 
+                mT__32(); 
 
                 }
                 break;
             case 21 :
-                // InternalCftLanguage.g:1:130: T__32
+                // InternalCftLanguage.g:1:130: T__33
                 {
-                mT__32(); 
+                mT__33(); 
 
                 }
                 break;
             case 22 :
-                // InternalCftLanguage.g:1:136: T__33
+                // InternalCftLanguage.g:1:136: T__34
                 {
-                mT__33(); 
+                mT__34(); 
 
                 }
                 break;
             case 23 :
-                // InternalCftLanguage.g:1:142: T__34
+                // InternalCftLanguage.g:1:142: T__35
                 {
-                mT__34(); 
+                mT__35(); 
 
                 }
                 break;
             case 24 :
-                // InternalCftLanguage.g:1:148: T__35
+                // InternalCftLanguage.g:1:148: T__36
                 {
-                mT__35(); 
+                mT__36(); 
 
                 }
                 break;
             case 25 :
-                // InternalCftLanguage.g:1:154: T__36
+                // InternalCftLanguage.g:1:154: T__37
                 {
-                mT__36(); 
+                mT__37(); 
 
                 }
                 break;
             case 26 :
-                // InternalCftLanguage.g:1:160: T__37
+                // InternalCftLanguage.g:1:160: T__38
                 {
-                mT__37(); 
+                mT__38(); 
 
                 }
                 break;
             case 27 :
-                // InternalCftLanguage.g:1:166: RULE_DOULBE
+                // InternalCftLanguage.g:1:166: T__39
                 {
-                mRULE_DOULBE(); 
+                mT__39(); 
 
                 }
                 break;
             case 28 :
-                // InternalCftLanguage.g:1:178: RULE_ID
+                // InternalCftLanguage.g:1:172: T__40
                 {
-                mRULE_ID(); 
+                mT__40(); 
 
                 }
                 break;
             case 29 :
-                // InternalCftLanguage.g:1:186: RULE_INT
+                // InternalCftLanguage.g:1:178: RULE_OF_INT
                 {
-                mRULE_INT(); 
+                mRULE_OF_INT(); 
 
                 }
                 break;
             case 30 :
-                // InternalCftLanguage.g:1:195: RULE_STRING
+                // InternalCftLanguage.g:1:190: RULE_T_DOUBLE
                 {
-                mRULE_STRING(); 
+                mRULE_T_DOUBLE(); 
 
                 }
                 break;
             case 31 :
-                // InternalCftLanguage.g:1:207: RULE_ML_COMMENT
+                // InternalCftLanguage.g:1:204: RULE_ID
                 {
-                mRULE_ML_COMMENT(); 
+                mRULE_ID(); 
 
                 }
                 break;
             case 32 :
-                // InternalCftLanguage.g:1:223: RULE_SL_COMMENT
+                // InternalCftLanguage.g:1:212: RULE_INT
                 {
-                mRULE_SL_COMMENT(); 
+                mRULE_INT(); 
 
                 }
                 break;
             case 33 :
-                // InternalCftLanguage.g:1:239: RULE_WS
+                // InternalCftLanguage.g:1:221: RULE_STRING
                 {
-                mRULE_WS(); 
+                mRULE_STRING(); 
 
                 }
                 break;
             case 34 :
-                // InternalCftLanguage.g:1:247: RULE_ANY_OTHER
+                // InternalCftLanguage.g:1:233: RULE_ML_COMMENT
+                {
+                mRULE_ML_COMMENT(); 
+
+                }
+                break;
+            case 35 :
+                // InternalCftLanguage.g:1:249: RULE_SL_COMMENT
+                {
+                mRULE_SL_COMMENT(); 
+
+                }
+                break;
+            case 36 :
+                // InternalCftLanguage.g:1:265: RULE_WS
+                {
+                mRULE_WS(); 
+
+                }
+                break;
+            case 37 :
+                // InternalCftLanguage.g:1:273: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1557,21 +1673,21 @@ public class InternalCftLanguageLexer extends Lexer {
     }
 
 
-    protected DFA7 dfa7 = new DFA7(this);
-    protected DFA19 dfa19 = new DFA19(this);
-    static final String DFA7_eotS =
+    protected DFA8 dfa8 = new DFA8(this);
+    protected DFA20 dfa20 = new DFA20(this);
+    static final String DFA8_eotS =
         "\3\uffff\1\4\1\uffff";
-    static final String DFA7_eofS =
+    static final String DFA8_eofS =
         "\5\uffff";
-    static final String DFA7_minS =
+    static final String DFA8_minS =
         "\1\56\1\60\1\uffff\1\60\1\uffff";
-    static final String DFA7_maxS =
+    static final String DFA8_maxS =
         "\1\145\1\71\1\uffff\1\145\1\uffff";
-    static final String DFA7_acceptS =
+    static final String DFA8_acceptS =
         "\2\uffff\1\2\1\uffff\1\1";
-    static final String DFA7_specialS =
+    static final String DFA8_specialS =
         "\5\uffff}>";
-    static final String[] DFA7_transitionS = {
+    static final String[] DFA8_transitionS = {
             "\1\1\26\uffff\1\2\37\uffff\1\2",
             "\12\3",
             "",
@@ -1579,101 +1695,103 @@ public class InternalCftLanguageLexer extends Lexer {
             ""
     };
 
-    static final short[] DFA7_eot = DFA.unpackEncodedString(DFA7_eotS);
-    static final short[] DFA7_eof = DFA.unpackEncodedString(DFA7_eofS);
-    static final char[] DFA7_min = DFA.unpackEncodedStringToUnsignedChars(DFA7_minS);
-    static final char[] DFA7_max = DFA.unpackEncodedStringToUnsignedChars(DFA7_maxS);
-    static final short[] DFA7_accept = DFA.unpackEncodedString(DFA7_acceptS);
-    static final short[] DFA7_special = DFA.unpackEncodedString(DFA7_specialS);
-    static final short[][] DFA7_transition;
+    static final short[] DFA8_eot = DFA.unpackEncodedString(DFA8_eotS);
+    static final short[] DFA8_eof = DFA.unpackEncodedString(DFA8_eofS);
+    static final char[] DFA8_min = DFA.unpackEncodedStringToUnsignedChars(DFA8_minS);
+    static final char[] DFA8_max = DFA.unpackEncodedStringToUnsignedChars(DFA8_maxS);
+    static final short[] DFA8_accept = DFA.unpackEncodedString(DFA8_acceptS);
+    static final short[] DFA8_special = DFA.unpackEncodedString(DFA8_specialS);
+    static final short[][] DFA8_transition;
 
     static {
-        int numStates = DFA7_transitionS.length;
-        DFA7_transition = new short[numStates][];
+        int numStates = DFA8_transitionS.length;
+        DFA8_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA7_transition[i] = DFA.unpackEncodedString(DFA7_transitionS[i]);
+            DFA8_transition[i] = DFA.unpackEncodedString(DFA8_transitionS[i]);
         }
     }
 
-    class DFA7 extends DFA {
+    class DFA8 extends DFA {
 
-        public DFA7(BaseRecognizer recognizer) {
+        public DFA8(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 7;
-            this.eot = DFA7_eot;
-            this.eof = DFA7_eof;
-            this.min = DFA7_min;
-            this.max = DFA7_max;
-            this.accept = DFA7_accept;
-            this.special = DFA7_special;
-            this.transition = DFA7_transition;
+            this.decisionNumber = 8;
+            this.eot = DFA8_eot;
+            this.eof = DFA8_eof;
+            this.min = DFA8_min;
+            this.max = DFA8_max;
+            this.accept = DFA8_accept;
+            this.special = DFA8_special;
+            this.transition = DFA8_transition;
         }
         public String getDescription() {
-            return "1318:27: ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )";
+            return "1673:29: ( '.' ( '0' .. '9' )+ | ( '.' ( '0' .. '9' )+ )? ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )";
         }
     }
-    static final String DFA19_eotS =
-        "\1\uffff\1\36\1\uffff\2\36\1\uffff\1\36\1\uffff\1\34\1\36\1\53\3\36\3\uffff\2\34\2\uffff\1\72\1\34\1\uffff\3\34\2\uffff\1\36\2\uffff\1\36\1\101\1\36\1\uffff\1\36\1\104\2\uffff\2\36\2\uffff\1\36\1\110\3\36\10\uffff\1\72\5\uffff\2\36\1\uffff\1\116\1\117\1\uffff\2\36\1\122\1\uffff\5\36\2\uffff\2\36\1\uffff\13\36\1\145\1\146\1\147\3\36\1\153\3\uffff\2\36\1\156\1\uffff\1\36\1\160\1\uffff\1\36\1\uffff\4\36\1\166\1\uffff";
-    static final String DFA19_eofS =
-        "\167\uffff";
-    static final String DFA19_minS =
-        "\1\0\1\141\1\uffff\1\155\1\146\1\uffff\1\162\1\uffff\1\135\1\141\1\76\1\156\1\157\1\141\3\uffff\2\75\2\uffff\1\56\1\101\1\uffff\2\0\1\52\2\uffff\1\143\2\uffff\1\160\1\60\1\164\1\uffff\1\164\1\60\2\uffff\1\155\1\157\2\uffff\1\144\1\60\1\141\2\160\10\uffff\1\56\5\uffff\1\153\1\157\1\uffff\2\60\1\uffff\1\142\1\153\1\60\1\uffff\1\156\1\154\1\160\1\141\1\162\2\uffff\1\144\1\165\1\uffff\1\163\1\145\1\151\1\147\1\164\1\141\1\160\1\146\1\166\1\156\1\145\3\60\1\157\1\145\1\147\1\60\3\uffff\1\162\1\154\1\60\1\uffff\1\155\1\60\1\uffff\1\141\1\uffff\1\164\1\151\1\157\1\156\1\60\1\uffff";
-    static final String DFA19_maxS =
-        "\1\uffff\1\141\1\uffff\1\156\1\146\1\uffff\1\165\1\uffff\1\135\1\157\1\76\1\163\1\162\1\141\3\uffff\2\75\2\uffff\1\145\1\172\1\uffff\2\uffff\1\57\2\uffff\1\143\2\uffff\1\160\1\172\1\164\1\uffff\1\164\1\172\2\uffff\1\155\1\157\2\uffff\1\144\1\172\1\141\2\160\10\uffff\1\145\5\uffff\1\153\1\157\1\uffff\2\172\1\uffff\1\142\1\153\1\172\1\uffff\1\156\1\154\1\160\1\141\1\162\2\uffff\1\144\1\165\1\uffff\1\163\1\145\1\151\1\147\1\164\1\141\1\160\1\146\1\166\1\156\1\145\3\172\1\157\1\145\1\147\1\172\3\uffff\1\162\1\154\1\172\1\uffff\1\155\1\172\1\uffff\1\141\1\uffff\1\164\1\151\1\157\1\156\1\172\1\uffff";
-    static final String DFA19_acceptS =
-        "\2\uffff\1\2\2\uffff\1\5\1\uffff\1\10\6\uffff\1\21\1\22\1\23\2\uffff\1\30\1\32\2\uffff\1\34\3\uffff\1\41\1\42\1\uffff\1\34\1\2\3\uffff\1\5\2\uffff\1\10\1\11\2\uffff\1\31\1\13\5\uffff\1\21\1\22\1\23\1\26\1\27\1\30\1\32\1\33\1\uffff\1\35\1\36\1\37\1\40\1\41\2\uffff\1\6\2\uffff\1\15\3\uffff\1\25\5\uffff\1\4\1\7\2\uffff\1\14\22\uffff\1\3\1\12\1\24\3\uffff\1\1\2\uffff\1\20\1\uffff\1\17\5\uffff\1\16";
-    static final String DFA19_specialS =
-        "\1\0\27\uffff\1\2\1\1\135\uffff}>";
-    static final String[] DFA19_transitionS = {
-            "\11\34\2\33\2\34\1\33\22\34\1\33\1\34\1\30\4\34\1\31\1\16\1\20\1\24\1\21\1\17\1\34\1\23\1\32\12\25\1\22\1\2\1\34\1\12\3\34\32\27\1\10\2\34\1\26\1\27\1\34\1\13\1\27\1\4\5\27\1\3\2\27\1\11\1\15\1\27\1\6\1\1\3\27\1\14\6\27\1\5\1\34\1\7\uff82\34",
-            "\1\35",
+    static final String DFA20_eotS =
+        "\1\uffff\1\36\1\uffff\2\37\1\uffff\1\37\1\uffff\1\34\1\53\4\37\3\uffff\2\34\2\uffff\1\72\1\34\1\uffff\3\34\2\uffff\1\37\3\uffff\1\37\1\103\1\37\1\uffff\1\37\1\106\1\110\4\uffff\3\37\1\114\3\37\10\uffff\1\72\5\uffff\2\37\1\uffff\1\122\1\123\1\uffff\1\124\1\uffff\2\37\1\127\1\uffff\5\37\3\uffff\2\37\1\uffff\13\37\1\152\1\153\1\154\3\37\1\160\3\uffff\2\37\1\163\1\uffff\1\37\1\165\1\uffff\1\37\1\uffff\4\37\1\173\1\uffff";
+    static final String DFA20_eofS =
+        "\174\uffff";
+    static final String DFA20_minS =
+        "\1\0\1\60\1\uffff\1\155\1\146\1\uffff\1\146\1\uffff\1\135\1\76\1\141\1\156\1\157\1\141\3\uffff\2\75\2\uffff\1\56\1\101\1\uffff\2\0\1\52\2\uffff\1\143\3\uffff\1\160\1\60\1\164\1\uffff\1\164\2\60\4\uffff\1\155\1\157\1\144\1\60\1\141\2\160\10\uffff\1\56\5\uffff\1\153\1\157\1\uffff\2\60\1\uffff\1\60\1\uffff\1\142\1\153\1\60\1\uffff\1\156\1\154\1\160\1\141\1\162\3\uffff\1\144\1\165\1\uffff\1\163\1\145\1\151\1\147\1\164\1\141\1\160\1\146\1\166\1\156\1\145\3\60\1\157\1\145\1\147\1\60\3\uffff\1\162\1\154\1\60\1\uffff\1\155\1\60\1\uffff\1\141\1\uffff\1\164\1\151\1\157\1\156\1\60\1\uffff";
+    static final String DFA20_maxS =
+        "\1\uffff\1\172\1\uffff\1\156\1\146\1\uffff\1\165\1\uffff\1\135\1\76\1\157\1\163\1\162\1\141\3\uffff\2\75\2\uffff\1\145\1\172\1\uffff\2\uffff\1\57\2\uffff\1\143\3\uffff\1\160\1\172\1\164\1\uffff\1\164\2\172\4\uffff\1\155\1\157\1\144\1\172\1\141\2\160\10\uffff\1\145\5\uffff\1\153\1\157\1\uffff\2\172\1\uffff\1\172\1\uffff\1\142\1\153\1\172\1\uffff\1\156\1\154\1\160\1\141\1\162\3\uffff\1\144\1\165\1\uffff\1\163\1\145\1\151\1\147\1\164\1\141\1\160\1\146\1\166\1\156\1\145\3\172\1\157\1\145\1\147\1\172\3\uffff\1\162\1\154\1\172\1\uffff\1\155\1\172\1\uffff\1\141\1\uffff\1\164\1\151\1\157\1\156\1\172\1\uffff";
+    static final String DFA20_acceptS =
+        "\2\uffff\1\2\2\uffff\1\5\1\uffff\1\10\6\uffff\1\23\1\24\1\25\2\uffff\1\32\1\34\2\uffff\1\37\3\uffff\1\44\1\45\1\uffff\1\12\1\37\1\2\3\uffff\1\5\3\uffff\1\10\1\11\1\33\1\13\7\uffff\1\23\1\24\1\25\1\30\1\31\1\32\1\34\1\40\1\uffff\1\36\1\41\1\42\1\43\1\44\2\uffff\1\6\2\uffff\1\16\1\uffff\1\17\3\uffff\1\27\5\uffff\1\4\1\7\1\35\2\uffff\1\15\22\uffff\1\3\1\14\1\26\3\uffff\1\1\2\uffff\1\22\1\uffff\1\21\5\uffff\1\20";
+    static final String DFA20_specialS =
+        "\1\1\27\uffff\1\2\1\0\142\uffff}>";
+    static final String[] DFA20_transitionS = {
+            "\11\34\2\33\2\34\1\33\22\34\1\33\1\34\1\30\4\34\1\31\1\16\1\20\1\24\1\21\1\17\1\34\1\23\1\32\12\25\1\22\1\2\1\34\1\11\3\34\32\27\1\10\2\34\1\26\1\27\1\34\1\13\1\27\1\4\5\27\1\3\2\27\1\12\1\15\1\27\1\6\1\1\3\27\1\14\6\27\1\5\1\34\1\7\uff82\34",
+            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\1\35\31\37",
             "",
-            "\1\40\1\41",
-            "\1\42",
+            "\1\41\1\42",
+            "\1\43",
             "",
-            "\1\45\2\uffff\1\44",
+            "\1\47\13\uffff\1\46\2\uffff\1\45",
             "",
-            "\1\47",
-            "\1\50\15\uffff\1\51",
+            "\1\51",
             "\1\52",
-            "\1\54\4\uffff\1\55",
-            "\1\57\2\uffff\1\56",
-            "\1\60",
+            "\1\54\15\uffff\1\55",
+            "\1\56\4\uffff\1\57",
+            "\1\61\2\uffff\1\60",
+            "\1\62",
+            "",
             "",
             "",
+            "\1\66",
+            "\1\67",
             "",
-            "\1\64",
-            "\1\65",
             "",
+            "\1\74\1\uffff\12\73\13\uffff\1\74\37\uffff\1\74",
+            "\32\37\4\uffff\1\37\1\uffff\32\37",
             "",
-            "\1\70\1\uffff\12\71\13\uffff\1\70\37\uffff\1\70",
-            "\32\36\4\uffff\1\36\1\uffff\32\36",
+            "\0\75",
+            "\0\75",
+            "\1\76\4\uffff\1\77",
             "",
-            "\0\73",
-            "\0\73",
-            "\1\74\4\uffff\1\75",
             "",
+            "\1\101",
             "",
-            "\1\77",
             "",
             "",
-            "\1\100",
-            "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36",
             "\1\102",
+            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
+            "\1\104",
             "",
-            "\1\103",
-            "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36",
+            "\1\105",
+            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
+            "\12\107\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
             "",
             "",
-            "\1\105",
-            "\1\106",
             "",
             "",
-            "\1\107",
-            "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36",
             "\1\111",
             "\1\112",
             "\1\113",
+            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
+            "\1\115",
+            "\1\116",
+            "\1\117",
             "",
             "",
             "",
@@ -1682,183 +1800,186 @@ public class InternalCftLanguageLexer extends Lexer {
             "",
             "",
             "",
-            "\1\70\1\uffff\12\71\13\uffff\1\70\37\uffff\1\70",
-            "",
-            "",
+            "\1\74\1\uffff\12\73\13\uffff\1\74\37\uffff\1\74",
             "",
             "",
             "",
-            "\1\114",
-            "\1\115",
             "",
-            "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36",
-            "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36",
             "",
             "\1\120",
             "\1\121",
-            "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36",
             "",
-            "\1\123",
-            "\1\124",
+            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
+            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
+            "",
+            "\12\107\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
+            "",
             "\1\125",
             "\1\126",
-            "\1\127",
-            "",
+            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
             "",
             "\1\130",
             "\1\131",
-            "",
             "\1\132",
             "\1\133",
             "\1\134",
+            "",
+            "",
+            "",
             "\1\135",
             "\1\136",
+            "",
             "\1\137",
             "\1\140",
             "\1\141",
             "\1\142",
             "\1\143",
             "\1\144",
-            "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36",
-            "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36",
-            "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36",
+            "\1\145",
+            "\1\146",
+            "\1\147",
             "\1\150",
             "\1\151",
-            "\1\152",
-            "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36",
-            "",
-            "",
-            "",
-            "\1\154",
+            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
+            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
+            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
             "\1\155",
-            "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36",
-            "",
+            "\1\156",
             "\1\157",
-            "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36",
+            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
             "",
-            "\1\161",
             "",
+            "",
+            "\1\161",
             "\1\162",
-            "\1\163",
+            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
+            "",
             "\1\164",
-            "\1\165",
-            "\12\36\7\uffff\32\36\4\uffff\1\36\1\uffff\32\36",
+            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
+            "",
+            "\1\166",
+            "",
+            "\1\167",
+            "\1\170",
+            "\1\171",
+            "\1\172",
+            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
             ""
     };
 
-    static final short[] DFA19_eot = DFA.unpackEncodedString(DFA19_eotS);
-    static final short[] DFA19_eof = DFA.unpackEncodedString(DFA19_eofS);
-    static final char[] DFA19_min = DFA.unpackEncodedStringToUnsignedChars(DFA19_minS);
-    static final char[] DFA19_max = DFA.unpackEncodedStringToUnsignedChars(DFA19_maxS);
-    static final short[] DFA19_accept = DFA.unpackEncodedString(DFA19_acceptS);
-    static final short[] DFA19_special = DFA.unpackEncodedString(DFA19_specialS);
-    static final short[][] DFA19_transition;
+    static final short[] DFA20_eot = DFA.unpackEncodedString(DFA20_eotS);
+    static final short[] DFA20_eof = DFA.unpackEncodedString(DFA20_eofS);
+    static final char[] DFA20_min = DFA.unpackEncodedStringToUnsignedChars(DFA20_minS);
+    static final char[] DFA20_max = DFA.unpackEncodedStringToUnsignedChars(DFA20_maxS);
+    static final short[] DFA20_accept = DFA.unpackEncodedString(DFA20_acceptS);
+    static final short[] DFA20_special = DFA.unpackEncodedString(DFA20_specialS);
+    static final short[][] DFA20_transition;
 
     static {
-        int numStates = DFA19_transitionS.length;
-        DFA19_transition = new short[numStates][];
+        int numStates = DFA20_transitionS.length;
+        DFA20_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA19_transition[i] = DFA.unpackEncodedString(DFA19_transitionS[i]);
+            DFA20_transition[i] = DFA.unpackEncodedString(DFA20_transitionS[i]);
         }
     }
 
-    class DFA19 extends DFA {
+    class DFA20 extends DFA {
 
-        public DFA19(BaseRecognizer recognizer) {
+        public DFA20(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 19;
-            this.eot = DFA19_eot;
-            this.eof = DFA19_eof;
-            this.min = DFA19_min;
-            this.max = DFA19_max;
-            this.accept = DFA19_accept;
-            this.special = DFA19_special;
-            this.transition = DFA19_transition;
+            this.decisionNumber = 20;
+            this.eot = DFA20_eot;
+            this.eof = DFA20_eof;
+            this.min = DFA20_min;
+            this.max = DFA20_max;
+            this.accept = DFA20_accept;
+            this.special = DFA20_special;
+            this.transition = DFA20_transition;
         }
         public String getDescription() {
-            return "1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | RULE_DOULBE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
+            return "1:1: Tokens : ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | RULE_OF_INT | RULE_T_DOUBLE | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             IntStream input = _input;
                 int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA19_0 = input.LA(1);
+                        int LA20_25 = input.LA(1);
 
                         s = -1;
-                        if ( (LA19_0=='p') ) {s = 1;}
+                        if ( ((LA20_25>='\u0000' && LA20_25<='\uFFFF')) ) {s = 61;}
 
-                        else if ( (LA19_0==';') ) {s = 2;}
+                        else s = 28;
 
-                        else if ( (LA19_0=='i') ) {s = 3;}
+                        if ( s>=0 ) return s;
+                        break;
+                    case 1 : 
+                        int LA20_0 = input.LA(1);
 
-                        else if ( (LA19_0=='c') ) {s = 4;}
+                        s = -1;
+                        if ( (LA20_0=='p') ) {s = 1;}
 
-                        else if ( (LA19_0=='{') ) {s = 5;}
+                        else if ( (LA20_0==';') ) {s = 2;}
 
-                        else if ( (LA19_0=='o') ) {s = 6;}
+                        else if ( (LA20_0=='i') ) {s = 3;}
 
-                        else if ( (LA19_0=='}') ) {s = 7;}
+                        else if ( (LA20_0=='c') ) {s = 4;}
 
-                        else if ( (LA19_0=='[') ) {s = 8;}
+                        else if ( (LA20_0=='{') ) {s = 5;}
 
-                        else if ( (LA19_0=='l') ) {s = 9;}
+                        else if ( (LA20_0=='o') ) {s = 6;}
 
-                        else if ( (LA19_0=='=') ) {s = 10;}
+                        else if ( (LA20_0=='}') ) {s = 7;}
 
-                        else if ( (LA19_0=='a') ) {s = 11;}
+                        else if ( (LA20_0=='[') ) {s = 8;}
 
-                        else if ( (LA19_0=='t') ) {s = 12;}
+                        else if ( (LA20_0=='=') ) {s = 9;}
 
-                        else if ( (LA19_0=='m') ) {s = 13;}
+                        else if ( (LA20_0=='l') ) {s = 10;}
 
-                        else if ( (LA19_0=='(') ) {s = 14;}
+                        else if ( (LA20_0=='a') ) {s = 11;}
 
-                        else if ( (LA19_0==',') ) {s = 15;}
+                        else if ( (LA20_0=='t') ) {s = 12;}
 
-                        else if ( (LA19_0==')') ) {s = 16;}
+                        else if ( (LA20_0=='m') ) {s = 13;}
 
-                        else if ( (LA19_0=='+') ) {s = 17;}
+                        else if ( (LA20_0=='(') ) {s = 14;}
 
-                        else if ( (LA19_0==':') ) {s = 18;}
+                        else if ( (LA20_0==',') ) {s = 15;}
 
-                        else if ( (LA19_0=='.') ) {s = 19;}
+                        else if ( (LA20_0==')') ) {s = 16;}
 
-                        else if ( (LA19_0=='*') ) {s = 20;}
+                        else if ( (LA20_0=='+') ) {s = 17;}
 
-                        else if ( ((LA19_0>='0' && LA19_0<='9')) ) {s = 21;}
+                        else if ( (LA20_0==':') ) {s = 18;}
 
-                        else if ( (LA19_0=='^') ) {s = 22;}
+                        else if ( (LA20_0=='.') ) {s = 19;}
 
-                        else if ( ((LA19_0>='A' && LA19_0<='Z')||LA19_0=='_'||LA19_0=='b'||(LA19_0>='d' && LA19_0<='h')||(LA19_0>='j' && LA19_0<='k')||LA19_0=='n'||(LA19_0>='q' && LA19_0<='s')||(LA19_0>='u' && LA19_0<='z')) ) {s = 23;}
+                        else if ( (LA20_0=='*') ) {s = 20;}
 
-                        else if ( (LA19_0=='\"') ) {s = 24;}
+                        else if ( ((LA20_0>='0' && LA20_0<='9')) ) {s = 21;}
 
-                        else if ( (LA19_0=='\'') ) {s = 25;}
+                        else if ( (LA20_0=='^') ) {s = 22;}
 
-                        else if ( (LA19_0=='/') ) {s = 26;}
+                        else if ( ((LA20_0>='A' && LA20_0<='Z')||LA20_0=='_'||LA20_0=='b'||(LA20_0>='d' && LA20_0<='h')||(LA20_0>='j' && LA20_0<='k')||LA20_0=='n'||(LA20_0>='q' && LA20_0<='s')||(LA20_0>='u' && LA20_0<='z')) ) {s = 23;}
 
-                        else if ( ((LA19_0>='\t' && LA19_0<='\n')||LA19_0=='\r'||LA19_0==' ') ) {s = 27;}
+                        else if ( (LA20_0=='\"') ) {s = 24;}
 
-                        else if ( ((LA19_0>='\u0000' && LA19_0<='\b')||(LA19_0>='\u000B' && LA19_0<='\f')||(LA19_0>='\u000E' && LA19_0<='\u001F')||LA19_0=='!'||(LA19_0>='#' && LA19_0<='&')||LA19_0=='-'||LA19_0=='<'||(LA19_0>='>' && LA19_0<='@')||(LA19_0>='\\' && LA19_0<=']')||LA19_0=='`'||LA19_0=='|'||(LA19_0>='~' && LA19_0<='\uFFFF')) ) {s = 28;}
+                        else if ( (LA20_0=='\'') ) {s = 25;}
 
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA19_25 = input.LA(1);
+                        else if ( (LA20_0=='/') ) {s = 26;}
 
-                        s = -1;
-                        if ( ((LA19_25>='\u0000' && LA19_25<='\uFFFF')) ) {s = 59;}
+                        else if ( ((LA20_0>='\t' && LA20_0<='\n')||LA20_0=='\r'||LA20_0==' ') ) {s = 27;}
 
-                        else s = 28;
+                        else if ( ((LA20_0>='\u0000' && LA20_0<='\b')||(LA20_0>='\u000B' && LA20_0<='\f')||(LA20_0>='\u000E' && LA20_0<='\u001F')||LA20_0=='!'||(LA20_0>='#' && LA20_0<='&')||LA20_0=='-'||LA20_0=='<'||(LA20_0>='>' && LA20_0<='@')||(LA20_0>='\\' && LA20_0<=']')||LA20_0=='`'||LA20_0=='|'||(LA20_0>='~' && LA20_0<='\uFFFF')) ) {s = 28;}
 
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA19_24 = input.LA(1);
+                        int LA20_24 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA19_24>='\u0000' && LA19_24<='\uFFFF')) ) {s = 59;}
+                        if ( ((LA20_24>='\u0000' && LA20_24<='\uFFFF')) ) {s = 61;}
 
                         else s = 28;
 
@@ -1866,7 +1987,7 @@ public class InternalCftLanguageLexer extends Lexer {
                         break;
             }
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 19, _s, input);
+                new NoViableAltException(getDescription(), 20, _s, input);
             error(nvae);
             throw nvae;
         }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguageParser.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguageParser.java
index 29c15563..4727763e 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguageParser.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/parser/antlr/internal/InternalCftLanguageParser.java
@@ -21,19 +21,21 @@ import java.util.ArrayList;
 @SuppressWarnings("all")
 public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_DOULBE", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'package'", "';'", "'import'", "'cft'", "'{'", "'in'", "'out'", "'}'", "'[]'", "'lambda'", "'='", "'and'", "'or'", "'transformation'", "'toplevel'", "'mapping'", "'('", "','", "')'", "'lookup'", "'as'", "'+='", "':='", "'.'", "'=>'", "'*'"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_OF_INT", "RULE_ID", "RULE_T_DOUBLE", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'package'", "';'", "'import'", "'cft'", "'{'", "'in'", "'out'", "'}'", "'[]'", "'p'", "'='", "'lambda'", "'and'", "'or'", "'of'", "'transformation'", "'toplevel'", "'mapping'", "'('", "','", "')'", "'lookup'", "'as'", "'+='", "':='", "'.'", "'=>'", "'*'"
     };
-    public static final int RULE_STRING=7;
-    public static final int RULE_SL_COMMENT=9;
+    public static final int RULE_STRING=8;
+    public static final int RULE_SL_COMMENT=10;
     public static final int T__19=19;
     public static final int T__15=15;
     public static final int T__37=37;
     public static final int T__16=16;
+    public static final int T__38=38;
     public static final int T__17=17;
+    public static final int T__39=39;
     public static final int T__18=18;
     public static final int T__33=33;
-    public static final int T__12=12;
     public static final int T__34=34;
+    public static final int RULE_T_DOUBLE=7;
     public static final int T__13=13;
     public static final int T__35=35;
     public static final int T__14=14;
@@ -42,20 +44,21 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
     public static final int T__30=30;
     public static final int T__31=31;
     public static final int T__32=32;
-    public static final int RULE_ID=4;
-    public static final int RULE_WS=10;
-    public static final int RULE_DOULBE=5;
-    public static final int RULE_ANY_OTHER=11;
+    public static final int RULE_OF_INT=5;
+    public static final int RULE_ID=6;
+    public static final int RULE_WS=11;
+    public static final int RULE_ANY_OTHER=12;
     public static final int T__26=26;
     public static final int T__27=27;
     public static final int T__28=28;
-    public static final int RULE_INT=6;
+    public static final int RULE_INT=4;
     public static final int T__29=29;
     public static final int T__22=22;
-    public static final int RULE_ML_COMMENT=8;
+    public static final int RULE_ML_COMMENT=9;
     public static final int T__23=23;
     public static final int T__24=24;
     public static final int T__25=25;
+    public static final int T__40=40;
     public static final int T__20=20;
     public static final int T__21=21;
 
@@ -160,7 +163,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
             // InternalCftLanguage.g:78:2: (otherlv_0= 'package' ( (lv_packageName_1_0= ruleQualifiedName ) ) (otherlv_2= ';' )? ( (lv_imports_3_0= ruleImportDeclaration ) )* ( ( (lv_componentDefinitions_4_0= ruleComponentDefinition ) ) | ( (lv_transformationDefinitions_5_0= ruleTransformationDefinition ) ) )* )
             // InternalCftLanguage.g:79:3: otherlv_0= 'package' ( (lv_packageName_1_0= ruleQualifiedName ) ) (otherlv_2= ';' )? ( (lv_imports_3_0= ruleImportDeclaration ) )* ( ( (lv_componentDefinitions_4_0= ruleComponentDefinition ) ) | ( (lv_transformationDefinitions_5_0= ruleTransformationDefinition ) ) )*
             {
-            otherlv_0=(Token)match(input,12,FOLLOW_3); 
+            otherlv_0=(Token)match(input,13,FOLLOW_3); 
 
                                 newLeafNode(otherlv_0, grammarAccess.getCftModelAccess().getPackageKeyword_0());
                         
@@ -199,14 +202,14 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
             int alt1=2;
             int LA1_0 = input.LA(1);
 
-            if ( (LA1_0==13) ) {
+            if ( (LA1_0==14) ) {
                 alt1=1;
             }
             switch (alt1) {
                 case 1 :
                     // InternalCftLanguage.g:103:4: otherlv_2= ';'
                     {
-                    otherlv_2=(Token)match(input,13,FOLLOW_5); 
+                    otherlv_2=(Token)match(input,14,FOLLOW_5); 
 
                                                 newLeafNode(otherlv_2, grammarAccess.getCftModelAccess().getSemicolonKeyword_2());
                                         
@@ -222,7 +225,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                 int alt2=2;
                 int LA2_0 = input.LA(1);
 
-                if ( (LA2_0==14) ) {
+                if ( (LA2_0==15) ) {
                     alt2=1;
                 }
 
@@ -271,10 +274,10 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                 int alt3=3;
                 int LA3_0 = input.LA(1);
 
-                if ( (LA3_0==15) ) {
+                if ( (LA3_0==16) ) {
                     alt3=1;
                 }
-                else if ( (LA3_0==25) ) {
+                else if ( (LA3_0==28) ) {
                     alt3=2;
                 }
 
@@ -438,7 +441,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
             // InternalCftLanguage.g:186:2: (otherlv_0= 'import' ( (lv_importedNamespace_1_0= ruleQualifiedNameWithWildcard ) ) (otherlv_2= ';' )? )
             // InternalCftLanguage.g:187:3: otherlv_0= 'import' ( (lv_importedNamespace_1_0= ruleQualifiedNameWithWildcard ) ) (otherlv_2= ';' )?
             {
-            otherlv_0=(Token)match(input,14,FOLLOW_3); 
+            otherlv_0=(Token)match(input,15,FOLLOW_3); 
 
                                 newLeafNode(otherlv_0, grammarAccess.getImportDeclarationAccess().getImportKeyword_0());
                         
@@ -477,14 +480,14 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
             int alt4=2;
             int LA4_0 = input.LA(1);
 
-            if ( (LA4_0==13) ) {
+            if ( (LA4_0==14) ) {
                 alt4=1;
             }
             switch (alt4) {
                 case 1 :
                     // InternalCftLanguage.g:211:4: otherlv_2= ';'
                     {
-                    otherlv_2=(Token)match(input,13,FOLLOW_2); 
+                    otherlv_2=(Token)match(input,14,FOLLOW_2); 
 
                                                 newLeafNode(otherlv_2, grammarAccess.getImportDeclarationAccess().getSemicolonKeyword_2());
                                         
@@ -553,20 +556,20 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleComponentDefinition"
-    // InternalCftLanguage.g:227:1: ruleComponentDefinition returns [EObject current=null] : (otherlv_0= 'cft' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';' ) ) ) ) )* ) ) ) ( ( (lv_eventDefinitions_10_0= ruleEventDefinition ) ) otherlv_11= ';' )* otherlv_12= '}' ) ;
+    // InternalCftLanguage.g:227:1: ruleComponentDefinition returns [EObject current=null] : (otherlv_0= 'cft' ( (lv_name_1_0= ruleValidId ) ) otherlv_2= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';' ) ) ) ) )* ) ) ) ( ( (lv_eventDefinitions_10_0= ruleEventDefinition ) ) otherlv_11= ';' )* otherlv_12= '}' ) ;
     public final EObject ruleComponentDefinition() throws RecognitionException {
         EObject current = null;
 
         Token otherlv_0=null;
-        Token lv_name_1_0=null;
         Token otherlv_2=null;
         Token otherlv_4=null;
         Token otherlv_6=null;
         Token otherlv_7=null;
-        Token otherlv_8=null;
         Token otherlv_9=null;
         Token otherlv_11=null;
         Token otherlv_12=null;
+        AntlrDatatypeRuleToken lv_name_1_0 = null;
+
         EObject lv_inputEvents_5_0 = null;
 
         EObject lv_eventDefinitions_10_0 = null;
@@ -576,35 +579,40 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:233:2: ( (otherlv_0= 'cft' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';' ) ) ) ) )* ) ) ) ( ( (lv_eventDefinitions_10_0= ruleEventDefinition ) ) otherlv_11= ';' )* otherlv_12= '}' ) )
-            // InternalCftLanguage.g:234:2: (otherlv_0= 'cft' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';' ) ) ) ) )* ) ) ) ( ( (lv_eventDefinitions_10_0= ruleEventDefinition ) ) otherlv_11= ';' )* otherlv_12= '}' )
+            // InternalCftLanguage.g:233:2: ( (otherlv_0= 'cft' ( (lv_name_1_0= ruleValidId ) ) otherlv_2= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';' ) ) ) ) )* ) ) ) ( ( (lv_eventDefinitions_10_0= ruleEventDefinition ) ) otherlv_11= ';' )* otherlv_12= '}' ) )
+            // InternalCftLanguage.g:234:2: (otherlv_0= 'cft' ( (lv_name_1_0= ruleValidId ) ) otherlv_2= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';' ) ) ) ) )* ) ) ) ( ( (lv_eventDefinitions_10_0= ruleEventDefinition ) ) otherlv_11= ';' )* otherlv_12= '}' )
             {
-            // InternalCftLanguage.g:234:2: (otherlv_0= 'cft' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';' ) ) ) ) )* ) ) ) ( ( (lv_eventDefinitions_10_0= ruleEventDefinition ) ) otherlv_11= ';' )* otherlv_12= '}' )
-            // InternalCftLanguage.g:235:3: otherlv_0= 'cft' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';' ) ) ) ) )* ) ) ) ( ( (lv_eventDefinitions_10_0= ruleEventDefinition ) ) otherlv_11= ';' )* otherlv_12= '}'
+            // InternalCftLanguage.g:234:2: (otherlv_0= 'cft' ( (lv_name_1_0= ruleValidId ) ) otherlv_2= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';' ) ) ) ) )* ) ) ) ( ( (lv_eventDefinitions_10_0= ruleEventDefinition ) ) otherlv_11= ';' )* otherlv_12= '}' )
+            // InternalCftLanguage.g:235:3: otherlv_0= 'cft' ( (lv_name_1_0= ruleValidId ) ) otherlv_2= '{' ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';' ) ) ) ) )* ) ) ) ( ( (lv_eventDefinitions_10_0= ruleEventDefinition ) ) otherlv_11= ';' )* otherlv_12= '}'
             {
-            otherlv_0=(Token)match(input,15,FOLLOW_3); 
+            otherlv_0=(Token)match(input,16,FOLLOW_3); 
 
                                 newLeafNode(otherlv_0, grammarAccess.getComponentDefinitionAccess().getCftKeyword_0());
                         
-            // InternalCftLanguage.g:239:3: ( (lv_name_1_0= RULE_ID ) )
-            // InternalCftLanguage.g:240:4: (lv_name_1_0= RULE_ID )
+            // InternalCftLanguage.g:239:3: ( (lv_name_1_0= ruleValidId ) )
+            // InternalCftLanguage.g:240:4: (lv_name_1_0= ruleValidId )
             {
-            // InternalCftLanguage.g:240:4: (lv_name_1_0= RULE_ID )
-            // InternalCftLanguage.g:241:5: lv_name_1_0= RULE_ID
+            // InternalCftLanguage.g:240:4: (lv_name_1_0= ruleValidId )
+            // InternalCftLanguage.g:241:5: lv_name_1_0= ruleValidId
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_8); 
 
-                                                newLeafNode(lv_name_1_0, grammarAccess.getComponentDefinitionAccess().getNameIDTerminalRuleCall_1_0());
+                                                newCompositeNode(grammarAccess.getComponentDefinitionAccess().getNameValidIdParserRuleCall_1_0());
                                         
+            pushFollow(FOLLOW_8);
+            lv_name_1_0=ruleValidId();
+
+            state._fsp--;
+
 
                                                 if (current==null) {
-                                                        current = createModelElement(grammarAccess.getComponentDefinitionRule());
+                                                        current = createModelElementForParent(grammarAccess.getComponentDefinitionRule());
                                                 }
-                                                setWithLastConsumed(
+                                                set(
                                                         current,
                                                         "name",
                                                         lv_name_1_0,
-                                                        "org.eclipse.xtext.common.Terminals.ID");
+                                                        "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -612,82 +620,82 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,16,FOLLOW_9); 
+            otherlv_2=(Token)match(input,17,FOLLOW_9); 
 
                                 newLeafNode(otherlv_2, grammarAccess.getComponentDefinitionAccess().getLeftCurlyBracketKeyword_2());
                         
-            // InternalCftLanguage.g:261:3: ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';' ) ) ) ) )* ) ) )
-            // InternalCftLanguage.g:262:4: ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';' ) ) ) ) )* ) )
+            // InternalCftLanguage.g:262:3: ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';' ) ) ) ) )* ) ) )
+            // InternalCftLanguage.g:263:4: ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';' ) ) ) ) )* ) )
             {
-            // InternalCftLanguage.g:262:4: ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';' ) ) ) ) )* ) )
-            // InternalCftLanguage.g:263:5: ( ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';' ) ) ) ) )* )
+            // InternalCftLanguage.g:263:4: ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';' ) ) ) ) )* ) )
+            // InternalCftLanguage.g:264:5: ( ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';' ) ) ) ) )* )
             {
              
                                           getUnorderedGroupHelper().enter(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3());
                                         
-            // InternalCftLanguage.g:266:5: ( ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';' ) ) ) ) )* )
-            // InternalCftLanguage.g:267:6: ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';' ) ) ) ) )*
+            // InternalCftLanguage.g:267:5: ( ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';' ) ) ) ) )* )
+            // InternalCftLanguage.g:268:6: ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';' ) ) ) ) )*
             {
-            // InternalCftLanguage.g:267:6: ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';' ) ) ) ) )*
+            // InternalCftLanguage.g:268:6: ( ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';' ) ) ) ) )*
             loop7:
             do {
                 int alt7=3;
                 int LA7_0 = input.LA(1);
 
-                if ( LA7_0 == 17 && getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 0) ) {
+                if ( LA7_0 == 18 && getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 0) ) {
                     alt7=1;
                 }
-                else if ( LA7_0 == 18 && getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 1) ) {
+                else if ( LA7_0 == 19 && getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 1) ) {
                     alt7=2;
                 }
 
 
                 switch (alt7) {
                 case 1 :
-                    // InternalCftLanguage.g:268:4: ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) )
+                    // InternalCftLanguage.g:269:4: ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) )
                     {
-                    // InternalCftLanguage.g:268:4: ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) )
-                    // InternalCftLanguage.g:269:5: {...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) )
+                    // InternalCftLanguage.g:269:4: ({...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) ) )
+                    // InternalCftLanguage.g:270:5: {...}? => ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 0) ) {
                         throw new FailedPredicateException(input, "ruleComponentDefinition", "getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 0)");
                     }
-                    // InternalCftLanguage.g:269:116: ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) )
-                    // InternalCftLanguage.g:270:6: ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) )
+                    // InternalCftLanguage.g:270:116: ( ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) ) )
+                    // InternalCftLanguage.g:271:6: ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) )
                     {
 
                                                                 getUnorderedGroupHelper().select(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 0);
                                                         
-                    // InternalCftLanguage.g:273:9: ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) )
-                    // InternalCftLanguage.g:273:10: {...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' )
+                    // InternalCftLanguage.g:274:9: ({...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' ) )
+                    // InternalCftLanguage.g:274:10: {...}? => (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' )
                     {
                     if ( !((true)) ) {
                         throw new FailedPredicateException(input, "ruleComponentDefinition", "true");
                     }
-                    // InternalCftLanguage.g:273:19: (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' )
-                    // InternalCftLanguage.g:273:20: otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';'
+                    // InternalCftLanguage.g:274:19: (otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';' )
+                    // InternalCftLanguage.g:274:20: otherlv_4= 'in' ( (lv_inputEvents_5_0= ruleInputEvent ) )* otherlv_6= ';'
                     {
-                    otherlv_4=(Token)match(input,17,FOLLOW_10); 
+                    otherlv_4=(Token)match(input,18,FOLLOW_10); 
 
                                                                                         newLeafNode(otherlv_4, grammarAccess.getComponentDefinitionAccess().getInKeyword_3_0_0());
                                                                                 
-                    // InternalCftLanguage.g:277:9: ( (lv_inputEvents_5_0= ruleInputEvent ) )*
+                    // InternalCftLanguage.g:278:9: ( (lv_inputEvents_5_0= ruleInputEvent ) )*
                     loop5:
                     do {
                         int alt5=2;
                         int LA5_0 = input.LA(1);
 
-                        if ( (LA5_0==RULE_ID) ) {
+                        if ( ((LA5_0>=RULE_OF_INT && LA5_0<=RULE_ID)) ) {
                             alt5=1;
                         }
 
 
                         switch (alt5) {
                         case 1 :
-                            // InternalCftLanguage.g:278:10: (lv_inputEvents_5_0= ruleInputEvent )
+                            // InternalCftLanguage.g:279:10: (lv_inputEvents_5_0= ruleInputEvent )
                             {
-                            // InternalCftLanguage.g:278:10: (lv_inputEvents_5_0= ruleInputEvent )
-                            // InternalCftLanguage.g:279:11: lv_inputEvents_5_0= ruleInputEvent
+                            // InternalCftLanguage.g:279:10: (lv_inputEvents_5_0= ruleInputEvent )
+                            // InternalCftLanguage.g:280:11: lv_inputEvents_5_0= ruleInputEvent
                             {
 
                                                                                                                 newCompositeNode(grammarAccess.getComponentDefinitionAccess().getInputEventsInputEventParserRuleCall_3_0_1_0());
@@ -720,7 +728,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                         }
                     } while (true);
 
-                    otherlv_6=(Token)match(input,13,FOLLOW_9); 
+                    otherlv_6=(Token)match(input,14,FOLLOW_9); 
 
                                                                                         newLeafNode(otherlv_6, grammarAccess.getComponentDefinitionAccess().getSemicolonKeyword_3_0_2());
                                                                                 
@@ -743,59 +751,66 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalCftLanguage.g:306:4: ({...}? => ( ({...}? => (otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';' ) ) ) )
+                    // InternalCftLanguage.g:307:4: ({...}? => ( ({...}? => (otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';' ) ) ) )
                     {
-                    // InternalCftLanguage.g:306:4: ({...}? => ( ({...}? => (otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';' ) ) ) )
-                    // InternalCftLanguage.g:307:5: {...}? => ( ({...}? => (otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';' ) ) )
+                    // InternalCftLanguage.g:307:4: ({...}? => ( ({...}? => (otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';' ) ) ) )
+                    // InternalCftLanguage.g:308:5: {...}? => ( ({...}? => (otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';' ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 1) ) {
                         throw new FailedPredicateException(input, "ruleComponentDefinition", "getUnorderedGroupHelper().canSelect(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 1)");
                     }
-                    // InternalCftLanguage.g:307:116: ( ({...}? => (otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';' ) ) )
-                    // InternalCftLanguage.g:308:6: ({...}? => (otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';' ) )
+                    // InternalCftLanguage.g:308:116: ( ({...}? => (otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';' ) ) )
+                    // InternalCftLanguage.g:309:6: ({...}? => (otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';' ) )
                     {
 
                                                                 getUnorderedGroupHelper().select(grammarAccess.getComponentDefinitionAccess().getUnorderedGroup_3(), 1);
                                                         
-                    // InternalCftLanguage.g:311:9: ({...}? => (otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';' ) )
-                    // InternalCftLanguage.g:311:10: {...}? => (otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';' )
+                    // InternalCftLanguage.g:312:9: ({...}? => (otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';' ) )
+                    // InternalCftLanguage.g:312:10: {...}? => (otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';' )
                     {
                     if ( !((true)) ) {
                         throw new FailedPredicateException(input, "ruleComponentDefinition", "true");
                     }
-                    // InternalCftLanguage.g:311:19: (otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';' )
-                    // InternalCftLanguage.g:311:20: otherlv_7= 'out' ( (otherlv_8= RULE_ID ) )* otherlv_9= ';'
+                    // InternalCftLanguage.g:312:19: (otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';' )
+                    // InternalCftLanguage.g:312:20: otherlv_7= 'out' ( ( ruleValidId ) )* otherlv_9= ';'
                     {
-                    otherlv_7=(Token)match(input,18,FOLLOW_10); 
+                    otherlv_7=(Token)match(input,19,FOLLOW_10); 
 
                                                                                         newLeafNode(otherlv_7, grammarAccess.getComponentDefinitionAccess().getOutKeyword_3_1_0());
                                                                                 
-                    // InternalCftLanguage.g:315:9: ( (otherlv_8= RULE_ID ) )*
+                    // InternalCftLanguage.g:316:9: ( ( ruleValidId ) )*
                     loop6:
                     do {
                         int alt6=2;
                         int LA6_0 = input.LA(1);
 
-                        if ( (LA6_0==RULE_ID) ) {
+                        if ( ((LA6_0>=RULE_OF_INT && LA6_0<=RULE_ID)) ) {
                             alt6=1;
                         }
 
 
                         switch (alt6) {
                         case 1 :
-                            // InternalCftLanguage.g:316:10: (otherlv_8= RULE_ID )
+                            // InternalCftLanguage.g:317:10: ( ruleValidId )
                             {
-                            // InternalCftLanguage.g:316:10: (otherlv_8= RULE_ID )
-                            // InternalCftLanguage.g:317:11: otherlv_8= RULE_ID
+                            // InternalCftLanguage.g:317:10: ( ruleValidId )
+                            // InternalCftLanguage.g:318:11: ruleValidId
                             {
 
                                                                                                                 if (current==null) {
                                                                                                                         current = createModelElement(grammarAccess.getComponentDefinitionRule());
                                                                                                                 }
                                                                                                         
-                            otherlv_8=(Token)match(input,RULE_ID,FOLLOW_10); 
 
-                                                                                                                newLeafNode(otherlv_8, grammarAccess.getComponentDefinitionAccess().getOutputEventsEventDeclarationCrossReference_3_1_1_0());
+                                                                                                                newCompositeNode(grammarAccess.getComponentDefinitionAccess().getOutputEventsEventDeclarationCrossReference_3_1_1_0());
+                                                                                                        
+                            pushFollow(FOLLOW_10);
+                            ruleValidId();
+
+                            state._fsp--;
+
+
+                                                                                                                afterParserOrEnumRuleCall();
                                                                                                         
 
                             }
@@ -809,7 +824,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                         }
                     } while (true);
 
-                    otherlv_9=(Token)match(input,13,FOLLOW_9); 
+                    otherlv_9=(Token)match(input,14,FOLLOW_9); 
 
                                                                                         newLeafNode(otherlv_9, grammarAccess.getComponentDefinitionAccess().getSemicolonKeyword_3_1_2());
                                                                                 
@@ -849,26 +864,26 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalCftLanguage.g:345:3: ( ( (lv_eventDefinitions_10_0= ruleEventDefinition ) ) otherlv_11= ';' )*
+            // InternalCftLanguage.g:349:3: ( ( (lv_eventDefinitions_10_0= ruleEventDefinition ) ) otherlv_11= ';' )*
             loop8:
             do {
                 int alt8=2;
                 int LA8_0 = input.LA(1);
 
-                if ( (LA8_0==RULE_ID) ) {
+                if ( ((LA8_0>=RULE_OF_INT && LA8_0<=RULE_ID)) ) {
                     alt8=1;
                 }
 
 
                 switch (alt8) {
                 case 1 :
-                    // InternalCftLanguage.g:346:4: ( (lv_eventDefinitions_10_0= ruleEventDefinition ) ) otherlv_11= ';'
+                    // InternalCftLanguage.g:350:4: ( (lv_eventDefinitions_10_0= ruleEventDefinition ) ) otherlv_11= ';'
                     {
-                    // InternalCftLanguage.g:346:4: ( (lv_eventDefinitions_10_0= ruleEventDefinition ) )
-                    // InternalCftLanguage.g:347:5: (lv_eventDefinitions_10_0= ruleEventDefinition )
+                    // InternalCftLanguage.g:350:4: ( (lv_eventDefinitions_10_0= ruleEventDefinition ) )
+                    // InternalCftLanguage.g:351:5: (lv_eventDefinitions_10_0= ruleEventDefinition )
                     {
-                    // InternalCftLanguage.g:347:5: (lv_eventDefinitions_10_0= ruleEventDefinition )
-                    // InternalCftLanguage.g:348:6: lv_eventDefinitions_10_0= ruleEventDefinition
+                    // InternalCftLanguage.g:351:5: (lv_eventDefinitions_10_0= ruleEventDefinition )
+                    // InternalCftLanguage.g:352:6: lv_eventDefinitions_10_0= ruleEventDefinition
                     {
 
                                                                 newCompositeNode(grammarAccess.getComponentDefinitionAccess().getEventDefinitionsEventDefinitionParserRuleCall_4_0_0());
@@ -895,7 +910,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_11=(Token)match(input,13,FOLLOW_12); 
+                    otherlv_11=(Token)match(input,14,FOLLOW_12); 
 
                                                 newLeafNode(otherlv_11, grammarAccess.getComponentDefinitionAccess().getSemicolonKeyword_4_1());
                                         
@@ -908,7 +923,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                 }
             } while (true);
 
-            otherlv_12=(Token)match(input,19,FOLLOW_2); 
+            otherlv_12=(Token)match(input,20,FOLLOW_2); 
 
                                 newLeafNode(otherlv_12, grammarAccess.getComponentDefinitionAccess().getRightCurlyBracketKeyword_5());
                         
@@ -935,7 +950,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleInputEvent"
-    // InternalCftLanguage.g:378:1: entryRuleInputEvent returns [EObject current=null] : iv_ruleInputEvent= ruleInputEvent EOF ;
+    // InternalCftLanguage.g:382:1: entryRuleInputEvent returns [EObject current=null] : iv_ruleInputEvent= ruleInputEvent EOF ;
     public final EObject entryRuleInputEvent() throws RecognitionException {
         EObject current = null;
 
@@ -943,8 +958,8 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalCftLanguage.g:378:51: (iv_ruleInputEvent= ruleInputEvent EOF )
-            // InternalCftLanguage.g:379:2: iv_ruleInputEvent= ruleInputEvent EOF
+            // InternalCftLanguage.g:382:51: (iv_ruleInputEvent= ruleInputEvent EOF )
+            // InternalCftLanguage.g:383:2: iv_ruleInputEvent= ruleInputEvent EOF
             {
              newCompositeNode(grammarAccess.getInputEventRule()); 
             pushFollow(FOLLOW_1);
@@ -971,42 +986,48 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleInputEvent"
-    // InternalCftLanguage.g:385:1: ruleInputEvent returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) ( (lv_multiple_1_0= '[]' ) )? ) ;
+    // InternalCftLanguage.g:389:1: ruleInputEvent returns [EObject current=null] : ( ( (lv_name_0_0= ruleValidId ) ) ( (lv_multiple_1_0= '[]' ) )? ) ;
     public final EObject ruleInputEvent() throws RecognitionException {
         EObject current = null;
 
-        Token lv_name_0_0=null;
         Token lv_multiple_1_0=null;
+        AntlrDatatypeRuleToken lv_name_0_0 = null;
+
 
 
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:391:2: ( ( ( (lv_name_0_0= RULE_ID ) ) ( (lv_multiple_1_0= '[]' ) )? ) )
-            // InternalCftLanguage.g:392:2: ( ( (lv_name_0_0= RULE_ID ) ) ( (lv_multiple_1_0= '[]' ) )? )
+            // InternalCftLanguage.g:395:2: ( ( ( (lv_name_0_0= ruleValidId ) ) ( (lv_multiple_1_0= '[]' ) )? ) )
+            // InternalCftLanguage.g:396:2: ( ( (lv_name_0_0= ruleValidId ) ) ( (lv_multiple_1_0= '[]' ) )? )
             {
-            // InternalCftLanguage.g:392:2: ( ( (lv_name_0_0= RULE_ID ) ) ( (lv_multiple_1_0= '[]' ) )? )
-            // InternalCftLanguage.g:393:3: ( (lv_name_0_0= RULE_ID ) ) ( (lv_multiple_1_0= '[]' ) )?
+            // InternalCftLanguage.g:396:2: ( ( (lv_name_0_0= ruleValidId ) ) ( (lv_multiple_1_0= '[]' ) )? )
+            // InternalCftLanguage.g:397:3: ( (lv_name_0_0= ruleValidId ) ) ( (lv_multiple_1_0= '[]' ) )?
             {
-            // InternalCftLanguage.g:393:3: ( (lv_name_0_0= RULE_ID ) )
-            // InternalCftLanguage.g:394:4: (lv_name_0_0= RULE_ID )
+            // InternalCftLanguage.g:397:3: ( (lv_name_0_0= ruleValidId ) )
+            // InternalCftLanguage.g:398:4: (lv_name_0_0= ruleValidId )
             {
-            // InternalCftLanguage.g:394:4: (lv_name_0_0= RULE_ID )
-            // InternalCftLanguage.g:395:5: lv_name_0_0= RULE_ID
+            // InternalCftLanguage.g:398:4: (lv_name_0_0= ruleValidId )
+            // InternalCftLanguage.g:399:5: lv_name_0_0= ruleValidId
             {
-            lv_name_0_0=(Token)match(input,RULE_ID,FOLLOW_13); 
 
-                                                newLeafNode(lv_name_0_0, grammarAccess.getInputEventAccess().getNameIDTerminalRuleCall_0_0());
+                                                newCompositeNode(grammarAccess.getInputEventAccess().getNameValidIdParserRuleCall_0_0());
                                         
+            pushFollow(FOLLOW_13);
+            lv_name_0_0=ruleValidId();
+
+            state._fsp--;
+
 
                                                 if (current==null) {
-                                                        current = createModelElement(grammarAccess.getInputEventRule());
+                                                        current = createModelElementForParent(grammarAccess.getInputEventRule());
                                                 }
-                                                setWithLastConsumed(
+                                                set(
                                                         current,
                                                         "name",
                                                         lv_name_0_0,
-                                                        "org.eclipse.xtext.common.Terminals.ID");
+                                                        "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -1014,21 +1035,21 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalCftLanguage.g:411:3: ( (lv_multiple_1_0= '[]' ) )?
+            // InternalCftLanguage.g:416:3: ( (lv_multiple_1_0= '[]' ) )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
-            if ( (LA9_0==20) ) {
+            if ( (LA9_0==21) ) {
                 alt9=1;
             }
             switch (alt9) {
                 case 1 :
-                    // InternalCftLanguage.g:412:4: (lv_multiple_1_0= '[]' )
+                    // InternalCftLanguage.g:417:4: (lv_multiple_1_0= '[]' )
                     {
-                    // InternalCftLanguage.g:412:4: (lv_multiple_1_0= '[]' )
-                    // InternalCftLanguage.g:413:5: lv_multiple_1_0= '[]'
+                    // InternalCftLanguage.g:417:4: (lv_multiple_1_0= '[]' )
+                    // InternalCftLanguage.g:418:5: lv_multiple_1_0= '[]'
                     {
-                    lv_multiple_1_0=(Token)match(input,20,FOLLOW_2); 
+                    lv_multiple_1_0=(Token)match(input,21,FOLLOW_2); 
 
                                                         newLeafNode(lv_multiple_1_0, grammarAccess.getInputEventAccess().getMultipleLeftSquareBracketRightSquareBracketKeyword_1_0());
                                                 
@@ -1070,7 +1091,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleEventDefinition"
-    // InternalCftLanguage.g:429:1: entryRuleEventDefinition returns [EObject current=null] : iv_ruleEventDefinition= ruleEventDefinition EOF ;
+    // InternalCftLanguage.g:434:1: entryRuleEventDefinition returns [EObject current=null] : iv_ruleEventDefinition= ruleEventDefinition EOF ;
     public final EObject entryRuleEventDefinition() throws RecognitionException {
         EObject current = null;
 
@@ -1078,8 +1099,8 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalCftLanguage.g:429:56: (iv_ruleEventDefinition= ruleEventDefinition EOF )
-            // InternalCftLanguage.g:430:2: iv_ruleEventDefinition= ruleEventDefinition EOF
+            // InternalCftLanguage.g:434:56: (iv_ruleEventDefinition= ruleEventDefinition EOF )
+            // InternalCftLanguage.g:435:2: iv_ruleEventDefinition= ruleEventDefinition EOF
             {
              newCompositeNode(grammarAccess.getEventDefinitionRule()); 
             pushFollow(FOLLOW_1);
@@ -1106,7 +1127,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleEventDefinition"
-    // InternalCftLanguage.g:436:1: ruleEventDefinition returns [EObject current=null] : (this_BasicEventDefinition_0= ruleBasicEventDefinition | this_GateDefinition_1= ruleGateDefinition ) ;
+    // InternalCftLanguage.g:441:1: ruleEventDefinition returns [EObject current=null] : (this_BasicEventDefinition_0= ruleBasicEventDefinition | this_GateDefinition_1= ruleGateDefinition ) ;
     public final EObject ruleEventDefinition() throws RecognitionException {
         EObject current = null;
 
@@ -1119,20 +1140,20 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:442:2: ( (this_BasicEventDefinition_0= ruleBasicEventDefinition | this_GateDefinition_1= ruleGateDefinition ) )
-            // InternalCftLanguage.g:443:2: (this_BasicEventDefinition_0= ruleBasicEventDefinition | this_GateDefinition_1= ruleGateDefinition )
+            // InternalCftLanguage.g:447:2: ( (this_BasicEventDefinition_0= ruleBasicEventDefinition | this_GateDefinition_1= ruleGateDefinition ) )
+            // InternalCftLanguage.g:448:2: (this_BasicEventDefinition_0= ruleBasicEventDefinition | this_GateDefinition_1= ruleGateDefinition )
             {
-            // InternalCftLanguage.g:443:2: (this_BasicEventDefinition_0= ruleBasicEventDefinition | this_GateDefinition_1= ruleGateDefinition )
+            // InternalCftLanguage.g:448:2: (this_BasicEventDefinition_0= ruleBasicEventDefinition | this_GateDefinition_1= ruleGateDefinition )
             int alt10=2;
             int LA10_0 = input.LA(1);
 
             if ( (LA10_0==RULE_ID) ) {
                 int LA10_1 = input.LA(2);
 
-                if ( ((LA10_1>=23 && LA10_1<=24)) ) {
+                if ( (LA10_1==RULE_INT||(LA10_1>=25 && LA10_1<=26)) ) {
                     alt10=2;
                 }
-                else if ( (LA10_1==21) ) {
+                else if ( (LA10_1==22||LA10_1==24) ) {
                     alt10=1;
                 }
                 else {
@@ -1142,6 +1163,22 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                     throw nvae;
                 }
             }
+            else if ( (LA10_0==RULE_OF_INT) ) {
+                int LA10_2 = input.LA(2);
+
+                if ( (LA10_2==22||LA10_2==24) ) {
+                    alt10=1;
+                }
+                else if ( (LA10_2==RULE_INT||(LA10_2>=25 && LA10_2<=26)) ) {
+                    alt10=2;
+                }
+                else {
+                    NoViableAltException nvae =
+                        new NoViableAltException("", 10, 2, input);
+
+                    throw nvae;
+                }
+            }
             else {
                 NoViableAltException nvae =
                     new NoViableAltException("", 10, 0, input);
@@ -1150,7 +1187,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
             }
             switch (alt10) {
                 case 1 :
-                    // InternalCftLanguage.g:444:3: this_BasicEventDefinition_0= ruleBasicEventDefinition
+                    // InternalCftLanguage.g:449:3: this_BasicEventDefinition_0= ruleBasicEventDefinition
                     {
 
                                         newCompositeNode(grammarAccess.getEventDefinitionAccess().getBasicEventDefinitionParserRuleCall_0());
@@ -1168,7 +1205,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalCftLanguage.g:453:3: this_GateDefinition_1= ruleGateDefinition
+                    // InternalCftLanguage.g:458:3: this_GateDefinition_1= ruleGateDefinition
                     {
 
                                         newCompositeNode(grammarAccess.getEventDefinitionAccess().getGateDefinitionParserRuleCall_1());
@@ -1208,7 +1245,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleBasicEventDefinition"
-    // InternalCftLanguage.g:465:1: entryRuleBasicEventDefinition returns [EObject current=null] : iv_ruleBasicEventDefinition= ruleBasicEventDefinition EOF ;
+    // InternalCftLanguage.g:470:1: entryRuleBasicEventDefinition returns [EObject current=null] : iv_ruleBasicEventDefinition= ruleBasicEventDefinition EOF ;
     public final EObject entryRuleBasicEventDefinition() throws RecognitionException {
         EObject current = null;
 
@@ -1216,8 +1253,8 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalCftLanguage.g:465:61: (iv_ruleBasicEventDefinition= ruleBasicEventDefinition EOF )
-            // InternalCftLanguage.g:466:2: iv_ruleBasicEventDefinition= ruleBasicEventDefinition EOF
+            // InternalCftLanguage.g:470:61: (iv_ruleBasicEventDefinition= ruleBasicEventDefinition EOF )
+            // InternalCftLanguage.g:471:2: iv_ruleBasicEventDefinition= ruleBasicEventDefinition EOF
             {
              newCompositeNode(grammarAccess.getBasicEventDefinitionRule()); 
             pushFollow(FOLLOW_1);
@@ -1244,44 +1281,325 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleBasicEventDefinition"
-    // InternalCftLanguage.g:472:1: ruleBasicEventDefinition returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= 'lambda' otherlv_2= '=' ( (lv_rate_3_0= RULE_DOULBE ) ) ) ;
+    // InternalCftLanguage.g:477:1: ruleBasicEventDefinition returns [EObject current=null] : ( ( (lv_name_0_0= ruleValidId ) ) ( (lv_distribution_1_0= ruleDistribution ) ) ) ;
     public final EObject ruleBasicEventDefinition() throws RecognitionException {
         EObject current = null;
 
-        Token lv_name_0_0=null;
-        Token otherlv_1=null;
-        Token otherlv_2=null;
-        Token lv_rate_3_0=null;
+        AntlrDatatypeRuleToken lv_name_0_0 = null;
+
+        EObject lv_distribution_1_0 = null;
+
 
 
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:478:2: ( ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= 'lambda' otherlv_2= '=' ( (lv_rate_3_0= RULE_DOULBE ) ) ) )
-            // InternalCftLanguage.g:479:2: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= 'lambda' otherlv_2= '=' ( (lv_rate_3_0= RULE_DOULBE ) ) )
+            // InternalCftLanguage.g:483:2: ( ( ( (lv_name_0_0= ruleValidId ) ) ( (lv_distribution_1_0= ruleDistribution ) ) ) )
+            // InternalCftLanguage.g:484:2: ( ( (lv_name_0_0= ruleValidId ) ) ( (lv_distribution_1_0= ruleDistribution ) ) )
             {
-            // InternalCftLanguage.g:479:2: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= 'lambda' otherlv_2= '=' ( (lv_rate_3_0= RULE_DOULBE ) ) )
-            // InternalCftLanguage.g:480:3: ( (lv_name_0_0= RULE_ID ) ) otherlv_1= 'lambda' otherlv_2= '=' ( (lv_rate_3_0= RULE_DOULBE ) )
+            // InternalCftLanguage.g:484:2: ( ( (lv_name_0_0= ruleValidId ) ) ( (lv_distribution_1_0= ruleDistribution ) ) )
+            // InternalCftLanguage.g:485:3: ( (lv_name_0_0= ruleValidId ) ) ( (lv_distribution_1_0= ruleDistribution ) )
             {
-            // InternalCftLanguage.g:480:3: ( (lv_name_0_0= RULE_ID ) )
-            // InternalCftLanguage.g:481:4: (lv_name_0_0= RULE_ID )
+            // InternalCftLanguage.g:485:3: ( (lv_name_0_0= ruleValidId ) )
+            // InternalCftLanguage.g:486:4: (lv_name_0_0= ruleValidId )
             {
-            // InternalCftLanguage.g:481:4: (lv_name_0_0= RULE_ID )
-            // InternalCftLanguage.g:482:5: lv_name_0_0= RULE_ID
+            // InternalCftLanguage.g:486:4: (lv_name_0_0= ruleValidId )
+            // InternalCftLanguage.g:487:5: lv_name_0_0= ruleValidId
             {
-            lv_name_0_0=(Token)match(input,RULE_ID,FOLLOW_14); 
 
-                                                newLeafNode(lv_name_0_0, grammarAccess.getBasicEventDefinitionAccess().getNameIDTerminalRuleCall_0_0());
+                                                newCompositeNode(grammarAccess.getBasicEventDefinitionAccess().getNameValidIdParserRuleCall_0_0());
                                         
+            pushFollow(FOLLOW_14);
+            lv_name_0_0=ruleValidId();
+
+            state._fsp--;
+
 
                                                 if (current==null) {
-                                                        current = createModelElement(grammarAccess.getBasicEventDefinitionRule());
+                                                        current = createModelElementForParent(grammarAccess.getBasicEventDefinitionRule());
                                                 }
-                                                setWithLastConsumed(
+                                                set(
                                                         current,
                                                         "name",
                                                         lv_name_0_0,
-                                                        "org.eclipse.xtext.common.Terminals.ID");
+                                                        "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                                                afterParserOrEnumRuleCall();
+                                        
+
+            }
+
+
+            }
+
+            // InternalCftLanguage.g:504:3: ( (lv_distribution_1_0= ruleDistribution ) )
+            // InternalCftLanguage.g:505:4: (lv_distribution_1_0= ruleDistribution )
+            {
+            // InternalCftLanguage.g:505:4: (lv_distribution_1_0= ruleDistribution )
+            // InternalCftLanguage.g:506:5: lv_distribution_1_0= ruleDistribution
+            {
+
+                                                newCompositeNode(grammarAccess.getBasicEventDefinitionAccess().getDistributionDistributionParserRuleCall_1_0());
+                                        
+            pushFollow(FOLLOW_2);
+            lv_distribution_1_0=ruleDistribution();
+
+            state._fsp--;
+
+
+                                                if (current==null) {
+                                                        current = createModelElementForParent(grammarAccess.getBasicEventDefinitionRule());
+                                                }
+                                                set(
+                                                        current,
+                                                        "distribution",
+                                                        lv_distribution_1_0,
+                                                        "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.Distribution");
+                                                afterParserOrEnumRuleCall();
+                                        
+
+            }
+
+
+            }
+
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleBasicEventDefinition"
+
+
+    // $ANTLR start "entryRuleDistribution"
+    // InternalCftLanguage.g:527:1: entryRuleDistribution returns [EObject current=null] : iv_ruleDistribution= ruleDistribution EOF ;
+    public final EObject entryRuleDistribution() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleDistribution = null;
+
+
+        try {
+            // InternalCftLanguage.g:527:53: (iv_ruleDistribution= ruleDistribution EOF )
+            // InternalCftLanguage.g:528:2: iv_ruleDistribution= ruleDistribution EOF
+            {
+             newCompositeNode(grammarAccess.getDistributionRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleDistribution=ruleDistribution();
+
+            state._fsp--;
+
+             current =iv_ruleDistribution; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleDistribution"
+
+
+    // $ANTLR start "ruleDistribution"
+    // InternalCftLanguage.g:534:1: ruleDistribution returns [EObject current=null] : (this_ConstantDistribution_0= ruleConstantDistribution | this_ExponentialDistribution_1= ruleExponentialDistribution ) ;
+    public final EObject ruleDistribution() throws RecognitionException {
+        EObject current = null;
+
+        EObject this_ConstantDistribution_0 = null;
+
+        EObject this_ExponentialDistribution_1 = null;
+
+
+
+                enterRule();
+
+        try {
+            // InternalCftLanguage.g:540:2: ( (this_ConstantDistribution_0= ruleConstantDistribution | this_ExponentialDistribution_1= ruleExponentialDistribution ) )
+            // InternalCftLanguage.g:541:2: (this_ConstantDistribution_0= ruleConstantDistribution | this_ExponentialDistribution_1= ruleExponentialDistribution )
+            {
+            // InternalCftLanguage.g:541:2: (this_ConstantDistribution_0= ruleConstantDistribution | this_ExponentialDistribution_1= ruleExponentialDistribution )
+            int alt11=2;
+            int LA11_0 = input.LA(1);
+
+            if ( (LA11_0==22) ) {
+                alt11=1;
+            }
+            else if ( (LA11_0==24) ) {
+                alt11=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 11, 0, input);
+
+                throw nvae;
+            }
+            switch (alt11) {
+                case 1 :
+                    // InternalCftLanguage.g:542:3: this_ConstantDistribution_0= ruleConstantDistribution
+                    {
+
+                                        newCompositeNode(grammarAccess.getDistributionAccess().getConstantDistributionParserRuleCall_0());
+                                
+                    pushFollow(FOLLOW_2);
+                    this_ConstantDistribution_0=ruleConstantDistribution();
+
+                    state._fsp--;
+
+
+                                        current = this_ConstantDistribution_0;
+                                        afterParserOrEnumRuleCall();
+                                
+
+                    }
+                    break;
+                case 2 :
+                    // InternalCftLanguage.g:551:3: this_ExponentialDistribution_1= ruleExponentialDistribution
+                    {
+
+                                        newCompositeNode(grammarAccess.getDistributionAccess().getExponentialDistributionParserRuleCall_1());
+                                
+                    pushFollow(FOLLOW_2);
+                    this_ExponentialDistribution_1=ruleExponentialDistribution();
+
+                    state._fsp--;
+
+
+                                        current = this_ExponentialDistribution_1;
+                                        afterParserOrEnumRuleCall();
+                                
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleDistribution"
+
+
+    // $ANTLR start "entryRuleConstantDistribution"
+    // InternalCftLanguage.g:563:1: entryRuleConstantDistribution returns [EObject current=null] : iv_ruleConstantDistribution= ruleConstantDistribution EOF ;
+    public final EObject entryRuleConstantDistribution() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleConstantDistribution = null;
+
+
+        try {
+            // InternalCftLanguage.g:563:61: (iv_ruleConstantDistribution= ruleConstantDistribution EOF )
+            // InternalCftLanguage.g:564:2: iv_ruleConstantDistribution= ruleConstantDistribution EOF
+            {
+             newCompositeNode(grammarAccess.getConstantDistributionRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleConstantDistribution=ruleConstantDistribution();
+
+            state._fsp--;
+
+             current =iv_ruleConstantDistribution; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleConstantDistribution"
+
+
+    // $ANTLR start "ruleConstantDistribution"
+    // InternalCftLanguage.g:570:1: ruleConstantDistribution returns [EObject current=null] : (otherlv_0= 'p' otherlv_1= '=' ( (lv_p_2_0= ruleDouble ) ) ) ;
+    public final EObject ruleConstantDistribution() throws RecognitionException {
+        EObject current = null;
+
+        Token otherlv_0=null;
+        Token otherlv_1=null;
+        AntlrDatatypeRuleToken lv_p_2_0 = null;
+
+
+
+                enterRule();
+
+        try {
+            // InternalCftLanguage.g:576:2: ( (otherlv_0= 'p' otherlv_1= '=' ( (lv_p_2_0= ruleDouble ) ) ) )
+            // InternalCftLanguage.g:577:2: (otherlv_0= 'p' otherlv_1= '=' ( (lv_p_2_0= ruleDouble ) ) )
+            {
+            // InternalCftLanguage.g:577:2: (otherlv_0= 'p' otherlv_1= '=' ( (lv_p_2_0= ruleDouble ) ) )
+            // InternalCftLanguage.g:578:3: otherlv_0= 'p' otherlv_1= '=' ( (lv_p_2_0= ruleDouble ) )
+            {
+            otherlv_0=(Token)match(input,22,FOLLOW_15); 
+
+                                newLeafNode(otherlv_0, grammarAccess.getConstantDistributionAccess().getPKeyword_0());
+                        
+            otherlv_1=(Token)match(input,23,FOLLOW_16); 
+
+                                newLeafNode(otherlv_1, grammarAccess.getConstantDistributionAccess().getEqualsSignKeyword_1());
+                        
+            // InternalCftLanguage.g:586:3: ( (lv_p_2_0= ruleDouble ) )
+            // InternalCftLanguage.g:587:4: (lv_p_2_0= ruleDouble )
+            {
+            // InternalCftLanguage.g:587:4: (lv_p_2_0= ruleDouble )
+            // InternalCftLanguage.g:588:5: lv_p_2_0= ruleDouble
+            {
+
+                                                newCompositeNode(grammarAccess.getConstantDistributionAccess().getPDoubleParserRuleCall_2_0());
+                                        
+            pushFollow(FOLLOW_2);
+            lv_p_2_0=ruleDouble();
+
+            state._fsp--;
+
+
+                                                if (current==null) {
+                                                        current = createModelElementForParent(grammarAccess.getConstantDistributionRule());
+                                                }
+                                                set(
+                                                        current,
+                                                        "p",
+                                                        lv_p_2_0,
+                                                        "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.Double");
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -1289,33 +1607,116 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,21,FOLLOW_15); 
 
-                                newLeafNode(otherlv_1, grammarAccess.getBasicEventDefinitionAccess().getLambdaKeyword_1());
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleConstantDistribution"
+
+
+    // $ANTLR start "entryRuleExponentialDistribution"
+    // InternalCftLanguage.g:609:1: entryRuleExponentialDistribution returns [EObject current=null] : iv_ruleExponentialDistribution= ruleExponentialDistribution EOF ;
+    public final EObject entryRuleExponentialDistribution() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleExponentialDistribution = null;
+
+
+        try {
+            // InternalCftLanguage.g:609:64: (iv_ruleExponentialDistribution= ruleExponentialDistribution EOF )
+            // InternalCftLanguage.g:610:2: iv_ruleExponentialDistribution= ruleExponentialDistribution EOF
+            {
+             newCompositeNode(grammarAccess.getExponentialDistributionRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleExponentialDistribution=ruleExponentialDistribution();
+
+            state._fsp--;
+
+             current =iv_ruleExponentialDistribution; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleExponentialDistribution"
+
+
+    // $ANTLR start "ruleExponentialDistribution"
+    // InternalCftLanguage.g:616:1: ruleExponentialDistribution returns [EObject current=null] : (otherlv_0= 'lambda' otherlv_1= '=' ( (lv_lambda_2_0= ruleDouble ) ) ) ;
+    public final EObject ruleExponentialDistribution() throws RecognitionException {
+        EObject current = null;
+
+        Token otherlv_0=null;
+        Token otherlv_1=null;
+        AntlrDatatypeRuleToken lv_lambda_2_0 = null;
+
+
+
+                enterRule();
+
+        try {
+            // InternalCftLanguage.g:622:2: ( (otherlv_0= 'lambda' otherlv_1= '=' ( (lv_lambda_2_0= ruleDouble ) ) ) )
+            // InternalCftLanguage.g:623:2: (otherlv_0= 'lambda' otherlv_1= '=' ( (lv_lambda_2_0= ruleDouble ) ) )
+            {
+            // InternalCftLanguage.g:623:2: (otherlv_0= 'lambda' otherlv_1= '=' ( (lv_lambda_2_0= ruleDouble ) ) )
+            // InternalCftLanguage.g:624:3: otherlv_0= 'lambda' otherlv_1= '=' ( (lv_lambda_2_0= ruleDouble ) )
+            {
+            otherlv_0=(Token)match(input,24,FOLLOW_15); 
+
+                                newLeafNode(otherlv_0, grammarAccess.getExponentialDistributionAccess().getLambdaKeyword_0());
                         
-            otherlv_2=(Token)match(input,22,FOLLOW_16); 
+            otherlv_1=(Token)match(input,23,FOLLOW_16); 
 
-                                newLeafNode(otherlv_2, grammarAccess.getBasicEventDefinitionAccess().getEqualsSignKeyword_2());
+                                newLeafNode(otherlv_1, grammarAccess.getExponentialDistributionAccess().getEqualsSignKeyword_1());
                         
-            // InternalCftLanguage.g:506:3: ( (lv_rate_3_0= RULE_DOULBE ) )
-            // InternalCftLanguage.g:507:4: (lv_rate_3_0= RULE_DOULBE )
+            // InternalCftLanguage.g:632:3: ( (lv_lambda_2_0= ruleDouble ) )
+            // InternalCftLanguage.g:633:4: (lv_lambda_2_0= ruleDouble )
             {
-            // InternalCftLanguage.g:507:4: (lv_rate_3_0= RULE_DOULBE )
-            // InternalCftLanguage.g:508:5: lv_rate_3_0= RULE_DOULBE
+            // InternalCftLanguage.g:633:4: (lv_lambda_2_0= ruleDouble )
+            // InternalCftLanguage.g:634:5: lv_lambda_2_0= ruleDouble
             {
-            lv_rate_3_0=(Token)match(input,RULE_DOULBE,FOLLOW_2); 
 
-                                                newLeafNode(lv_rate_3_0, grammarAccess.getBasicEventDefinitionAccess().getRateDOULBETerminalRuleCall_3_0());
+                                                newCompositeNode(grammarAccess.getExponentialDistributionAccess().getLambdaDoubleParserRuleCall_2_0());
                                         
+            pushFollow(FOLLOW_2);
+            lv_lambda_2_0=ruleDouble();
+
+            state._fsp--;
+
 
                                                 if (current==null) {
-                                                        current = createModelElement(grammarAccess.getBasicEventDefinitionRule());
+                                                        current = createModelElementForParent(grammarAccess.getExponentialDistributionRule());
                                                 }
-                                                setWithLastConsumed(
+                                                set(
                                                         current,
-                                                        "rate",
-                                                        lv_rate_3_0,
-                                                        "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.DOULBE");
+                                                        "lambda",
+                                                        lv_lambda_2_0,
+                                                        "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.Double");
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -1342,11 +1743,11 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
         }
         return current;
     }
-    // $ANTLR end "ruleBasicEventDefinition"
+    // $ANTLR end "ruleExponentialDistribution"
 
 
     // $ANTLR start "entryRuleGateDefinition"
-    // InternalCftLanguage.g:528:1: entryRuleGateDefinition returns [EObject current=null] : iv_ruleGateDefinition= ruleGateDefinition EOF ;
+    // InternalCftLanguage.g:655:1: entryRuleGateDefinition returns [EObject current=null] : iv_ruleGateDefinition= ruleGateDefinition EOF ;
     public final EObject entryRuleGateDefinition() throws RecognitionException {
         EObject current = null;
 
@@ -1354,8 +1755,8 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalCftLanguage.g:528:55: (iv_ruleGateDefinition= ruleGateDefinition EOF )
-            // InternalCftLanguage.g:529:2: iv_ruleGateDefinition= ruleGateDefinition EOF
+            // InternalCftLanguage.g:655:55: (iv_ruleGateDefinition= ruleGateDefinition EOF )
+            // InternalCftLanguage.g:656:2: iv_ruleGateDefinition= ruleGateDefinition EOF
             {
              newCompositeNode(grammarAccess.getGateDefinitionRule()); 
             pushFollow(FOLLOW_1);
@@ -1382,80 +1783,134 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleGateDefinition"
-    // InternalCftLanguage.g:535:1: ruleGateDefinition returns [EObject current=null] : (this_AndGate_0= ruleAndGate | this_OrGate_1= ruleOrGate ) ;
+    // InternalCftLanguage.g:662:1: ruleGateDefinition returns [EObject current=null] : (this_AndGateDefinition_0= ruleAndGateDefinition | this_OrGateDefinition_1= ruleOrGateDefinition | this_KOfMGateDefinition_2= ruleKOfMGateDefinition ) ;
     public final EObject ruleGateDefinition() throws RecognitionException {
         EObject current = null;
 
-        EObject this_AndGate_0 = null;
+        EObject this_AndGateDefinition_0 = null;
 
-        EObject this_OrGate_1 = null;
+        EObject this_OrGateDefinition_1 = null;
+
+        EObject this_KOfMGateDefinition_2 = null;
 
 
 
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:541:2: ( (this_AndGate_0= ruleAndGate | this_OrGate_1= ruleOrGate ) )
-            // InternalCftLanguage.g:542:2: (this_AndGate_0= ruleAndGate | this_OrGate_1= ruleOrGate )
+            // InternalCftLanguage.g:668:2: ( (this_AndGateDefinition_0= ruleAndGateDefinition | this_OrGateDefinition_1= ruleOrGateDefinition | this_KOfMGateDefinition_2= ruleKOfMGateDefinition ) )
+            // InternalCftLanguage.g:669:2: (this_AndGateDefinition_0= ruleAndGateDefinition | this_OrGateDefinition_1= ruleOrGateDefinition | this_KOfMGateDefinition_2= ruleKOfMGateDefinition )
             {
-            // InternalCftLanguage.g:542:2: (this_AndGate_0= ruleAndGate | this_OrGate_1= ruleOrGate )
-            int alt11=2;
-            int LA11_0 = input.LA(1);
+            // InternalCftLanguage.g:669:2: (this_AndGateDefinition_0= ruleAndGateDefinition | this_OrGateDefinition_1= ruleOrGateDefinition | this_KOfMGateDefinition_2= ruleKOfMGateDefinition )
+            int alt12=3;
+            int LA12_0 = input.LA(1);
 
-            if ( (LA11_0==RULE_ID) ) {
-                int LA11_1 = input.LA(2);
+            if ( (LA12_0==RULE_ID) ) {
+                switch ( input.LA(2) ) {
+                case RULE_INT:
+                    {
+                    alt12=3;
+                    }
+                    break;
+                case 26:
+                    {
+                    alt12=2;
+                    }
+                    break;
+                case 25:
+                    {
+                    alt12=1;
+                    }
+                    break;
+                default:
+                    NoViableAltException nvae =
+                        new NoViableAltException("", 12, 1, input);
 
-                if ( (LA11_1==24) ) {
-                    alt11=2;
-                }
-                else if ( (LA11_1==23) ) {
-                    alt11=1;
+                    throw nvae;
                 }
-                else {
+
+            }
+            else if ( (LA12_0==RULE_OF_INT) ) {
+                switch ( input.LA(2) ) {
+                case RULE_INT:
+                    {
+                    alt12=3;
+                    }
+                    break;
+                case 26:
+                    {
+                    alt12=2;
+                    }
+                    break;
+                case 25:
+                    {
+                    alt12=1;
+                    }
+                    break;
+                default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 11, 1, input);
+                        new NoViableAltException("", 12, 2, input);
 
                     throw nvae;
                 }
+
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 11, 0, input);
+                    new NoViableAltException("", 12, 0, input);
 
                 throw nvae;
             }
-            switch (alt11) {
+            switch (alt12) {
                 case 1 :
-                    // InternalCftLanguage.g:543:3: this_AndGate_0= ruleAndGate
+                    // InternalCftLanguage.g:670:3: this_AndGateDefinition_0= ruleAndGateDefinition
                     {
 
-                                        newCompositeNode(grammarAccess.getGateDefinitionAccess().getAndGateParserRuleCall_0());
+                                        newCompositeNode(grammarAccess.getGateDefinitionAccess().getAndGateDefinitionParserRuleCall_0());
                                 
                     pushFollow(FOLLOW_2);
-                    this_AndGate_0=ruleAndGate();
+                    this_AndGateDefinition_0=ruleAndGateDefinition();
 
                     state._fsp--;
 
 
-                                        current = this_AndGate_0;
+                                        current = this_AndGateDefinition_0;
                                         afterParserOrEnumRuleCall();
                                 
 
                     }
                     break;
                 case 2 :
-                    // InternalCftLanguage.g:552:3: this_OrGate_1= ruleOrGate
+                    // InternalCftLanguage.g:679:3: this_OrGateDefinition_1= ruleOrGateDefinition
                     {
 
-                                        newCompositeNode(grammarAccess.getGateDefinitionAccess().getOrGateParserRuleCall_1());
+                                        newCompositeNode(grammarAccess.getGateDefinitionAccess().getOrGateDefinitionParserRuleCall_1());
                                 
                     pushFollow(FOLLOW_2);
-                    this_OrGate_1=ruleOrGate();
+                    this_OrGateDefinition_1=ruleOrGateDefinition();
 
                     state._fsp--;
 
 
-                                        current = this_OrGate_1;
+                                        current = this_OrGateDefinition_1;
+                                        afterParserOrEnumRuleCall();
+                                
+
+                    }
+                    break;
+                case 3 :
+                    // InternalCftLanguage.g:688:3: this_KOfMGateDefinition_2= ruleKOfMGateDefinition
+                    {
+
+                                        newCompositeNode(grammarAccess.getGateDefinitionAccess().getKOfMGateDefinitionParserRuleCall_2());
+                                
+                    pushFollow(FOLLOW_2);
+                    this_KOfMGateDefinition_2=ruleKOfMGateDefinition();
+
+                    state._fsp--;
+
+
+                                        current = this_KOfMGateDefinition_2;
                                         afterParserOrEnumRuleCall();
                                 
 
@@ -1483,25 +1938,25 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
     // $ANTLR end "ruleGateDefinition"
 
 
-    // $ANTLR start "entryRuleAndGate"
-    // InternalCftLanguage.g:564:1: entryRuleAndGate returns [EObject current=null] : iv_ruleAndGate= ruleAndGate EOF ;
-    public final EObject entryRuleAndGate() throws RecognitionException {
+    // $ANTLR start "entryRuleAndGateDefinition"
+    // InternalCftLanguage.g:700:1: entryRuleAndGateDefinition returns [EObject current=null] : iv_ruleAndGateDefinition= ruleAndGateDefinition EOF ;
+    public final EObject entryRuleAndGateDefinition() throws RecognitionException {
         EObject current = null;
 
-        EObject iv_ruleAndGate = null;
+        EObject iv_ruleAndGateDefinition = null;
 
 
         try {
-            // InternalCftLanguage.g:564:48: (iv_ruleAndGate= ruleAndGate EOF )
-            // InternalCftLanguage.g:565:2: iv_ruleAndGate= ruleAndGate EOF
+            // InternalCftLanguage.g:700:58: (iv_ruleAndGateDefinition= ruleAndGateDefinition EOF )
+            // InternalCftLanguage.g:701:2: iv_ruleAndGateDefinition= ruleAndGateDefinition EOF
             {
-             newCompositeNode(grammarAccess.getAndGateRule()); 
+             newCompositeNode(grammarAccess.getAndGateDefinitionRule()); 
             pushFollow(FOLLOW_1);
-            iv_ruleAndGate=ruleAndGate();
+            iv_ruleAndGateDefinition=ruleAndGateDefinition();
 
             state._fsp--;
 
-             current =iv_ruleAndGate; 
+             current =iv_ruleAndGateDefinition; 
             match(input,EOF,FOLLOW_2); 
 
             }
@@ -1516,47 +1971,52 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
         }
         return current;
     }
-    // $ANTLR end "entryRuleAndGate"
+    // $ANTLR end "entryRuleAndGateDefinition"
 
 
-    // $ANTLR start "ruleAndGate"
-    // InternalCftLanguage.g:571:1: ruleAndGate returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= 'and' ( (otherlv_2= RULE_ID ) )* ) ;
-    public final EObject ruleAndGate() throws RecognitionException {
+    // $ANTLR start "ruleAndGateDefinition"
+    // InternalCftLanguage.g:707:1: ruleAndGateDefinition returns [EObject current=null] : ( ( (lv_name_0_0= ruleValidId ) ) otherlv_1= 'and' ( ( ruleValidId ) )* ) ;
+    public final EObject ruleAndGateDefinition() throws RecognitionException {
         EObject current = null;
 
-        Token lv_name_0_0=null;
         Token otherlv_1=null;
-        Token otherlv_2=null;
+        AntlrDatatypeRuleToken lv_name_0_0 = null;
+
 
 
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:577:2: ( ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= 'and' ( (otherlv_2= RULE_ID ) )* ) )
-            // InternalCftLanguage.g:578:2: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= 'and' ( (otherlv_2= RULE_ID ) )* )
+            // InternalCftLanguage.g:713:2: ( ( ( (lv_name_0_0= ruleValidId ) ) otherlv_1= 'and' ( ( ruleValidId ) )* ) )
+            // InternalCftLanguage.g:714:2: ( ( (lv_name_0_0= ruleValidId ) ) otherlv_1= 'and' ( ( ruleValidId ) )* )
             {
-            // InternalCftLanguage.g:578:2: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= 'and' ( (otherlv_2= RULE_ID ) )* )
-            // InternalCftLanguage.g:579:3: ( (lv_name_0_0= RULE_ID ) ) otherlv_1= 'and' ( (otherlv_2= RULE_ID ) )*
+            // InternalCftLanguage.g:714:2: ( ( (lv_name_0_0= ruleValidId ) ) otherlv_1= 'and' ( ( ruleValidId ) )* )
+            // InternalCftLanguage.g:715:3: ( (lv_name_0_0= ruleValidId ) ) otherlv_1= 'and' ( ( ruleValidId ) )*
             {
-            // InternalCftLanguage.g:579:3: ( (lv_name_0_0= RULE_ID ) )
-            // InternalCftLanguage.g:580:4: (lv_name_0_0= RULE_ID )
+            // InternalCftLanguage.g:715:3: ( (lv_name_0_0= ruleValidId ) )
+            // InternalCftLanguage.g:716:4: (lv_name_0_0= ruleValidId )
             {
-            // InternalCftLanguage.g:580:4: (lv_name_0_0= RULE_ID )
-            // InternalCftLanguage.g:581:5: lv_name_0_0= RULE_ID
+            // InternalCftLanguage.g:716:4: (lv_name_0_0= ruleValidId )
+            // InternalCftLanguage.g:717:5: lv_name_0_0= ruleValidId
             {
-            lv_name_0_0=(Token)match(input,RULE_ID,FOLLOW_17); 
 
-                                                newLeafNode(lv_name_0_0, grammarAccess.getAndGateAccess().getNameIDTerminalRuleCall_0_0());
+                                                newCompositeNode(grammarAccess.getAndGateDefinitionAccess().getNameValidIdParserRuleCall_0_0());
                                         
+            pushFollow(FOLLOW_17);
+            lv_name_0_0=ruleValidId();
+
+            state._fsp--;
+
 
                                                 if (current==null) {
-                                                        current = createModelElement(grammarAccess.getAndGateRule());
+                                                        current = createModelElementForParent(grammarAccess.getAndGateDefinitionRule());
                                                 }
-                                                setWithLastConsumed(
+                                                set(
                                                         current,
                                                         "name",
                                                         lv_name_0_0,
-                                                        "org.eclipse.xtext.common.Terminals.ID");
+                                                        "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -1564,36 +2024,43 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,23,FOLLOW_18); 
+            otherlv_1=(Token)match(input,25,FOLLOW_18); 
 
-                                newLeafNode(otherlv_1, grammarAccess.getAndGateAccess().getAndKeyword_1());
+                                newLeafNode(otherlv_1, grammarAccess.getAndGateDefinitionAccess().getAndKeyword_1());
                         
-            // InternalCftLanguage.g:601:3: ( (otherlv_2= RULE_ID ) )*
-            loop12:
+            // InternalCftLanguage.g:738:3: ( ( ruleValidId ) )*
+            loop13:
             do {
-                int alt12=2;
-                int LA12_0 = input.LA(1);
+                int alt13=2;
+                int LA13_0 = input.LA(1);
 
-                if ( (LA12_0==RULE_ID) ) {
-                    alt12=1;
+                if ( ((LA13_0>=RULE_OF_INT && LA13_0<=RULE_ID)) ) {
+                    alt13=1;
                 }
 
 
-                switch (alt12) {
+                switch (alt13) {
                 case 1 :
-                    // InternalCftLanguage.g:602:4: (otherlv_2= RULE_ID )
+                    // InternalCftLanguage.g:739:4: ( ruleValidId )
                     {
-                    // InternalCftLanguage.g:602:4: (otherlv_2= RULE_ID )
-                    // InternalCftLanguage.g:603:5: otherlv_2= RULE_ID
+                    // InternalCftLanguage.g:739:4: ( ruleValidId )
+                    // InternalCftLanguage.g:740:5: ruleValidId
                     {
 
                                                         if (current==null) {
-                                                                current = createModelElement(grammarAccess.getAndGateRule());
+                                                                current = createModelElement(grammarAccess.getAndGateDefinitionRule());
                                                         }
                                                 
-                    otherlv_2=(Token)match(input,RULE_ID,FOLLOW_18); 
 
-                                                        newLeafNode(otherlv_2, grammarAccess.getAndGateAccess().getInputEventsEventDeclarationCrossReference_2_0());
+                                                        newCompositeNode(grammarAccess.getAndGateDefinitionAccess().getInputEventsEventDeclarationCrossReference_2_0());
+                                                
+                    pushFollow(FOLLOW_18);
+                    ruleValidId();
+
+                    state._fsp--;
+
+
+                                                        afterParserOrEnumRuleCall();
                                                 
 
                     }
@@ -1603,7 +2070,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                     break;
 
                 default :
-                    break loop12;
+                    break loop13;
                 }
             } while (true);
 
@@ -1626,28 +2093,28 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
         }
         return current;
     }
-    // $ANTLR end "ruleAndGate"
+    // $ANTLR end "ruleAndGateDefinition"
 
 
-    // $ANTLR start "entryRuleOrGate"
-    // InternalCftLanguage.g:618:1: entryRuleOrGate returns [EObject current=null] : iv_ruleOrGate= ruleOrGate EOF ;
-    public final EObject entryRuleOrGate() throws RecognitionException {
+    // $ANTLR start "entryRuleOrGateDefinition"
+    // InternalCftLanguage.g:758:1: entryRuleOrGateDefinition returns [EObject current=null] : iv_ruleOrGateDefinition= ruleOrGateDefinition EOF ;
+    public final EObject entryRuleOrGateDefinition() throws RecognitionException {
         EObject current = null;
 
-        EObject iv_ruleOrGate = null;
+        EObject iv_ruleOrGateDefinition = null;
 
 
         try {
-            // InternalCftLanguage.g:618:47: (iv_ruleOrGate= ruleOrGate EOF )
-            // InternalCftLanguage.g:619:2: iv_ruleOrGate= ruleOrGate EOF
+            // InternalCftLanguage.g:758:57: (iv_ruleOrGateDefinition= ruleOrGateDefinition EOF )
+            // InternalCftLanguage.g:759:2: iv_ruleOrGateDefinition= ruleOrGateDefinition EOF
             {
-             newCompositeNode(grammarAccess.getOrGateRule()); 
+             newCompositeNode(grammarAccess.getOrGateDefinitionRule()); 
             pushFollow(FOLLOW_1);
-            iv_ruleOrGate=ruleOrGate();
+            iv_ruleOrGateDefinition=ruleOrGateDefinition();
 
             state._fsp--;
 
-             current =iv_ruleOrGate; 
+             current =iv_ruleOrGateDefinition; 
             match(input,EOF,FOLLOW_2); 
 
             }
@@ -1662,47 +2129,52 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
         }
         return current;
     }
-    // $ANTLR end "entryRuleOrGate"
+    // $ANTLR end "entryRuleOrGateDefinition"
 
 
-    // $ANTLR start "ruleOrGate"
-    // InternalCftLanguage.g:625:1: ruleOrGate returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= 'or' ( (otherlv_2= RULE_ID ) )* ) ;
-    public final EObject ruleOrGate() throws RecognitionException {
+    // $ANTLR start "ruleOrGateDefinition"
+    // InternalCftLanguage.g:765:1: ruleOrGateDefinition returns [EObject current=null] : ( ( (lv_name_0_0= ruleValidId ) ) otherlv_1= 'or' ( ( ruleValidId ) )* ) ;
+    public final EObject ruleOrGateDefinition() throws RecognitionException {
         EObject current = null;
 
-        Token lv_name_0_0=null;
         Token otherlv_1=null;
-        Token otherlv_2=null;
+        AntlrDatatypeRuleToken lv_name_0_0 = null;
+
 
 
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:631:2: ( ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= 'or' ( (otherlv_2= RULE_ID ) )* ) )
-            // InternalCftLanguage.g:632:2: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= 'or' ( (otherlv_2= RULE_ID ) )* )
+            // InternalCftLanguage.g:771:2: ( ( ( (lv_name_0_0= ruleValidId ) ) otherlv_1= 'or' ( ( ruleValidId ) )* ) )
+            // InternalCftLanguage.g:772:2: ( ( (lv_name_0_0= ruleValidId ) ) otherlv_1= 'or' ( ( ruleValidId ) )* )
             {
-            // InternalCftLanguage.g:632:2: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= 'or' ( (otherlv_2= RULE_ID ) )* )
-            // InternalCftLanguage.g:633:3: ( (lv_name_0_0= RULE_ID ) ) otherlv_1= 'or' ( (otherlv_2= RULE_ID ) )*
+            // InternalCftLanguage.g:772:2: ( ( (lv_name_0_0= ruleValidId ) ) otherlv_1= 'or' ( ( ruleValidId ) )* )
+            // InternalCftLanguage.g:773:3: ( (lv_name_0_0= ruleValidId ) ) otherlv_1= 'or' ( ( ruleValidId ) )*
             {
-            // InternalCftLanguage.g:633:3: ( (lv_name_0_0= RULE_ID ) )
-            // InternalCftLanguage.g:634:4: (lv_name_0_0= RULE_ID )
+            // InternalCftLanguage.g:773:3: ( (lv_name_0_0= ruleValidId ) )
+            // InternalCftLanguage.g:774:4: (lv_name_0_0= ruleValidId )
             {
-            // InternalCftLanguage.g:634:4: (lv_name_0_0= RULE_ID )
-            // InternalCftLanguage.g:635:5: lv_name_0_0= RULE_ID
+            // InternalCftLanguage.g:774:4: (lv_name_0_0= ruleValidId )
+            // InternalCftLanguage.g:775:5: lv_name_0_0= ruleValidId
             {
-            lv_name_0_0=(Token)match(input,RULE_ID,FOLLOW_19); 
 
-                                                newLeafNode(lv_name_0_0, grammarAccess.getOrGateAccess().getNameIDTerminalRuleCall_0_0());
+                                                newCompositeNode(grammarAccess.getOrGateDefinitionAccess().getNameValidIdParserRuleCall_0_0());
                                         
+            pushFollow(FOLLOW_19);
+            lv_name_0_0=ruleValidId();
+
+            state._fsp--;
+
 
                                                 if (current==null) {
-                                                        current = createModelElement(grammarAccess.getOrGateRule());
+                                                        current = createModelElementForParent(grammarAccess.getOrGateDefinitionRule());
                                                 }
-                                                setWithLastConsumed(
+                                                set(
                                                         current,
                                                         "name",
                                                         lv_name_0_0,
-                                                        "org.eclipse.xtext.common.Terminals.ID");
+                                                        "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -1710,36 +2182,43 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,24,FOLLOW_18); 
+            otherlv_1=(Token)match(input,26,FOLLOW_18); 
 
-                                newLeafNode(otherlv_1, grammarAccess.getOrGateAccess().getOrKeyword_1());
+                                newLeafNode(otherlv_1, grammarAccess.getOrGateDefinitionAccess().getOrKeyword_1());
                         
-            // InternalCftLanguage.g:655:3: ( (otherlv_2= RULE_ID ) )*
-            loop13:
+            // InternalCftLanguage.g:796:3: ( ( ruleValidId ) )*
+            loop14:
             do {
-                int alt13=2;
-                int LA13_0 = input.LA(1);
+                int alt14=2;
+                int LA14_0 = input.LA(1);
 
-                if ( (LA13_0==RULE_ID) ) {
-                    alt13=1;
+                if ( ((LA14_0>=RULE_OF_INT && LA14_0<=RULE_ID)) ) {
+                    alt14=1;
                 }
 
 
-                switch (alt13) {
+                switch (alt14) {
                 case 1 :
-                    // InternalCftLanguage.g:656:4: (otherlv_2= RULE_ID )
+                    // InternalCftLanguage.g:797:4: ( ruleValidId )
                     {
-                    // InternalCftLanguage.g:656:4: (otherlv_2= RULE_ID )
-                    // InternalCftLanguage.g:657:5: otherlv_2= RULE_ID
+                    // InternalCftLanguage.g:797:4: ( ruleValidId )
+                    // InternalCftLanguage.g:798:5: ruleValidId
                     {
 
                                                         if (current==null) {
-                                                                current = createModelElement(grammarAccess.getOrGateRule());
+                                                                current = createModelElement(grammarAccess.getOrGateDefinitionRule());
                                                         }
                                                 
-                    otherlv_2=(Token)match(input,RULE_ID,FOLLOW_18); 
 
-                                                        newLeafNode(otherlv_2, grammarAccess.getOrGateAccess().getInputEventsEventDeclarationCrossReference_2_0());
+                                                        newCompositeNode(grammarAccess.getOrGateDefinitionAccess().getInputEventsEventDeclarationCrossReference_2_0());
+                                                
+                    pushFollow(FOLLOW_18);
+                    ruleValidId();
+
+                    state._fsp--;
+
+
+                                                        afterParserOrEnumRuleCall();
                                                 
 
                     }
@@ -1749,7 +2228,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                     break;
 
                 default :
-                    break loop13;
+                    break loop14;
                 }
             } while (true);
 
@@ -1772,11 +2251,288 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
         }
         return current;
     }
-    // $ANTLR end "ruleOrGate"
+    // $ANTLR end "ruleOrGateDefinition"
+
+
+    // $ANTLR start "entryRuleKOfMGateDefinition"
+    // InternalCftLanguage.g:816:1: entryRuleKOfMGateDefinition returns [EObject current=null] : iv_ruleKOfMGateDefinition= ruleKOfMGateDefinition EOF ;
+    public final EObject entryRuleKOfMGateDefinition() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleKOfMGateDefinition = null;
+
+
+        try {
+            // InternalCftLanguage.g:816:59: (iv_ruleKOfMGateDefinition= ruleKOfMGateDefinition EOF )
+            // InternalCftLanguage.g:817:2: iv_ruleKOfMGateDefinition= ruleKOfMGateDefinition EOF
+            {
+             newCompositeNode(grammarAccess.getKOfMGateDefinitionRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleKOfMGateDefinition=ruleKOfMGateDefinition();
+
+            state._fsp--;
+
+             current =iv_ruleKOfMGateDefinition; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleKOfMGateDefinition"
+
+
+    // $ANTLR start "ruleKOfMGateDefinition"
+    // InternalCftLanguage.g:823:1: ruleKOfMGateDefinition returns [EObject current=null] : ( ( (lv_name_0_0= ruleValidId ) ) ( (lv_k_1_0= RULE_INT ) ) ( (otherlv_2= 'of' ( (lv_m_3_0= RULE_INT ) ) ) | ( (lv_m_4_0= RULE_OF_INT ) ) ) ( ( ruleValidId ) )* ) ;
+    public final EObject ruleKOfMGateDefinition() throws RecognitionException {
+        EObject current = null;
+
+        Token lv_k_1_0=null;
+        Token otherlv_2=null;
+        Token lv_m_3_0=null;
+        Token lv_m_4_0=null;
+        AntlrDatatypeRuleToken lv_name_0_0 = null;
+
+
+
+                enterRule();
+
+        try {
+            // InternalCftLanguage.g:829:2: ( ( ( (lv_name_0_0= ruleValidId ) ) ( (lv_k_1_0= RULE_INT ) ) ( (otherlv_2= 'of' ( (lv_m_3_0= RULE_INT ) ) ) | ( (lv_m_4_0= RULE_OF_INT ) ) ) ( ( ruleValidId ) )* ) )
+            // InternalCftLanguage.g:830:2: ( ( (lv_name_0_0= ruleValidId ) ) ( (lv_k_1_0= RULE_INT ) ) ( (otherlv_2= 'of' ( (lv_m_3_0= RULE_INT ) ) ) | ( (lv_m_4_0= RULE_OF_INT ) ) ) ( ( ruleValidId ) )* )
+            {
+            // InternalCftLanguage.g:830:2: ( ( (lv_name_0_0= ruleValidId ) ) ( (lv_k_1_0= RULE_INT ) ) ( (otherlv_2= 'of' ( (lv_m_3_0= RULE_INT ) ) ) | ( (lv_m_4_0= RULE_OF_INT ) ) ) ( ( ruleValidId ) )* )
+            // InternalCftLanguage.g:831:3: ( (lv_name_0_0= ruleValidId ) ) ( (lv_k_1_0= RULE_INT ) ) ( (otherlv_2= 'of' ( (lv_m_3_0= RULE_INT ) ) ) | ( (lv_m_4_0= RULE_OF_INT ) ) ) ( ( ruleValidId ) )*
+            {
+            // InternalCftLanguage.g:831:3: ( (lv_name_0_0= ruleValidId ) )
+            // InternalCftLanguage.g:832:4: (lv_name_0_0= ruleValidId )
+            {
+            // InternalCftLanguage.g:832:4: (lv_name_0_0= ruleValidId )
+            // InternalCftLanguage.g:833:5: lv_name_0_0= ruleValidId
+            {
+
+                                                newCompositeNode(grammarAccess.getKOfMGateDefinitionAccess().getNameValidIdParserRuleCall_0_0());
+                                        
+            pushFollow(FOLLOW_20);
+            lv_name_0_0=ruleValidId();
+
+            state._fsp--;
+
+
+                                                if (current==null) {
+                                                        current = createModelElementForParent(grammarAccess.getKOfMGateDefinitionRule());
+                                                }
+                                                set(
+                                                        current,
+                                                        "name",
+                                                        lv_name_0_0,
+                                                        "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                                                afterParserOrEnumRuleCall();
+                                        
+
+            }
+
+
+            }
+
+            // InternalCftLanguage.g:850:3: ( (lv_k_1_0= RULE_INT ) )
+            // InternalCftLanguage.g:851:4: (lv_k_1_0= RULE_INT )
+            {
+            // InternalCftLanguage.g:851:4: (lv_k_1_0= RULE_INT )
+            // InternalCftLanguage.g:852:5: lv_k_1_0= RULE_INT
+            {
+            lv_k_1_0=(Token)match(input,RULE_INT,FOLLOW_21); 
+
+                                                newLeafNode(lv_k_1_0, grammarAccess.getKOfMGateDefinitionAccess().getKINTTerminalRuleCall_1_0());
+                                        
+
+                                                if (current==null) {
+                                                        current = createModelElement(grammarAccess.getKOfMGateDefinitionRule());
+                                                }
+                                                setWithLastConsumed(
+                                                        current,
+                                                        "k",
+                                                        lv_k_1_0,
+                                                        "org.eclipse.xtext.common.Terminals.INT");
+                                        
+
+            }
+
+
+            }
+
+            // InternalCftLanguage.g:868:3: ( (otherlv_2= 'of' ( (lv_m_3_0= RULE_INT ) ) ) | ( (lv_m_4_0= RULE_OF_INT ) ) )
+            int alt15=2;
+            int LA15_0 = input.LA(1);
+
+            if ( (LA15_0==27) ) {
+                alt15=1;
+            }
+            else if ( (LA15_0==RULE_OF_INT) ) {
+                alt15=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 15, 0, input);
+
+                throw nvae;
+            }
+            switch (alt15) {
+                case 1 :
+                    // InternalCftLanguage.g:869:4: (otherlv_2= 'of' ( (lv_m_3_0= RULE_INT ) ) )
+                    {
+                    // InternalCftLanguage.g:869:4: (otherlv_2= 'of' ( (lv_m_3_0= RULE_INT ) ) )
+                    // InternalCftLanguage.g:870:5: otherlv_2= 'of' ( (lv_m_3_0= RULE_INT ) )
+                    {
+                    otherlv_2=(Token)match(input,27,FOLLOW_20); 
+
+                                                        newLeafNode(otherlv_2, grammarAccess.getKOfMGateDefinitionAccess().getOfKeyword_2_0_0());
+                                                
+                    // InternalCftLanguage.g:874:5: ( (lv_m_3_0= RULE_INT ) )
+                    // InternalCftLanguage.g:875:6: (lv_m_3_0= RULE_INT )
+                    {
+                    // InternalCftLanguage.g:875:6: (lv_m_3_0= RULE_INT )
+                    // InternalCftLanguage.g:876:7: lv_m_3_0= RULE_INT
+                    {
+                    lv_m_3_0=(Token)match(input,RULE_INT,FOLLOW_18); 
+
+                                                                        newLeafNode(lv_m_3_0, grammarAccess.getKOfMGateDefinitionAccess().getMINTTerminalRuleCall_2_0_1_0());
+                                                                
+
+                                                                        if (current==null) {
+                                                                                current = createModelElement(grammarAccess.getKOfMGateDefinitionRule());
+                                                                        }
+                                                                        setWithLastConsumed(
+                                                                                current,
+                                                                                "m",
+                                                                                lv_m_3_0,
+                                                                                "org.eclipse.xtext.common.Terminals.INT");
+                                                                
+
+                    }
+
+
+                    }
+
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalCftLanguage.g:894:4: ( (lv_m_4_0= RULE_OF_INT ) )
+                    {
+                    // InternalCftLanguage.g:894:4: ( (lv_m_4_0= RULE_OF_INT ) )
+                    // InternalCftLanguage.g:895:5: (lv_m_4_0= RULE_OF_INT )
+                    {
+                    // InternalCftLanguage.g:895:5: (lv_m_4_0= RULE_OF_INT )
+                    // InternalCftLanguage.g:896:6: lv_m_4_0= RULE_OF_INT
+                    {
+                    lv_m_4_0=(Token)match(input,RULE_OF_INT,FOLLOW_18); 
+
+                                                                newLeafNode(lv_m_4_0, grammarAccess.getKOfMGateDefinitionAccess().getMOF_INTTerminalRuleCall_2_1_0());
+                                                        
+
+                                                                if (current==null) {
+                                                                        current = createModelElement(grammarAccess.getKOfMGateDefinitionRule());
+                                                                }
+                                                                setWithLastConsumed(
+                                                                        current,
+                                                                        "m",
+                                                                        lv_m_4_0,
+                                                                        "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.OF_INT");
+                                                        
+
+                    }
+
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+
+            // InternalCftLanguage.g:913:3: ( ( ruleValidId ) )*
+            loop16:
+            do {
+                int alt16=2;
+                int LA16_0 = input.LA(1);
+
+                if ( ((LA16_0>=RULE_OF_INT && LA16_0<=RULE_ID)) ) {
+                    alt16=1;
+                }
+
+
+                switch (alt16) {
+                case 1 :
+                    // InternalCftLanguage.g:914:4: ( ruleValidId )
+                    {
+                    // InternalCftLanguage.g:914:4: ( ruleValidId )
+                    // InternalCftLanguage.g:915:5: ruleValidId
+                    {
+
+                                                        if (current==null) {
+                                                                current = createModelElement(grammarAccess.getKOfMGateDefinitionRule());
+                                                        }
+                                                
+
+                                                        newCompositeNode(grammarAccess.getKOfMGateDefinitionAccess().getInputEventsEventDeclarationCrossReference_3_0());
+                                                
+                    pushFollow(FOLLOW_18);
+                    ruleValidId();
+
+                    state._fsp--;
+
+
+                                                        afterParserOrEnumRuleCall();
+                                                
+
+                    }
+
+
+                    }
+                    break;
+
+                default :
+                    break loop16;
+                }
+            } while (true);
+
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleKOfMGateDefinition"
 
 
     // $ANTLR start "entryRuleTransformationDefinition"
-    // InternalCftLanguage.g:672:1: entryRuleTransformationDefinition returns [EObject current=null] : iv_ruleTransformationDefinition= ruleTransformationDefinition EOF ;
+    // InternalCftLanguage.g:933:1: entryRuleTransformationDefinition returns [EObject current=null] : iv_ruleTransformationDefinition= ruleTransformationDefinition EOF ;
     public final EObject entryRuleTransformationDefinition() throws RecognitionException {
         EObject current = null;
 
@@ -1784,8 +2540,8 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalCftLanguage.g:672:65: (iv_ruleTransformationDefinition= ruleTransformationDefinition EOF )
-            // InternalCftLanguage.g:673:2: iv_ruleTransformationDefinition= ruleTransformationDefinition EOF
+            // InternalCftLanguage.g:933:65: (iv_ruleTransformationDefinition= ruleTransformationDefinition EOF )
+            // InternalCftLanguage.g:934:2: iv_ruleTransformationDefinition= ruleTransformationDefinition EOF
             {
              newCompositeNode(grammarAccess.getTransformationDefinitionRule()); 
             pushFollow(FOLLOW_1);
@@ -1812,14 +2568,15 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTransformationDefinition"
-    // InternalCftLanguage.g:679:1: ruleTransformationDefinition returns [EObject current=null] : (otherlv_0= 'transformation' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '{' ( (lv_mappingDefinitions_3_0= ruleMappingDefinition ) )* otherlv_4= '}' ) ;
+    // InternalCftLanguage.g:940:1: ruleTransformationDefinition returns [EObject current=null] : (otherlv_0= 'transformation' ( (lv_name_1_0= ruleValidId ) ) otherlv_2= '{' ( (lv_mappingDefinitions_3_0= ruleMappingDefinition ) )* otherlv_4= '}' ) ;
     public final EObject ruleTransformationDefinition() throws RecognitionException {
         EObject current = null;
 
         Token otherlv_0=null;
-        Token lv_name_1_0=null;
         Token otherlv_2=null;
         Token otherlv_4=null;
+        AntlrDatatypeRuleToken lv_name_1_0 = null;
+
         EObject lv_mappingDefinitions_3_0 = null;
 
 
@@ -1827,35 +2584,40 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:685:2: ( (otherlv_0= 'transformation' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '{' ( (lv_mappingDefinitions_3_0= ruleMappingDefinition ) )* otherlv_4= '}' ) )
-            // InternalCftLanguage.g:686:2: (otherlv_0= 'transformation' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '{' ( (lv_mappingDefinitions_3_0= ruleMappingDefinition ) )* otherlv_4= '}' )
+            // InternalCftLanguage.g:946:2: ( (otherlv_0= 'transformation' ( (lv_name_1_0= ruleValidId ) ) otherlv_2= '{' ( (lv_mappingDefinitions_3_0= ruleMappingDefinition ) )* otherlv_4= '}' ) )
+            // InternalCftLanguage.g:947:2: (otherlv_0= 'transformation' ( (lv_name_1_0= ruleValidId ) ) otherlv_2= '{' ( (lv_mappingDefinitions_3_0= ruleMappingDefinition ) )* otherlv_4= '}' )
             {
-            // InternalCftLanguage.g:686:2: (otherlv_0= 'transformation' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '{' ( (lv_mappingDefinitions_3_0= ruleMappingDefinition ) )* otherlv_4= '}' )
-            // InternalCftLanguage.g:687:3: otherlv_0= 'transformation' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '{' ( (lv_mappingDefinitions_3_0= ruleMappingDefinition ) )* otherlv_4= '}'
+            // InternalCftLanguage.g:947:2: (otherlv_0= 'transformation' ( (lv_name_1_0= ruleValidId ) ) otherlv_2= '{' ( (lv_mappingDefinitions_3_0= ruleMappingDefinition ) )* otherlv_4= '}' )
+            // InternalCftLanguage.g:948:3: otherlv_0= 'transformation' ( (lv_name_1_0= ruleValidId ) ) otherlv_2= '{' ( (lv_mappingDefinitions_3_0= ruleMappingDefinition ) )* otherlv_4= '}'
             {
-            otherlv_0=(Token)match(input,25,FOLLOW_3); 
+            otherlv_0=(Token)match(input,28,FOLLOW_3); 
 
                                 newLeafNode(otherlv_0, grammarAccess.getTransformationDefinitionAccess().getTransformationKeyword_0());
                         
-            // InternalCftLanguage.g:691:3: ( (lv_name_1_0= RULE_ID ) )
-            // InternalCftLanguage.g:692:4: (lv_name_1_0= RULE_ID )
+            // InternalCftLanguage.g:952:3: ( (lv_name_1_0= ruleValidId ) )
+            // InternalCftLanguage.g:953:4: (lv_name_1_0= ruleValidId )
             {
-            // InternalCftLanguage.g:692:4: (lv_name_1_0= RULE_ID )
-            // InternalCftLanguage.g:693:5: lv_name_1_0= RULE_ID
+            // InternalCftLanguage.g:953:4: (lv_name_1_0= ruleValidId )
+            // InternalCftLanguage.g:954:5: lv_name_1_0= ruleValidId
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_8); 
 
-                                                newLeafNode(lv_name_1_0, grammarAccess.getTransformationDefinitionAccess().getNameIDTerminalRuleCall_1_0());
+                                                newCompositeNode(grammarAccess.getTransformationDefinitionAccess().getNameValidIdParserRuleCall_1_0());
                                         
+            pushFollow(FOLLOW_8);
+            lv_name_1_0=ruleValidId();
+
+            state._fsp--;
+
 
                                                 if (current==null) {
-                                                        current = createModelElement(grammarAccess.getTransformationDefinitionRule());
+                                                        current = createModelElementForParent(grammarAccess.getTransformationDefinitionRule());
                                                 }
-                                                setWithLastConsumed(
+                                                set(
                                                         current,
                                                         "name",
                                                         lv_name_1_0,
-                                                        "org.eclipse.xtext.common.Terminals.ID");
+                                                        "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -1863,32 +2625,32 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,16,FOLLOW_20); 
+            otherlv_2=(Token)match(input,17,FOLLOW_22); 
 
                                 newLeafNode(otherlv_2, grammarAccess.getTransformationDefinitionAccess().getLeftCurlyBracketKeyword_2());
                         
-            // InternalCftLanguage.g:713:3: ( (lv_mappingDefinitions_3_0= ruleMappingDefinition ) )*
-            loop14:
+            // InternalCftLanguage.g:975:3: ( (lv_mappingDefinitions_3_0= ruleMappingDefinition ) )*
+            loop17:
             do {
-                int alt14=2;
-                int LA14_0 = input.LA(1);
+                int alt17=2;
+                int LA17_0 = input.LA(1);
 
-                if ( ((LA14_0>=26 && LA14_0<=27)) ) {
-                    alt14=1;
+                if ( ((LA17_0>=29 && LA17_0<=30)) ) {
+                    alt17=1;
                 }
 
 
-                switch (alt14) {
+                switch (alt17) {
                 case 1 :
-                    // InternalCftLanguage.g:714:4: (lv_mappingDefinitions_3_0= ruleMappingDefinition )
+                    // InternalCftLanguage.g:976:4: (lv_mappingDefinitions_3_0= ruleMappingDefinition )
                     {
-                    // InternalCftLanguage.g:714:4: (lv_mappingDefinitions_3_0= ruleMappingDefinition )
-                    // InternalCftLanguage.g:715:5: lv_mappingDefinitions_3_0= ruleMappingDefinition
+                    // InternalCftLanguage.g:976:4: (lv_mappingDefinitions_3_0= ruleMappingDefinition )
+                    // InternalCftLanguage.g:977:5: lv_mappingDefinitions_3_0= ruleMappingDefinition
                     {
 
                                                         newCompositeNode(grammarAccess.getTransformationDefinitionAccess().getMappingDefinitionsMappingDefinitionParserRuleCall_3_0());
                                                 
-                    pushFollow(FOLLOW_20);
+                    pushFollow(FOLLOW_22);
                     lv_mappingDefinitions_3_0=ruleMappingDefinition();
 
                     state._fsp--;
@@ -1912,11 +2674,11 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                     break;
 
                 default :
-                    break loop14;
+                    break loop17;
                 }
             } while (true);
 
-            otherlv_4=(Token)match(input,19,FOLLOW_2); 
+            otherlv_4=(Token)match(input,20,FOLLOW_2); 
 
                                 newLeafNode(otherlv_4, grammarAccess.getTransformationDefinitionAccess().getRightCurlyBracketKeyword_4());
                         
@@ -1943,7 +2705,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleMappingDefinition"
-    // InternalCftLanguage.g:740:1: entryRuleMappingDefinition returns [EObject current=null] : iv_ruleMappingDefinition= ruleMappingDefinition EOF ;
+    // InternalCftLanguage.g:1002:1: entryRuleMappingDefinition returns [EObject current=null] : iv_ruleMappingDefinition= ruleMappingDefinition EOF ;
     public final EObject entryRuleMappingDefinition() throws RecognitionException {
         EObject current = null;
 
@@ -1951,8 +2713,8 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalCftLanguage.g:740:58: (iv_ruleMappingDefinition= ruleMappingDefinition EOF )
-            // InternalCftLanguage.g:741:2: iv_ruleMappingDefinition= ruleMappingDefinition EOF
+            // InternalCftLanguage.g:1002:58: (iv_ruleMappingDefinition= ruleMappingDefinition EOF )
+            // InternalCftLanguage.g:1003:2: iv_ruleMappingDefinition= ruleMappingDefinition EOF
             {
              newCompositeNode(grammarAccess.getMappingDefinitionRule()); 
             pushFollow(FOLLOW_1);
@@ -1979,7 +2741,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleMappingDefinition"
-    // InternalCftLanguage.g:747:1: ruleMappingDefinition returns [EObject current=null] : ( ( (lv_topLevel_0_0= 'toplevel' ) )? otherlv_1= 'mapping' ( ( ruleQualifiedName ) ) otherlv_3= '(' ( (lv_parameters_4_0= ruleMappingParameter ) ) (otherlv_5= ',' ( (lv_parameters_6_0= ruleMappingParameter ) ) )* otherlv_7= ')' ( (lv_componentInstance_8_0= ruleComponentInstance ) )? (otherlv_9= '{' ( ( ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) ) | ( (lv_assignments_11_0= ruleAssignment ) ) ) otherlv_12= ';' )* otherlv_13= '}' )? ) ;
+    // InternalCftLanguage.g:1009:1: ruleMappingDefinition returns [EObject current=null] : ( ( (lv_topLevel_0_0= 'toplevel' ) )? otherlv_1= 'mapping' ( ( ruleQualifiedName ) ) otherlv_3= '(' ( (lv_parameters_4_0= ruleMappingParameter ) ) (otherlv_5= ',' ( (lv_parameters_6_0= ruleMappingParameter ) ) )* otherlv_7= ')' ( (lv_componentInstance_8_0= ruleComponentInstance ) )? (otherlv_9= '{' ( ( ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) ) | ( (lv_assignments_11_0= ruleAssignment ) ) ) otherlv_12= ';' )* otherlv_13= '}' )? ) ;
     public final EObject ruleMappingDefinition() throws RecognitionException {
         EObject current = null;
 
@@ -2006,27 +2768,27 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:753:2: ( ( ( (lv_topLevel_0_0= 'toplevel' ) )? otherlv_1= 'mapping' ( ( ruleQualifiedName ) ) otherlv_3= '(' ( (lv_parameters_4_0= ruleMappingParameter ) ) (otherlv_5= ',' ( (lv_parameters_6_0= ruleMappingParameter ) ) )* otherlv_7= ')' ( (lv_componentInstance_8_0= ruleComponentInstance ) )? (otherlv_9= '{' ( ( ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) ) | ( (lv_assignments_11_0= ruleAssignment ) ) ) otherlv_12= ';' )* otherlv_13= '}' )? ) )
-            // InternalCftLanguage.g:754:2: ( ( (lv_topLevel_0_0= 'toplevel' ) )? otherlv_1= 'mapping' ( ( ruleQualifiedName ) ) otherlv_3= '(' ( (lv_parameters_4_0= ruleMappingParameter ) ) (otherlv_5= ',' ( (lv_parameters_6_0= ruleMappingParameter ) ) )* otherlv_7= ')' ( (lv_componentInstance_8_0= ruleComponentInstance ) )? (otherlv_9= '{' ( ( ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) ) | ( (lv_assignments_11_0= ruleAssignment ) ) ) otherlv_12= ';' )* otherlv_13= '}' )? )
+            // InternalCftLanguage.g:1015:2: ( ( ( (lv_topLevel_0_0= 'toplevel' ) )? otherlv_1= 'mapping' ( ( ruleQualifiedName ) ) otherlv_3= '(' ( (lv_parameters_4_0= ruleMappingParameter ) ) (otherlv_5= ',' ( (lv_parameters_6_0= ruleMappingParameter ) ) )* otherlv_7= ')' ( (lv_componentInstance_8_0= ruleComponentInstance ) )? (otherlv_9= '{' ( ( ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) ) | ( (lv_assignments_11_0= ruleAssignment ) ) ) otherlv_12= ';' )* otherlv_13= '}' )? ) )
+            // InternalCftLanguage.g:1016:2: ( ( (lv_topLevel_0_0= 'toplevel' ) )? otherlv_1= 'mapping' ( ( ruleQualifiedName ) ) otherlv_3= '(' ( (lv_parameters_4_0= ruleMappingParameter ) ) (otherlv_5= ',' ( (lv_parameters_6_0= ruleMappingParameter ) ) )* otherlv_7= ')' ( (lv_componentInstance_8_0= ruleComponentInstance ) )? (otherlv_9= '{' ( ( ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) ) | ( (lv_assignments_11_0= ruleAssignment ) ) ) otherlv_12= ';' )* otherlv_13= '}' )? )
             {
-            // InternalCftLanguage.g:754:2: ( ( (lv_topLevel_0_0= 'toplevel' ) )? otherlv_1= 'mapping' ( ( ruleQualifiedName ) ) otherlv_3= '(' ( (lv_parameters_4_0= ruleMappingParameter ) ) (otherlv_5= ',' ( (lv_parameters_6_0= ruleMappingParameter ) ) )* otherlv_7= ')' ( (lv_componentInstance_8_0= ruleComponentInstance ) )? (otherlv_9= '{' ( ( ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) ) | ( (lv_assignments_11_0= ruleAssignment ) ) ) otherlv_12= ';' )* otherlv_13= '}' )? )
-            // InternalCftLanguage.g:755:3: ( (lv_topLevel_0_0= 'toplevel' ) )? otherlv_1= 'mapping' ( ( ruleQualifiedName ) ) otherlv_3= '(' ( (lv_parameters_4_0= ruleMappingParameter ) ) (otherlv_5= ',' ( (lv_parameters_6_0= ruleMappingParameter ) ) )* otherlv_7= ')' ( (lv_componentInstance_8_0= ruleComponentInstance ) )? (otherlv_9= '{' ( ( ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) ) | ( (lv_assignments_11_0= ruleAssignment ) ) ) otherlv_12= ';' )* otherlv_13= '}' )?
+            // InternalCftLanguage.g:1016:2: ( ( (lv_topLevel_0_0= 'toplevel' ) )? otherlv_1= 'mapping' ( ( ruleQualifiedName ) ) otherlv_3= '(' ( (lv_parameters_4_0= ruleMappingParameter ) ) (otherlv_5= ',' ( (lv_parameters_6_0= ruleMappingParameter ) ) )* otherlv_7= ')' ( (lv_componentInstance_8_0= ruleComponentInstance ) )? (otherlv_9= '{' ( ( ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) ) | ( (lv_assignments_11_0= ruleAssignment ) ) ) otherlv_12= ';' )* otherlv_13= '}' )? )
+            // InternalCftLanguage.g:1017:3: ( (lv_topLevel_0_0= 'toplevel' ) )? otherlv_1= 'mapping' ( ( ruleQualifiedName ) ) otherlv_3= '(' ( (lv_parameters_4_0= ruleMappingParameter ) ) (otherlv_5= ',' ( (lv_parameters_6_0= ruleMappingParameter ) ) )* otherlv_7= ')' ( (lv_componentInstance_8_0= ruleComponentInstance ) )? (otherlv_9= '{' ( ( ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) ) | ( (lv_assignments_11_0= ruleAssignment ) ) ) otherlv_12= ';' )* otherlv_13= '}' )?
             {
-            // InternalCftLanguage.g:755:3: ( (lv_topLevel_0_0= 'toplevel' ) )?
-            int alt15=2;
-            int LA15_0 = input.LA(1);
+            // InternalCftLanguage.g:1017:3: ( (lv_topLevel_0_0= 'toplevel' ) )?
+            int alt18=2;
+            int LA18_0 = input.LA(1);
 
-            if ( (LA15_0==26) ) {
-                alt15=1;
+            if ( (LA18_0==29) ) {
+                alt18=1;
             }
-            switch (alt15) {
+            switch (alt18) {
                 case 1 :
-                    // InternalCftLanguage.g:756:4: (lv_topLevel_0_0= 'toplevel' )
+                    // InternalCftLanguage.g:1018:4: (lv_topLevel_0_0= 'toplevel' )
                     {
-                    // InternalCftLanguage.g:756:4: (lv_topLevel_0_0= 'toplevel' )
-                    // InternalCftLanguage.g:757:5: lv_topLevel_0_0= 'toplevel'
+                    // InternalCftLanguage.g:1018:4: (lv_topLevel_0_0= 'toplevel' )
+                    // InternalCftLanguage.g:1019:5: lv_topLevel_0_0= 'toplevel'
                     {
-                    lv_topLevel_0_0=(Token)match(input,26,FOLLOW_21); 
+                    lv_topLevel_0_0=(Token)match(input,29,FOLLOW_23); 
 
                                                         newLeafNode(lv_topLevel_0_0, grammarAccess.getMappingDefinitionAccess().getTopLevelToplevelKeyword_0_0());
                                                 
@@ -2045,15 +2807,15 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,27,FOLLOW_3); 
+            otherlv_1=(Token)match(input,30,FOLLOW_3); 
 
                                 newLeafNode(otherlv_1, grammarAccess.getMappingDefinitionAccess().getMappingKeyword_1());
                         
-            // InternalCftLanguage.g:773:3: ( ( ruleQualifiedName ) )
-            // InternalCftLanguage.g:774:4: ( ruleQualifiedName )
+            // InternalCftLanguage.g:1035:3: ( ( ruleQualifiedName ) )
+            // InternalCftLanguage.g:1036:4: ( ruleQualifiedName )
             {
-            // InternalCftLanguage.g:774:4: ( ruleQualifiedName )
-            // InternalCftLanguage.g:775:5: ruleQualifiedName
+            // InternalCftLanguage.g:1036:4: ( ruleQualifiedName )
+            // InternalCftLanguage.g:1037:5: ruleQualifiedName
             {
 
                                                 if (current==null) {
@@ -2063,7 +2825,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
                                                 newCompositeNode(grammarAccess.getMappingDefinitionAccess().getPatternPatternCrossReference_2_0());
                                         
-            pushFollow(FOLLOW_22);
+            pushFollow(FOLLOW_24);
             ruleQualifiedName();
 
             state._fsp--;
@@ -2077,20 +2839,20 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,28,FOLLOW_3); 
+            otherlv_3=(Token)match(input,31,FOLLOW_3); 
 
                                 newLeafNode(otherlv_3, grammarAccess.getMappingDefinitionAccess().getLeftParenthesisKeyword_3());
                         
-            // InternalCftLanguage.g:793:3: ( (lv_parameters_4_0= ruleMappingParameter ) )
-            // InternalCftLanguage.g:794:4: (lv_parameters_4_0= ruleMappingParameter )
+            // InternalCftLanguage.g:1055:3: ( (lv_parameters_4_0= ruleMappingParameter ) )
+            // InternalCftLanguage.g:1056:4: (lv_parameters_4_0= ruleMappingParameter )
             {
-            // InternalCftLanguage.g:794:4: (lv_parameters_4_0= ruleMappingParameter )
-            // InternalCftLanguage.g:795:5: lv_parameters_4_0= ruleMappingParameter
+            // InternalCftLanguage.g:1056:4: (lv_parameters_4_0= ruleMappingParameter )
+            // InternalCftLanguage.g:1057:5: lv_parameters_4_0= ruleMappingParameter
             {
 
                                                 newCompositeNode(grammarAccess.getMappingDefinitionAccess().getParametersMappingParameterParserRuleCall_4_0());
                                         
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_25);
             lv_parameters_4_0=ruleMappingParameter();
 
             state._fsp--;
@@ -2112,35 +2874,35 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalCftLanguage.g:812:3: (otherlv_5= ',' ( (lv_parameters_6_0= ruleMappingParameter ) ) )*
-            loop16:
+            // InternalCftLanguage.g:1074:3: (otherlv_5= ',' ( (lv_parameters_6_0= ruleMappingParameter ) ) )*
+            loop19:
             do {
-                int alt16=2;
-                int LA16_0 = input.LA(1);
+                int alt19=2;
+                int LA19_0 = input.LA(1);
 
-                if ( (LA16_0==29) ) {
-                    alt16=1;
+                if ( (LA19_0==32) ) {
+                    alt19=1;
                 }
 
 
-                switch (alt16) {
+                switch (alt19) {
                 case 1 :
-                    // InternalCftLanguage.g:813:4: otherlv_5= ',' ( (lv_parameters_6_0= ruleMappingParameter ) )
+                    // InternalCftLanguage.g:1075:4: otherlv_5= ',' ( (lv_parameters_6_0= ruleMappingParameter ) )
                     {
-                    otherlv_5=(Token)match(input,29,FOLLOW_3); 
+                    otherlv_5=(Token)match(input,32,FOLLOW_3); 
 
                                                 newLeafNode(otherlv_5, grammarAccess.getMappingDefinitionAccess().getCommaKeyword_5_0());
                                         
-                    // InternalCftLanguage.g:817:4: ( (lv_parameters_6_0= ruleMappingParameter ) )
-                    // InternalCftLanguage.g:818:5: (lv_parameters_6_0= ruleMappingParameter )
+                    // InternalCftLanguage.g:1079:4: ( (lv_parameters_6_0= ruleMappingParameter ) )
+                    // InternalCftLanguage.g:1080:5: (lv_parameters_6_0= ruleMappingParameter )
                     {
-                    // InternalCftLanguage.g:818:5: (lv_parameters_6_0= ruleMappingParameter )
-                    // InternalCftLanguage.g:819:6: lv_parameters_6_0= ruleMappingParameter
+                    // InternalCftLanguage.g:1080:5: (lv_parameters_6_0= ruleMappingParameter )
+                    // InternalCftLanguage.g:1081:6: lv_parameters_6_0= ruleMappingParameter
                     {
 
                                                                 newCompositeNode(grammarAccess.getMappingDefinitionAccess().getParametersMappingParameterParserRuleCall_5_1_0());
                                                         
-                    pushFollow(FOLLOW_23);
+                    pushFollow(FOLLOW_25);
                     lv_parameters_6_0=ruleMappingParameter();
 
                     state._fsp--;
@@ -2167,32 +2929,32 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                     break;
 
                 default :
-                    break loop16;
+                    break loop19;
                 }
             } while (true);
 
-            otherlv_7=(Token)match(input,30,FOLLOW_24); 
+            otherlv_7=(Token)match(input,33,FOLLOW_26); 
 
                                 newLeafNode(otherlv_7, grammarAccess.getMappingDefinitionAccess().getRightParenthesisKeyword_6());
                         
-            // InternalCftLanguage.g:841:3: ( (lv_componentInstance_8_0= ruleComponentInstance ) )?
-            int alt17=2;
-            int LA17_0 = input.LA(1);
+            // InternalCftLanguage.g:1103:3: ( (lv_componentInstance_8_0= ruleComponentInstance ) )?
+            int alt20=2;
+            int LA20_0 = input.LA(1);
 
-            if ( (LA17_0==36) ) {
-                alt17=1;
+            if ( (LA20_0==39) ) {
+                alt20=1;
             }
-            switch (alt17) {
+            switch (alt20) {
                 case 1 :
-                    // InternalCftLanguage.g:842:4: (lv_componentInstance_8_0= ruleComponentInstance )
+                    // InternalCftLanguage.g:1104:4: (lv_componentInstance_8_0= ruleComponentInstance )
                     {
-                    // InternalCftLanguage.g:842:4: (lv_componentInstance_8_0= ruleComponentInstance )
-                    // InternalCftLanguage.g:843:5: lv_componentInstance_8_0= ruleComponentInstance
+                    // InternalCftLanguage.g:1104:4: (lv_componentInstance_8_0= ruleComponentInstance )
+                    // InternalCftLanguage.g:1105:5: lv_componentInstance_8_0= ruleComponentInstance
                     {
 
                                                         newCompositeNode(grammarAccess.getMappingDefinitionAccess().getComponentInstanceComponentInstanceParserRuleCall_7_0());
                                                 
-                    pushFollow(FOLLOW_25);
+                    pushFollow(FOLLOW_27);
                     lv_componentInstance_8_0=ruleComponentInstance();
 
                     state._fsp--;
@@ -2217,61 +2979,61 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalCftLanguage.g:860:3: (otherlv_9= '{' ( ( ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) ) | ( (lv_assignments_11_0= ruleAssignment ) ) ) otherlv_12= ';' )* otherlv_13= '}' )?
-            int alt20=2;
-            int LA20_0 = input.LA(1);
+            // InternalCftLanguage.g:1122:3: (otherlv_9= '{' ( ( ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) ) | ( (lv_assignments_11_0= ruleAssignment ) ) ) otherlv_12= ';' )* otherlv_13= '}' )?
+            int alt23=2;
+            int LA23_0 = input.LA(1);
 
-            if ( (LA20_0==16) ) {
-                alt20=1;
+            if ( (LA23_0==17) ) {
+                alt23=1;
             }
-            switch (alt20) {
+            switch (alt23) {
                 case 1 :
-                    // InternalCftLanguage.g:861:4: otherlv_9= '{' ( ( ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) ) | ( (lv_assignments_11_0= ruleAssignment ) ) ) otherlv_12= ';' )* otherlv_13= '}'
+                    // InternalCftLanguage.g:1123:4: otherlv_9= '{' ( ( ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) ) | ( (lv_assignments_11_0= ruleAssignment ) ) ) otherlv_12= ';' )* otherlv_13= '}'
                     {
-                    otherlv_9=(Token)match(input,16,FOLLOW_26); 
+                    otherlv_9=(Token)match(input,17,FOLLOW_28); 
 
                                                 newLeafNode(otherlv_9, grammarAccess.getMappingDefinitionAccess().getLeftCurlyBracketKeyword_8_0());
                                         
-                    // InternalCftLanguage.g:865:4: ( ( ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) ) | ( (lv_assignments_11_0= ruleAssignment ) ) ) otherlv_12= ';' )*
-                    loop19:
+                    // InternalCftLanguage.g:1127:4: ( ( ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) ) | ( (lv_assignments_11_0= ruleAssignment ) ) ) otherlv_12= ';' )*
+                    loop22:
                     do {
-                        int alt19=2;
-                        int LA19_0 = input.LA(1);
+                        int alt22=2;
+                        int LA22_0 = input.LA(1);
 
-                        if ( (LA19_0==RULE_ID||LA19_0==31) ) {
-                            alt19=1;
+                        if ( ((LA22_0>=RULE_OF_INT && LA22_0<=RULE_ID)||LA22_0==34) ) {
+                            alt22=1;
                         }
 
 
-                        switch (alt19) {
+                        switch (alt22) {
                         case 1 :
-                            // InternalCftLanguage.g:866:5: ( ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) ) | ( (lv_assignments_11_0= ruleAssignment ) ) ) otherlv_12= ';'
+                            // InternalCftLanguage.g:1128:5: ( ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) ) | ( (lv_assignments_11_0= ruleAssignment ) ) ) otherlv_12= ';'
                             {
-                            // InternalCftLanguage.g:866:5: ( ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) ) | ( (lv_assignments_11_0= ruleAssignment ) ) )
-                            int alt18=2;
-                            int LA18_0 = input.LA(1);
+                            // InternalCftLanguage.g:1128:5: ( ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) ) | ( (lv_assignments_11_0= ruleAssignment ) ) )
+                            int alt21=2;
+                            int LA21_0 = input.LA(1);
 
-                            if ( (LA18_0==31) ) {
-                                alt18=1;
+                            if ( (LA21_0==34) ) {
+                                alt21=1;
                             }
-                            else if ( (LA18_0==RULE_ID) ) {
-                                alt18=2;
+                            else if ( ((LA21_0>=RULE_OF_INT && LA21_0<=RULE_ID)) ) {
+                                alt21=2;
                             }
                             else {
                                 NoViableAltException nvae =
-                                    new NoViableAltException("", 18, 0, input);
+                                    new NoViableAltException("", 21, 0, input);
 
                                 throw nvae;
                             }
-                            switch (alt18) {
+                            switch (alt21) {
                                 case 1 :
-                                    // InternalCftLanguage.g:867:6: ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) )
+                                    // InternalCftLanguage.g:1129:6: ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) )
                                     {
-                                    // InternalCftLanguage.g:867:6: ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) )
-                                    // InternalCftLanguage.g:868:7: (lv_lookupDefinitions_10_0= ruleLookupDefinition )
+                                    // InternalCftLanguage.g:1129:6: ( (lv_lookupDefinitions_10_0= ruleLookupDefinition ) )
+                                    // InternalCftLanguage.g:1130:7: (lv_lookupDefinitions_10_0= ruleLookupDefinition )
                                     {
-                                    // InternalCftLanguage.g:868:7: (lv_lookupDefinitions_10_0= ruleLookupDefinition )
-                                    // InternalCftLanguage.g:869:8: lv_lookupDefinitions_10_0= ruleLookupDefinition
+                                    // InternalCftLanguage.g:1130:7: (lv_lookupDefinitions_10_0= ruleLookupDefinition )
+                                    // InternalCftLanguage.g:1131:8: lv_lookupDefinitions_10_0= ruleLookupDefinition
                                     {
 
                                                                                                 newCompositeNode(grammarAccess.getMappingDefinitionAccess().getLookupDefinitionsLookupDefinitionParserRuleCall_8_1_0_0_0());
@@ -2302,13 +3064,13 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                                     }
                                     break;
                                 case 2 :
-                                    // InternalCftLanguage.g:887:6: ( (lv_assignments_11_0= ruleAssignment ) )
+                                    // InternalCftLanguage.g:1149:6: ( (lv_assignments_11_0= ruleAssignment ) )
                                     {
-                                    // InternalCftLanguage.g:887:6: ( (lv_assignments_11_0= ruleAssignment ) )
-                                    // InternalCftLanguage.g:888:7: (lv_assignments_11_0= ruleAssignment )
+                                    // InternalCftLanguage.g:1149:6: ( (lv_assignments_11_0= ruleAssignment ) )
+                                    // InternalCftLanguage.g:1150:7: (lv_assignments_11_0= ruleAssignment )
                                     {
-                                    // InternalCftLanguage.g:888:7: (lv_assignments_11_0= ruleAssignment )
-                                    // InternalCftLanguage.g:889:8: lv_assignments_11_0= ruleAssignment
+                                    // InternalCftLanguage.g:1150:7: (lv_assignments_11_0= ruleAssignment )
+                                    // InternalCftLanguage.g:1151:8: lv_assignments_11_0= ruleAssignment
                                     {
 
                                                                                                 newCompositeNode(grammarAccess.getMappingDefinitionAccess().getAssignmentsAssignmentParserRuleCall_8_1_0_1_0());
@@ -2341,7 +3103,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            otherlv_12=(Token)match(input,13,FOLLOW_26); 
+                            otherlv_12=(Token)match(input,14,FOLLOW_28); 
 
                                                                 newLeafNode(otherlv_12, grammarAccess.getMappingDefinitionAccess().getSemicolonKeyword_8_1_1());
                                                         
@@ -2350,11 +3112,11 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                             break;
 
                         default :
-                            break loop19;
+                            break loop22;
                         }
                     } while (true);
 
-                    otherlv_13=(Token)match(input,19,FOLLOW_2); 
+                    otherlv_13=(Token)match(input,20,FOLLOW_2); 
 
                                                 newLeafNode(otherlv_13, grammarAccess.getMappingDefinitionAccess().getRightCurlyBracketKeyword_8_2());
                                         
@@ -2387,7 +3149,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleMappingParameter"
-    // InternalCftLanguage.g:921:1: entryRuleMappingParameter returns [EObject current=null] : iv_ruleMappingParameter= ruleMappingParameter EOF ;
+    // InternalCftLanguage.g:1183:1: entryRuleMappingParameter returns [EObject current=null] : iv_ruleMappingParameter= ruleMappingParameter EOF ;
     public final EObject entryRuleMappingParameter() throws RecognitionException {
         EObject current = null;
 
@@ -2395,8 +3157,8 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalCftLanguage.g:921:57: (iv_ruleMappingParameter= ruleMappingParameter EOF )
-            // InternalCftLanguage.g:922:2: iv_ruleMappingParameter= ruleMappingParameter EOF
+            // InternalCftLanguage.g:1183:57: (iv_ruleMappingParameter= ruleMappingParameter EOF )
+            // InternalCftLanguage.g:1184:2: iv_ruleMappingParameter= ruleMappingParameter EOF
             {
              newCompositeNode(grammarAccess.getMappingParameterRule()); 
             pushFollow(FOLLOW_1);
@@ -2423,38 +3185,44 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleMappingParameter"
-    // InternalCftLanguage.g:928:1: ruleMappingParameter returns [EObject current=null] : ( (lv_name_0_0= RULE_ID ) ) ;
+    // InternalCftLanguage.g:1190:1: ruleMappingParameter returns [EObject current=null] : ( (lv_name_0_0= ruleValidId ) ) ;
     public final EObject ruleMappingParameter() throws RecognitionException {
         EObject current = null;
 
-        Token lv_name_0_0=null;
+        AntlrDatatypeRuleToken lv_name_0_0 = null;
+
 
 
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:934:2: ( ( (lv_name_0_0= RULE_ID ) ) )
-            // InternalCftLanguage.g:935:2: ( (lv_name_0_0= RULE_ID ) )
+            // InternalCftLanguage.g:1196:2: ( ( (lv_name_0_0= ruleValidId ) ) )
+            // InternalCftLanguage.g:1197:2: ( (lv_name_0_0= ruleValidId ) )
             {
-            // InternalCftLanguage.g:935:2: ( (lv_name_0_0= RULE_ID ) )
-            // InternalCftLanguage.g:936:3: (lv_name_0_0= RULE_ID )
+            // InternalCftLanguage.g:1197:2: ( (lv_name_0_0= ruleValidId ) )
+            // InternalCftLanguage.g:1198:3: (lv_name_0_0= ruleValidId )
             {
-            // InternalCftLanguage.g:936:3: (lv_name_0_0= RULE_ID )
-            // InternalCftLanguage.g:937:4: lv_name_0_0= RULE_ID
+            // InternalCftLanguage.g:1198:3: (lv_name_0_0= ruleValidId )
+            // InternalCftLanguage.g:1199:4: lv_name_0_0= ruleValidId
             {
-            lv_name_0_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
-                                        newLeafNode(lv_name_0_0, grammarAccess.getMappingParameterAccess().getNameIDTerminalRuleCall_0());
+                                        newCompositeNode(grammarAccess.getMappingParameterAccess().getNameValidIdParserRuleCall_0());
                                 
+            pushFollow(FOLLOW_2);
+            lv_name_0_0=ruleValidId();
+
+            state._fsp--;
+
 
                                         if (current==null) {
-                                                current = createModelElement(grammarAccess.getMappingParameterRule());
+                                                current = createModelElementForParent(grammarAccess.getMappingParameterRule());
                                         }
-                                        setWithLastConsumed(
+                                        set(
                                                 current,
                                                 "name",
                                                 lv_name_0_0,
-                                                "org.eclipse.xtext.common.Terminals.ID");
+                                                "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                                        afterParserOrEnumRuleCall();
                                 
 
             }
@@ -2482,7 +3250,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleLookupDefinition"
-    // InternalCftLanguage.g:956:1: entryRuleLookupDefinition returns [EObject current=null] : iv_ruleLookupDefinition= ruleLookupDefinition EOF ;
+    // InternalCftLanguage.g:1219:1: entryRuleLookupDefinition returns [EObject current=null] : iv_ruleLookupDefinition= ruleLookupDefinition EOF ;
     public final EObject entryRuleLookupDefinition() throws RecognitionException {
         EObject current = null;
 
@@ -2490,8 +3258,8 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalCftLanguage.g:956:57: (iv_ruleLookupDefinition= ruleLookupDefinition EOF )
-            // InternalCftLanguage.g:957:2: iv_ruleLookupDefinition= ruleLookupDefinition EOF
+            // InternalCftLanguage.g:1219:57: (iv_ruleLookupDefinition= ruleLookupDefinition EOF )
+            // InternalCftLanguage.g:1220:2: iv_ruleLookupDefinition= ruleLookupDefinition EOF
             {
              newCompositeNode(grammarAccess.getLookupDefinitionRule()); 
             pushFollow(FOLLOW_1);
@@ -2518,48 +3286,53 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLookupDefinition"
-    // InternalCftLanguage.g:963:1: ruleLookupDefinition returns [EObject current=null] : (otherlv_0= 'lookup' ( (otherlv_1= RULE_ID ) ) otherlv_2= '(' ( (otherlv_3= RULE_ID ) ) (otherlv_4= ',' ( (otherlv_5= RULE_ID ) ) )* otherlv_6= ')' otherlv_7= 'as' ( (lv_name_8_0= RULE_ID ) ) ) ;
+    // InternalCftLanguage.g:1226:1: ruleLookupDefinition returns [EObject current=null] : (otherlv_0= 'lookup' ( ( ruleQualifiedName ) ) otherlv_2= '(' ( ( ruleValidId ) ) (otherlv_4= ',' ( ( ruleValidId ) ) )* otherlv_6= ')' otherlv_7= 'as' ( (lv_name_8_0= ruleValidId ) ) ) ;
     public final EObject ruleLookupDefinition() throws RecognitionException {
         EObject current = null;
 
         Token otherlv_0=null;
-        Token otherlv_1=null;
         Token otherlv_2=null;
-        Token otherlv_3=null;
         Token otherlv_4=null;
-        Token otherlv_5=null;
         Token otherlv_6=null;
         Token otherlv_7=null;
-        Token lv_name_8_0=null;
+        AntlrDatatypeRuleToken lv_name_8_0 = null;
+
 
 
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:969:2: ( (otherlv_0= 'lookup' ( (otherlv_1= RULE_ID ) ) otherlv_2= '(' ( (otherlv_3= RULE_ID ) ) (otherlv_4= ',' ( (otherlv_5= RULE_ID ) ) )* otherlv_6= ')' otherlv_7= 'as' ( (lv_name_8_0= RULE_ID ) ) ) )
-            // InternalCftLanguage.g:970:2: (otherlv_0= 'lookup' ( (otherlv_1= RULE_ID ) ) otherlv_2= '(' ( (otherlv_3= RULE_ID ) ) (otherlv_4= ',' ( (otherlv_5= RULE_ID ) ) )* otherlv_6= ')' otherlv_7= 'as' ( (lv_name_8_0= RULE_ID ) ) )
+            // InternalCftLanguage.g:1232:2: ( (otherlv_0= 'lookup' ( ( ruleQualifiedName ) ) otherlv_2= '(' ( ( ruleValidId ) ) (otherlv_4= ',' ( ( ruleValidId ) ) )* otherlv_6= ')' otherlv_7= 'as' ( (lv_name_8_0= ruleValidId ) ) ) )
+            // InternalCftLanguage.g:1233:2: (otherlv_0= 'lookup' ( ( ruleQualifiedName ) ) otherlv_2= '(' ( ( ruleValidId ) ) (otherlv_4= ',' ( ( ruleValidId ) ) )* otherlv_6= ')' otherlv_7= 'as' ( (lv_name_8_0= ruleValidId ) ) )
             {
-            // InternalCftLanguage.g:970:2: (otherlv_0= 'lookup' ( (otherlv_1= RULE_ID ) ) otherlv_2= '(' ( (otherlv_3= RULE_ID ) ) (otherlv_4= ',' ( (otherlv_5= RULE_ID ) ) )* otherlv_6= ')' otherlv_7= 'as' ( (lv_name_8_0= RULE_ID ) ) )
-            // InternalCftLanguage.g:971:3: otherlv_0= 'lookup' ( (otherlv_1= RULE_ID ) ) otherlv_2= '(' ( (otherlv_3= RULE_ID ) ) (otherlv_4= ',' ( (otherlv_5= RULE_ID ) ) )* otherlv_6= ')' otherlv_7= 'as' ( (lv_name_8_0= RULE_ID ) )
+            // InternalCftLanguage.g:1233:2: (otherlv_0= 'lookup' ( ( ruleQualifiedName ) ) otherlv_2= '(' ( ( ruleValidId ) ) (otherlv_4= ',' ( ( ruleValidId ) ) )* otherlv_6= ')' otherlv_7= 'as' ( (lv_name_8_0= ruleValidId ) ) )
+            // InternalCftLanguage.g:1234:3: otherlv_0= 'lookup' ( ( ruleQualifiedName ) ) otherlv_2= '(' ( ( ruleValidId ) ) (otherlv_4= ',' ( ( ruleValidId ) ) )* otherlv_6= ')' otherlv_7= 'as' ( (lv_name_8_0= ruleValidId ) )
             {
-            otherlv_0=(Token)match(input,31,FOLLOW_3); 
+            otherlv_0=(Token)match(input,34,FOLLOW_3); 
 
                                 newLeafNode(otherlv_0, grammarAccess.getLookupDefinitionAccess().getLookupKeyword_0());
                         
-            // InternalCftLanguage.g:975:3: ( (otherlv_1= RULE_ID ) )
-            // InternalCftLanguage.g:976:4: (otherlv_1= RULE_ID )
+            // InternalCftLanguage.g:1238:3: ( ( ruleQualifiedName ) )
+            // InternalCftLanguage.g:1239:4: ( ruleQualifiedName )
             {
-            // InternalCftLanguage.g:976:4: (otherlv_1= RULE_ID )
-            // InternalCftLanguage.g:977:5: otherlv_1= RULE_ID
+            // InternalCftLanguage.g:1239:4: ( ruleQualifiedName )
+            // InternalCftLanguage.g:1240:5: ruleQualifiedName
             {
 
                                                 if (current==null) {
                                                         current = createModelElement(grammarAccess.getLookupDefinitionRule());
                                                 }
                                         
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_22); 
 
-                                                newLeafNode(otherlv_1, grammarAccess.getLookupDefinitionAccess().getMappingMappingDefinitionCrossReference_1_0());
+                                                newCompositeNode(grammarAccess.getLookupDefinitionAccess().getMappingMappingDefinitionCrossReference_1_0());
+                                        
+            pushFollow(FOLLOW_24);
+            ruleQualifiedName();
+
+            state._fsp--;
+
+
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -2567,24 +3340,31 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,28,FOLLOW_3); 
+            otherlv_2=(Token)match(input,31,FOLLOW_3); 
 
                                 newLeafNode(otherlv_2, grammarAccess.getLookupDefinitionAccess().getLeftParenthesisKeyword_2());
                         
-            // InternalCftLanguage.g:992:3: ( (otherlv_3= RULE_ID ) )
-            // InternalCftLanguage.g:993:4: (otherlv_3= RULE_ID )
+            // InternalCftLanguage.g:1258:3: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:1259:4: ( ruleValidId )
             {
-            // InternalCftLanguage.g:993:4: (otherlv_3= RULE_ID )
-            // InternalCftLanguage.g:994:5: otherlv_3= RULE_ID
+            // InternalCftLanguage.g:1259:4: ( ruleValidId )
+            // InternalCftLanguage.g:1260:5: ruleValidId
             {
 
                                                 if (current==null) {
                                                         current = createModelElement(grammarAccess.getLookupDefinitionRule());
                                                 }
                                         
-            otherlv_3=(Token)match(input,RULE_ID,FOLLOW_23); 
 
-                                                newLeafNode(otherlv_3, grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterCrossReference_3_0());
+                                                newCompositeNode(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterCrossReference_3_0());
+                                        
+            pushFollow(FOLLOW_25);
+            ruleValidId();
+
+            state._fsp--;
+
+
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -2592,39 +3372,46 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalCftLanguage.g:1005:3: (otherlv_4= ',' ( (otherlv_5= RULE_ID ) ) )*
-            loop21:
+            // InternalCftLanguage.g:1274:3: (otherlv_4= ',' ( ( ruleValidId ) ) )*
+            loop24:
             do {
-                int alt21=2;
-                int LA21_0 = input.LA(1);
+                int alt24=2;
+                int LA24_0 = input.LA(1);
 
-                if ( (LA21_0==29) ) {
-                    alt21=1;
+                if ( (LA24_0==32) ) {
+                    alt24=1;
                 }
 
 
-                switch (alt21) {
+                switch (alt24) {
                 case 1 :
-                    // InternalCftLanguage.g:1006:4: otherlv_4= ',' ( (otherlv_5= RULE_ID ) )
+                    // InternalCftLanguage.g:1275:4: otherlv_4= ',' ( ( ruleValidId ) )
                     {
-                    otherlv_4=(Token)match(input,29,FOLLOW_3); 
+                    otherlv_4=(Token)match(input,32,FOLLOW_3); 
 
                                                 newLeafNode(otherlv_4, grammarAccess.getLookupDefinitionAccess().getCommaKeyword_4_0());
                                         
-                    // InternalCftLanguage.g:1010:4: ( (otherlv_5= RULE_ID ) )
-                    // InternalCftLanguage.g:1011:5: (otherlv_5= RULE_ID )
+                    // InternalCftLanguage.g:1279:4: ( ( ruleValidId ) )
+                    // InternalCftLanguage.g:1280:5: ( ruleValidId )
                     {
-                    // InternalCftLanguage.g:1011:5: (otherlv_5= RULE_ID )
-                    // InternalCftLanguage.g:1012:6: otherlv_5= RULE_ID
+                    // InternalCftLanguage.g:1280:5: ( ruleValidId )
+                    // InternalCftLanguage.g:1281:6: ruleValidId
                     {
 
                                                                 if (current==null) {
                                                                         current = createModelElement(grammarAccess.getLookupDefinitionRule());
                                                                 }
                                                         
-                    otherlv_5=(Token)match(input,RULE_ID,FOLLOW_23); 
 
-                                                                newLeafNode(otherlv_5, grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterCrossReference_4_1_0());
+                                                                newCompositeNode(grammarAccess.getLookupDefinitionAccess().getArgumentsMappingParameterCrossReference_4_1_0());
+                                                        
+                    pushFollow(FOLLOW_25);
+                    ruleValidId();
+
+                    state._fsp--;
+
+
+                                                                afterParserOrEnumRuleCall();
                                                         
 
                     }
@@ -2637,37 +3424,42 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                     break;
 
                 default :
-                    break loop21;
+                    break loop24;
                 }
             } while (true);
 
-            otherlv_6=(Token)match(input,30,FOLLOW_27); 
+            otherlv_6=(Token)match(input,33,FOLLOW_29); 
 
                                 newLeafNode(otherlv_6, grammarAccess.getLookupDefinitionAccess().getRightParenthesisKeyword_5());
                         
-            otherlv_7=(Token)match(input,32,FOLLOW_3); 
+            otherlv_7=(Token)match(input,35,FOLLOW_3); 
 
                                 newLeafNode(otherlv_7, grammarAccess.getLookupDefinitionAccess().getAsKeyword_6());
                         
-            // InternalCftLanguage.g:1032:3: ( (lv_name_8_0= RULE_ID ) )
-            // InternalCftLanguage.g:1033:4: (lv_name_8_0= RULE_ID )
+            // InternalCftLanguage.g:1304:3: ( (lv_name_8_0= ruleValidId ) )
+            // InternalCftLanguage.g:1305:4: (lv_name_8_0= ruleValidId )
             {
-            // InternalCftLanguage.g:1033:4: (lv_name_8_0= RULE_ID )
-            // InternalCftLanguage.g:1034:5: lv_name_8_0= RULE_ID
+            // InternalCftLanguage.g:1305:4: (lv_name_8_0= ruleValidId )
+            // InternalCftLanguage.g:1306:5: lv_name_8_0= ruleValidId
             {
-            lv_name_8_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
-                                                newLeafNode(lv_name_8_0, grammarAccess.getLookupDefinitionAccess().getNameIDTerminalRuleCall_7_0());
+                                                newCompositeNode(grammarAccess.getLookupDefinitionAccess().getNameValidIdParserRuleCall_7_0());
                                         
+            pushFollow(FOLLOW_2);
+            lv_name_8_0=ruleValidId();
+
+            state._fsp--;
+
 
                                                 if (current==null) {
-                                                        current = createModelElement(grammarAccess.getLookupDefinitionRule());
+                                                        current = createModelElementForParent(grammarAccess.getLookupDefinitionRule());
                                                 }
-                                                setWithLastConsumed(
+                                                set(
                                                         current,
                                                         "name",
                                                         lv_name_8_0,
-                                                        "org.eclipse.xtext.common.Terminals.ID");
+                                                        "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -2698,7 +3490,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAssignment"
-    // InternalCftLanguage.g:1054:1: entryRuleAssignment returns [EObject current=null] : iv_ruleAssignment= ruleAssignment EOF ;
+    // InternalCftLanguage.g:1327:1: entryRuleAssignment returns [EObject current=null] : iv_ruleAssignment= ruleAssignment EOF ;
     public final EObject entryRuleAssignment() throws RecognitionException {
         EObject current = null;
 
@@ -2706,8 +3498,8 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalCftLanguage.g:1054:51: (iv_ruleAssignment= ruleAssignment EOF )
-            // InternalCftLanguage.g:1055:2: iv_ruleAssignment= ruleAssignment EOF
+            // InternalCftLanguage.g:1327:51: (iv_ruleAssignment= ruleAssignment EOF )
+            // InternalCftLanguage.g:1328:2: iv_ruleAssignment= ruleAssignment EOF
             {
              newCompositeNode(grammarAccess.getAssignmentRule()); 
             pushFollow(FOLLOW_1);
@@ -2734,7 +3526,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAssignment"
-    // InternalCftLanguage.g:1061:1: ruleAssignment returns [EObject current=null] : ( ( (lv_input_0_0= ruleEventReference ) ) ( ( (lv_multiple_1_0= '+=' ) ) | otherlv_2= ':=' ) ( (lv_output_3_0= ruleEventReference ) ) ) ;
+    // InternalCftLanguage.g:1334:1: ruleAssignment returns [EObject current=null] : ( ( (lv_input_0_0= ruleEventReference ) ) ( ( (lv_multiple_1_0= '+=' ) ) | otherlv_2= ':=' ) ( (lv_output_3_0= ruleEventReference ) ) ) ;
     public final EObject ruleAssignment() throws RecognitionException {
         EObject current = null;
 
@@ -2749,22 +3541,22 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:1067:2: ( ( ( (lv_input_0_0= ruleEventReference ) ) ( ( (lv_multiple_1_0= '+=' ) ) | otherlv_2= ':=' ) ( (lv_output_3_0= ruleEventReference ) ) ) )
-            // InternalCftLanguage.g:1068:2: ( ( (lv_input_0_0= ruleEventReference ) ) ( ( (lv_multiple_1_0= '+=' ) ) | otherlv_2= ':=' ) ( (lv_output_3_0= ruleEventReference ) ) )
+            // InternalCftLanguage.g:1340:2: ( ( ( (lv_input_0_0= ruleEventReference ) ) ( ( (lv_multiple_1_0= '+=' ) ) | otherlv_2= ':=' ) ( (lv_output_3_0= ruleEventReference ) ) ) )
+            // InternalCftLanguage.g:1341:2: ( ( (lv_input_0_0= ruleEventReference ) ) ( ( (lv_multiple_1_0= '+=' ) ) | otherlv_2= ':=' ) ( (lv_output_3_0= ruleEventReference ) ) )
             {
-            // InternalCftLanguage.g:1068:2: ( ( (lv_input_0_0= ruleEventReference ) ) ( ( (lv_multiple_1_0= '+=' ) ) | otherlv_2= ':=' ) ( (lv_output_3_0= ruleEventReference ) ) )
-            // InternalCftLanguage.g:1069:3: ( (lv_input_0_0= ruleEventReference ) ) ( ( (lv_multiple_1_0= '+=' ) ) | otherlv_2= ':=' ) ( (lv_output_3_0= ruleEventReference ) )
+            // InternalCftLanguage.g:1341:2: ( ( (lv_input_0_0= ruleEventReference ) ) ( ( (lv_multiple_1_0= '+=' ) ) | otherlv_2= ':=' ) ( (lv_output_3_0= ruleEventReference ) ) )
+            // InternalCftLanguage.g:1342:3: ( (lv_input_0_0= ruleEventReference ) ) ( ( (lv_multiple_1_0= '+=' ) ) | otherlv_2= ':=' ) ( (lv_output_3_0= ruleEventReference ) )
             {
-            // InternalCftLanguage.g:1069:3: ( (lv_input_0_0= ruleEventReference ) )
-            // InternalCftLanguage.g:1070:4: (lv_input_0_0= ruleEventReference )
+            // InternalCftLanguage.g:1342:3: ( (lv_input_0_0= ruleEventReference ) )
+            // InternalCftLanguage.g:1343:4: (lv_input_0_0= ruleEventReference )
             {
-            // InternalCftLanguage.g:1070:4: (lv_input_0_0= ruleEventReference )
-            // InternalCftLanguage.g:1071:5: lv_input_0_0= ruleEventReference
+            // InternalCftLanguage.g:1343:4: (lv_input_0_0= ruleEventReference )
+            // InternalCftLanguage.g:1344:5: lv_input_0_0= ruleEventReference
             {
 
                                                 newCompositeNode(grammarAccess.getAssignmentAccess().getInputEventReferenceParserRuleCall_0_0());
                                         
-            pushFollow(FOLLOW_28);
+            pushFollow(FOLLOW_30);
             lv_input_0_0=ruleEventReference();
 
             state._fsp--;
@@ -2786,33 +3578,33 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalCftLanguage.g:1088:3: ( ( (lv_multiple_1_0= '+=' ) ) | otherlv_2= ':=' )
-            int alt22=2;
-            int LA22_0 = input.LA(1);
+            // InternalCftLanguage.g:1361:3: ( ( (lv_multiple_1_0= '+=' ) ) | otherlv_2= ':=' )
+            int alt25=2;
+            int LA25_0 = input.LA(1);
 
-            if ( (LA22_0==33) ) {
-                alt22=1;
+            if ( (LA25_0==36) ) {
+                alt25=1;
             }
-            else if ( (LA22_0==34) ) {
-                alt22=2;
+            else if ( (LA25_0==37) ) {
+                alt25=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 22, 0, input);
+                    new NoViableAltException("", 25, 0, input);
 
                 throw nvae;
             }
-            switch (alt22) {
+            switch (alt25) {
                 case 1 :
-                    // InternalCftLanguage.g:1089:4: ( (lv_multiple_1_0= '+=' ) )
+                    // InternalCftLanguage.g:1362:4: ( (lv_multiple_1_0= '+=' ) )
                     {
-                    // InternalCftLanguage.g:1089:4: ( (lv_multiple_1_0= '+=' ) )
-                    // InternalCftLanguage.g:1090:5: (lv_multiple_1_0= '+=' )
+                    // InternalCftLanguage.g:1362:4: ( (lv_multiple_1_0= '+=' ) )
+                    // InternalCftLanguage.g:1363:5: (lv_multiple_1_0= '+=' )
                     {
-                    // InternalCftLanguage.g:1090:5: (lv_multiple_1_0= '+=' )
-                    // InternalCftLanguage.g:1091:6: lv_multiple_1_0= '+='
+                    // InternalCftLanguage.g:1363:5: (lv_multiple_1_0= '+=' )
+                    // InternalCftLanguage.g:1364:6: lv_multiple_1_0= '+='
                     {
-                    lv_multiple_1_0=(Token)match(input,33,FOLLOW_29); 
+                    lv_multiple_1_0=(Token)match(input,36,FOLLOW_31); 
 
                                                                 newLeafNode(lv_multiple_1_0, grammarAccess.getAssignmentAccess().getMultiplePlusSignEqualsSignKeyword_1_0_0());
                                                         
@@ -2832,9 +3624,9 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalCftLanguage.g:1104:4: otherlv_2= ':='
+                    // InternalCftLanguage.g:1377:4: otherlv_2= ':='
                     {
-                    otherlv_2=(Token)match(input,34,FOLLOW_29); 
+                    otherlv_2=(Token)match(input,37,FOLLOW_31); 
 
                                                 newLeafNode(otherlv_2, grammarAccess.getAssignmentAccess().getColonEqualsSignKeyword_1_1());
                                         
@@ -2844,11 +3636,11 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalCftLanguage.g:1109:3: ( (lv_output_3_0= ruleEventReference ) )
-            // InternalCftLanguage.g:1110:4: (lv_output_3_0= ruleEventReference )
+            // InternalCftLanguage.g:1382:3: ( (lv_output_3_0= ruleEventReference ) )
+            // InternalCftLanguage.g:1383:4: (lv_output_3_0= ruleEventReference )
             {
-            // InternalCftLanguage.g:1110:4: (lv_output_3_0= ruleEventReference )
-            // InternalCftLanguage.g:1111:5: lv_output_3_0= ruleEventReference
+            // InternalCftLanguage.g:1383:4: (lv_output_3_0= ruleEventReference )
+            // InternalCftLanguage.g:1384:5: lv_output_3_0= ruleEventReference
             {
 
                                                 newCompositeNode(grammarAccess.getAssignmentAccess().getOutputEventReferenceParserRuleCall_2_0());
@@ -2898,7 +3690,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleEventReference"
-    // InternalCftLanguage.g:1132:1: entryRuleEventReference returns [EObject current=null] : iv_ruleEventReference= ruleEventReference EOF ;
+    // InternalCftLanguage.g:1405:1: entryRuleEventReference returns [EObject current=null] : iv_ruleEventReference= ruleEventReference EOF ;
     public final EObject entryRuleEventReference() throws RecognitionException {
         EObject current = null;
 
@@ -2906,8 +3698,8 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalCftLanguage.g:1132:55: (iv_ruleEventReference= ruleEventReference EOF )
-            // InternalCftLanguage.g:1133:2: iv_ruleEventReference= ruleEventReference EOF
+            // InternalCftLanguage.g:1405:55: (iv_ruleEventReference= ruleEventReference EOF )
+            // InternalCftLanguage.g:1406:2: iv_ruleEventReference= ruleEventReference EOF
             {
              newCompositeNode(grammarAccess.getEventReferenceRule()); 
             pushFollow(FOLLOW_1);
@@ -2934,38 +3726,43 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleEventReference"
-    // InternalCftLanguage.g:1139:1: ruleEventReference returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) ) ;
+    // InternalCftLanguage.g:1412:1: ruleEventReference returns [EObject current=null] : ( ( ( ruleValidId ) ) otherlv_1= '.' ( ( ruleValidId ) ) ) ;
     public final EObject ruleEventReference() throws RecognitionException {
         EObject current = null;
 
-        Token otherlv_0=null;
         Token otherlv_1=null;
-        Token otherlv_2=null;
 
 
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:1145:2: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) ) )
-            // InternalCftLanguage.g:1146:2: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) )
+            // InternalCftLanguage.g:1418:2: ( ( ( ( ruleValidId ) ) otherlv_1= '.' ( ( ruleValidId ) ) ) )
+            // InternalCftLanguage.g:1419:2: ( ( ( ruleValidId ) ) otherlv_1= '.' ( ( ruleValidId ) ) )
             {
-            // InternalCftLanguage.g:1146:2: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) )
-            // InternalCftLanguage.g:1147:3: ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (otherlv_2= RULE_ID ) )
+            // InternalCftLanguage.g:1419:2: ( ( ( ruleValidId ) ) otherlv_1= '.' ( ( ruleValidId ) ) )
+            // InternalCftLanguage.g:1420:3: ( ( ruleValidId ) ) otherlv_1= '.' ( ( ruleValidId ) )
             {
-            // InternalCftLanguage.g:1147:3: ( (otherlv_0= RULE_ID ) )
-            // InternalCftLanguage.g:1148:4: (otherlv_0= RULE_ID )
+            // InternalCftLanguage.g:1420:3: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:1421:4: ( ruleValidId )
             {
-            // InternalCftLanguage.g:1148:4: (otherlv_0= RULE_ID )
-            // InternalCftLanguage.g:1149:5: otherlv_0= RULE_ID
+            // InternalCftLanguage.g:1421:4: ( ruleValidId )
+            // InternalCftLanguage.g:1422:5: ruleValidId
             {
 
                                                 if (current==null) {
                                                         current = createModelElement(grammarAccess.getEventReferenceRule());
                                                 }
                                         
-            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_30); 
 
-                                                newLeafNode(otherlv_0, grammarAccess.getEventReferenceAccess().getComponentVariableCrossReference_0_0());
+                                                newCompositeNode(grammarAccess.getEventReferenceAccess().getComponentVariableCrossReference_0_0());
+                                        
+            pushFollow(FOLLOW_32);
+            ruleValidId();
+
+            state._fsp--;
+
+
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -2973,24 +3770,31 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,35,FOLLOW_3); 
+            otherlv_1=(Token)match(input,38,FOLLOW_3); 
 
                                 newLeafNode(otherlv_1, grammarAccess.getEventReferenceAccess().getFullStopKeyword_1());
                         
-            // InternalCftLanguage.g:1164:3: ( (otherlv_2= RULE_ID ) )
-            // InternalCftLanguage.g:1165:4: (otherlv_2= RULE_ID )
+            // InternalCftLanguage.g:1440:3: ( ( ruleValidId ) )
+            // InternalCftLanguage.g:1441:4: ( ruleValidId )
             {
-            // InternalCftLanguage.g:1165:4: (otherlv_2= RULE_ID )
-            // InternalCftLanguage.g:1166:5: otherlv_2= RULE_ID
+            // InternalCftLanguage.g:1441:4: ( ruleValidId )
+            // InternalCftLanguage.g:1442:5: ruleValidId
             {
 
                                                 if (current==null) {
                                                         current = createModelElement(grammarAccess.getEventReferenceRule());
                                                 }
                                         
-            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_2); 
 
-                                                newLeafNode(otherlv_2, grammarAccess.getEventReferenceAccess().getEventEventDeclarationCrossReference_2_0());
+                                                newCompositeNode(grammarAccess.getEventReferenceAccess().getEventEventDeclarationCrossReference_2_0());
+                                        
+            pushFollow(FOLLOW_2);
+            ruleValidId();
+
+            state._fsp--;
+
+
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -3021,7 +3825,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleComponentInstance"
-    // InternalCftLanguage.g:1181:1: entryRuleComponentInstance returns [EObject current=null] : iv_ruleComponentInstance= ruleComponentInstance EOF ;
+    // InternalCftLanguage.g:1460:1: entryRuleComponentInstance returns [EObject current=null] : iv_ruleComponentInstance= ruleComponentInstance EOF ;
     public final EObject entryRuleComponentInstance() throws RecognitionException {
         EObject current = null;
 
@@ -3029,8 +3833,8 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalCftLanguage.g:1181:58: (iv_ruleComponentInstance= ruleComponentInstance EOF )
-            // InternalCftLanguage.g:1182:2: iv_ruleComponentInstance= ruleComponentInstance EOF
+            // InternalCftLanguage.g:1460:58: (iv_ruleComponentInstance= ruleComponentInstance EOF )
+            // InternalCftLanguage.g:1461:2: iv_ruleComponentInstance= ruleComponentInstance EOF
             {
              newCompositeNode(grammarAccess.getComponentInstanceRule()); 
             pushFollow(FOLLOW_1);
@@ -3057,7 +3861,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleComponentInstance"
-    // InternalCftLanguage.g:1188:1: ruleComponentInstance returns [EObject current=null] : (otherlv_0= '=>' ( ( ruleQualifiedName ) ) ( (lv_name_2_0= RULE_ID ) )? ) ;
+    // InternalCftLanguage.g:1467:1: ruleComponentInstance returns [EObject current=null] : (otherlv_0= '=>' ( ( ruleQualifiedName ) ) ( (lv_name_2_0= RULE_ID ) )? ) ;
     public final EObject ruleComponentInstance() throws RecognitionException {
         EObject current = null;
 
@@ -3068,21 +3872,21 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:1194:2: ( (otherlv_0= '=>' ( ( ruleQualifiedName ) ) ( (lv_name_2_0= RULE_ID ) )? ) )
-            // InternalCftLanguage.g:1195:2: (otherlv_0= '=>' ( ( ruleQualifiedName ) ) ( (lv_name_2_0= RULE_ID ) )? )
+            // InternalCftLanguage.g:1473:2: ( (otherlv_0= '=>' ( ( ruleQualifiedName ) ) ( (lv_name_2_0= RULE_ID ) )? ) )
+            // InternalCftLanguage.g:1474:2: (otherlv_0= '=>' ( ( ruleQualifiedName ) ) ( (lv_name_2_0= RULE_ID ) )? )
             {
-            // InternalCftLanguage.g:1195:2: (otherlv_0= '=>' ( ( ruleQualifiedName ) ) ( (lv_name_2_0= RULE_ID ) )? )
-            // InternalCftLanguage.g:1196:3: otherlv_0= '=>' ( ( ruleQualifiedName ) ) ( (lv_name_2_0= RULE_ID ) )?
+            // InternalCftLanguage.g:1474:2: (otherlv_0= '=>' ( ( ruleQualifiedName ) ) ( (lv_name_2_0= RULE_ID ) )? )
+            // InternalCftLanguage.g:1475:3: otherlv_0= '=>' ( ( ruleQualifiedName ) ) ( (lv_name_2_0= RULE_ID ) )?
             {
-            otherlv_0=(Token)match(input,36,FOLLOW_3); 
+            otherlv_0=(Token)match(input,39,FOLLOW_3); 
 
                                 newLeafNode(otherlv_0, grammarAccess.getComponentInstanceAccess().getEqualsSignGreaterThanSignKeyword_0());
                         
-            // InternalCftLanguage.g:1200:3: ( ( ruleQualifiedName ) )
-            // InternalCftLanguage.g:1201:4: ( ruleQualifiedName )
+            // InternalCftLanguage.g:1479:3: ( ( ruleQualifiedName ) )
+            // InternalCftLanguage.g:1480:4: ( ruleQualifiedName )
             {
-            // InternalCftLanguage.g:1201:4: ( ruleQualifiedName )
-            // InternalCftLanguage.g:1202:5: ruleQualifiedName
+            // InternalCftLanguage.g:1480:4: ( ruleQualifiedName )
+            // InternalCftLanguage.g:1481:5: ruleQualifiedName
             {
 
                                                 if (current==null) {
@@ -3092,7 +3896,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
                                                 newCompositeNode(grammarAccess.getComponentInstanceAccess().getComponentTypeComponentDefinitionCrossReference_1_0());
                                         
-            pushFollow(FOLLOW_18);
+            pushFollow(FOLLOW_33);
             ruleQualifiedName();
 
             state._fsp--;
@@ -3106,19 +3910,19 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalCftLanguage.g:1216:3: ( (lv_name_2_0= RULE_ID ) )?
-            int alt23=2;
-            int LA23_0 = input.LA(1);
+            // InternalCftLanguage.g:1495:3: ( (lv_name_2_0= RULE_ID ) )?
+            int alt26=2;
+            int LA26_0 = input.LA(1);
 
-            if ( (LA23_0==RULE_ID) ) {
-                alt23=1;
+            if ( (LA26_0==RULE_ID) ) {
+                alt26=1;
             }
-            switch (alt23) {
+            switch (alt26) {
                 case 1 :
-                    // InternalCftLanguage.g:1217:4: (lv_name_2_0= RULE_ID )
+                    // InternalCftLanguage.g:1496:4: (lv_name_2_0= RULE_ID )
                     {
-                    // InternalCftLanguage.g:1217:4: (lv_name_2_0= RULE_ID )
-                    // InternalCftLanguage.g:1218:5: lv_name_2_0= RULE_ID
+                    // InternalCftLanguage.g:1496:4: (lv_name_2_0= RULE_ID )
+                    // InternalCftLanguage.g:1497:5: lv_name_2_0= RULE_ID
                     {
                     lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
@@ -3166,7 +3970,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleQualifiedName"
-    // InternalCftLanguage.g:1238:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
+    // InternalCftLanguage.g:1517:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
     public final String entryRuleQualifiedName() throws RecognitionException {
         String current = null;
 
@@ -3174,8 +3978,8 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalCftLanguage.g:1238:53: (iv_ruleQualifiedName= ruleQualifiedName EOF )
-            // InternalCftLanguage.g:1239:2: iv_ruleQualifiedName= ruleQualifiedName EOF
+            // InternalCftLanguage.g:1517:53: (iv_ruleQualifiedName= ruleQualifiedName EOF )
+            // InternalCftLanguage.g:1518:2: iv_ruleQualifiedName= ruleQualifiedName EOF
             {
              newCompositeNode(grammarAccess.getQualifiedNameRule()); 
             pushFollow(FOLLOW_1);
@@ -3202,70 +4006,86 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleQualifiedName"
-    // InternalCftLanguage.g:1245:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) ;
+    // InternalCftLanguage.g:1524:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidId_0= ruleValidId (kw= '.' this_ValidId_2= ruleValidId )* ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
-        Token this_ID_0=null;
         Token kw=null;
-        Token this_ID_2=null;
+        AntlrDatatypeRuleToken this_ValidId_0 = null;
+
+        AntlrDatatypeRuleToken this_ValidId_2 = null;
+
 
 
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:1251:2: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
-            // InternalCftLanguage.g:1252:2: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+            // InternalCftLanguage.g:1530:2: ( (this_ValidId_0= ruleValidId (kw= '.' this_ValidId_2= ruleValidId )* ) )
+            // InternalCftLanguage.g:1531:2: (this_ValidId_0= ruleValidId (kw= '.' this_ValidId_2= ruleValidId )* )
             {
-            // InternalCftLanguage.g:1252:2: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
-            // InternalCftLanguage.g:1253:3: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )*
+            // InternalCftLanguage.g:1531:2: (this_ValidId_0= ruleValidId (kw= '.' this_ValidId_2= ruleValidId )* )
+            // InternalCftLanguage.g:1532:3: this_ValidId_0= ruleValidId (kw= '.' this_ValidId_2= ruleValidId )*
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_31); 
 
-                                current.merge(this_ID_0);
+                                newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIdParserRuleCall_0());
                         
+            pushFollow(FOLLOW_34);
+            this_ValidId_0=ruleValidId();
+
+            state._fsp--;
+
 
-                                newLeafNode(this_ID_0, grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_0());
+                                current.merge(this_ValidId_0);
                         
-            // InternalCftLanguage.g:1260:3: (kw= '.' this_ID_2= RULE_ID )*
-            loop24:
+
+                                afterParserOrEnumRuleCall();
+                        
+            // InternalCftLanguage.g:1542:3: (kw= '.' this_ValidId_2= ruleValidId )*
+            loop27:
             do {
-                int alt24=2;
-                int LA24_0 = input.LA(1);
+                int alt27=2;
+                int LA27_0 = input.LA(1);
 
-                if ( (LA24_0==35) ) {
-                    int LA24_2 = input.LA(2);
+                if ( (LA27_0==38) ) {
+                    int LA27_2 = input.LA(2);
 
-                    if ( (LA24_2==RULE_ID) ) {
-                        alt24=1;
+                    if ( ((LA27_2>=RULE_OF_INT && LA27_2<=RULE_ID)) ) {
+                        alt27=1;
                     }
 
 
                 }
 
 
-                switch (alt24) {
+                switch (alt27) {
                 case 1 :
-                    // InternalCftLanguage.g:1261:4: kw= '.' this_ID_2= RULE_ID
+                    // InternalCftLanguage.g:1543:4: kw= '.' this_ValidId_2= ruleValidId
                     {
-                    kw=(Token)match(input,35,FOLLOW_3); 
+                    kw=(Token)match(input,38,FOLLOW_3); 
 
                                                 current.merge(kw);
                                                 newLeafNode(kw, grammarAccess.getQualifiedNameAccess().getFullStopKeyword_1_0());
                                         
-                    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_31); 
 
-                                                current.merge(this_ID_2);
+                                                newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIdParserRuleCall_1_1());
                                         
+                    pushFollow(FOLLOW_34);
+                    this_ValidId_2=ruleValidId();
+
+                    state._fsp--;
+
 
-                                                newLeafNode(this_ID_2, grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1());
+                                                current.merge(this_ValidId_2);
+                                        
+
+                                                afterParserOrEnumRuleCall();
                                         
 
                     }
                     break;
 
                 default :
-                    break loop24;
+                    break loop27;
                 }
             } while (true);
 
@@ -3292,7 +4112,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleQualifiedNameWithWildcard"
-    // InternalCftLanguage.g:1278:1: entryRuleQualifiedNameWithWildcard returns [String current=null] : iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF ;
+    // InternalCftLanguage.g:1563:1: entryRuleQualifiedNameWithWildcard returns [String current=null] : iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF ;
     public final String entryRuleQualifiedNameWithWildcard() throws RecognitionException {
         String current = null;
 
@@ -3300,8 +4120,8 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalCftLanguage.g:1278:65: (iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF )
-            // InternalCftLanguage.g:1279:2: iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF
+            // InternalCftLanguage.g:1563:65: (iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF )
+            // InternalCftLanguage.g:1564:2: iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF
             {
              newCompositeNode(grammarAccess.getQualifiedNameWithWildcardRule()); 
             pushFollow(FOLLOW_1);
@@ -3328,7 +4148,7 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleQualifiedNameWithWildcard"
-    // InternalCftLanguage.g:1285:1: ruleQualifiedNameWithWildcard returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QualifiedName_0= ruleQualifiedName (kw= '.' kw= '*' )? ) ;
+    // InternalCftLanguage.g:1570:1: ruleQualifiedNameWithWildcard returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QualifiedName_0= ruleQualifiedName (kw= '.' kw= '*' )? ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -3340,16 +4160,16 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalCftLanguage.g:1291:2: ( (this_QualifiedName_0= ruleQualifiedName (kw= '.' kw= '*' )? ) )
-            // InternalCftLanguage.g:1292:2: (this_QualifiedName_0= ruleQualifiedName (kw= '.' kw= '*' )? )
+            // InternalCftLanguage.g:1576:2: ( (this_QualifiedName_0= ruleQualifiedName (kw= '.' kw= '*' )? ) )
+            // InternalCftLanguage.g:1577:2: (this_QualifiedName_0= ruleQualifiedName (kw= '.' kw= '*' )? )
             {
-            // InternalCftLanguage.g:1292:2: (this_QualifiedName_0= ruleQualifiedName (kw= '.' kw= '*' )? )
-            // InternalCftLanguage.g:1293:3: this_QualifiedName_0= ruleQualifiedName (kw= '.' kw= '*' )?
+            // InternalCftLanguage.g:1577:2: (this_QualifiedName_0= ruleQualifiedName (kw= '.' kw= '*' )? )
+            // InternalCftLanguage.g:1578:3: this_QualifiedName_0= ruleQualifiedName (kw= '.' kw= '*' )?
             {
 
                                 newCompositeNode(grammarAccess.getQualifiedNameWithWildcardAccess().getQualifiedNameParserRuleCall_0());
                         
-            pushFollow(FOLLOW_31);
+            pushFollow(FOLLOW_34);
             this_QualifiedName_0=ruleQualifiedName();
 
             state._fsp--;
@@ -3360,23 +4180,23 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
                                 afterParserOrEnumRuleCall();
                         
-            // InternalCftLanguage.g:1303:3: (kw= '.' kw= '*' )?
-            int alt25=2;
-            int LA25_0 = input.LA(1);
+            // InternalCftLanguage.g:1588:3: (kw= '.' kw= '*' )?
+            int alt28=2;
+            int LA28_0 = input.LA(1);
 
-            if ( (LA25_0==35) ) {
-                alt25=1;
+            if ( (LA28_0==38) ) {
+                alt28=1;
             }
-            switch (alt25) {
+            switch (alt28) {
                 case 1 :
-                    // InternalCftLanguage.g:1304:4: kw= '.' kw= '*'
+                    // InternalCftLanguage.g:1589:4: kw= '.' kw= '*'
                     {
-                    kw=(Token)match(input,35,FOLLOW_32); 
+                    kw=(Token)match(input,38,FOLLOW_35); 
 
                                                 current.merge(kw);
                                                 newLeafNode(kw, grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1_0());
                                         
-                    kw=(Token)match(input,37,FOLLOW_2); 
+                    kw=(Token)match(input,40,FOLLOW_2); 
 
                                                 current.merge(kw);
                                                 newLeafNode(kw, grammarAccess.getQualifiedNameWithWildcardAccess().getAsteriskKeyword_1_1());
@@ -3408,6 +4228,238 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
     }
     // $ANTLR end "ruleQualifiedNameWithWildcard"
 
+
+    // $ANTLR start "entryRuleValidId"
+    // InternalCftLanguage.g:1604:1: entryRuleValidId returns [String current=null] : iv_ruleValidId= ruleValidId EOF ;
+    public final String entryRuleValidId() throws RecognitionException {
+        String current = null;
+
+        AntlrDatatypeRuleToken iv_ruleValidId = null;
+
+
+        try {
+            // InternalCftLanguage.g:1604:47: (iv_ruleValidId= ruleValidId EOF )
+            // InternalCftLanguage.g:1605:2: iv_ruleValidId= ruleValidId EOF
+            {
+             newCompositeNode(grammarAccess.getValidIdRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleValidId=ruleValidId();
+
+            state._fsp--;
+
+             current =iv_ruleValidId.getText(); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleValidId"
+
+
+    // $ANTLR start "ruleValidId"
+    // InternalCftLanguage.g:1611:1: ruleValidId returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID | this_OF_INT_1= RULE_OF_INT ) ;
+    public final AntlrDatatypeRuleToken ruleValidId() throws RecognitionException {
+        AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+        Token this_ID_0=null;
+        Token this_OF_INT_1=null;
+
+
+                enterRule();
+
+        try {
+            // InternalCftLanguage.g:1617:2: ( (this_ID_0= RULE_ID | this_OF_INT_1= RULE_OF_INT ) )
+            // InternalCftLanguage.g:1618:2: (this_ID_0= RULE_ID | this_OF_INT_1= RULE_OF_INT )
+            {
+            // InternalCftLanguage.g:1618:2: (this_ID_0= RULE_ID | this_OF_INT_1= RULE_OF_INT )
+            int alt29=2;
+            int LA29_0 = input.LA(1);
+
+            if ( (LA29_0==RULE_ID) ) {
+                alt29=1;
+            }
+            else if ( (LA29_0==RULE_OF_INT) ) {
+                alt29=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 29, 0, input);
+
+                throw nvae;
+            }
+            switch (alt29) {
+                case 1 :
+                    // InternalCftLanguage.g:1619:3: this_ID_0= RULE_ID
+                    {
+                    this_ID_0=(Token)match(input,RULE_ID,FOLLOW_2); 
+
+                                        current.merge(this_ID_0);
+                                
+
+                                        newLeafNode(this_ID_0, grammarAccess.getValidIdAccess().getIDTerminalRuleCall_0());
+                                
+
+                    }
+                    break;
+                case 2 :
+                    // InternalCftLanguage.g:1627:3: this_OF_INT_1= RULE_OF_INT
+                    {
+                    this_OF_INT_1=(Token)match(input,RULE_OF_INT,FOLLOW_2); 
+
+                                        current.merge(this_OF_INT_1);
+                                
+
+                                        newLeafNode(this_OF_INT_1, grammarAccess.getValidIdAccess().getOF_INTTerminalRuleCall_1());
+                                
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleValidId"
+
+
+    // $ANTLR start "entryRuleDouble"
+    // InternalCftLanguage.g:1638:1: entryRuleDouble returns [String current=null] : iv_ruleDouble= ruleDouble EOF ;
+    public final String entryRuleDouble() throws RecognitionException {
+        String current = null;
+
+        AntlrDatatypeRuleToken iv_ruleDouble = null;
+
+
+        try {
+            // InternalCftLanguage.g:1638:46: (iv_ruleDouble= ruleDouble EOF )
+            // InternalCftLanguage.g:1639:2: iv_ruleDouble= ruleDouble EOF
+            {
+             newCompositeNode(grammarAccess.getDoubleRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleDouble=ruleDouble();
+
+            state._fsp--;
+
+             current =iv_ruleDouble.getText(); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleDouble"
+
+
+    // $ANTLR start "ruleDouble"
+    // InternalCftLanguage.g:1645:1: ruleDouble returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_INT_0= RULE_INT | this_T_DOUBLE_1= RULE_T_DOUBLE ) ;
+    public final AntlrDatatypeRuleToken ruleDouble() throws RecognitionException {
+        AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+        Token this_INT_0=null;
+        Token this_T_DOUBLE_1=null;
+
+
+                enterRule();
+
+        try {
+            // InternalCftLanguage.g:1651:2: ( (this_INT_0= RULE_INT | this_T_DOUBLE_1= RULE_T_DOUBLE ) )
+            // InternalCftLanguage.g:1652:2: (this_INT_0= RULE_INT | this_T_DOUBLE_1= RULE_T_DOUBLE )
+            {
+            // InternalCftLanguage.g:1652:2: (this_INT_0= RULE_INT | this_T_DOUBLE_1= RULE_T_DOUBLE )
+            int alt30=2;
+            int LA30_0 = input.LA(1);
+
+            if ( (LA30_0==RULE_INT) ) {
+                alt30=1;
+            }
+            else if ( (LA30_0==RULE_T_DOUBLE) ) {
+                alt30=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 30, 0, input);
+
+                throw nvae;
+            }
+            switch (alt30) {
+                case 1 :
+                    // InternalCftLanguage.g:1653:3: this_INT_0= RULE_INT
+                    {
+                    this_INT_0=(Token)match(input,RULE_INT,FOLLOW_2); 
+
+                                        current.merge(this_INT_0);
+                                
+
+                                        newLeafNode(this_INT_0, grammarAccess.getDoubleAccess().getINTTerminalRuleCall_0());
+                                
+
+                    }
+                    break;
+                case 2 :
+                    // InternalCftLanguage.g:1661:3: this_T_DOUBLE_1= RULE_T_DOUBLE
+                    {
+                    this_T_DOUBLE_1=(Token)match(input,RULE_T_DOUBLE,FOLLOW_2); 
+
+                                        current.merge(this_T_DOUBLE_1);
+                                
+
+                                        newLeafNode(this_T_DOUBLE_1, grammarAccess.getDoubleAccess().getT_DOUBLETerminalRuleCall_1());
+                                
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleDouble"
+
     // Delegated rules
 
 
@@ -3415,35 +4467,38 @@ public class InternalCftLanguageParser extends AbstractInternalAntlrParser {
 
     public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
     public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x000000000200E002L});
-    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x000000000200C002L});
-    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000002008002L});
-    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000002002L});
-    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x00000000000E0010L});
-    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000002010L});
-    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000080010L});
-    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000100002L});
-    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x000000000C080000L});
-    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000060000000L});
-    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000001000010002L});
-    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000000010002L});
-    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000080080010L});
-    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000600000000L});
-    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000080000010L});
-    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000800000002L});
-    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000000060L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x000000001001C002L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000010018002L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000010010002L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000004002L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000020000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x00000000001C0060L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000004060L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000100060L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000200002L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000001400000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000000000090L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000000000062L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000004000000L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000008000020L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000060100000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000300000000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000008000020002L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000000020002L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000400100060L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000800000000L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000003000000000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000400000060L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000004000000000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000000000042L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000004000000002L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000010000000000L});
 
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/serializer/CftLanguageSemanticSequencer.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/serializer/CftLanguageSemanticSequencer.java
index 18682f69..835bb8cc 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/serializer/CftLanguageSemanticSequencer.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/serializer/CftLanguageSemanticSequencer.java
@@ -4,22 +4,27 @@
 package hu.bme.mit.inf.dslreasoner.faulttree.components.serializer;
 
 import com.google.inject.Inject;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.AndGate;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.Assignment;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.BasicEventDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftModel;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentInstance;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventReference;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ImportDeclaration;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.InputEvent;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.LookupDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.MappingDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.MappingParameter;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.OrGate;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.TransformationDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.services.CftLanguageGrammarAccess;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.AndGateDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.BasicEventDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.IntputEvent;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.OrGateDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ConstantDistribution;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ExponentialDistribution;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage;
 import java.util.Set;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
@@ -43,23 +48,35 @@ public class CftLanguageSemanticSequencer extends AbstractDelegatingSemanticSequ
                 ParserRule rule = context.getParserRule();
                 Action action = context.getAssignedAction();
                 Set<Parameter> parameters = context.getEnabledBooleanParameters();
-                if (epackage == CftLanguagePackage.eINSTANCE)
+                if (epackage == CftPackage.eINSTANCE)
                         switch (semanticObject.eClass().getClassifierID()) {
-                        case CftLanguagePackage.AND_GATE:
-                                sequence_AndGate(context, (AndGate) semanticObject); 
+                        case CftPackage.AND_GATE_DEFINITION:
+                                sequence_AndGateDefinition(context, (AndGateDefinition) semanticObject); 
                                 return; 
+                        case CftPackage.BASIC_EVENT_DEFINITION:
+                                sequence_BasicEventDefinition(context, (BasicEventDefinition) semanticObject); 
+                                return; 
+                        case CftPackage.COMPONENT_DEFINITION:
+                                sequence_ComponentDefinition(context, (ComponentDefinition) semanticObject); 
+                                return; 
+                        case CftPackage.INTPUT_EVENT:
+                                sequence_InputEvent(context, (IntputEvent) semanticObject); 
+                                return; 
+                        case CftPackage.KOF_MGATE_DEFINITION:
+                                sequence_KOfMGateDefinition(context, (KOfMGateDefinition) semanticObject); 
+                                return; 
+                        case CftPackage.OR_GATE_DEFINITION:
+                                sequence_OrGateDefinition(context, (OrGateDefinition) semanticObject); 
+                                return; 
+                        }
+                else if (epackage == CftLanguagePackage.eINSTANCE)
+                        switch (semanticObject.eClass().getClassifierID()) {
                         case CftLanguagePackage.ASSIGNMENT:
                                 sequence_Assignment(context, (Assignment) semanticObject); 
                                 return; 
-                        case CftLanguagePackage.BASIC_EVENT_DEFINITION:
-                                sequence_BasicEventDefinition(context, (BasicEventDefinition) semanticObject); 
-                                return; 
                         case CftLanguagePackage.CFT_MODEL:
                                 sequence_CftModel(context, (CftModel) semanticObject); 
                                 return; 
-                        case CftLanguagePackage.COMPONENT_DEFINITION:
-                                sequence_ComponentDefinition(context, (ComponentDefinition) semanticObject); 
-                                return; 
                         case CftLanguagePackage.COMPONENT_INSTANCE:
                                 sequence_ComponentInstance(context, (ComponentInstance) semanticObject); 
                                 return; 
@@ -69,9 +86,6 @@ public class CftLanguageSemanticSequencer extends AbstractDelegatingSemanticSequ
                         case CftLanguagePackage.IMPORT_DECLARATION:
                                 sequence_ImportDeclaration(context, (ImportDeclaration) semanticObject); 
                                 return; 
-                        case CftLanguagePackage.INPUT_EVENT:
-                                sequence_InputEvent(context, (InputEvent) semanticObject); 
-                                return; 
                         case CftLanguagePackage.LOOKUP_DEFINITION:
                                 sequence_LookupDefinition(context, (LookupDefinition) semanticObject); 
                                 return; 
@@ -81,28 +95,33 @@ public class CftLanguageSemanticSequencer extends AbstractDelegatingSemanticSequ
                         case CftLanguagePackage.MAPPING_PARAMETER:
                                 sequence_MappingParameter(context, (MappingParameter) semanticObject); 
                                 return; 
-                        case CftLanguagePackage.OR_GATE:
-                                sequence_OrGate(context, (OrGate) semanticObject); 
-                                return; 
                         case CftLanguagePackage.TRANSFORMATION_DEFINITION:
                                 sequence_TransformationDefinition(context, (TransformationDefinition) semanticObject); 
                                 return; 
                         }
+                else if (epackage == FtPackage.eINSTANCE)
+                        switch (semanticObject.eClass().getClassifierID()) {
+                        case FtPackage.CONSTANT_DISTRIBUTION:
+                                sequence_ConstantDistribution(context, (ConstantDistribution) semanticObject); 
+                                return; 
+                        case FtPackage.EXPONENTIAL_DISTRIBUTION:
+                                sequence_ExponentialDistribution(context, (ExponentialDistribution) semanticObject); 
+                                return; 
+                        }
                 if (errorAcceptor != null)
                         errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
         }
         
         /**
          * Contexts:
-         *     EventDeclaration returns AndGate
-         *     EventDefinition returns AndGate
-         *     GateDefinition returns AndGate
-         *     AndGate returns AndGate
+         *     EventDefinition returns AndGateDefinition
+         *     GateDefinition returns AndGateDefinition
+         *     AndGateDefinition returns AndGateDefinition
          *
          * Constraint:
-         *     (name=ID inputEvents+=[EventDeclaration|ID]*)
+         *     (name=ValidId inputEvents+=[EventDeclaration|ValidId]*)
          */
-        protected void sequence_AndGate(ISerializationContext context, AndGate semanticObject) {
+        protected void sequence_AndGateDefinition(ISerializationContext context, AndGateDefinition semanticObject) {
                 genericSequencer.createSequence(context, semanticObject);
         }
         
@@ -121,23 +140,22 @@ public class CftLanguageSemanticSequencer extends AbstractDelegatingSemanticSequ
         
         /**
          * Contexts:
-         *     EventDeclaration returns BasicEventDefinition
          *     EventDefinition returns BasicEventDefinition
          *     BasicEventDefinition returns BasicEventDefinition
          *
          * Constraint:
-         *     (name=ID rate=DOULBE)
+         *     (name=ValidId distribution=Distribution)
          */
         protected void sequence_BasicEventDefinition(ISerializationContext context, BasicEventDefinition semanticObject) {
                 if (errorAcceptor != null) {
-                        if (transientValues.isValueTransient(semanticObject, CftLanguagePackage.Literals.EVENT_DECLARATION__NAME) == ValueTransient.YES)
-                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CftLanguagePackage.Literals.EVENT_DECLARATION__NAME));
-                        if (transientValues.isValueTransient(semanticObject, CftLanguagePackage.Literals.BASIC_EVENT_DEFINITION__RATE) == ValueTransient.YES)
-                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CftLanguagePackage.Literals.BASIC_EVENT_DEFINITION__RATE));
+                        if (transientValues.isValueTransient(semanticObject, CftPackage.Literals.EVENT_DECLARATION__NAME) == ValueTransient.YES)
+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CftPackage.Literals.EVENT_DECLARATION__NAME));
+                        if (transientValues.isValueTransient(semanticObject, CftPackage.Literals.BASIC_EVENT_DEFINITION__DISTRIBUTION) == ValueTransient.YES)
+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CftPackage.Literals.BASIC_EVENT_DEFINITION__DISTRIBUTION));
                 }
                 SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
-                feeder.accept(grammarAccess.getBasicEventDefinitionAccess().getNameIDTerminalRuleCall_0_0(), semanticObject.getName());
-                feeder.accept(grammarAccess.getBasicEventDefinitionAccess().getRateDOULBETerminalRuleCall_3_0(), semanticObject.getRate());
+                feeder.accept(grammarAccess.getBasicEventDefinitionAccess().getNameValidIdParserRuleCall_0_0(), semanticObject.getName());
+                feeder.accept(grammarAccess.getBasicEventDefinitionAccess().getDistributionDistributionParserRuleCall_1_0(), semanticObject.getDistribution());
                 feeder.finish();
         }
         
@@ -163,7 +181,7 @@ public class CftLanguageSemanticSequencer extends AbstractDelegatingSemanticSequ
          *     ComponentDefinition returns ComponentDefinition
          *
          * Constraint:
-         *     (name=ID (inputEvents+=InputEvent | outputEvents+=[EventDeclaration|ID])* eventDefinitions+=EventDefinition*)
+         *     (name=ValidId (inputEvents+=InputEvent | outputEvents+=[EventDeclaration|ValidId])* eventDefinitions+=EventDefinition*)
          */
         protected void sequence_ComponentDefinition(ISerializationContext context, ComponentDefinition semanticObject) {
                 genericSequencer.createSequence(context, semanticObject);
@@ -185,10 +203,29 @@ public class CftLanguageSemanticSequencer extends AbstractDelegatingSemanticSequ
         
         /**
          * Contexts:
+         *     Distribution returns ConstantDistribution
+         *     ConstantDistribution returns ConstantDistribution
+         *
+         * Constraint:
+         *     p=Double
+         */
+        protected void sequence_ConstantDistribution(ISerializationContext context, ConstantDistribution semanticObject) {
+                if (errorAcceptor != null) {
+                        if (transientValues.isValueTransient(semanticObject, FtPackage.Literals.CONSTANT_DISTRIBUTION__P) == ValueTransient.YES)
+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FtPackage.Literals.CONSTANT_DISTRIBUTION__P));
+                }
+                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+                feeder.accept(grammarAccess.getConstantDistributionAccess().getPDoubleParserRuleCall_2_0(), semanticObject.getP());
+                feeder.finish();
+        }
+        
+        
+        /**
+         * Contexts:
          *     EventReference returns EventReference
          *
          * Constraint:
-         *     (component=[Variable|ID] event=[EventDeclaration|ID])
+         *     (component=[Variable|ValidId] event=[EventDeclaration|ValidId])
          */
         protected void sequence_EventReference(ISerializationContext context, EventReference semanticObject) {
                 if (errorAcceptor != null) {
@@ -198,8 +235,27 @@ public class CftLanguageSemanticSequencer extends AbstractDelegatingSemanticSequ
                                 errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CftLanguagePackage.Literals.EVENT_REFERENCE__EVENT));
                 }
                 SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
-                feeder.accept(grammarAccess.getEventReferenceAccess().getComponentVariableIDTerminalRuleCall_0_0_1(), semanticObject.eGet(CftLanguagePackage.Literals.EVENT_REFERENCE__COMPONENT, false));
-                feeder.accept(grammarAccess.getEventReferenceAccess().getEventEventDeclarationIDTerminalRuleCall_2_0_1(), semanticObject.eGet(CftLanguagePackage.Literals.EVENT_REFERENCE__EVENT, false));
+                feeder.accept(grammarAccess.getEventReferenceAccess().getComponentVariableValidIdParserRuleCall_0_0_1(), semanticObject.eGet(CftLanguagePackage.Literals.EVENT_REFERENCE__COMPONENT, false));
+                feeder.accept(grammarAccess.getEventReferenceAccess().getEventEventDeclarationValidIdParserRuleCall_2_0_1(), semanticObject.eGet(CftLanguagePackage.Literals.EVENT_REFERENCE__EVENT, false));
+                feeder.finish();
+        }
+        
+        
+        /**
+         * Contexts:
+         *     Distribution returns ExponentialDistribution
+         *     ExponentialDistribution returns ExponentialDistribution
+         *
+         * Constraint:
+         *     lambda=Double
+         */
+        protected void sequence_ExponentialDistribution(ISerializationContext context, ExponentialDistribution semanticObject) {
+                if (errorAcceptor != null) {
+                        if (transientValues.isValueTransient(semanticObject, FtPackage.Literals.EXPONENTIAL_DISTRIBUTION__LAMBDA) == ValueTransient.YES)
+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FtPackage.Literals.EXPONENTIAL_DISTRIBUTION__LAMBDA));
+                }
+                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+                feeder.accept(grammarAccess.getExponentialDistributionAccess().getLambdaDoubleParserRuleCall_2_0(), semanticObject.getLambda());
                 feeder.finish();
         }
         
@@ -224,13 +280,26 @@ public class CftLanguageSemanticSequencer extends AbstractDelegatingSemanticSequ
         
         /**
          * Contexts:
-         *     EventDeclaration returns InputEvent
-         *     InputEvent returns InputEvent
+         *     InputEvent returns IntputEvent
+         *
+         * Constraint:
+         *     (name=ValidId multiple?='[]'?)
+         */
+        protected void sequence_InputEvent(ISerializationContext context, IntputEvent semanticObject) {
+                genericSequencer.createSequence(context, semanticObject);
+        }
+        
+        
+        /**
+         * Contexts:
+         *     EventDefinition returns KOfMGateDefinition
+         *     GateDefinition returns KOfMGateDefinition
+         *     KOfMGateDefinition returns KOfMGateDefinition
          *
          * Constraint:
-         *     (name=ID multiple?='[]'?)
+         *     (name=ValidId k=INT (m=INT | m=OF_INT) inputEvents+=[EventDeclaration|ValidId]*)
          */
-        protected void sequence_InputEvent(ISerializationContext context, InputEvent semanticObject) {
+        protected void sequence_KOfMGateDefinition(ISerializationContext context, KOfMGateDefinition semanticObject) {
                 genericSequencer.createSequence(context, semanticObject);
         }
         
@@ -241,7 +310,7 @@ public class CftLanguageSemanticSequencer extends AbstractDelegatingSemanticSequ
          *     Variable returns LookupDefinition
          *
          * Constraint:
-         *     (mapping=[MappingDefinition|ID] arguments+=[MappingParameter|ID] arguments+=[MappingParameter|ID]* name=ID)
+         *     (mapping=[MappingDefinition|QualifiedName] arguments+=[MappingParameter|ValidId] arguments+=[MappingParameter|ValidId]* name=ValidId)
          */
         protected void sequence_LookupDefinition(ISerializationContext context, LookupDefinition semanticObject) {
                 genericSequencer.createSequence(context, semanticObject);
@@ -272,7 +341,7 @@ public class CftLanguageSemanticSequencer extends AbstractDelegatingSemanticSequ
          *     MappingParameter returns MappingParameter
          *
          * Constraint:
-         *     name=ID
+         *     name=ValidId
          */
         protected void sequence_MappingParameter(ISerializationContext context, MappingParameter semanticObject) {
                 if (errorAcceptor != null) {
@@ -280,22 +349,21 @@ public class CftLanguageSemanticSequencer extends AbstractDelegatingSemanticSequ
                                 errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CftLanguagePackage.Literals.MAPPING_PARAMETER__NAME));
                 }
                 SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
-                feeder.accept(grammarAccess.getMappingParameterAccess().getNameIDTerminalRuleCall_0(), semanticObject.getName());
+                feeder.accept(grammarAccess.getMappingParameterAccess().getNameValidIdParserRuleCall_0(), semanticObject.getName());
                 feeder.finish();
         }
         
         
         /**
          * Contexts:
-         *     EventDeclaration returns OrGate
-         *     EventDefinition returns OrGate
-         *     GateDefinition returns OrGate
-         *     OrGate returns OrGate
+         *     EventDefinition returns OrGateDefinition
+         *     GateDefinition returns OrGateDefinition
+         *     OrGateDefinition returns OrGateDefinition
          *
          * Constraint:
-         *     (name=ID inputEvents+=[EventDeclaration|ID]*)
+         *     (name=ValidId inputEvents+=[EventDeclaration|ValidId]*)
          */
-        protected void sequence_OrGate(ISerializationContext context, OrGate semanticObject) {
+        protected void sequence_OrGateDefinition(ISerializationContext context, OrGateDefinition semanticObject) {
                 genericSequencer.createSequence(context, semanticObject);
         }
         
@@ -305,7 +373,7 @@ public class CftLanguageSemanticSequencer extends AbstractDelegatingSemanticSequ
          *     TransformationDefinition returns TransformationDefinition
          *
          * Constraint:
-         *     (name=ID mappingDefinitions+=MappingDefinition*)
+         *     (name=ValidId mappingDefinitions+=MappingDefinition*)
          */
         protected void sequence_TransformationDefinition(ISerializationContext context, TransformationDefinition semanticObject) {
                 genericSequencer.createSequence(context, semanticObject);
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/serializer/CftLanguageSyntacticSequencer.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/serializer/CftLanguageSyntacticSequencer.java
index 65b39fb2..62a80a00 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/serializer/CftLanguageSyntacticSequencer.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/serializer/CftLanguageSyntacticSequencer.java
@@ -123,10 +123,10 @@ public class CftLanguageSyntacticSequencer extends AbstractSyntacticSequencer {
          *     ('in' ';')*
          *
          * This ambiguous syntax occurs at:
-         *     inputEvents+=InputEvent ';' (ambiguity) (('out' ';')? ('out' ';' 'in' ';')?)+ 'out' outputEvents+=[EventDeclaration|ID]
-         *     name=ID '{' (ambiguity) 'out' (';' (ambiguity) 'out')* outputEvents+=[EventDeclaration|ID]
-         *     outputEvents+=[EventDeclaration|ID] ';' (ambiguity) ('out' ';' (ambiguity))* '}' (rule end)
-         *     outputEvents+=[EventDeclaration|ID] ';' (ambiguity) ('out' ';' (ambiguity))* eventDefinitions+=EventDefinition
+         *     inputEvents+=InputEvent ';' (ambiguity) (('out' ';')? ('out' ';' 'in' ';')?)+ 'out' outputEvents+=[EventDeclaration|ValidId]
+         *     name=ValidId '{' (ambiguity) 'out' (';' (ambiguity) 'out')* outputEvents+=[EventDeclaration|ValidId]
+         *     outputEvents+=[EventDeclaration|ValidId] ';' (ambiguity) ('out' ';' (ambiguity))* '}' (rule end)
+         *     outputEvents+=[EventDeclaration|ValidId] ';' (ambiguity) ('out' ';' (ambiguity))* eventDefinitions+=EventDefinition
          */
         protected void emit_ComponentDefinition___InKeyword_3_0_0_SemicolonKeyword_3_0_2__a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
                 acceptNodes(transition, nodes);
@@ -137,8 +137,8 @@ public class CftLanguageSyntacticSequencer extends AbstractSyntacticSequencer {
          *     ('out' ';' ('in' ';')*)*
          *
          * This ambiguous syntax occurs at:
-         *     outputEvents+=[EventDeclaration|ID] ';' ('in' ';')* (ambiguity) '}' (rule end)
-         *     outputEvents+=[EventDeclaration|ID] ';' ('in' ';')* (ambiguity) eventDefinitions+=EventDefinition
+         *     outputEvents+=[EventDeclaration|ValidId] ';' ('in' ';')* (ambiguity) '}' (rule end)
+         *     outputEvents+=[EventDeclaration|ValidId] ';' ('in' ';')* (ambiguity) eventDefinitions+=EventDefinition
          */
         protected void emit_ComponentDefinition___OutKeyword_3_1_0_SemicolonKeyword_3_1_2___InKeyword_3_0_0_SemicolonKeyword_3_0_2__a__a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
                 acceptNodes(transition, nodes);
@@ -151,8 +151,8 @@ public class CftLanguageSyntacticSequencer extends AbstractSyntacticSequencer {
          * This ambiguous syntax occurs at:
          *     inputEvents+=InputEvent ';' (ambiguity) ('in' ';' (ambiguity))* '}' (rule end)
          *     inputEvents+=InputEvent ';' (ambiguity) ('in' ';' (ambiguity))* eventDefinitions+=EventDefinition
-         *     name=ID '{' (ambiguity) 'in' (';' (ambiguity) 'in')* inputEvents+=InputEvent
-         *     outputEvents+=[EventDeclaration|ID] ';' (ambiguity) (('in' ';')? ('in' ';' 'out' ';')?)+ 'in' inputEvents+=InputEvent
+         *     name=ValidId '{' (ambiguity) 'in' (';' (ambiguity) 'in')* inputEvents+=InputEvent
+         *     outputEvents+=[EventDeclaration|ValidId] ';' (ambiguity) (('in' ';')? ('in' ';' 'out' ';')?)+ 'in' inputEvents+=InputEvent
          */
         protected void emit_ComponentDefinition___OutKeyword_3_1_0_SemicolonKeyword_3_1_2__a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
                 acceptNodes(transition, nodes);
@@ -164,7 +164,7 @@ public class CftLanguageSyntacticSequencer extends AbstractSyntacticSequencer {
          *
          * This ambiguous syntax occurs at:
          *     inputEvents+=InputEvent (ambiguity) inputEvents+=InputEvent
-         *     name=ID '{' ('out' ';')* 'in' (ambiguity) inputEvents+=InputEvent
+         *     name=ValidId '{' ('out' ';')* 'in' (ambiguity) inputEvents+=InputEvent
          */
         protected void emit_ComponentDefinition___SemicolonKeyword_3_0_2___OutKeyword_3_1_0_SemicolonKeyword_3_1_2__a_InKeyword_3_0_0__a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
                 acceptNodes(transition, nodes);
@@ -175,8 +175,8 @@ public class CftLanguageSyntacticSequencer extends AbstractSyntacticSequencer {
          *     (';' ('in' ';')* 'out')*
          *
          * This ambiguous syntax occurs at:
-         *     name=ID '{' ('in' ';')* 'out' (ambiguity) outputEvents+=[EventDeclaration|ID]
-         *     outputEvents+=[EventDeclaration|ID] (ambiguity) outputEvents+=[EventDeclaration|ID]
+         *     name=ValidId '{' ('in' ';')* 'out' (ambiguity) outputEvents+=[EventDeclaration|ValidId]
+         *     outputEvents+=[EventDeclaration|ValidId] (ambiguity) outputEvents+=[EventDeclaration|ValidId]
          */
         protected void emit_ComponentDefinition___SemicolonKeyword_3_1_2___InKeyword_3_0_0_SemicolonKeyword_3_0_2__a_OutKeyword_3_1_0__a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
                 acceptNodes(transition, nodes);
@@ -187,8 +187,8 @@ public class CftLanguageSyntacticSequencer extends AbstractSyntacticSequencer {
          *     (('in' ';') | ('out' ';'))*
          *
          * This ambiguous syntax occurs at:
-         *     name=ID '{' (ambiguity) '}' (rule end)
-         *     name=ID '{' (ambiguity) eventDefinitions+=EventDefinition
+         *     name=ValidId '{' (ambiguity) '}' (rule end)
+         *     name=ValidId '{' (ambiguity) eventDefinitions+=EventDefinition
          */
         protected void emit_ComponentDefinition_____InKeyword_3_0_0_SemicolonKeyword_3_0_2___or___OutKeyword_3_1_0_SemicolonKeyword_3_1_2____a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
                 acceptNodes(transition, nodes);
@@ -199,7 +199,7 @@ public class CftLanguageSyntacticSequencer extends AbstractSyntacticSequencer {
          *     (('in' ';')? ('in' ';' 'out' ';')?)+
          *
          * This ambiguous syntax occurs at:
-         *     outputEvents+=[EventDeclaration|ID] ';' ('out' ';')* (ambiguity) 'in' inputEvents+=InputEvent
+         *     outputEvents+=[EventDeclaration|ValidId] ';' ('out' ';')* (ambiguity) 'in' inputEvents+=InputEvent
          */
         protected void emit_ComponentDefinition_____InKeyword_3_0_0_SemicolonKeyword_3_0_2__q___InKeyword_3_0_0_SemicolonKeyword_3_0_2_OutKeyword_3_1_0_SemicolonKeyword_3_1_2__q__p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
                 acceptNodes(transition, nodes);
@@ -210,7 +210,7 @@ public class CftLanguageSyntacticSequencer extends AbstractSyntacticSequencer {
          *     (('out' ';')? ('out' ';' 'in' ';')?)+
          *
          * This ambiguous syntax occurs at:
-         *     inputEvents+=InputEvent ';' ('in' ';')* (ambiguity) 'out' outputEvents+=[EventDeclaration|ID]
+         *     inputEvents+=InputEvent ';' ('in' ';')* (ambiguity) 'out' outputEvents+=[EventDeclaration|ValidId]
          */
         protected void emit_ComponentDefinition_____OutKeyword_3_1_0_SemicolonKeyword_3_1_2__q___OutKeyword_3_1_0_SemicolonKeyword_3_1_2_InKeyword_3_0_0_SemicolonKeyword_3_0_2__q__p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
                 acceptNodes(transition, nodes);
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/services/CftLanguageGrammarAccess.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/services/CftLanguageGrammarAccess.java
index 1ca0cf8e..69f00bb3 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/services/CftLanguageGrammarAccess.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/services/CftLanguageGrammarAccess.java
@@ -114,7 +114,7 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 private final Group cGroup = (Group)rule.eContents().get(1);
                 private final Keyword cCftKeyword_0 = (Keyword)cGroup.eContents().get(0);
                 private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
-                private final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);
+                private final RuleCall cNameValidIdParserRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);
                 private final Keyword cLeftCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);
                 private final UnorderedGroup cUnorderedGroup_3 = (UnorderedGroup)cGroup.eContents().get(3);
                 private final Group cGroup_3_0 = (Group)cUnorderedGroup_3.eContents().get(0);
@@ -126,7 +126,7 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 private final Keyword cOutKeyword_3_1_0 = (Keyword)cGroup_3_1.eContents().get(0);
                 private final Assignment cOutputEventsAssignment_3_1_1 = (Assignment)cGroup_3_1.eContents().get(1);
                 private final CrossReference cOutputEventsEventDeclarationCrossReference_3_1_1_0 = (CrossReference)cOutputEventsAssignment_3_1_1.eContents().get(0);
-                private final RuleCall cOutputEventsEventDeclarationIDTerminalRuleCall_3_1_1_0_1 = (RuleCall)cOutputEventsEventDeclarationCrossReference_3_1_1_0.eContents().get(1);
+                private final RuleCall cOutputEventsEventDeclarationValidIdParserRuleCall_3_1_1_0_1 = (RuleCall)cOutputEventsEventDeclarationCrossReference_3_1_1_0.eContents().get(1);
                 private final Keyword cSemicolonKeyword_3_1_2 = (Keyword)cGroup_3_1.eContents().get(2);
                 private final Group cGroup_4 = (Group)cGroup.eContents().get(4);
                 private final Assignment cEventDefinitionsAssignment_4_0 = (Assignment)cGroup_4.eContents().get(0);
@@ -134,29 +134,29 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 private final Keyword cSemicolonKeyword_4_1 = (Keyword)cGroup_4.eContents().get(1);
                 private final Keyword cRightCurlyBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);
                 
-                //ComponentDefinition:
-                //      "cft" name=ID "{" (("in" inputEvents+=InputEvent* ";")? & ("out" outputEvents+=[EventDeclaration]* ";")?)
-                //      (eventDefinitions+=EventDefinition ";")*
+                //ComponentDefinition cft::ComponentDefinition:
+                //      "cft" name=ValidId "{" (("in" inputEvents+=InputEvent* ";")? & ("out" outputEvents+=[cft::EventDeclaration|ValidId]*
+                //      ";")?) (eventDefinitions+=EventDefinition ";")*
                 //      "}";
                 @Override public ParserRule getRule() { return rule; }
                 
-                //"cft" name=ID "{" (("in" inputEvents+=InputEvent* ";")? & ("out" outputEvents+=[EventDeclaration]* ";")?)
-                //(eventDefinitions+=EventDefinition ";")* "}"
+                //"cft" name=ValidId "{" (("in" inputEvents+=InputEvent* ";")? & ("out" outputEvents+=[cft::EventDeclaration|ValidId]*
+                //";")?) (eventDefinitions+=EventDefinition ";")* "}"
                 public Group getGroup() { return cGroup; }
                 
                 //"cft"
                 public Keyword getCftKeyword_0() { return cCftKeyword_0; }
                 
-                //name=ID
+                //name=ValidId
                 public Assignment getNameAssignment_1() { return cNameAssignment_1; }
                 
-                //ID
-                public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
+                //ValidId
+                public RuleCall getNameValidIdParserRuleCall_1_0() { return cNameValidIdParserRuleCall_1_0; }
                 
                 //"{"
                 public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
                 
-                //("in" inputEvents+=InputEvent* ";")? & ("out" outputEvents+=[EventDeclaration]* ";")?
+                //("in" inputEvents+=InputEvent* ";")? & ("out" outputEvents+=[cft::EventDeclaration|ValidId]* ";")?
                 public UnorderedGroup getUnorderedGroup_3() { return cUnorderedGroup_3; }
                 
                 //("in" inputEvents+=InputEvent* ";")?
@@ -174,20 +174,20 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 //";"
                 public Keyword getSemicolonKeyword_3_0_2() { return cSemicolonKeyword_3_0_2; }
                 
-                //("out" outputEvents+=[EventDeclaration]* ";")?
+                //("out" outputEvents+=[cft::EventDeclaration|ValidId]* ";")?
                 public Group getGroup_3_1() { return cGroup_3_1; }
                 
                 //"out"
                 public Keyword getOutKeyword_3_1_0() { return cOutKeyword_3_1_0; }
                 
-                //outputEvents+=[EventDeclaration]*
+                //outputEvents+=[cft::EventDeclaration|ValidId]*
                 public Assignment getOutputEventsAssignment_3_1_1() { return cOutputEventsAssignment_3_1_1; }
                 
-                //[EventDeclaration]
+                //[cft::EventDeclaration|ValidId]
                 public CrossReference getOutputEventsEventDeclarationCrossReference_3_1_1_0() { return cOutputEventsEventDeclarationCrossReference_3_1_1_0; }
                 
-                //ID
-                public RuleCall getOutputEventsEventDeclarationIDTerminalRuleCall_3_1_1_0_1() { return cOutputEventsEventDeclarationIDTerminalRuleCall_3_1_1_0_1; }
+                //ValidId
+                public RuleCall getOutputEventsEventDeclarationValidIdParserRuleCall_3_1_1_0_1() { return cOutputEventsEventDeclarationValidIdParserRuleCall_3_1_1_0_1; }
                 
                 //";"
                 public Keyword getSemicolonKeyword_3_1_2() { return cSemicolonKeyword_3_1_2; }
@@ -207,45 +207,26 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 //"}"
                 public Keyword getRightCurlyBracketKeyword_5() { return cRightCurlyBracketKeyword_5; }
         }
-        public class EventDeclarationElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.EventDeclaration");
-                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-                private final RuleCall cInputEventParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
-                private final RuleCall cEventDefinitionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
-                
-                //EventDeclaration:
-                //      InputEvent | EventDefinition;
-                @Override public ParserRule getRule() { return rule; }
-                
-                //InputEvent | EventDefinition
-                public Alternatives getAlternatives() { return cAlternatives; }
-                
-                //InputEvent
-                public RuleCall getInputEventParserRuleCall_0() { return cInputEventParserRuleCall_0; }
-                
-                //EventDefinition
-                public RuleCall getEventDefinitionParserRuleCall_1() { return cEventDefinitionParserRuleCall_1; }
-        }
         public class InputEventElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.InputEvent");
                 private final Group cGroup = (Group)rule.eContents().get(1);
                 private final Assignment cNameAssignment_0 = (Assignment)cGroup.eContents().get(0);
-                private final RuleCall cNameIDTerminalRuleCall_0_0 = (RuleCall)cNameAssignment_0.eContents().get(0);
+                private final RuleCall cNameValidIdParserRuleCall_0_0 = (RuleCall)cNameAssignment_0.eContents().get(0);
                 private final Assignment cMultipleAssignment_1 = (Assignment)cGroup.eContents().get(1);
                 private final Keyword cMultipleLeftSquareBracketRightSquareBracketKeyword_1_0 = (Keyword)cMultipleAssignment_1.eContents().get(0);
                 
-                //InputEvent:
-                //      name=ID multiple?="[]"?;
+                //InputEvent cft::IntputEvent:
+                //      name=ValidId multiple?="[]"?;
                 @Override public ParserRule getRule() { return rule; }
                 
-                //name=ID multiple?="[]"?
+                //name=ValidId multiple?="[]"?
                 public Group getGroup() { return cGroup; }
                 
-                //name=ID
+                //name=ValidId
                 public Assignment getNameAssignment_0() { return cNameAssignment_0; }
                 
-                //ID
-                public RuleCall getNameIDTerminalRuleCall_0_0() { return cNameIDTerminalRuleCall_0_0; }
+                //ValidId
+                public RuleCall getNameValidIdParserRuleCall_0_0() { return cNameValidIdParserRuleCall_0_0; }
                 
                 //multiple?="[]"?
                 public Assignment getMultipleAssignment_1() { return cMultipleAssignment_1; }
@@ -259,7 +240,7 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 private final RuleCall cBasicEventDefinitionParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
                 private final RuleCall cGateDefinitionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
                 
-                //EventDefinition:
+                //EventDefinition cft::EventDefinition:
                 //      BasicEventDefinition | GateDefinition;
                 @Override public ParserRule getRule() { return rule; }
                 
@@ -276,154 +257,290 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.BasicEventDefinition");
                 private final Group cGroup = (Group)rule.eContents().get(1);
                 private final Assignment cNameAssignment_0 = (Assignment)cGroup.eContents().get(0);
-                private final RuleCall cNameIDTerminalRuleCall_0_0 = (RuleCall)cNameAssignment_0.eContents().get(0);
-                private final Keyword cLambdaKeyword_1 = (Keyword)cGroup.eContents().get(1);
-                private final Keyword cEqualsSignKeyword_2 = (Keyword)cGroup.eContents().get(2);
-                private final Assignment cRateAssignment_3 = (Assignment)cGroup.eContents().get(3);
-                private final RuleCall cRateDOULBETerminalRuleCall_3_0 = (RuleCall)cRateAssignment_3.eContents().get(0);
-                
-                //BasicEventDefinition:
-                //      name=ID "lambda" "=" rate=DOULBE;
+                private final RuleCall cNameValidIdParserRuleCall_0_0 = (RuleCall)cNameAssignment_0.eContents().get(0);
+                private final Assignment cDistributionAssignment_1 = (Assignment)cGroup.eContents().get(1);
+                private final RuleCall cDistributionDistributionParserRuleCall_1_0 = (RuleCall)cDistributionAssignment_1.eContents().get(0);
+                
+                //BasicEventDefinition cft::BasicEventDefinition:
+                //      name=ValidId distribution=Distribution;
                 @Override public ParserRule getRule() { return rule; }
                 
-                //name=ID "lambda" "=" rate=DOULBE
+                //name=ValidId distribution=Distribution
                 public Group getGroup() { return cGroup; }
                 
-                //name=ID
+                //name=ValidId
                 public Assignment getNameAssignment_0() { return cNameAssignment_0; }
                 
-                //ID
-                public RuleCall getNameIDTerminalRuleCall_0_0() { return cNameIDTerminalRuleCall_0_0; }
+                //ValidId
+                public RuleCall getNameValidIdParserRuleCall_0_0() { return cNameValidIdParserRuleCall_0_0; }
+                
+                //distribution=Distribution
+                public Assignment getDistributionAssignment_1() { return cDistributionAssignment_1; }
+                
+                //Distribution
+                public RuleCall getDistributionDistributionParserRuleCall_1_0() { return cDistributionDistributionParserRuleCall_1_0; }
+        }
+        public class DistributionElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.Distribution");
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final RuleCall cConstantDistributionParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final RuleCall cExponentialDistributionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                
+                //Distribution ft::Distribution:
+                //      ConstantDistribution | ExponentialDistribution;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //ConstantDistribution | ExponentialDistribution
+                public Alternatives getAlternatives() { return cAlternatives; }
+                
+                //ConstantDistribution
+                public RuleCall getConstantDistributionParserRuleCall_0() { return cConstantDistributionParserRuleCall_0; }
+                
+                //ExponentialDistribution
+                public RuleCall getExponentialDistributionParserRuleCall_1() { return cExponentialDistributionParserRuleCall_1; }
+        }
+        public class ConstantDistributionElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ConstantDistribution");
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Keyword cPKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final Keyword cEqualsSignKeyword_1 = (Keyword)cGroup.eContents().get(1);
+                private final Assignment cPAssignment_2 = (Assignment)cGroup.eContents().get(2);
+                private final RuleCall cPDoubleParserRuleCall_2_0 = (RuleCall)cPAssignment_2.eContents().get(0);
+                
+                //ConstantDistribution ft::ConstantDistribution:
+                //      "p" "=" p=Double;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //"p" "=" p=Double
+                public Group getGroup() { return cGroup; }
+                
+                //"p"
+                public Keyword getPKeyword_0() { return cPKeyword_0; }
+                
+                //"="
+                public Keyword getEqualsSignKeyword_1() { return cEqualsSignKeyword_1; }
+                
+                //p=Double
+                public Assignment getPAssignment_2() { return cPAssignment_2; }
+                
+                //Double
+                public RuleCall getPDoubleParserRuleCall_2_0() { return cPDoubleParserRuleCall_2_0; }
+        }
+        public class ExponentialDistributionElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ExponentialDistribution");
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Keyword cLambdaKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final Keyword cEqualsSignKeyword_1 = (Keyword)cGroup.eContents().get(1);
+                private final Assignment cLambdaAssignment_2 = (Assignment)cGroup.eContents().get(2);
+                private final RuleCall cLambdaDoubleParserRuleCall_2_0 = (RuleCall)cLambdaAssignment_2.eContents().get(0);
+                
+                //ExponentialDistribution ft::ExponentialDistribution:
+                //      "lambda" "=" lambda=Double;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //"lambda" "=" lambda=Double
+                public Group getGroup() { return cGroup; }
                 
                 //"lambda"
-                public Keyword getLambdaKeyword_1() { return cLambdaKeyword_1; }
+                public Keyword getLambdaKeyword_0() { return cLambdaKeyword_0; }
                 
                 //"="
-                public Keyword getEqualsSignKeyword_2() { return cEqualsSignKeyword_2; }
+                public Keyword getEqualsSignKeyword_1() { return cEqualsSignKeyword_1; }
                 
-                //rate=DOULBE
-                public Assignment getRateAssignment_3() { return cRateAssignment_3; }
+                //lambda=Double
+                public Assignment getLambdaAssignment_2() { return cLambdaAssignment_2; }
                 
-                //DOULBE
-                public RuleCall getRateDOULBETerminalRuleCall_3_0() { return cRateDOULBETerminalRuleCall_3_0; }
+                //Double
+                public RuleCall getLambdaDoubleParserRuleCall_2_0() { return cLambdaDoubleParserRuleCall_2_0; }
         }
         public class GateDefinitionElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.GateDefinition");
                 private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-                private final RuleCall cAndGateParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
-                private final RuleCall cOrGateParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                private final RuleCall cAndGateDefinitionParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final RuleCall cOrGateDefinitionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                private final RuleCall cKOfMGateDefinitionParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
                 
-                //GateDefinition:
-                //      AndGate | OrGate;
+                //GateDefinition cft::GateDefinition:
+                //      AndGateDefinition | OrGateDefinition | KOfMGateDefinition;
                 @Override public ParserRule getRule() { return rule; }
                 
-                //AndGate | OrGate
+                //AndGateDefinition | OrGateDefinition | KOfMGateDefinition
                 public Alternatives getAlternatives() { return cAlternatives; }
                 
-                //AndGate
-                public RuleCall getAndGateParserRuleCall_0() { return cAndGateParserRuleCall_0; }
+                //AndGateDefinition
+                public RuleCall getAndGateDefinitionParserRuleCall_0() { return cAndGateDefinitionParserRuleCall_0; }
                 
-                //OrGate
-                public RuleCall getOrGateParserRuleCall_1() { return cOrGateParserRuleCall_1; }
+                //OrGateDefinition
+                public RuleCall getOrGateDefinitionParserRuleCall_1() { return cOrGateDefinitionParserRuleCall_1; }
+                
+                //KOfMGateDefinition
+                public RuleCall getKOfMGateDefinitionParserRuleCall_2() { return cKOfMGateDefinitionParserRuleCall_2; }
         }
-        public class AndGateElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.AndGate");
+        public class AndGateDefinitionElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.AndGateDefinition");
                 private final Group cGroup = (Group)rule.eContents().get(1);
                 private final Assignment cNameAssignment_0 = (Assignment)cGroup.eContents().get(0);
-                private final RuleCall cNameIDTerminalRuleCall_0_0 = (RuleCall)cNameAssignment_0.eContents().get(0);
+                private final RuleCall cNameValidIdParserRuleCall_0_0 = (RuleCall)cNameAssignment_0.eContents().get(0);
                 private final Keyword cAndKeyword_1 = (Keyword)cGroup.eContents().get(1);
                 private final Assignment cInputEventsAssignment_2 = (Assignment)cGroup.eContents().get(2);
                 private final CrossReference cInputEventsEventDeclarationCrossReference_2_0 = (CrossReference)cInputEventsAssignment_2.eContents().get(0);
-                private final RuleCall cInputEventsEventDeclarationIDTerminalRuleCall_2_0_1 = (RuleCall)cInputEventsEventDeclarationCrossReference_2_0.eContents().get(1);
+                private final RuleCall cInputEventsEventDeclarationValidIdParserRuleCall_2_0_1 = (RuleCall)cInputEventsEventDeclarationCrossReference_2_0.eContents().get(1);
                 
-                //AndGate:
-                //      name=ID "and" inputEvents+=[EventDeclaration]*;
+                //AndGateDefinition cft::AndGateDefinition:
+                //      name=ValidId "and" inputEvents+=[cft::EventDeclaration|ValidId]*;
                 @Override public ParserRule getRule() { return rule; }
                 
-                //name=ID "and" inputEvents+=[EventDeclaration]*
+                //name=ValidId "and" inputEvents+=[cft::EventDeclaration|ValidId]*
                 public Group getGroup() { return cGroup; }
                 
-                //name=ID
+                //name=ValidId
                 public Assignment getNameAssignment_0() { return cNameAssignment_0; }
                 
-                //ID
-                public RuleCall getNameIDTerminalRuleCall_0_0() { return cNameIDTerminalRuleCall_0_0; }
+                //ValidId
+                public RuleCall getNameValidIdParserRuleCall_0_0() { return cNameValidIdParserRuleCall_0_0; }
                 
                 //"and"
                 public Keyword getAndKeyword_1() { return cAndKeyword_1; }
                 
-                //inputEvents+=[EventDeclaration]*
+                //inputEvents+=[cft::EventDeclaration|ValidId]*
                 public Assignment getInputEventsAssignment_2() { return cInputEventsAssignment_2; }
                 
-                //[EventDeclaration]
+                //[cft::EventDeclaration|ValidId]
                 public CrossReference getInputEventsEventDeclarationCrossReference_2_0() { return cInputEventsEventDeclarationCrossReference_2_0; }
                 
-                //ID
-                public RuleCall getInputEventsEventDeclarationIDTerminalRuleCall_2_0_1() { return cInputEventsEventDeclarationIDTerminalRuleCall_2_0_1; }
+                //ValidId
+                public RuleCall getInputEventsEventDeclarationValidIdParserRuleCall_2_0_1() { return cInputEventsEventDeclarationValidIdParserRuleCall_2_0_1; }
         }
-        public class OrGateElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.OrGate");
+        public class OrGateDefinitionElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.OrGateDefinition");
                 private final Group cGroup = (Group)rule.eContents().get(1);
                 private final Assignment cNameAssignment_0 = (Assignment)cGroup.eContents().get(0);
-                private final RuleCall cNameIDTerminalRuleCall_0_0 = (RuleCall)cNameAssignment_0.eContents().get(0);
+                private final RuleCall cNameValidIdParserRuleCall_0_0 = (RuleCall)cNameAssignment_0.eContents().get(0);
                 private final Keyword cOrKeyword_1 = (Keyword)cGroup.eContents().get(1);
                 private final Assignment cInputEventsAssignment_2 = (Assignment)cGroup.eContents().get(2);
                 private final CrossReference cInputEventsEventDeclarationCrossReference_2_0 = (CrossReference)cInputEventsAssignment_2.eContents().get(0);
-                private final RuleCall cInputEventsEventDeclarationIDTerminalRuleCall_2_0_1 = (RuleCall)cInputEventsEventDeclarationCrossReference_2_0.eContents().get(1);
+                private final RuleCall cInputEventsEventDeclarationValidIdParserRuleCall_2_0_1 = (RuleCall)cInputEventsEventDeclarationCrossReference_2_0.eContents().get(1);
                 
-                //OrGate:
-                //      name=ID "or" inputEvents+=[EventDeclaration]*;
+                //OrGateDefinition cft::OrGateDefinition:
+                //      name=ValidId "or" inputEvents+=[cft::EventDeclaration|ValidId]*;
                 @Override public ParserRule getRule() { return rule; }
                 
-                //name=ID "or" inputEvents+=[EventDeclaration]*
+                //name=ValidId "or" inputEvents+=[cft::EventDeclaration|ValidId]*
                 public Group getGroup() { return cGroup; }
                 
-                //name=ID
+                //name=ValidId
                 public Assignment getNameAssignment_0() { return cNameAssignment_0; }
                 
-                //ID
-                public RuleCall getNameIDTerminalRuleCall_0_0() { return cNameIDTerminalRuleCall_0_0; }
+                //ValidId
+                public RuleCall getNameValidIdParserRuleCall_0_0() { return cNameValidIdParserRuleCall_0_0; }
                 
                 //"or"
                 public Keyword getOrKeyword_1() { return cOrKeyword_1; }
                 
-                //inputEvents+=[EventDeclaration]*
+                //inputEvents+=[cft::EventDeclaration|ValidId]*
                 public Assignment getInputEventsAssignment_2() { return cInputEventsAssignment_2; }
                 
-                //[EventDeclaration]
+                //[cft::EventDeclaration|ValidId]
                 public CrossReference getInputEventsEventDeclarationCrossReference_2_0() { return cInputEventsEventDeclarationCrossReference_2_0; }
                 
-                //ID
-                public RuleCall getInputEventsEventDeclarationIDTerminalRuleCall_2_0_1() { return cInputEventsEventDeclarationIDTerminalRuleCall_2_0_1; }
+                //ValidId
+                public RuleCall getInputEventsEventDeclarationValidIdParserRuleCall_2_0_1() { return cInputEventsEventDeclarationValidIdParserRuleCall_2_0_1; }
+        }
+        public class KOfMGateDefinitionElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.KOfMGateDefinition");
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Assignment cNameAssignment_0 = (Assignment)cGroup.eContents().get(0);
+                private final RuleCall cNameValidIdParserRuleCall_0_0 = (RuleCall)cNameAssignment_0.eContents().get(0);
+                private final Assignment cKAssignment_1 = (Assignment)cGroup.eContents().get(1);
+                private final RuleCall cKINTTerminalRuleCall_1_0 = (RuleCall)cKAssignment_1.eContents().get(0);
+                private final Alternatives cAlternatives_2 = (Alternatives)cGroup.eContents().get(2);
+                private final Group cGroup_2_0 = (Group)cAlternatives_2.eContents().get(0);
+                private final Keyword cOfKeyword_2_0_0 = (Keyword)cGroup_2_0.eContents().get(0);
+                private final Assignment cMAssignment_2_0_1 = (Assignment)cGroup_2_0.eContents().get(1);
+                private final RuleCall cMINTTerminalRuleCall_2_0_1_0 = (RuleCall)cMAssignment_2_0_1.eContents().get(0);
+                private final Assignment cMAssignment_2_1 = (Assignment)cAlternatives_2.eContents().get(1);
+                private final RuleCall cMOF_INTTerminalRuleCall_2_1_0 = (RuleCall)cMAssignment_2_1.eContents().get(0);
+                private final Assignment cInputEventsAssignment_3 = (Assignment)cGroup.eContents().get(3);
+                private final CrossReference cInputEventsEventDeclarationCrossReference_3_0 = (CrossReference)cInputEventsAssignment_3.eContents().get(0);
+                private final RuleCall cInputEventsEventDeclarationValidIdParserRuleCall_3_0_1 = (RuleCall)cInputEventsEventDeclarationCrossReference_3_0.eContents().get(1);
+                
+                //KOfMGateDefinition cft::KOfMGateDefinition:
+                //      name=ValidId k=INT ("of" m=INT | m=OF_INT) inputEvents+=[cft::EventDeclaration|ValidId]*;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //name=ValidId k=INT ("of" m=INT | m=OF_INT) inputEvents+=[cft::EventDeclaration|ValidId]*
+                public Group getGroup() { return cGroup; }
+                
+                //name=ValidId
+                public Assignment getNameAssignment_0() { return cNameAssignment_0; }
+                
+                //ValidId
+                public RuleCall getNameValidIdParserRuleCall_0_0() { return cNameValidIdParserRuleCall_0_0; }
+                
+                //k=INT
+                public Assignment getKAssignment_1() { return cKAssignment_1; }
+                
+                //INT
+                public RuleCall getKINTTerminalRuleCall_1_0() { return cKINTTerminalRuleCall_1_0; }
+                
+                //"of" m=INT | m=OF_INT
+                public Alternatives getAlternatives_2() { return cAlternatives_2; }
+                
+                //"of" m=INT
+                public Group getGroup_2_0() { return cGroup_2_0; }
+                
+                //"of"
+                public Keyword getOfKeyword_2_0_0() { return cOfKeyword_2_0_0; }
+                
+                //m=INT
+                public Assignment getMAssignment_2_0_1() { return cMAssignment_2_0_1; }
+                
+                //INT
+                public RuleCall getMINTTerminalRuleCall_2_0_1_0() { return cMINTTerminalRuleCall_2_0_1_0; }
+                
+                //m=OF_INT
+                public Assignment getMAssignment_2_1() { return cMAssignment_2_1; }
+                
+                //OF_INT
+                public RuleCall getMOF_INTTerminalRuleCall_2_1_0() { return cMOF_INTTerminalRuleCall_2_1_0; }
+                
+                //inputEvents+=[cft::EventDeclaration|ValidId]*
+                public Assignment getInputEventsAssignment_3() { return cInputEventsAssignment_3; }
+                
+                //[cft::EventDeclaration|ValidId]
+                public CrossReference getInputEventsEventDeclarationCrossReference_3_0() { return cInputEventsEventDeclarationCrossReference_3_0; }
+                
+                //ValidId
+                public RuleCall getInputEventsEventDeclarationValidIdParserRuleCall_3_0_1() { return cInputEventsEventDeclarationValidIdParserRuleCall_3_0_1; }
         }
         public class TransformationDefinitionElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.TransformationDefinition");
                 private final Group cGroup = (Group)rule.eContents().get(1);
                 private final Keyword cTransformationKeyword_0 = (Keyword)cGroup.eContents().get(0);
                 private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
-                private final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);
+                private final RuleCall cNameValidIdParserRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);
                 private final Keyword cLeftCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);
                 private final Assignment cMappingDefinitionsAssignment_3 = (Assignment)cGroup.eContents().get(3);
                 private final RuleCall cMappingDefinitionsMappingDefinitionParserRuleCall_3_0 = (RuleCall)cMappingDefinitionsAssignment_3.eContents().get(0);
                 private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
                 
                 //TransformationDefinition:
-                //      "transformation" name=ID "{"
+                //      "transformation" name=ValidId "{"
                 //      mappingDefinitions+=MappingDefinition*
                 //      "}";
                 @Override public ParserRule getRule() { return rule; }
                 
-                //"transformation" name=ID "{" mappingDefinitions+=MappingDefinition* "}"
+                //"transformation" name=ValidId "{" mappingDefinitions+=MappingDefinition* "}"
                 public Group getGroup() { return cGroup; }
                 
                 //"transformation"
                 public Keyword getTransformationKeyword_0() { return cTransformationKeyword_0; }
                 
-                //name=ID
+                //name=ValidId
                 public Assignment getNameAssignment_1() { return cNameAssignment_1; }
                 
-                //ID
-                public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
+                //ValidId
+                public RuleCall getNameValidIdParserRuleCall_1_0() { return cNameValidIdParserRuleCall_1_0; }
                 
                 //"{"
                 public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
@@ -560,17 +677,17 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
         public class MappingParameterElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.MappingParameter");
                 private final Assignment cNameAssignment = (Assignment)rule.eContents().get(1);
-                private final RuleCall cNameIDTerminalRuleCall_0 = (RuleCall)cNameAssignment.eContents().get(0);
+                private final RuleCall cNameValidIdParserRuleCall_0 = (RuleCall)cNameAssignment.eContents().get(0);
                 
                 //MappingParameter:
-                //      name=ID;
+                //      name=ValidId;
                 @Override public ParserRule getRule() { return rule; }
                 
-                //name=ID
+                //name=ValidId
                 public Assignment getNameAssignment() { return cNameAssignment; }
                 
-                //ID
-                public RuleCall getNameIDTerminalRuleCall_0() { return cNameIDTerminalRuleCall_0; }
+                //ValidId
+                public RuleCall getNameValidIdParserRuleCall_0() { return cNameValidIdParserRuleCall_0; }
         }
         public class LookupDefinitionElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.LookupDefinition");
@@ -578,69 +695,69 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 private final Keyword cLookupKeyword_0 = (Keyword)cGroup.eContents().get(0);
                 private final Assignment cMappingAssignment_1 = (Assignment)cGroup.eContents().get(1);
                 private final CrossReference cMappingMappingDefinitionCrossReference_1_0 = (CrossReference)cMappingAssignment_1.eContents().get(0);
-                private final RuleCall cMappingMappingDefinitionIDTerminalRuleCall_1_0_1 = (RuleCall)cMappingMappingDefinitionCrossReference_1_0.eContents().get(1);
+                private final RuleCall cMappingMappingDefinitionQualifiedNameParserRuleCall_1_0_1 = (RuleCall)cMappingMappingDefinitionCrossReference_1_0.eContents().get(1);
                 private final Keyword cLeftParenthesisKeyword_2 = (Keyword)cGroup.eContents().get(2);
                 private final Assignment cArgumentsAssignment_3 = (Assignment)cGroup.eContents().get(3);
                 private final CrossReference cArgumentsMappingParameterCrossReference_3_0 = (CrossReference)cArgumentsAssignment_3.eContents().get(0);
-                private final RuleCall cArgumentsMappingParameterIDTerminalRuleCall_3_0_1 = (RuleCall)cArgumentsMappingParameterCrossReference_3_0.eContents().get(1);
+                private final RuleCall cArgumentsMappingParameterValidIdParserRuleCall_3_0_1 = (RuleCall)cArgumentsMappingParameterCrossReference_3_0.eContents().get(1);
                 private final Group cGroup_4 = (Group)cGroup.eContents().get(4);
                 private final Keyword cCommaKeyword_4_0 = (Keyword)cGroup_4.eContents().get(0);
                 private final Assignment cArgumentsAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);
                 private final CrossReference cArgumentsMappingParameterCrossReference_4_1_0 = (CrossReference)cArgumentsAssignment_4_1.eContents().get(0);
-                private final RuleCall cArgumentsMappingParameterIDTerminalRuleCall_4_1_0_1 = (RuleCall)cArgumentsMappingParameterCrossReference_4_1_0.eContents().get(1);
+                private final RuleCall cArgumentsMappingParameterValidIdParserRuleCall_4_1_0_1 = (RuleCall)cArgumentsMappingParameterCrossReference_4_1_0.eContents().get(1);
                 private final Keyword cRightParenthesisKeyword_5 = (Keyword)cGroup.eContents().get(5);
                 private final Keyword cAsKeyword_6 = (Keyword)cGroup.eContents().get(6);
                 private final Assignment cNameAssignment_7 = (Assignment)cGroup.eContents().get(7);
-                private final RuleCall cNameIDTerminalRuleCall_7_0 = (RuleCall)cNameAssignment_7.eContents().get(0);
+                private final RuleCall cNameValidIdParserRuleCall_7_0 = (RuleCall)cNameAssignment_7.eContents().get(0);
                 
                 //LookupDefinition:
-                //      "lookup" mapping=[MappingDefinition]
-                //      "(" arguments+=[MappingParameter] ("," arguments+=[MappingParameter])* ")"
-                //      "as" name=ID;
+                //      "lookup" mapping=[MappingDefinition|QualifiedName]
+                //      "(" arguments+=[MappingParameter|ValidId] ("," arguments+=[MappingParameter|ValidId])* ")"
+                //      "as" name=ValidId;
                 @Override public ParserRule getRule() { return rule; }
                 
-                //"lookup" mapping=[MappingDefinition] "(" arguments+=[MappingParameter] ("," arguments+=[MappingParameter])* ")" "as"
-                //name=ID
+                //"lookup" mapping=[MappingDefinition|QualifiedName] "(" arguments+=[MappingParameter|ValidId] (","
+                //arguments+=[MappingParameter|ValidId])* ")" "as" name=ValidId
                 public Group getGroup() { return cGroup; }
                 
                 //"lookup"
                 public Keyword getLookupKeyword_0() { return cLookupKeyword_0; }
                 
-                //mapping=[MappingDefinition]
+                //mapping=[MappingDefinition|QualifiedName]
                 public Assignment getMappingAssignment_1() { return cMappingAssignment_1; }
                 
-                //[MappingDefinition]
+                //[MappingDefinition|QualifiedName]
                 public CrossReference getMappingMappingDefinitionCrossReference_1_0() { return cMappingMappingDefinitionCrossReference_1_0; }
                 
-                //ID
-                public RuleCall getMappingMappingDefinitionIDTerminalRuleCall_1_0_1() { return cMappingMappingDefinitionIDTerminalRuleCall_1_0_1; }
+                //QualifiedName
+                public RuleCall getMappingMappingDefinitionQualifiedNameParserRuleCall_1_0_1() { return cMappingMappingDefinitionQualifiedNameParserRuleCall_1_0_1; }
                 
                 //"("
                 public Keyword getLeftParenthesisKeyword_2() { return cLeftParenthesisKeyword_2; }
                 
-                //arguments+=[MappingParameter]
+                //arguments+=[MappingParameter|ValidId]
                 public Assignment getArgumentsAssignment_3() { return cArgumentsAssignment_3; }
                 
-                //[MappingParameter]
+                //[MappingParameter|ValidId]
                 public CrossReference getArgumentsMappingParameterCrossReference_3_0() { return cArgumentsMappingParameterCrossReference_3_0; }
                 
-                //ID
-                public RuleCall getArgumentsMappingParameterIDTerminalRuleCall_3_0_1() { return cArgumentsMappingParameterIDTerminalRuleCall_3_0_1; }
+                //ValidId
+                public RuleCall getArgumentsMappingParameterValidIdParserRuleCall_3_0_1() { return cArgumentsMappingParameterValidIdParserRuleCall_3_0_1; }
                 
-                //("," arguments+=[MappingParameter])*
+                //("," arguments+=[MappingParameter|ValidId])*
                 public Group getGroup_4() { return cGroup_4; }
                 
                 //","
                 public Keyword getCommaKeyword_4_0() { return cCommaKeyword_4_0; }
                 
-                //arguments+=[MappingParameter]
+                //arguments+=[MappingParameter|ValidId]
                 public Assignment getArgumentsAssignment_4_1() { return cArgumentsAssignment_4_1; }
                 
-                //[MappingParameter]
+                //[MappingParameter|ValidId]
                 public CrossReference getArgumentsMappingParameterCrossReference_4_1_0() { return cArgumentsMappingParameterCrossReference_4_1_0; }
                 
-                //ID
-                public RuleCall getArgumentsMappingParameterIDTerminalRuleCall_4_1_0_1() { return cArgumentsMappingParameterIDTerminalRuleCall_4_1_0_1; }
+                //ValidId
+                public RuleCall getArgumentsMappingParameterValidIdParserRuleCall_4_1_0_1() { return cArgumentsMappingParameterValidIdParserRuleCall_4_1_0_1; }
                 
                 //")"
                 public Keyword getRightParenthesisKeyword_5() { return cRightParenthesisKeyword_5; }
@@ -648,11 +765,11 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 //"as"
                 public Keyword getAsKeyword_6() { return cAsKeyword_6; }
                 
-                //name=ID
+                //name=ValidId
                 public Assignment getNameAssignment_7() { return cNameAssignment_7; }
                 
-                //ID
-                public RuleCall getNameIDTerminalRuleCall_7_0() { return cNameIDTerminalRuleCall_7_0; }
+                //ValidId
+                public RuleCall getNameValidIdParserRuleCall_7_0() { return cNameValidIdParserRuleCall_7_0; }
         }
         public class VariableElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.Variable");
@@ -721,39 +838,39 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 private final Group cGroup = (Group)rule.eContents().get(1);
                 private final Assignment cComponentAssignment_0 = (Assignment)cGroup.eContents().get(0);
                 private final CrossReference cComponentVariableCrossReference_0_0 = (CrossReference)cComponentAssignment_0.eContents().get(0);
-                private final RuleCall cComponentVariableIDTerminalRuleCall_0_0_1 = (RuleCall)cComponentVariableCrossReference_0_0.eContents().get(1);
+                private final RuleCall cComponentVariableValidIdParserRuleCall_0_0_1 = (RuleCall)cComponentVariableCrossReference_0_0.eContents().get(1);
                 private final Keyword cFullStopKeyword_1 = (Keyword)cGroup.eContents().get(1);
                 private final Assignment cEventAssignment_2 = (Assignment)cGroup.eContents().get(2);
                 private final CrossReference cEventEventDeclarationCrossReference_2_0 = (CrossReference)cEventAssignment_2.eContents().get(0);
-                private final RuleCall cEventEventDeclarationIDTerminalRuleCall_2_0_1 = (RuleCall)cEventEventDeclarationCrossReference_2_0.eContents().get(1);
+                private final RuleCall cEventEventDeclarationValidIdParserRuleCall_2_0_1 = (RuleCall)cEventEventDeclarationCrossReference_2_0.eContents().get(1);
                 
                 //EventReference:
-                //      component=[Variable] "." event=[EventDeclaration];
+                //      component=[Variable|ValidId] "." event=[cft::EventDeclaration|ValidId];
                 @Override public ParserRule getRule() { return rule; }
                 
-                //component=[Variable] "." event=[EventDeclaration]
+                //component=[Variable|ValidId] "." event=[cft::EventDeclaration|ValidId]
                 public Group getGroup() { return cGroup; }
                 
-                //component=[Variable]
+                //component=[Variable|ValidId]
                 public Assignment getComponentAssignment_0() { return cComponentAssignment_0; }
                 
-                //[Variable]
+                //[Variable|ValidId]
                 public CrossReference getComponentVariableCrossReference_0_0() { return cComponentVariableCrossReference_0_0; }
                 
-                //ID
-                public RuleCall getComponentVariableIDTerminalRuleCall_0_0_1() { return cComponentVariableIDTerminalRuleCall_0_0_1; }
+                //ValidId
+                public RuleCall getComponentVariableValidIdParserRuleCall_0_0_1() { return cComponentVariableValidIdParserRuleCall_0_0_1; }
                 
                 //"."
                 public Keyword getFullStopKeyword_1() { return cFullStopKeyword_1; }
                 
-                //event=[EventDeclaration]
+                //event=[cft::EventDeclaration|ValidId]
                 public Assignment getEventAssignment_2() { return cEventAssignment_2; }
                 
-                //[EventDeclaration]
+                //[cft::EventDeclaration|ValidId]
                 public CrossReference getEventEventDeclarationCrossReference_2_0() { return cEventEventDeclarationCrossReference_2_0; }
                 
-                //ID
-                public RuleCall getEventEventDeclarationIDTerminalRuleCall_2_0_1() { return cEventEventDeclarationIDTerminalRuleCall_2_0_1; }
+                //ValidId
+                public RuleCall getEventEventDeclarationValidIdParserRuleCall_2_0_1() { return cEventEventDeclarationValidIdParserRuleCall_2_0_1; }
         }
         public class ComponentInstanceElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ComponentInstance");
@@ -766,19 +883,19 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 private final RuleCall cNameIDTerminalRuleCall_2_0 = (RuleCall)cNameAssignment_2.eContents().get(0);
                 
                 //ComponentInstance:
-                //      "=>" componentType=[ComponentDefinition|QualifiedName] name=ID?;
+                //      "=>" componentType=[cft::ComponentDefinition|QualifiedName] name=ID?;
                 @Override public ParserRule getRule() { return rule; }
                 
-                //"=>" componentType=[ComponentDefinition|QualifiedName] name=ID?
+                //"=>" componentType=[cft::ComponentDefinition|QualifiedName] name=ID?
                 public Group getGroup() { return cGroup; }
                 
                 //"=>"
                 public Keyword getEqualsSignGreaterThanSignKeyword_0() { return cEqualsSignGreaterThanSignKeyword_0; }
                 
-                //componentType=[ComponentDefinition|QualifiedName]
+                //componentType=[cft::ComponentDefinition|QualifiedName]
                 public Assignment getComponentTypeAssignment_1() { return cComponentTypeAssignment_1; }
                 
-                //[ComponentDefinition|QualifiedName]
+                //[cft::ComponentDefinition|QualifiedName]
                 public CrossReference getComponentTypeComponentDefinitionCrossReference_1_0() { return cComponentTypeComponentDefinitionCrossReference_1_0; }
                 
                 //QualifiedName
@@ -793,29 +910,29 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
         public class QualifiedNameElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.QualifiedName");
                 private final Group cGroup = (Group)rule.eContents().get(1);
-                private final RuleCall cIDTerminalRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
+                private final RuleCall cValidIdParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
                 private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
                 private final Keyword cFullStopKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);
-                private final RuleCall cIDTerminalRuleCall_1_1 = (RuleCall)cGroup_1.eContents().get(1);
+                private final RuleCall cValidIdParserRuleCall_1_1 = (RuleCall)cGroup_1.eContents().get(1);
                 
                 //QualifiedName:
-                //      ID ("." ID)*;
+                //      ValidId ("." ValidId)*;
                 @Override public ParserRule getRule() { return rule; }
                 
-                //ID ("." ID)*
+                //ValidId ("." ValidId)*
                 public Group getGroup() { return cGroup; }
                 
-                //ID
-                public RuleCall getIDTerminalRuleCall_0() { return cIDTerminalRuleCall_0; }
+                //ValidId
+                public RuleCall getValidIdParserRuleCall_0() { return cValidIdParserRuleCall_0; }
                 
-                //("." ID)*
+                //("." ValidId)*
                 public Group getGroup_1() { return cGroup_1; }
                 
                 //"."
                 public Keyword getFullStopKeyword_1_0() { return cFullStopKeyword_1_0; }
                 
-                //ID
-                public RuleCall getIDTerminalRuleCall_1_1() { return cIDTerminalRuleCall_1_1; }
+                //ValidId
+                public RuleCall getValidIdParserRuleCall_1_1() { return cValidIdParserRuleCall_1_1; }
         }
         public class QualifiedNameWithWildcardElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.QualifiedNameWithWildcard");
@@ -844,18 +961,59 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 //"*"
                 public Keyword getAsteriskKeyword_1_1() { return cAsteriskKeyword_1_1; }
         }
+        public class ValidIdElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.ValidId");
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final RuleCall cIDTerminalRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final RuleCall cOF_INTTerminalRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                
+                //ValidId:
+                //      ID | OF_INT;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //ID | OF_INT
+                public Alternatives getAlternatives() { return cAlternatives; }
+                
+                //ID
+                public RuleCall getIDTerminalRuleCall_0() { return cIDTerminalRuleCall_0; }
+                
+                //OF_INT
+                public RuleCall getOF_INTTerminalRuleCall_1() { return cOF_INTTerminalRuleCall_1; }
+        }
+        public class DoubleElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.Double");
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final RuleCall cINTTerminalRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final RuleCall cT_DOUBLETerminalRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                
+                //Double ecore::EDouble:
+                //      INT | T_DOUBLE;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //INT | T_DOUBLE
+                public Alternatives getAlternatives() { return cAlternatives; }
+                
+                //INT
+                public RuleCall getINTTerminalRuleCall_0() { return cINTTerminalRuleCall_0; }
+                
+                //T_DOUBLE
+                public RuleCall getT_DOUBLETerminalRuleCall_1() { return cT_DOUBLETerminalRuleCall_1; }
+        }
         
         
         private final CftModelElements pCftModel;
         private final ImportDeclarationElements pImportDeclaration;
         private final ComponentDefinitionElements pComponentDefinition;
-        private final EventDeclarationElements pEventDeclaration;
         private final InputEventElements pInputEvent;
         private final EventDefinitionElements pEventDefinition;
         private final BasicEventDefinitionElements pBasicEventDefinition;
+        private final DistributionElements pDistribution;
+        private final ConstantDistributionElements pConstantDistribution;
+        private final ExponentialDistributionElements pExponentialDistribution;
         private final GateDefinitionElements pGateDefinition;
-        private final AndGateElements pAndGate;
-        private final OrGateElements pOrGate;
+        private final AndGateDefinitionElements pAndGateDefinition;
+        private final OrGateDefinitionElements pOrGateDefinition;
+        private final KOfMGateDefinitionElements pKOfMGateDefinition;
         private final TransformationDefinitionElements pTransformationDefinition;
         private final MappingDefinitionElements pMappingDefinition;
         private final MappingParameterElements pMappingParameter;
@@ -866,7 +1024,10 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
         private final ComponentInstanceElements pComponentInstance;
         private final QualifiedNameElements pQualifiedName;
         private final QualifiedNameWithWildcardElements pQualifiedNameWithWildcard;
-        private final TerminalRule tDOULBE;
+        private final ValidIdElements pValidId;
+        private final DoubleElements pDouble;
+        private final TerminalRule tOF_INT;
+        private final TerminalRule tT_DOUBLE;
         
         private final Grammar grammar;
         
@@ -880,13 +1041,16 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 this.pCftModel = new CftModelElements();
                 this.pImportDeclaration = new ImportDeclarationElements();
                 this.pComponentDefinition = new ComponentDefinitionElements();
-                this.pEventDeclaration = new EventDeclarationElements();
                 this.pInputEvent = new InputEventElements();
                 this.pEventDefinition = new EventDefinitionElements();
                 this.pBasicEventDefinition = new BasicEventDefinitionElements();
+                this.pDistribution = new DistributionElements();
+                this.pConstantDistribution = new ConstantDistributionElements();
+                this.pExponentialDistribution = new ExponentialDistributionElements();
                 this.pGateDefinition = new GateDefinitionElements();
-                this.pAndGate = new AndGateElements();
-                this.pOrGate = new OrGateElements();
+                this.pAndGateDefinition = new AndGateDefinitionElements();
+                this.pOrGateDefinition = new OrGateDefinitionElements();
+                this.pKOfMGateDefinition = new KOfMGateDefinitionElements();
                 this.pTransformationDefinition = new TransformationDefinitionElements();
                 this.pMappingDefinition = new MappingDefinitionElements();
                 this.pMappingParameter = new MappingParameterElements();
@@ -897,7 +1061,10 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 this.pComponentInstance = new ComponentInstanceElements();
                 this.pQualifiedName = new QualifiedNameElements();
                 this.pQualifiedNameWithWildcard = new QualifiedNameWithWildcardElements();
-                this.tDOULBE = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.DOULBE");
+                this.pValidId = new ValidIdElements();
+                this.pDouble = new DoubleElements();
+                this.tOF_INT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.OF_INT");
+                this.tT_DOUBLE = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage.T_DOUBLE");
         }
         
         protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
@@ -949,9 +1116,9 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 return getImportDeclarationAccess().getRule();
         }
         
-        //ComponentDefinition:
-        //      "cft" name=ID "{" (("in" inputEvents+=InputEvent* ";")? & ("out" outputEvents+=[EventDeclaration]* ";")?)
-        //      (eventDefinitions+=EventDefinition ";")*
+        //ComponentDefinition cft::ComponentDefinition:
+        //      "cft" name=ValidId "{" (("in" inputEvents+=InputEvent* ";")? & ("out" outputEvents+=[cft::EventDeclaration|ValidId]*
+        //      ";")?) (eventDefinitions+=EventDefinition ";")*
         //      "}";
         public ComponentDefinitionElements getComponentDefinitionAccess() {
                 return pComponentDefinition;
@@ -961,18 +1128,8 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 return getComponentDefinitionAccess().getRule();
         }
         
-        //EventDeclaration:
-        //      InputEvent | EventDefinition;
-        public EventDeclarationElements getEventDeclarationAccess() {
-                return pEventDeclaration;
-        }
-        
-        public ParserRule getEventDeclarationRule() {
-                return getEventDeclarationAccess().getRule();
-        }
-        
-        //InputEvent:
-        //      name=ID multiple?="[]"?;
+        //InputEvent cft::IntputEvent:
+        //      name=ValidId multiple?="[]"?;
         public InputEventElements getInputEventAccess() {
                 return pInputEvent;
         }
@@ -981,7 +1138,7 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 return getInputEventAccess().getRule();
         }
         
-        //EventDefinition:
+        //EventDefinition cft::EventDefinition:
         //      BasicEventDefinition | GateDefinition;
         public EventDefinitionElements getEventDefinitionAccess() {
                 return pEventDefinition;
@@ -991,8 +1148,8 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 return getEventDefinitionAccess().getRule();
         }
         
-        //BasicEventDefinition:
-        //      name=ID "lambda" "=" rate=DOULBE;
+        //BasicEventDefinition cft::BasicEventDefinition:
+        //      name=ValidId distribution=Distribution;
         public BasicEventDefinitionElements getBasicEventDefinitionAccess() {
                 return pBasicEventDefinition;
         }
@@ -1001,8 +1158,38 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 return getBasicEventDefinitionAccess().getRule();
         }
         
-        //GateDefinition:
-        //      AndGate | OrGate;
+        //Distribution ft::Distribution:
+        //      ConstantDistribution | ExponentialDistribution;
+        public DistributionElements getDistributionAccess() {
+                return pDistribution;
+        }
+        
+        public ParserRule getDistributionRule() {
+                return getDistributionAccess().getRule();
+        }
+        
+        //ConstantDistribution ft::ConstantDistribution:
+        //      "p" "=" p=Double;
+        public ConstantDistributionElements getConstantDistributionAccess() {
+                return pConstantDistribution;
+        }
+        
+        public ParserRule getConstantDistributionRule() {
+                return getConstantDistributionAccess().getRule();
+        }
+        
+        //ExponentialDistribution ft::ExponentialDistribution:
+        //      "lambda" "=" lambda=Double;
+        public ExponentialDistributionElements getExponentialDistributionAccess() {
+                return pExponentialDistribution;
+        }
+        
+        public ParserRule getExponentialDistributionRule() {
+                return getExponentialDistributionAccess().getRule();
+        }
+        
+        //GateDefinition cft::GateDefinition:
+        //      AndGateDefinition | OrGateDefinition | KOfMGateDefinition;
         public GateDefinitionElements getGateDefinitionAccess() {
                 return pGateDefinition;
         }
@@ -1011,28 +1198,38 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 return getGateDefinitionAccess().getRule();
         }
         
-        //AndGate:
-        //      name=ID "and" inputEvents+=[EventDeclaration]*;
-        public AndGateElements getAndGateAccess() {
-                return pAndGate;
+        //AndGateDefinition cft::AndGateDefinition:
+        //      name=ValidId "and" inputEvents+=[cft::EventDeclaration|ValidId]*;
+        public AndGateDefinitionElements getAndGateDefinitionAccess() {
+                return pAndGateDefinition;
+        }
+        
+        public ParserRule getAndGateDefinitionRule() {
+                return getAndGateDefinitionAccess().getRule();
         }
         
-        public ParserRule getAndGateRule() {
-                return getAndGateAccess().getRule();
+        //OrGateDefinition cft::OrGateDefinition:
+        //      name=ValidId "or" inputEvents+=[cft::EventDeclaration|ValidId]*;
+        public OrGateDefinitionElements getOrGateDefinitionAccess() {
+                return pOrGateDefinition;
         }
         
-        //OrGate:
-        //      name=ID "or" inputEvents+=[EventDeclaration]*;
-        public OrGateElements getOrGateAccess() {
-                return pOrGate;
+        public ParserRule getOrGateDefinitionRule() {
+                return getOrGateDefinitionAccess().getRule();
         }
         
-        public ParserRule getOrGateRule() {
-                return getOrGateAccess().getRule();
+        //KOfMGateDefinition cft::KOfMGateDefinition:
+        //      name=ValidId k=INT ("of" m=INT | m=OF_INT) inputEvents+=[cft::EventDeclaration|ValidId]*;
+        public KOfMGateDefinitionElements getKOfMGateDefinitionAccess() {
+                return pKOfMGateDefinition;
+        }
+        
+        public ParserRule getKOfMGateDefinitionRule() {
+                return getKOfMGateDefinitionAccess().getRule();
         }
         
         //TransformationDefinition:
-        //      "transformation" name=ID "{"
+        //      "transformation" name=ValidId "{"
         //      mappingDefinitions+=MappingDefinition*
         //      "}";
         public TransformationDefinitionElements getTransformationDefinitionAccess() {
@@ -1057,7 +1254,7 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
         }
         
         //MappingParameter:
-        //      name=ID;
+        //      name=ValidId;
         public MappingParameterElements getMappingParameterAccess() {
                 return pMappingParameter;
         }
@@ -1067,9 +1264,9 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
         }
         
         //LookupDefinition:
-        //      "lookup" mapping=[MappingDefinition]
-        //      "(" arguments+=[MappingParameter] ("," arguments+=[MappingParameter])* ")"
-        //      "as" name=ID;
+        //      "lookup" mapping=[MappingDefinition|QualifiedName]
+        //      "(" arguments+=[MappingParameter|ValidId] ("," arguments+=[MappingParameter|ValidId])* ")"
+        //      "as" name=ValidId;
         public LookupDefinitionElements getLookupDefinitionAccess() {
                 return pLookupDefinition;
         }
@@ -1099,7 +1296,7 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
         }
         
         //EventReference:
-        //      component=[Variable] "." event=[EventDeclaration];
+        //      component=[Variable|ValidId] "." event=[cft::EventDeclaration|ValidId];
         public EventReferenceElements getEventReferenceAccess() {
                 return pEventReference;
         }
@@ -1109,7 +1306,7 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
         }
         
         //ComponentInstance:
-        //      "=>" componentType=[ComponentDefinition|QualifiedName] name=ID?;
+        //      "=>" componentType=[cft::ComponentDefinition|QualifiedName] name=ID?;
         public ComponentInstanceElements getComponentInstanceAccess() {
                 return pComponentInstance;
         }
@@ -1119,7 +1316,7 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
         }
         
         //QualifiedName:
-        //      ID ("." ID)*;
+        //      ValidId ("." ValidId)*;
         public QualifiedNameElements getQualifiedNameAccess() {
                 return pQualifiedName;
         }
@@ -1138,10 +1335,36 @@ public class CftLanguageGrammarAccess extends AbstractGrammarElementFinder {
                 return getQualifiedNameWithWildcardAccess().getRule();
         }
         
-        //terminal DOULBE returns ecore::EDouble:
+        //ValidId:
+        //      ID | OF_INT;
+        public ValidIdElements getValidIdAccess() {
+                return pValidId;
+        }
+        
+        public ParserRule getValidIdRule() {
+                return getValidIdAccess().getRule();
+        }
+        
+        //Double ecore::EDouble:
+        //      INT | T_DOUBLE;
+        public DoubleElements getDoubleAccess() {
+                return pDouble;
+        }
+        
+        public ParserRule getDoubleRule() {
+                return getDoubleAccess().getRule();
+        }
+        
+        //terminal OF_INT returns ecore::EInt:
+        //      "o" "f" '0'..'9'+;
+        public TerminalRule getOF_INTRule() {
+                return tOF_INT;
+        }
+        
+        //terminal T_DOUBLE:
         //      '0'..'9'+ ("." '0'..'9'+ | ("." '0'..'9'+)? ("e" | "E") ("+" | "-")? '0'..'9'+);
-        public TerminalRule getDOULBERule() {
-                return tDOULBE;
+        public TerminalRule getT_DOUBLERule() {
+                return tT_DOUBLE;
         }
         
         //terminal ID:
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/validation/AbstractCftLanguageValidator.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/validation/AbstractCftLanguageValidator.java
index a0c1efe7..1c5dbdee 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/validation/AbstractCftLanguageValidator.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/validation/AbstractCftLanguageValidator.java
@@ -14,6 +14,8 @@ public abstract class AbstractCftLanguageValidator extends AbstractDeclarativeVa
         protected List<EPackage> getEPackages() {
                 List<EPackage> result = new ArrayList<EPackage>();
                 result.add(hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage.eINSTANCE);
+                result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.bme.hu/mit/inf/dslreasoner/faulttree/model/cft"));
+                result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.bme.hu/mit/inf/dslreasoner/faulttree/model/ft"));
                 return result;
         }
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/CftLanguage.xtext b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/CftLanguage.xtext
index 3d82413f..61ab3359 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/CftLanguage.xtext
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/CftLanguage.xtext
@@ -2,7 +2,8 @@ grammar hu.bme.mit.inf.dslreasoner.faulttree.components.CftLanguage with org.ecl
 
 import "http://www.eclipse.org/emf/2002/Ecore" as ecore
 import "http://www.eclipse.org/viatra/query/patternlanguage/emf/PatternLanguage" as vql
-
+import "http://www.bme.hu/mit/inf/dslreasoner/faulttree/model/ft" as ft
+import "http://www.bme.hu/mit/inf/dslreasoner/faulttree/model/cft" as cft
 generate cftLanguage "http://www.bme.hu/mit/inf/dslreasoner/faulttree/components/CftLanguage"
 
 CftModel:
@@ -13,35 +14,44 @@ CftModel:
 ImportDeclaration:
         "import" importedNamespace=QualifiedNameWithWildcard ";"?;
 
-ComponentDefinition:
-        "cft" name=ID "{"
-        (("in" inputEvents+=InputEvent* ";")? & ("out" outputEvents+=[EventDeclaration]* ";")?)
+ComponentDefinition returns cft::ComponentDefinition:
+        "cft" name=ValidId "{"
+        (("in" inputEvents+=InputEvent* ";")? & ("out" outputEvents+=[cft::EventDeclaration|ValidId]* ";")?)
         (eventDefinitions+=EventDefinition ";")*
         "}";
 
-EventDeclaration:
-        InputEvent | EventDefinition;
-
-InputEvent:
-        name=ID multiple?="[]"?;
+InputEvent returns cft::IntputEvent:
+        name=ValidId multiple?="[]"?;
 
-EventDefinition:
+EventDefinition returns cft::EventDefinition:
         BasicEventDefinition | GateDefinition;
 
-BasicEventDefinition:
-        name=ID "lambda" "=" rate=DOULBE;
+BasicEventDefinition returns cft::BasicEventDefinition:
+        name=ValidId distribution=Distribution;
+
+Distribution returns ft::Distribution:
+        ConstantDistribution | ExponentialDistribution;
+
+ConstantDistribution returns ft::ConstantDistribution:
+        "p" "=" p=Double;
+
+ExponentialDistribution returns ft::ExponentialDistribution:
+        "lambda" "=" lambda=Double;
 
-GateDefinition:
-        AndGate | OrGate;
+GateDefinition returns cft::GateDefinition:
+        AndGateDefinition | OrGateDefinition | KOfMGateDefinition;
 
-AndGate:
-        name=ID "and" inputEvents+=[EventDeclaration]*;
+AndGateDefinition returns cft::AndGateDefinition:
+        name=ValidId "and" inputEvents+=[cft::EventDeclaration|ValidId]*;
 
-OrGate:
-        name=ID "or" inputEvents+=[EventDeclaration]*;
+OrGateDefinition returns cft::OrGateDefinition:
+        name=ValidId "or" inputEvents+=[cft::EventDeclaration|ValidId]*;
+
+KOfMGateDefinition returns cft::KOfMGateDefinition:
+        name=ValidId k=INT ("of" m=INT | m=OF_INT) inputEvents+=[cft::EventDeclaration|ValidId]*;
 
 TransformationDefinition:
-        "transformation" name=ID "{"
+        "transformation" name=ValidId "{"
         mappingDefinitions+=MappingDefinition*
         "}";
 
@@ -49,16 +59,16 @@ MappingDefinition:
         topLevel?="toplevel"? "mapping" pattern=[vql::Pattern|QualifiedName]
         "(" parameters+=MappingParameter ("," parameters+=MappingParameter)* ")"
         (componentInstance=ComponentInstance)? ("{"
-                ((lookupDefinitions+=LookupDefinition | assignments+=Assignment) ";")*
+        ((lookupDefinitions+=LookupDefinition | assignments+=Assignment) ";")*
         "}")?;
 
 MappingParameter:
-        name=ID;
+        name=ValidId;
 
 LookupDefinition:
-        "lookup" mapping=[MappingDefinition]
-        "(" arguments+=[MappingParameter] ("," arguments+=[MappingParameter])* ")"
-        "as" name=ID;
+        "lookup" mapping=[MappingDefinition|QualifiedName]
+        "(" arguments+=[MappingParameter|ValidId] ("," arguments+=[MappingParameter|ValidId])* ")"
+        "as" name=ValidId;
 
 Variable:
         ComponentInstance | LookupDefinition;
@@ -67,16 +77,25 @@ Assignment:
         input=EventReference (multiple?="+=" | ":=") output=EventReference;
 
 EventReference:
-        component=[Variable] "." event=[EventDeclaration];
+        component=[Variable|ValidId] "." event=[cft::EventDeclaration|ValidId];
 
 ComponentInstance:
-        "=>" componentType=[ComponentDefinition|QualifiedName] name=ID?;
+        "=>" componentType=[cft::ComponentDefinition|QualifiedName] name=ID?;
 
 QualifiedName returns ecore::EString:
-        ID ("." ID)*;
+        ValidId ("." ValidId)*;
 
 QualifiedNameWithWildcard returns ecore::EString:
         QualifiedName ("." "*")?;
 
-terminal DOULBE returns ecore::EDouble:
+ValidId:
+        ID | OF_INT;
+
+Double returns ecore::EDouble:
+        INT | T_DOUBLE;
+
+terminal OF_INT returns ecore::EInt:
+        "o" "f" ('0'..'9')+;
+
+terminal T_DOUBLE:
         ('0'..'9')+ ("." ('0'..'9')+ | ("." ('0'..'9')+)? ("e" | "E") ("+" | "-")? ('0'..'9')+);
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/CftLanguageRuntimeModule.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/CftLanguageRuntimeModule.xtend
index f780591d..fe5965fa 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/CftLanguageRuntimeModule.xtend
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/CftLanguageRuntimeModule.xtend
@@ -5,6 +5,7 @@ package hu.bme.mit.inf.dslreasoner.faulttree.components
 
 import com.google.inject.Binder
 import com.google.inject.name.Names
+import hu.bme.mit.inf.dslreasoner.faulttree.components.conversion.CftLanguageValueConverterService
 import hu.bme.mit.inf.dslreasoner.faulttree.components.naming.CftLanguageQualifiedNameProvider
 import hu.bme.mit.inf.dslreasoner.faulttree.components.scoping.CftLanguageImportedNamespaceAwareLocalScopeProvider
 import org.eclipse.xtext.scoping.IScopeProvider
@@ -30,4 +31,7 @@ class CftLanguageRuntimeModule extends AbstractCftLanguageRuntimeModule {
                 CftLanguageQualifiedNameProvider
         }
         
+        override bindIValueConverterService() {
+                CftLanguageValueConverterService
+        }
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/GenerateCftLanguage.mwe2 b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/GenerateCftLanguage.mwe2
index fa383404..89efbb05 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/GenerateCftLanguage.mwe2
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/GenerateCftLanguage.mwe2
@@ -29,6 +29,8 @@ Workflow {
                         
                         referencedResource = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel"
                         referencedResource = "platform:/resource/org.eclipse.viatra.query.patternlanguage.emf/model/PatternLanguage.genmodel"
+                        referencedResource = "platform:/resource/hu.bme.mit.inf.dslreasoner.faulttree.model/model/ft.genmodel"
+                        referencedResource = "platform:/resource/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.genmodel"
 
                         serializer = {
                                 generateStub = false
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/CftLanguageValueConverterService.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/CftLanguageValueConverterService.xtend
new file mode 100644
index 00000000..974e0df4
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/CftLanguageValueConverterService.xtend
@@ -0,0 +1,15 @@
+package hu.bme.mit.inf.dslreasoner.faulttree.components.conversion
+
+import com.google.inject.Inject
+import org.eclipse.xtext.common.services.DefaultTerminalConverters
+import org.eclipse.xtext.conversion.IValueConverter
+import org.eclipse.xtext.conversion.ValueConverter
+
+class CftLanguageValueConverterService extends DefaultTerminalConverters {
+        @Inject OF_INTValueConverter ofIntValueConverter
+
+        @ValueConverter(rule="OF_INT")
+        def IValueConverter<Integer> OF_INT() {
+                ofIntValueConverter
+        }
+}
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/OF_INTValueConverter.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/OF_INTValueConverter.xtend
new file mode 100644
index 00000000..ba3d39e6
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/OF_INTValueConverter.xtend
@@ -0,0 +1,35 @@
+package hu.bme.mit.inf.dslreasoner.faulttree.components.conversion
+
+import org.eclipse.xtext.conversion.ValueConverterException
+import org.eclipse.xtext.conversion.impl.AbstractLexerBasedConverter
+import org.eclipse.xtext.nodemodel.INode
+
+class OF_INTValueConverter extends AbstractLexerBasedConverter<Integer> {
+        static val PREFIX = "of"
+
+        override toValue(String string, INode node) throws ValueConverterException {
+                if (string === null) {
+                        return null
+                }
+                if (string.length < PREFIX.length || string.substring(0, PREFIX.length) != PREFIX) {
+                        throw new ValueConverterException("'" + string + "' must start with the characters 'of'.", node, null);
+                }
+                try {
+                        val intValue = Integer.parseInt(string.substring(PREFIX.length), 10)
+                        Integer.valueOf(intValue)
+                } catch (NumberFormatException e) {
+                        throw new ValueConverterException("Couldn't convert '" + string + "' to an int value.", node, e);
+                }
+        }
+
+        override protected toEscapedString(Integer value) {
+                PREFIX + value
+        }
+
+        override protected assertValidValue(Integer value) {
+                super.assertValidValue(value)
+                if (value < 0) {
+                        throw new ValueConverterException(getRuleName() + " may not be negative.", null, null);
+                }
+        }
+}
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/naming/CftLanguageQualifiedNameProvider.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/naming/CftLanguageQualifiedNameProvider.xtend
index eb96901c..db89ebf9 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/naming/CftLanguageQualifiedNameProvider.xtend
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/naming/CftLanguageQualifiedNameProvider.xtend
@@ -1,8 +1,8 @@
 package hu.bme.mit.inf.dslreasoner.faulttree.components.naming
 
 import com.google.inject.Inject
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.TransformationDefinition
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider
 
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/scoping/CftLanguageScopeProvider.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/scoping/CftLanguageScopeProvider.xtend
index ab708087..e95d8c91 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/scoping/CftLanguageScopeProvider.xtend
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/src/hu/bme/mit/inf/dslreasoner/faulttree/components/scoping/CftLanguageScopeProvider.xtend
@@ -5,13 +5,13 @@ package hu.bme.mit.inf.dslreasoner.faulttree.components.scoping
 
 import com.google.common.collect.Lists
 import com.google.inject.Inject
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentInstance
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventReference
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.LookupDefinition
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.MappingDefinition
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.TransformationDefinition
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.Variable
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition
 import org.eclipse.emf.common.notify.Notifier
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.EReference
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/.CftLanguageRuntimeModule.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/.CftLanguageRuntimeModule.xtendbin
index 5f61bd34..638dac63 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/.CftLanguageRuntimeModule.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/.CftLanguageRuntimeModule.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/.CftLanguageStandaloneSetup.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/.CftLanguageStandaloneSetup.xtendbin
index deb1eee6..414dfa3e 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/.CftLanguageStandaloneSetup.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/.CftLanguageStandaloneSetup.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/CftLanguageRuntimeModule.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/CftLanguageRuntimeModule.java
index c63cd33c..e798e394 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/CftLanguageRuntimeModule.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/CftLanguageRuntimeModule.java
@@ -6,8 +6,10 @@ package hu.bme.mit.inf.dslreasoner.faulttree.components;
 import com.google.inject.Binder;
 import com.google.inject.name.Names;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.AbstractCftLanguageRuntimeModule;
+import hu.bme.mit.inf.dslreasoner.faulttree.components.conversion.CftLanguageValueConverterService;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.naming.CftLanguageQualifiedNameProvider;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.scoping.CftLanguageImportedNamespaceAwareLocalScopeProvider;
+import org.eclipse.xtext.conversion.IValueConverterService;
 import org.eclipse.xtext.naming.IQualifiedNameProvider;
 import org.eclipse.xtext.scoping.IGlobalScopeProvider;
 import org.eclipse.xtext.scoping.IScopeProvider;
@@ -34,4 +36,9 @@ public class CftLanguageRuntimeModule extends AbstractCftLanguageRuntimeModule {
   public Class<? extends IQualifiedNameProvider> bindIQualifiedNameProvider() {
     return CftLanguageQualifiedNameProvider.class;
   }
+  
+  @Override
+  public Class<? extends IValueConverterService> bindIValueConverterService() {
+    return CftLanguageValueConverterService.class;
+  }
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/.CftLanguageValueConverterService.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/.CftLanguageValueConverterService.xtendbin
new file mode 100644
index 00000000..80e91ebf
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/.CftLanguageValueConverterService.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/.OF_INTValueConverter.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/.OF_INTValueConverter.xtendbin
new file mode 100644
index 00000000..6787af3f
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/.OF_INTValueConverter.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/.gitignore
new file mode 100644
index 00000000..1cb9dafb
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/.gitignore
@@ -0,0 +1,2 @@
+/.OF_INTValueConverter.java._trace
+/.CftLanguageValueConverterService.java._trace
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/CftLanguageValueConverterService.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/CftLanguageValueConverterService.java
new file mode 100644
index 00000000..f14362c9
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/CftLanguageValueConverterService.java
@@ -0,0 +1,18 @@
+package hu.bme.mit.inf.dslreasoner.faulttree.components.conversion;
+
+import com.google.inject.Inject;
+import hu.bme.mit.inf.dslreasoner.faulttree.components.conversion.OF_INTValueConverter;
+import org.eclipse.xtext.common.services.DefaultTerminalConverters;
+import org.eclipse.xtext.conversion.IValueConverter;
+import org.eclipse.xtext.conversion.ValueConverter;
+
+@SuppressWarnings("all")
+public class CftLanguageValueConverterService extends DefaultTerminalConverters {
+  @Inject
+  private OF_INTValueConverter ofIntValueConverter;
+  
+  @ValueConverter(rule = "OF_INT")
+  public IValueConverter<Integer> OF_INT() {
+    return this.ofIntValueConverter;
+  }
+}
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/OF_INTValueConverter.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/OF_INTValueConverter.java
new file mode 100644
index 00000000..0fd2375e
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/conversion/OF_INTValueConverter.java
@@ -0,0 +1,58 @@
+package hu.bme.mit.inf.dslreasoner.faulttree.components.conversion;
+
+import com.google.common.base.Objects;
+import org.eclipse.xtext.conversion.ValueConverterException;
+import org.eclipse.xtext.conversion.impl.AbstractLexerBasedConverter;
+import org.eclipse.xtext.nodemodel.INode;
+import org.eclipse.xtext.xbase.lib.Exceptions;
+
+@SuppressWarnings("all")
+public class OF_INTValueConverter extends AbstractLexerBasedConverter<Integer> {
+  private static final String PREFIX = "of";
+  
+  @Override
+  public Integer toValue(final String string, final INode node) throws ValueConverterException {
+    Integer _xblockexpression = null;
+    {
+      if ((string == null)) {
+        return null;
+      }
+      if (((string.length() < OF_INTValueConverter.PREFIX.length()) || (!Objects.equal(string.substring(0, OF_INTValueConverter.PREFIX.length()), OF_INTValueConverter.PREFIX)))) {
+        throw new ValueConverterException((("\'" + string) + "\' must start with the characters \'of\'."), node, null);
+      }
+      Integer _xtrycatchfinallyexpression = null;
+      try {
+        Integer _xblockexpression_1 = null;
+        {
+          final int intValue = Integer.parseInt(string.substring(OF_INTValueConverter.PREFIX.length()), 10);
+          _xblockexpression_1 = Integer.valueOf(intValue);
+        }
+        _xtrycatchfinallyexpression = _xblockexpression_1;
+      } catch (final Throwable _t) {
+        if (_t instanceof NumberFormatException) {
+          final NumberFormatException e = (NumberFormatException)_t;
+          throw new ValueConverterException((("Couldn\'t convert \'" + string) + "\' to an int value."), node, e);
+        } else {
+          throw Exceptions.sneakyThrow(_t);
+        }
+      }
+      _xblockexpression = _xtrycatchfinallyexpression;
+    }
+    return _xblockexpression;
+  }
+  
+  @Override
+  protected String toEscapedString(final Integer value) {
+    return (OF_INTValueConverter.PREFIX + value);
+  }
+  
+  @Override
+  protected void assertValidValue(final Integer value) {
+    super.assertValidValue(value);
+    if (((value).intValue() < 0)) {
+      String _ruleName = this.getRuleName();
+      String _plus = (_ruleName + " may not be negative.");
+      throw new ValueConverterException(_plus, null, null);
+    }
+  }
+}
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/generator/.CftLanguageGenerator.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/generator/.CftLanguageGenerator.xtendbin
index a974921d..0ad3ae5a 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/generator/.CftLanguageGenerator.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/generator/.CftLanguageGenerator.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/naming/.CftLanguageQualifiedNameProvider.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/naming/.CftLanguageQualifiedNameProvider.xtendbin
index 73ada4f1..6dde8420 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/naming/.CftLanguageQualifiedNameProvider.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/naming/.CftLanguageQualifiedNameProvider.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/naming/.PackageNameProvider.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/naming/.PackageNameProvider.xtendbin
index 6f4eaae7..fc3d90f0 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/naming/.PackageNameProvider.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/naming/.PackageNameProvider.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/naming/CftLanguageQualifiedNameProvider.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/naming/CftLanguageQualifiedNameProvider.java
index 4e0607dd..24ebaccb 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/naming/CftLanguageQualifiedNameProvider.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/naming/CftLanguageQualifiedNameProvider.java
@@ -1,9 +1,9 @@
 package hu.bme.mit.inf.dslreasoner.faulttree.components.naming;
 
 import com.google.inject.Inject;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.TransformationDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.naming.PackageNameProvider;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider;
 import org.eclipse.xtext.naming.QualifiedName;
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/scoping/.CftLanguageImportedNamespaceAwareLocalScopeProvider.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/scoping/.CftLanguageImportedNamespaceAwareLocalScopeProvider.xtendbin
index 4a0036bd..c570dbe3 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/scoping/.CftLanguageImportedNamespaceAwareLocalScopeProvider.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/scoping/.CftLanguageImportedNamespaceAwareLocalScopeProvider.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/scoping/.CftLanguageScopeProvider.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/scoping/.CftLanguageScopeProvider.xtendbin
index 722c0e58..40e8786a 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/scoping/.CftLanguageScopeProvider.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/scoping/.CftLanguageScopeProvider.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/scoping/CftLanguageScopeProvider.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/scoping/CftLanguageScopeProvider.java
index 0149c8d1..9286d5ca 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/scoping/CftLanguageScopeProvider.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/scoping/CftLanguageScopeProvider.java
@@ -7,9 +7,7 @@ import com.google.common.base.Objects;
 import com.google.common.collect.Lists;
 import com.google.inject.Inject;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftLanguagePackage;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.ComponentInstance;
-import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventDeclaration;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.EventReference;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.LookupDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.MappingDefinition;
@@ -18,6 +16,8 @@ import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.Transformatio
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.Variable;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.scoping.AbstractCftLanguageScopeProvider;
 import hu.bme.mit.inf.dslreasoner.faulttree.components.scoping.CftLanguageImportedNamespaceAwareLocalScopeProvider;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration;
 import java.util.ArrayList;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.ecore.EObject;
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/validation/.CftLanguageValidator.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/validation/.CftLanguageValidator.xtendbin
index c978854b..683ac14e 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/validation/.CftLanguageValidator.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/validation/.CftLanguageValidator.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/.classpath b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/.classpath
new file mode 100644
index 00000000..5bc9ff04
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+        <classpathentry kind="src" path="ecore-gen"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+        <classpathentry kind="src" path="src"/>
+        <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/.project b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/.project
new file mode 100644
index 00000000..a86ce76f
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/.project
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+        <name>hu.bme.mit.inf.dslreasoner.faulttree.model</name>
+        <comment></comment>
+        <projects>
+        </projects>
+        <buildSpec>
+                <buildCommand>
+                        <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.jdt.core.javabuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.pde.ManifestBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.pde.SchemaBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+        </buildSpec>
+        <natures>
+                <nature>org.eclipse.sirius.nature.modelingproject</nature>
+                <nature>org.eclipse.pde.PluginNature</nature>
+                <nature>org.eclipse.jdt.core.javanature</nature>
+                <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+        </natures>
+</projectDescription>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/.settings/org.eclipse.jdt.core.prefs b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..0c68a61d
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/META-INF/MANIFEST.MF b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..eeabfee3
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: hu.bme.mit.inf.dslreasoner.faulttree.model;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.faulttree.model
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: hu.bme.mit.inf.dslreasoner.faulttree.model.ft,
+ hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl,
+ hu.bme.mit.inf.dslreasoner.faulttree.model.ft.util,
+ hu.bme.mit.inf.dslreasoner.faulttree.model.cft,
+ hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl,
+ hu.bme.mit.inf.dslreasoner.faulttree.model.cft.util
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ hu.bme.mit.inf.dslreasoner.faulttree.model;visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/build.properties b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/build.properties
new file mode 100644
index 00000000..6d7585eb
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/build.properties
@@ -0,0 +1,11 @@
+#
+
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src/,\
+           ecore-gen/
+output.. = bin/
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/AndGateDefinition.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/AndGateDefinition.java
new file mode 100644
index 00000000..cdae0f09
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/AndGateDefinition.java
@@ -0,0 +1,17 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>And Gate Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getAndGateDefinition()
+ * @model
+ * @generated
+ */
+public interface AndGateDefinition extends GateDefinition {
+} // AndGateDefinition
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/BasicEventDefinition.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/BasicEventDefinition.java
new file mode 100644
index 00000000..c963dbfe
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/BasicEventDefinition.java
@@ -0,0 +1,50 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Distribution;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Basic Event Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.BasicEventDefinition#getDistribution <em>Distribution</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getBasicEventDefinition()
+ * @model
+ * @generated
+ */
+public interface BasicEventDefinition extends EventDefinition {
+        /**
+         * Returns the value of the '<em><b>Distribution</b></em>' containment reference.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Distribution</em>' containment reference isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Distribution</em>' containment reference.
+         * @see #setDistribution(Distribution)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getBasicEventDefinition_Distribution()
+         * @model containment="true" required="true"
+         * @generated
+         */
+        Distribution getDistribution();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.BasicEventDefinition#getDistribution <em>Distribution</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Distribution</em>' containment reference.
+         * @see #getDistribution()
+         * @generated
+         */
+        void setDistribution(Distribution value);
+
+} // BasicEventDefinition
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/CftFactory.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/CftFactory.java
new file mode 100644
index 00000000..d5f4cd76
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/CftFactory.java
@@ -0,0 +1,132 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage
+ * @generated
+ */
+public interface CftFactory extends EFactory {
+        /**
+         * The singleton instance of the factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        CftFactory eINSTANCE = hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftFactoryImpl.init();
+
+        /**
+         * Returns a new object of class '<em>Component Definition</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Component Definition</em>'.
+         * @generated
+         */
+        ComponentDefinition createComponentDefinition();
+
+        /**
+         * Returns a new object of class '<em>Basic Event Definition</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Basic Event Definition</em>'.
+         * @generated
+         */
+        BasicEventDefinition createBasicEventDefinition();
+
+        /**
+         * Returns a new object of class '<em>Intput Event</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Intput Event</em>'.
+         * @generated
+         */
+        IntputEvent createIntputEvent();
+
+        /**
+         * Returns a new object of class '<em>And Gate Definition</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>And Gate Definition</em>'.
+         * @generated
+         */
+        AndGateDefinition createAndGateDefinition();
+
+        /**
+         * Returns a new object of class '<em>Or Gate Definition</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Or Gate Definition</em>'.
+         * @generated
+         */
+        OrGateDefinition createOrGateDefinition();
+
+        /**
+         * Returns a new object of class '<em>KOf MGate Definition</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>KOf MGate Definition</em>'.
+         * @generated
+         */
+        KOfMGateDefinition createKOfMGateDefinition();
+
+        /**
+         * Returns a new object of class '<em>Component Fault Tree</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Component Fault Tree</em>'.
+         * @generated
+         */
+        ComponentFaultTree createComponentFaultTree();
+
+        /**
+         * Returns a new object of class '<em>Component</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Component</em>'.
+         * @generated
+         */
+        Component createComponent();
+
+        /**
+         * Returns a new object of class '<em>Input</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Input</em>'.
+         * @generated
+         */
+        Input createInput();
+
+        /**
+         * Returns a new object of class '<em>Output</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Output</em>'.
+         * @generated
+         */
+        Output createOutput();
+
+        /**
+         * Returns a new object of class '<em>Connection</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Connection</em>'.
+         * @generated
+         */
+        Connection createConnection();
+
+        /**
+         * Returns the package supported by this factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the package supported by this factory.
+         * @generated
+         */
+        CftPackage getCftPackage();
+
+} //CftFactory
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/CftPackage.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/CftPackage.java
new file mode 100644
index 00000000..8cf7dbc6
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/CftPackage.java
@@ -0,0 +1,1491 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface CftPackage extends EPackage {
+        /**
+         * The package name.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        String eNAME = "cft";
+
+        /**
+         * The package namespace URI.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        String eNS_URI = "http://www.bme.hu/mit/inf/dslreasoner/faulttree/model/cft";
+
+        /**
+         * The package namespace name.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        String eNS_PREFIX = "cft";
+
+        /**
+         * The singleton instance of the package.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        CftPackage eINSTANCE = hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl.init();
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentDefinitionImpl <em>Component Definition</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentDefinitionImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getComponentDefinition()
+         * @generated
+         */
+        int COMPONENT_DEFINITION = 0;
+
+        /**
+         * The feature id for the '<em><b>Input Events</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMPONENT_DEFINITION__INPUT_EVENTS = 0;
+
+        /**
+         * The feature id for the '<em><b>Event Definitions</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMPONENT_DEFINITION__EVENT_DEFINITIONS = 1;
+
+        /**
+         * The feature id for the '<em><b>Output Events</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMPONENT_DEFINITION__OUTPUT_EVENTS = 2;
+
+        /**
+         * The feature id for the '<em><b>Name</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMPONENT_DEFINITION__NAME = 3;
+
+        /**
+         * The number of structural features of the '<em>Component Definition</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMPONENT_DEFINITION_FEATURE_COUNT = 4;
+
+        /**
+         * The number of operations of the '<em>Component Definition</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMPONENT_DEFINITION_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.EventDeclarationImpl <em>Event Declaration</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.EventDeclarationImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getEventDeclaration()
+         * @generated
+         */
+        int EVENT_DECLARATION = 5;
+
+        /**
+         * The feature id for the '<em><b>Name</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int EVENT_DECLARATION__NAME = 0;
+
+        /**
+         * The number of structural features of the '<em>Event Declaration</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int EVENT_DECLARATION_FEATURE_COUNT = 1;
+
+        /**
+         * The number of operations of the '<em>Event Declaration</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int EVENT_DECLARATION_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.EventDefinitionImpl <em>Event Definition</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.EventDefinitionImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getEventDefinition()
+         * @generated
+         */
+        int EVENT_DEFINITION = 1;
+
+        /**
+         * The feature id for the '<em><b>Name</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int EVENT_DEFINITION__NAME = EVENT_DECLARATION__NAME;
+
+        /**
+         * The number of structural features of the '<em>Event Definition</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int EVENT_DEFINITION_FEATURE_COUNT = EVENT_DECLARATION_FEATURE_COUNT + 0;
+
+        /**
+         * The number of operations of the '<em>Event Definition</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int EVENT_DEFINITION_OPERATION_COUNT = EVENT_DECLARATION_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.GateDefinitionImpl <em>Gate Definition</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.GateDefinitionImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getGateDefinition()
+         * @generated
+         */
+        int GATE_DEFINITION = 2;
+
+        /**
+         * The feature id for the '<em><b>Name</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int GATE_DEFINITION__NAME = EVENT_DEFINITION__NAME;
+
+        /**
+         * The feature id for the '<em><b>Input Events</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int GATE_DEFINITION__INPUT_EVENTS = EVENT_DEFINITION_FEATURE_COUNT + 0;
+
+        /**
+         * The number of structural features of the '<em>Gate Definition</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int GATE_DEFINITION_FEATURE_COUNT = EVENT_DEFINITION_FEATURE_COUNT + 1;
+
+        /**
+         * The number of operations of the '<em>Gate Definition</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int GATE_DEFINITION_OPERATION_COUNT = EVENT_DEFINITION_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.BasicEventDefinitionImpl <em>Basic Event Definition</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.BasicEventDefinitionImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getBasicEventDefinition()
+         * @generated
+         */
+        int BASIC_EVENT_DEFINITION = 3;
+
+        /**
+         * The feature id for the '<em><b>Name</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int BASIC_EVENT_DEFINITION__NAME = EVENT_DEFINITION__NAME;
+
+        /**
+         * The feature id for the '<em><b>Distribution</b></em>' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int BASIC_EVENT_DEFINITION__DISTRIBUTION = EVENT_DEFINITION_FEATURE_COUNT + 0;
+
+        /**
+         * The number of structural features of the '<em>Basic Event Definition</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int BASIC_EVENT_DEFINITION_FEATURE_COUNT = EVENT_DEFINITION_FEATURE_COUNT + 1;
+
+        /**
+         * The number of operations of the '<em>Basic Event Definition</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int BASIC_EVENT_DEFINITION_OPERATION_COUNT = EVENT_DEFINITION_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.IntputEventImpl <em>Intput Event</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.IntputEventImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getIntputEvent()
+         * @generated
+         */
+        int INTPUT_EVENT = 4;
+
+        /**
+         * The feature id for the '<em><b>Name</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int INTPUT_EVENT__NAME = EVENT_DECLARATION__NAME;
+
+        /**
+         * The feature id for the '<em><b>Multiple</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int INTPUT_EVENT__MULTIPLE = EVENT_DECLARATION_FEATURE_COUNT + 0;
+
+        /**
+         * The number of structural features of the '<em>Intput Event</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int INTPUT_EVENT_FEATURE_COUNT = EVENT_DECLARATION_FEATURE_COUNT + 1;
+
+        /**
+         * The number of operations of the '<em>Intput Event</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int INTPUT_EVENT_OPERATION_COUNT = EVENT_DECLARATION_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.AndGateDefinitionImpl <em>And Gate Definition</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.AndGateDefinitionImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getAndGateDefinition()
+         * @generated
+         */
+        int AND_GATE_DEFINITION = 6;
+
+        /**
+         * The feature id for the '<em><b>Name</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int AND_GATE_DEFINITION__NAME = GATE_DEFINITION__NAME;
+
+        /**
+         * The feature id for the '<em><b>Input Events</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int AND_GATE_DEFINITION__INPUT_EVENTS = GATE_DEFINITION__INPUT_EVENTS;
+
+        /**
+         * The number of structural features of the '<em>And Gate Definition</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int AND_GATE_DEFINITION_FEATURE_COUNT = GATE_DEFINITION_FEATURE_COUNT + 0;
+
+        /**
+         * The number of operations of the '<em>And Gate Definition</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int AND_GATE_DEFINITION_OPERATION_COUNT = GATE_DEFINITION_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.OrGateDefinitionImpl <em>Or Gate Definition</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.OrGateDefinitionImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getOrGateDefinition()
+         * @generated
+         */
+        int OR_GATE_DEFINITION = 7;
+
+        /**
+         * The feature id for the '<em><b>Name</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int OR_GATE_DEFINITION__NAME = GATE_DEFINITION__NAME;
+
+        /**
+         * The feature id for the '<em><b>Input Events</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int OR_GATE_DEFINITION__INPUT_EVENTS = GATE_DEFINITION__INPUT_EVENTS;
+
+        /**
+         * The number of structural features of the '<em>Or Gate Definition</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int OR_GATE_DEFINITION_FEATURE_COUNT = GATE_DEFINITION_FEATURE_COUNT + 0;
+
+        /**
+         * The number of operations of the '<em>Or Gate Definition</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int OR_GATE_DEFINITION_OPERATION_COUNT = GATE_DEFINITION_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.KOfMGateDefinitionImpl <em>KOf MGate Definition</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.KOfMGateDefinitionImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getKOfMGateDefinition()
+         * @generated
+         */
+        int KOF_MGATE_DEFINITION = 8;
+
+        /**
+         * The feature id for the '<em><b>Name</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int KOF_MGATE_DEFINITION__NAME = GATE_DEFINITION__NAME;
+
+        /**
+         * The feature id for the '<em><b>Input Events</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int KOF_MGATE_DEFINITION__INPUT_EVENTS = GATE_DEFINITION__INPUT_EVENTS;
+
+        /**
+         * The feature id for the '<em><b>K</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int KOF_MGATE_DEFINITION__K = GATE_DEFINITION_FEATURE_COUNT + 0;
+
+        /**
+         * The feature id for the '<em><b>M</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int KOF_MGATE_DEFINITION__M = GATE_DEFINITION_FEATURE_COUNT + 1;
+
+        /**
+         * The number of structural features of the '<em>KOf MGate Definition</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int KOF_MGATE_DEFINITION_FEATURE_COUNT = GATE_DEFINITION_FEATURE_COUNT + 2;
+
+        /**
+         * The number of operations of the '<em>KOf MGate Definition</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int KOF_MGATE_DEFINITION_OPERATION_COUNT = GATE_DEFINITION_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentFaultTreeImpl <em>Component Fault Tree</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentFaultTreeImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getComponentFaultTree()
+         * @generated
+         */
+        int COMPONENT_FAULT_TREE = 9;
+
+        /**
+         * The feature id for the '<em><b>Components</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMPONENT_FAULT_TREE__COMPONENTS = 0;
+
+        /**
+         * The feature id for the '<em><b>Top Event</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMPONENT_FAULT_TREE__TOP_EVENT = 1;
+
+        /**
+         * The number of structural features of the '<em>Component Fault Tree</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMPONENT_FAULT_TREE_FEATURE_COUNT = 2;
+
+        /**
+         * The number of operations of the '<em>Component Fault Tree</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMPONENT_FAULT_TREE_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentImpl <em>Component</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getComponent()
+         * @generated
+         */
+        int COMPONENT = 10;
+
+        /**
+         * The feature id for the '<em><b>Inputs</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMPONENT__INPUTS = 0;
+
+        /**
+         * The feature id for the '<em><b>Outputs</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMPONENT__OUTPUTS = 1;
+
+        /**
+         * The feature id for the '<em><b>Component Definition</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMPONENT__COMPONENT_DEFINITION = 2;
+
+        /**
+         * The number of structural features of the '<em>Component</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMPONENT_FEATURE_COUNT = 3;
+
+        /**
+         * The number of operations of the '<em>Component</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMPONENT_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.InputImpl <em>Input</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.InputImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getInput()
+         * @generated
+         */
+        int INPUT = 11;
+
+        /**
+         * The feature id for the '<em><b>Intput Event</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int INPUT__INTPUT_EVENT = 0;
+
+        /**
+         * The feature id for the '<em><b>Component</b></em>' container reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int INPUT__COMPONENT = 1;
+
+        /**
+         * The feature id for the '<em><b>Incoming Connections</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int INPUT__INCOMING_CONNECTIONS = 2;
+
+        /**
+         * The number of structural features of the '<em>Input</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int INPUT_FEATURE_COUNT = 3;
+
+        /**
+         * The number of operations of the '<em>Input</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int INPUT_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.OutputImpl <em>Output</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.OutputImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getOutput()
+         * @generated
+         */
+        int OUTPUT = 12;
+
+        /**
+         * The feature id for the '<em><b>Event Declaration</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int OUTPUT__EVENT_DECLARATION = 0;
+
+        /**
+         * The feature id for the '<em><b>Outgoing Connections</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int OUTPUT__OUTGOING_CONNECTIONS = 1;
+
+        /**
+         * The feature id for the '<em><b>Component</b></em>' container reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int OUTPUT__COMPONENT = 2;
+
+        /**
+         * The number of structural features of the '<em>Output</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int OUTPUT_FEATURE_COUNT = 3;
+
+        /**
+         * The number of operations of the '<em>Output</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int OUTPUT_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ConnectionImpl <em>Connection</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ConnectionImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getConnection()
+         * @generated
+         */
+        int CONNECTION = 13;
+
+        /**
+         * The feature id for the '<em><b>Input</b></em>' container reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CONNECTION__INPUT = 0;
+
+        /**
+         * The feature id for the '<em><b>Output</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CONNECTION__OUTPUT = 1;
+
+        /**
+         * The number of structural features of the '<em>Connection</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CONNECTION_FEATURE_COUNT = 2;
+
+        /**
+         * The number of operations of the '<em>Connection</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CONNECTION_OPERATION_COUNT = 0;
+
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition <em>Component Definition</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Component Definition</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition
+         * @generated
+         */
+        EClass getComponentDefinition();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition#getInputEvents <em>Input Events</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Input Events</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition#getInputEvents()
+         * @see #getComponentDefinition()
+         * @generated
+         */
+        EReference getComponentDefinition_InputEvents();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition#getEventDefinitions <em>Event Definitions</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Event Definitions</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition#getEventDefinitions()
+         * @see #getComponentDefinition()
+         * @generated
+         */
+        EReference getComponentDefinition_EventDefinitions();
+
+        /**
+         * Returns the meta object for the reference list '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition#getOutputEvents <em>Output Events</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference list '<em>Output Events</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition#getOutputEvents()
+         * @see #getComponentDefinition()
+         * @generated
+         */
+        EReference getComponentDefinition_OutputEvents();
+
+        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition#getName <em>Name</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Name</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition#getName()
+         * @see #getComponentDefinition()
+         * @generated
+         */
+        EAttribute getComponentDefinition_Name();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDefinition <em>Event Definition</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Event Definition</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDefinition
+         * @generated
+         */
+        EClass getEventDefinition();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.GateDefinition <em>Gate Definition</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Gate Definition</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.GateDefinition
+         * @generated
+         */
+        EClass getGateDefinition();
+
+        /**
+         * Returns the meta object for the reference list '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.GateDefinition#getInputEvents <em>Input Events</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference list '<em>Input Events</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.GateDefinition#getInputEvents()
+         * @see #getGateDefinition()
+         * @generated
+         */
+        EReference getGateDefinition_InputEvents();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.BasicEventDefinition <em>Basic Event Definition</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Basic Event Definition</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.BasicEventDefinition
+         * @generated
+         */
+        EClass getBasicEventDefinition();
+
+        /**
+         * Returns the meta object for the containment reference '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.BasicEventDefinition#getDistribution <em>Distribution</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference '<em>Distribution</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.BasicEventDefinition#getDistribution()
+         * @see #getBasicEventDefinition()
+         * @generated
+         */
+        EReference getBasicEventDefinition_Distribution();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.IntputEvent <em>Intput Event</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Intput Event</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.IntputEvent
+         * @generated
+         */
+        EClass getIntputEvent();
+
+        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.IntputEvent#isMultiple <em>Multiple</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Multiple</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.IntputEvent#isMultiple()
+         * @see #getIntputEvent()
+         * @generated
+         */
+        EAttribute getIntputEvent_Multiple();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration <em>Event Declaration</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Event Declaration</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration
+         * @generated
+         */
+        EClass getEventDeclaration();
+
+        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration#getName <em>Name</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Name</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration#getName()
+         * @see #getEventDeclaration()
+         * @generated
+         */
+        EAttribute getEventDeclaration_Name();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.AndGateDefinition <em>And Gate Definition</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>And Gate Definition</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.AndGateDefinition
+         * @generated
+         */
+        EClass getAndGateDefinition();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.OrGateDefinition <em>Or Gate Definition</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Or Gate Definition</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.OrGateDefinition
+         * @generated
+         */
+        EClass getOrGateDefinition();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition <em>KOf MGate Definition</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>KOf MGate Definition</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition
+         * @generated
+         */
+        EClass getKOfMGateDefinition();
+
+        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition#getK <em>K</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>K</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition#getK()
+         * @see #getKOfMGateDefinition()
+         * @generated
+         */
+        EAttribute getKOfMGateDefinition_K();
+
+        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition#getM <em>M</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>M</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition#getM()
+         * @see #getKOfMGateDefinition()
+         * @generated
+         */
+        EAttribute getKOfMGateDefinition_M();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentFaultTree <em>Component Fault Tree</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Component Fault Tree</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentFaultTree
+         * @generated
+         */
+        EClass getComponentFaultTree();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentFaultTree#getComponents <em>Components</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Components</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentFaultTree#getComponents()
+         * @see #getComponentFaultTree()
+         * @generated
+         */
+        EReference getComponentFaultTree_Components();
+
+        /**
+         * Returns the meta object for the reference '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentFaultTree#getTopEvent <em>Top Event</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference '<em>Top Event</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentFaultTree#getTopEvent()
+         * @see #getComponentFaultTree()
+         * @generated
+         */
+        EReference getComponentFaultTree_TopEvent();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component <em>Component</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Component</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component
+         * @generated
+         */
+        EClass getComponent();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#getInputs <em>Inputs</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Inputs</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#getInputs()
+         * @see #getComponent()
+         * @generated
+         */
+        EReference getComponent_Inputs();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#getOutputs <em>Outputs</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Outputs</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#getOutputs()
+         * @see #getComponent()
+         * @generated
+         */
+        EReference getComponent_Outputs();
+
+        /**
+         * Returns the meta object for the reference '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#getComponentDefinition <em>Component Definition</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference '<em>Component Definition</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#getComponentDefinition()
+         * @see #getComponent()
+         * @generated
+         */
+        EReference getComponent_ComponentDefinition();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input <em>Input</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Input</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input
+         * @generated
+         */
+        EClass getInput();
+
+        /**
+         * Returns the meta object for the reference '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input#getIntputEvent <em>Intput Event</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference '<em>Intput Event</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input#getIntputEvent()
+         * @see #getInput()
+         * @generated
+         */
+        EReference getInput_IntputEvent();
+
+        /**
+         * Returns the meta object for the container reference '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input#getComponent <em>Component</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the container reference '<em>Component</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input#getComponent()
+         * @see #getInput()
+         * @generated
+         */
+        EReference getInput_Component();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input#getIncomingConnections <em>Incoming Connections</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Incoming Connections</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input#getIncomingConnections()
+         * @see #getInput()
+         * @generated
+         */
+        EReference getInput_IncomingConnections();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output <em>Output</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Output</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output
+         * @generated
+         */
+        EClass getOutput();
+
+        /**
+         * Returns the meta object for the reference '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output#getEventDeclaration <em>Event Declaration</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference '<em>Event Declaration</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output#getEventDeclaration()
+         * @see #getOutput()
+         * @generated
+         */
+        EReference getOutput_EventDeclaration();
+
+        /**
+         * Returns the meta object for the reference list '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output#getOutgoingConnections <em>Outgoing Connections</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference list '<em>Outgoing Connections</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output#getOutgoingConnections()
+         * @see #getOutput()
+         * @generated
+         */
+        EReference getOutput_OutgoingConnections();
+
+        /**
+         * Returns the meta object for the container reference '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output#getComponent <em>Component</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the container reference '<em>Component</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output#getComponent()
+         * @see #getOutput()
+         * @generated
+         */
+        EReference getOutput_Component();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection <em>Connection</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Connection</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection
+         * @generated
+         */
+        EClass getConnection();
+
+        /**
+         * Returns the meta object for the container reference '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection#getInput <em>Input</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the container reference '<em>Input</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection#getInput()
+         * @see #getConnection()
+         * @generated
+         */
+        EReference getConnection_Input();
+
+        /**
+         * Returns the meta object for the reference '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection#getOutput <em>Output</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference '<em>Output</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection#getOutput()
+         * @see #getConnection()
+         * @generated
+         */
+        EReference getConnection_Output();
+
+        /**
+         * Returns the factory that creates the instances of the model.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the factory that creates the instances of the model.
+         * @generated
+         */
+        CftFactory getCftFactory();
+
+        /**
+         * <!-- begin-user-doc -->
+         * Defines literals for the meta objects that represent
+         * <ul>
+         *   <li>each class,</li>
+         *   <li>each feature of each class,</li>
+         *   <li>each operation of each class,</li>
+         *   <li>each enum,</li>
+         *   <li>and each data type</li>
+         * </ul>
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        interface Literals {
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentDefinitionImpl <em>Component Definition</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentDefinitionImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getComponentDefinition()
+                 * @generated
+                 */
+                EClass COMPONENT_DEFINITION = eINSTANCE.getComponentDefinition();
+
+                /**
+                 * The meta object literal for the '<em><b>Input Events</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference COMPONENT_DEFINITION__INPUT_EVENTS = eINSTANCE.getComponentDefinition_InputEvents();
+
+                /**
+                 * The meta object literal for the '<em><b>Event Definitions</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference COMPONENT_DEFINITION__EVENT_DEFINITIONS = eINSTANCE.getComponentDefinition_EventDefinitions();
+
+                /**
+                 * The meta object literal for the '<em><b>Output Events</b></em>' reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference COMPONENT_DEFINITION__OUTPUT_EVENTS = eINSTANCE.getComponentDefinition_OutputEvents();
+
+                /**
+                 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute COMPONENT_DEFINITION__NAME = eINSTANCE.getComponentDefinition_Name();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.EventDefinitionImpl <em>Event Definition</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.EventDefinitionImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getEventDefinition()
+                 * @generated
+                 */
+                EClass EVENT_DEFINITION = eINSTANCE.getEventDefinition();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.GateDefinitionImpl <em>Gate Definition</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.GateDefinitionImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getGateDefinition()
+                 * @generated
+                 */
+                EClass GATE_DEFINITION = eINSTANCE.getGateDefinition();
+
+                /**
+                 * The meta object literal for the '<em><b>Input Events</b></em>' reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference GATE_DEFINITION__INPUT_EVENTS = eINSTANCE.getGateDefinition_InputEvents();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.BasicEventDefinitionImpl <em>Basic Event Definition</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.BasicEventDefinitionImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getBasicEventDefinition()
+                 * @generated
+                 */
+                EClass BASIC_EVENT_DEFINITION = eINSTANCE.getBasicEventDefinition();
+
+                /**
+                 * The meta object literal for the '<em><b>Distribution</b></em>' containment reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference BASIC_EVENT_DEFINITION__DISTRIBUTION = eINSTANCE.getBasicEventDefinition_Distribution();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.IntputEventImpl <em>Intput Event</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.IntputEventImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getIntputEvent()
+                 * @generated
+                 */
+                EClass INTPUT_EVENT = eINSTANCE.getIntputEvent();
+
+                /**
+                 * The meta object literal for the '<em><b>Multiple</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute INTPUT_EVENT__MULTIPLE = eINSTANCE.getIntputEvent_Multiple();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.EventDeclarationImpl <em>Event Declaration</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.EventDeclarationImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getEventDeclaration()
+                 * @generated
+                 */
+                EClass EVENT_DECLARATION = eINSTANCE.getEventDeclaration();
+
+                /**
+                 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute EVENT_DECLARATION__NAME = eINSTANCE.getEventDeclaration_Name();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.AndGateDefinitionImpl <em>And Gate Definition</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.AndGateDefinitionImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getAndGateDefinition()
+                 * @generated
+                 */
+                EClass AND_GATE_DEFINITION = eINSTANCE.getAndGateDefinition();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.OrGateDefinitionImpl <em>Or Gate Definition</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.OrGateDefinitionImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getOrGateDefinition()
+                 * @generated
+                 */
+                EClass OR_GATE_DEFINITION = eINSTANCE.getOrGateDefinition();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.KOfMGateDefinitionImpl <em>KOf MGate Definition</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.KOfMGateDefinitionImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getKOfMGateDefinition()
+                 * @generated
+                 */
+                EClass KOF_MGATE_DEFINITION = eINSTANCE.getKOfMGateDefinition();
+
+                /**
+                 * The meta object literal for the '<em><b>K</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute KOF_MGATE_DEFINITION__K = eINSTANCE.getKOfMGateDefinition_K();
+
+                /**
+                 * The meta object literal for the '<em><b>M</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute KOF_MGATE_DEFINITION__M = eINSTANCE.getKOfMGateDefinition_M();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentFaultTreeImpl <em>Component Fault Tree</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentFaultTreeImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getComponentFaultTree()
+                 * @generated
+                 */
+                EClass COMPONENT_FAULT_TREE = eINSTANCE.getComponentFaultTree();
+
+                /**
+                 * The meta object literal for the '<em><b>Components</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference COMPONENT_FAULT_TREE__COMPONENTS = eINSTANCE.getComponentFaultTree_Components();
+
+                /**
+                 * The meta object literal for the '<em><b>Top Event</b></em>' reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference COMPONENT_FAULT_TREE__TOP_EVENT = eINSTANCE.getComponentFaultTree_TopEvent();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentImpl <em>Component</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getComponent()
+                 * @generated
+                 */
+                EClass COMPONENT = eINSTANCE.getComponent();
+
+                /**
+                 * The meta object literal for the '<em><b>Inputs</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference COMPONENT__INPUTS = eINSTANCE.getComponent_Inputs();
+
+                /**
+                 * The meta object literal for the '<em><b>Outputs</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference COMPONENT__OUTPUTS = eINSTANCE.getComponent_Outputs();
+
+                /**
+                 * The meta object literal for the '<em><b>Component Definition</b></em>' reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference COMPONENT__COMPONENT_DEFINITION = eINSTANCE.getComponent_ComponentDefinition();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.InputImpl <em>Input</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.InputImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getInput()
+                 * @generated
+                 */
+                EClass INPUT = eINSTANCE.getInput();
+
+                /**
+                 * The meta object literal for the '<em><b>Intput Event</b></em>' reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference INPUT__INTPUT_EVENT = eINSTANCE.getInput_IntputEvent();
+
+                /**
+                 * The meta object literal for the '<em><b>Component</b></em>' container reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference INPUT__COMPONENT = eINSTANCE.getInput_Component();
+
+                /**
+                 * The meta object literal for the '<em><b>Incoming Connections</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference INPUT__INCOMING_CONNECTIONS = eINSTANCE.getInput_IncomingConnections();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.OutputImpl <em>Output</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.OutputImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getOutput()
+                 * @generated
+                 */
+                EClass OUTPUT = eINSTANCE.getOutput();
+
+                /**
+                 * The meta object literal for the '<em><b>Event Declaration</b></em>' reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference OUTPUT__EVENT_DECLARATION = eINSTANCE.getOutput_EventDeclaration();
+
+                /**
+                 * The meta object literal for the '<em><b>Outgoing Connections</b></em>' reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference OUTPUT__OUTGOING_CONNECTIONS = eINSTANCE.getOutput_OutgoingConnections();
+
+                /**
+                 * The meta object literal for the '<em><b>Component</b></em>' container reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference OUTPUT__COMPONENT = eINSTANCE.getOutput_Component();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ConnectionImpl <em>Connection</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ConnectionImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getConnection()
+                 * @generated
+                 */
+                EClass CONNECTION = eINSTANCE.getConnection();
+
+                /**
+                 * The meta object literal for the '<em><b>Input</b></em>' container reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference CONNECTION__INPUT = eINSTANCE.getConnection_Input();
+
+                /**
+                 * The meta object literal for the '<em><b>Output</b></em>' reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference CONNECTION__OUTPUT = eINSTANCE.getConnection_Output();
+
+        }
+
+} //CftPackage
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Component.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Component.java
new file mode 100644
index 00000000..e1951172
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Component.java
@@ -0,0 +1,90 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Component</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#getInputs <em>Inputs</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#getOutputs <em>Outputs</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#getComponentDefinition <em>Component Definition</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getComponent()
+ * @model
+ * @generated
+ */
+public interface Component extends EObject {
+        /**
+         * Returns the value of the '<em><b>Inputs</b></em>' containment reference list.
+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input}.
+         * It is bidirectional and its opposite is '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input#getComponent <em>Component</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Inputs</em>' containment reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Inputs</em>' containment reference list.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getComponent_Inputs()
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input#getComponent
+         * @model opposite="component" containment="true"
+         * @generated
+         */
+        EList<Input> getInputs();
+
+        /**
+         * Returns the value of the '<em><b>Outputs</b></em>' containment reference list.
+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output}.
+         * It is bidirectional and its opposite is '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output#getComponent <em>Component</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Outputs</em>' containment reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Outputs</em>' containment reference list.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getComponent_Outputs()
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output#getComponent
+         * @model opposite="component" containment="true"
+         * @generated
+         */
+        EList<Output> getOutputs();
+
+        /**
+         * Returns the value of the '<em><b>Component Definition</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Component Definition</em>' reference isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Component Definition</em>' reference.
+         * @see #setComponentDefinition(ComponentDefinition)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getComponent_ComponentDefinition()
+         * @model required="true"
+         * @generated
+         */
+        ComponentDefinition getComponentDefinition();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#getComponentDefinition <em>Component Definition</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Component Definition</em>' reference.
+         * @see #getComponentDefinition()
+         * @generated
+         */
+        void setComponentDefinition(ComponentDefinition value);
+
+} // Component
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/ComponentDefinition.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/ComponentDefinition.java
new file mode 100644
index 00000000..b3f3b163
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/ComponentDefinition.java
@@ -0,0 +1,103 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Component Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition#getInputEvents <em>Input Events</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition#getEventDefinitions <em>Event Definitions</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition#getOutputEvents <em>Output Events</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getComponentDefinition()
+ * @model
+ * @generated
+ */
+public interface ComponentDefinition extends EObject {
+        /**
+         * Returns the value of the '<em><b>Input Events</b></em>' containment reference list.
+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.IntputEvent}.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Input Events</em>' containment reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Input Events</em>' containment reference list.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getComponentDefinition_InputEvents()
+         * @model containment="true"
+         * @generated
+         */
+        EList<IntputEvent> getInputEvents();
+
+        /**
+         * Returns the value of the '<em><b>Event Definitions</b></em>' containment reference list.
+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDefinition}.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Event Definitions</em>' containment reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Event Definitions</em>' containment reference list.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getComponentDefinition_EventDefinitions()
+         * @model containment="true"
+         * @generated
+         */
+        EList<EventDefinition> getEventDefinitions();
+
+        /**
+         * Returns the value of the '<em><b>Output Events</b></em>' reference list.
+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration}.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Output Events</em>' reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Output Events</em>' reference list.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getComponentDefinition_OutputEvents()
+         * @model
+         * @generated
+         */
+        EList<EventDeclaration> getOutputEvents();
+
+        /**
+         * Returns the value of the '<em><b>Name</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Name</em>' attribute isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Name</em>' attribute.
+         * @see #setName(String)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getComponentDefinition_Name()
+         * @model
+         * @generated
+         */
+        String getName();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition#getName <em>Name</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Name</em>' attribute.
+         * @see #getName()
+         * @generated
+         */
+        void setName(String value);
+
+} // ComponentDefinition
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/ComponentFaultTree.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/ComponentFaultTree.java
new file mode 100644
index 00000000..06554378
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/ComponentFaultTree.java
@@ -0,0 +1,69 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Component Fault Tree</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentFaultTree#getComponents <em>Components</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentFaultTree#getTopEvent <em>Top Event</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getComponentFaultTree()
+ * @model
+ * @generated
+ */
+public interface ComponentFaultTree extends EObject {
+        /**
+         * Returns the value of the '<em><b>Components</b></em>' containment reference list.
+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component}.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Components</em>' containment reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Components</em>' containment reference list.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getComponentFaultTree_Components()
+         * @model containment="true"
+         * @generated
+         */
+        EList<Component> getComponents();
+
+        /**
+         * Returns the value of the '<em><b>Top Event</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Top Event</em>' reference isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Top Event</em>' reference.
+         * @see #setTopEvent(Output)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getComponentFaultTree_TopEvent()
+         * @model required="true"
+         * @generated
+         */
+        Output getTopEvent();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentFaultTree#getTopEvent <em>Top Event</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Top Event</em>' reference.
+         * @see #getTopEvent()
+         * @generated
+         */
+        void setTopEvent(Output value);
+
+} // ComponentFaultTree
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Connection.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Connection.java
new file mode 100644
index 00000000..c05e809b
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Connection.java
@@ -0,0 +1,81 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Connection</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection#getInput <em>Input</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection#getOutput <em>Output</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getConnection()
+ * @model
+ * @generated
+ */
+public interface Connection extends EObject {
+        /**
+         * Returns the value of the '<em><b>Input</b></em>' container reference.
+         * It is bidirectional and its opposite is '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input#getIncomingConnections <em>Incoming Connections</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Input</em>' container reference isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Input</em>' container reference.
+         * @see #setInput(Input)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getConnection_Input()
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input#getIncomingConnections
+         * @model opposite="incomingConnections" required="true" transient="false"
+         * @generated
+         */
+        Input getInput();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection#getInput <em>Input</em>}' container reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Input</em>' container reference.
+         * @see #getInput()
+         * @generated
+         */
+        void setInput(Input value);
+
+        /**
+         * Returns the value of the '<em><b>Output</b></em>' reference.
+         * It is bidirectional and its opposite is '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output#getOutgoingConnections <em>Outgoing Connections</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Output</em>' reference isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Output</em>' reference.
+         * @see #setOutput(Output)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getConnection_Output()
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output#getOutgoingConnections
+         * @model opposite="outgoingConnections" required="true"
+         * @generated
+         */
+        Output getOutput();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection#getOutput <em>Output</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Output</em>' reference.
+         * @see #getOutput()
+         * @generated
+         */
+        void setOutput(Output value);
+
+} // Connection
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/EventDeclaration.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/EventDeclaration.java
new file mode 100644
index 00000000..1e52a570
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/EventDeclaration.java
@@ -0,0 +1,50 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Event Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getEventDeclaration()
+ * @model abstract="true"
+ * @generated
+ */
+public interface EventDeclaration extends EObject {
+
+        /**
+         * Returns the value of the '<em><b>Name</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Name</em>' attribute isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Name</em>' attribute.
+         * @see #setName(String)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getEventDeclaration_Name()
+         * @model
+         * @generated
+         */
+        String getName();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration#getName <em>Name</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Name</em>' attribute.
+         * @see #getName()
+         * @generated
+         */
+        void setName(String value);
+} // EventDeclaration
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/EventDefinition.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/EventDefinition.java
new file mode 100644
index 00000000..d279ddfc
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/EventDefinition.java
@@ -0,0 +1,17 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Event Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getEventDefinition()
+ * @model abstract="true"
+ * @generated
+ */
+public interface EventDefinition extends EventDeclaration {
+} // EventDefinition
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/GateDefinition.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/GateDefinition.java
new file mode 100644
index 00000000..2173be5c
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/GateDefinition.java
@@ -0,0 +1,40 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Gate Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.GateDefinition#getInputEvents <em>Input Events</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getGateDefinition()
+ * @model abstract="true"
+ * @generated
+ */
+public interface GateDefinition extends EventDefinition {
+        /**
+         * Returns the value of the '<em><b>Input Events</b></em>' reference list.
+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration}.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Input Events</em>' reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Input Events</em>' reference list.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getGateDefinition_InputEvents()
+         * @model
+         * @generated
+         */
+        EList<EventDeclaration> getInputEvents();
+
+} // GateDefinition
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Input.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Input.java
new file mode 100644
index 00000000..55da3f9a
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Input.java
@@ -0,0 +1,100 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Input</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input#getIntputEvent <em>Intput Event</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input#getComponent <em>Component</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input#getIncomingConnections <em>Incoming Connections</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getInput()
+ * @model
+ * @generated
+ */
+public interface Input extends EObject {
+        /**
+         * Returns the value of the '<em><b>Intput Event</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Intput Event</em>' reference isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Intput Event</em>' reference.
+         * @see #setIntputEvent(IntputEvent)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getInput_IntputEvent()
+         * @model required="true"
+         * @generated
+         */
+        IntputEvent getIntputEvent();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input#getIntputEvent <em>Intput Event</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Intput Event</em>' reference.
+         * @see #getIntputEvent()
+         * @generated
+         */
+        void setIntputEvent(IntputEvent value);
+
+        /**
+         * Returns the value of the '<em><b>Component</b></em>' container reference.
+         * It is bidirectional and its opposite is '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#getInputs <em>Inputs</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Component</em>' container reference isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Component</em>' container reference.
+         * @see #setComponent(Component)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getInput_Component()
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#getInputs
+         * @model opposite="inputs" required="true" transient="false"
+         * @generated
+         */
+        Component getComponent();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input#getComponent <em>Component</em>}' container reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Component</em>' container reference.
+         * @see #getComponent()
+         * @generated
+         */
+        void setComponent(Component value);
+
+        /**
+         * Returns the value of the '<em><b>Incoming Connections</b></em>' containment reference list.
+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection}.
+         * It is bidirectional and its opposite is '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection#getInput <em>Input</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Incoming Connections</em>' containment reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Incoming Connections</em>' containment reference list.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getInput_IncomingConnections()
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection#getInput
+         * @model opposite="input" containment="true"
+         * @generated
+         */
+        EList<Connection> getIncomingConnections();
+
+} // Input
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/IntputEvent.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/IntputEvent.java
new file mode 100644
index 00000000..bec5c487
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/IntputEvent.java
@@ -0,0 +1,49 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Intput Event</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.IntputEvent#isMultiple <em>Multiple</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getIntputEvent()
+ * @model
+ * @generated
+ */
+public interface IntputEvent extends EventDeclaration {
+        /**
+         * Returns the value of the '<em><b>Multiple</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Multiple</em>' attribute isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Multiple</em>' attribute.
+         * @see #setMultiple(boolean)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getIntputEvent_Multiple()
+         * @model
+         * @generated
+         */
+        boolean isMultiple();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.IntputEvent#isMultiple <em>Multiple</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Multiple</em>' attribute.
+         * @see #isMultiple()
+         * @generated
+         */
+        void setMultiple(boolean value);
+
+} // IntputEvent
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/KOfMGateDefinition.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/KOfMGateDefinition.java
new file mode 100644
index 00000000..6e1bc1c1
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/KOfMGateDefinition.java
@@ -0,0 +1,76 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>KOf MGate Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition#getK <em>K</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition#getM <em>M</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getKOfMGateDefinition()
+ * @model
+ * @generated
+ */
+public interface KOfMGateDefinition extends GateDefinition {
+        /**
+         * Returns the value of the '<em><b>K</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>K</em>' attribute isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>K</em>' attribute.
+         * @see #setK(int)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getKOfMGateDefinition_K()
+         * @model
+         * @generated
+         */
+        int getK();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition#getK <em>K</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>K</em>' attribute.
+         * @see #getK()
+         * @generated
+         */
+        void setK(int value);
+
+        /**
+         * Returns the value of the '<em><b>M</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>M</em>' attribute isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>M</em>' attribute.
+         * @see #setM(int)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getKOfMGateDefinition_M()
+         * @model
+         * @generated
+         */
+        int getM();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition#getM <em>M</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>M</em>' attribute.
+         * @see #getM()
+         * @generated
+         */
+        void setM(int value);
+
+} // KOfMGateDefinition
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/OrGateDefinition.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/OrGateDefinition.java
new file mode 100644
index 00000000..f62d6652
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/OrGateDefinition.java
@@ -0,0 +1,17 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Or Gate Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getOrGateDefinition()
+ * @model
+ * @generated
+ */
+public interface OrGateDefinition extends GateDefinition {
+} // OrGateDefinition
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Output.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Output.java
new file mode 100644
index 00000000..ffb61b8c
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Output.java
@@ -0,0 +1,100 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Output</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output#getEventDeclaration <em>Event Declaration</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output#getOutgoingConnections <em>Outgoing Connections</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output#getComponent <em>Component</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getOutput()
+ * @model
+ * @generated
+ */
+public interface Output extends EObject {
+        /**
+         * Returns the value of the '<em><b>Event Declaration</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Event Declaration</em>' reference isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Event Declaration</em>' reference.
+         * @see #setEventDeclaration(EventDeclaration)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getOutput_EventDeclaration()
+         * @model required="true"
+         * @generated
+         */
+        EventDeclaration getEventDeclaration();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output#getEventDeclaration <em>Event Declaration</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Event Declaration</em>' reference.
+         * @see #getEventDeclaration()
+         * @generated
+         */
+        void setEventDeclaration(EventDeclaration value);
+
+        /**
+         * Returns the value of the '<em><b>Outgoing Connections</b></em>' reference list.
+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection}.
+         * It is bidirectional and its opposite is '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection#getOutput <em>Output</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Outgoing Connections</em>' reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Outgoing Connections</em>' reference list.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getOutput_OutgoingConnections()
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection#getOutput
+         * @model opposite="output"
+         * @generated
+         */
+        EList<Connection> getOutgoingConnections();
+
+        /**
+         * Returns the value of the '<em><b>Component</b></em>' container reference.
+         * It is bidirectional and its opposite is '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#getOutputs <em>Outputs</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Component</em>' container reference isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Component</em>' container reference.
+         * @see #setComponent(Component)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getOutput_Component()
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#getOutputs
+         * @model opposite="outputs" required="true" transient="false"
+         * @generated
+         */
+        Component getComponent();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output#getComponent <em>Component</em>}' container reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Component</em>' container reference.
+         * @see #getComponent()
+         * @generated
+         */
+        void setComponent(Component value);
+
+} // Output
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/AndGateDefinitionImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/AndGateDefinitionImpl.java
new file mode 100644
index 00000000..fd716fc9
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/AndGateDefinitionImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.AndGateDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>And Gate Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class AndGateDefinitionImpl extends GateDefinitionImpl implements AndGateDefinition {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected AndGateDefinitionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CftPackage.Literals.AND_GATE_DEFINITION;
+        }
+
+} //AndGateDefinitionImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/BasicEventDefinitionImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/BasicEventDefinitionImpl.java
new file mode 100644
index 00000000..87fc5d70
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/BasicEventDefinitionImpl.java
@@ -0,0 +1,178 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.BasicEventDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Distribution;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Basic Event Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.BasicEventDefinitionImpl#getDistribution <em>Distribution</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class BasicEventDefinitionImpl extends EventDefinitionImpl implements BasicEventDefinition {
+        /**
+         * The cached value of the '{@link #getDistribution() <em>Distribution</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getDistribution()
+         * @generated
+         * @ordered
+         */
+        protected Distribution distribution;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected BasicEventDefinitionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CftPackage.Literals.BASIC_EVENT_DEFINITION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Distribution getDistribution() {
+                return distribution;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetDistribution(Distribution newDistribution, NotificationChain msgs) {
+                Distribution oldDistribution = distribution;
+                distribution = newDistribution;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CftPackage.BASIC_EVENT_DEFINITION__DISTRIBUTION, oldDistribution, newDistribution);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setDistribution(Distribution newDistribution) {
+                if (newDistribution != distribution) {
+                        NotificationChain msgs = null;
+                        if (distribution != null)
+                                msgs = ((InternalEObject)distribution).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CftPackage.BASIC_EVENT_DEFINITION__DISTRIBUTION, null, msgs);
+                        if (newDistribution != null)
+                                msgs = ((InternalEObject)newDistribution).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CftPackage.BASIC_EVENT_DEFINITION__DISTRIBUTION, null, msgs);
+                        msgs = basicSetDistribution(newDistribution, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.BASIC_EVENT_DEFINITION__DISTRIBUTION, newDistribution, newDistribution));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case CftPackage.BASIC_EVENT_DEFINITION__DISTRIBUTION:
+                                return basicSetDistribution(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case CftPackage.BASIC_EVENT_DEFINITION__DISTRIBUTION:
+                                return getDistribution();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case CftPackage.BASIC_EVENT_DEFINITION__DISTRIBUTION:
+                                setDistribution((Distribution)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case CftPackage.BASIC_EVENT_DEFINITION__DISTRIBUTION:
+                                setDistribution((Distribution)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case CftPackage.BASIC_EVENT_DEFINITION__DISTRIBUTION:
+                                return distribution != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //BasicEventDefinitionImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftFactoryImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftFactoryImpl.java
new file mode 100644
index 00000000..33778461
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftFactoryImpl.java
@@ -0,0 +1,217 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.*;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class CftFactoryImpl extends EFactoryImpl implements CftFactory {
+        /**
+         * Creates the default factory implementation.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public static CftFactory init() {
+                try {
+                        CftFactory theCftFactory = (CftFactory)EPackage.Registry.INSTANCE.getEFactory(CftPackage.eNS_URI);
+                        if (theCftFactory != null) {
+                                return theCftFactory;
+                        }
+                }
+                catch (Exception exception) {
+                        EcorePlugin.INSTANCE.log(exception);
+                }
+                return new CftFactoryImpl();
+        }
+
+        /**
+         * Creates an instance of the factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public CftFactoryImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EObject create(EClass eClass) {
+                switch (eClass.getClassifierID()) {
+                        case CftPackage.COMPONENT_DEFINITION: return createComponentDefinition();
+                        case CftPackage.BASIC_EVENT_DEFINITION: return createBasicEventDefinition();
+                        case CftPackage.INTPUT_EVENT: return createIntputEvent();
+                        case CftPackage.AND_GATE_DEFINITION: return createAndGateDefinition();
+                        case CftPackage.OR_GATE_DEFINITION: return createOrGateDefinition();
+                        case CftPackage.KOF_MGATE_DEFINITION: return createKOfMGateDefinition();
+                        case CftPackage.COMPONENT_FAULT_TREE: return createComponentFaultTree();
+                        case CftPackage.COMPONENT: return createComponent();
+                        case CftPackage.INPUT: return createInput();
+                        case CftPackage.OUTPUT: return createOutput();
+                        case CftPackage.CONNECTION: return createConnection();
+                        default:
+                                throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+                }
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public ComponentDefinition createComponentDefinition() {
+                ComponentDefinitionImpl componentDefinition = new ComponentDefinitionImpl();
+                return componentDefinition;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public BasicEventDefinition createBasicEventDefinition() {
+                BasicEventDefinitionImpl basicEventDefinition = new BasicEventDefinitionImpl();
+                return basicEventDefinition;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public IntputEvent createIntputEvent() {
+                IntputEventImpl intputEvent = new IntputEventImpl();
+                return intputEvent;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public AndGateDefinition createAndGateDefinition() {
+                AndGateDefinitionImpl andGateDefinition = new AndGateDefinitionImpl();
+                return andGateDefinition;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public OrGateDefinition createOrGateDefinition() {
+                OrGateDefinitionImpl orGateDefinition = new OrGateDefinitionImpl();
+                return orGateDefinition;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public KOfMGateDefinition createKOfMGateDefinition() {
+                KOfMGateDefinitionImpl kOfMGateDefinition = new KOfMGateDefinitionImpl();
+                return kOfMGateDefinition;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public ComponentFaultTree createComponentFaultTree() {
+                ComponentFaultTreeImpl componentFaultTree = new ComponentFaultTreeImpl();
+                return componentFaultTree;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Component createComponent() {
+                ComponentImpl component = new ComponentImpl();
+                return component;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Input createInput() {
+                InputImpl input = new InputImpl();
+                return input;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Output createOutput() {
+                OutputImpl output = new OutputImpl();
+                return output;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Connection createConnection() {
+                ConnectionImpl connection = new ConnectionImpl();
+                return connection;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public CftPackage getCftPackage() {
+                return (CftPackage)getEPackage();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @deprecated
+         * @generated
+         */
+        @Deprecated
+        public static CftPackage getPackage() {
+                return CftPackage.eINSTANCE;
+        }
+
+} //CftFactoryImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftPackageImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftPackageImpl.java
new file mode 100644
index 00000000..f03fa0ba
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftPackageImpl.java
@@ -0,0 +1,746 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.AndGateDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.BasicEventDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftFactory;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentFaultTree;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.GateDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.IntputEvent;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.OrGateDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class CftPackageImpl extends EPackageImpl implements CftPackage {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass componentDefinitionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass eventDefinitionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass gateDefinitionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass basicEventDefinitionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass intputEventEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass eventDeclarationEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass andGateDefinitionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass orGateDefinitionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass kOfMGateDefinitionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass componentFaultTreeEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass componentEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass inputEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass outputEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass connectionEClass = null;
+
+        /**
+         * Creates an instance of the model <b>Package</b>, registered with
+         * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+         * package URI value.
+         * <p>Note: the correct way to create the package is via the static
+         * factory method {@link #init init()}, which also performs
+         * initialization of the package, or returns the registered package,
+         * if one already exists.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.emf.ecore.EPackage.Registry
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#eNS_URI
+         * @see #init()
+         * @generated
+         */
+        private CftPackageImpl() {
+                super(eNS_URI, CftFactory.eINSTANCE);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private static boolean isInited = false;
+
+        /**
+         * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+         *
+         * <p>This method is used to initialize {@link CftPackage#eINSTANCE} when that field is accessed.
+         * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #eNS_URI
+         * @see #createPackageContents()
+         * @see #initializePackageContents()
+         * @generated
+         */
+        public static CftPackage init() {
+                if (isInited) return (CftPackage)EPackage.Registry.INSTANCE.getEPackage(CftPackage.eNS_URI);
+
+                // Obtain or create and register package
+                Object registeredCftPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+                CftPackageImpl theCftPackage = registeredCftPackage instanceof CftPackageImpl ? (CftPackageImpl)registeredCftPackage : new CftPackageImpl();
+
+                isInited = true;
+
+                // Initialize simple dependencies
+                FtPackage.eINSTANCE.eClass();
+
+                // Create package meta-data objects
+                theCftPackage.createPackageContents();
+
+                // Initialize created meta-data
+                theCftPackage.initializePackageContents();
+
+                // Mark meta-data to indicate it can't be changed
+                theCftPackage.freeze();
+
+                // Update the registry and return the package
+                EPackage.Registry.INSTANCE.put(CftPackage.eNS_URI, theCftPackage);
+                return theCftPackage;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getComponentDefinition() {
+                return componentDefinitionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getComponentDefinition_InputEvents() {
+                return (EReference)componentDefinitionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getComponentDefinition_EventDefinitions() {
+                return (EReference)componentDefinitionEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getComponentDefinition_OutputEvents() {
+                return (EReference)componentDefinitionEClass.getEStructuralFeatures().get(2);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EAttribute getComponentDefinition_Name() {
+                return (EAttribute)componentDefinitionEClass.getEStructuralFeatures().get(3);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getEventDefinition() {
+                return eventDefinitionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getGateDefinition() {
+                return gateDefinitionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getGateDefinition_InputEvents() {
+                return (EReference)gateDefinitionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getBasicEventDefinition() {
+                return basicEventDefinitionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getBasicEventDefinition_Distribution() {
+                return (EReference)basicEventDefinitionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getIntputEvent() {
+                return intputEventEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EAttribute getIntputEvent_Multiple() {
+                return (EAttribute)intputEventEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getEventDeclaration() {
+                return eventDeclarationEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EAttribute getEventDeclaration_Name() {
+                return (EAttribute)eventDeclarationEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getAndGateDefinition() {
+                return andGateDefinitionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getOrGateDefinition() {
+                return orGateDefinitionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getKOfMGateDefinition() {
+                return kOfMGateDefinitionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EAttribute getKOfMGateDefinition_K() {
+                return (EAttribute)kOfMGateDefinitionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EAttribute getKOfMGateDefinition_M() {
+                return (EAttribute)kOfMGateDefinitionEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getComponentFaultTree() {
+                return componentFaultTreeEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getComponentFaultTree_Components() {
+                return (EReference)componentFaultTreeEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getComponentFaultTree_TopEvent() {
+                return (EReference)componentFaultTreeEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getComponent() {
+                return componentEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getComponent_Inputs() {
+                return (EReference)componentEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getComponent_Outputs() {
+                return (EReference)componentEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getComponent_ComponentDefinition() {
+                return (EReference)componentEClass.getEStructuralFeatures().get(2);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getInput() {
+                return inputEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getInput_IntputEvent() {
+                return (EReference)inputEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getInput_Component() {
+                return (EReference)inputEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getInput_IncomingConnections() {
+                return (EReference)inputEClass.getEStructuralFeatures().get(2);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getOutput() {
+                return outputEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getOutput_EventDeclaration() {
+                return (EReference)outputEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getOutput_OutgoingConnections() {
+                return (EReference)outputEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getOutput_Component() {
+                return (EReference)outputEClass.getEStructuralFeatures().get(2);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getConnection() {
+                return connectionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getConnection_Input() {
+                return (EReference)connectionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getConnection_Output() {
+                return (EReference)connectionEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public CftFactory getCftFactory() {
+                return (CftFactory)getEFactoryInstance();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private boolean isCreated = false;
+
+        /**
+         * Creates the meta-model objects for the package.  This method is
+         * guarded to have no affect on any invocation but its first.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void createPackageContents() {
+                if (isCreated) return;
+                isCreated = true;
+
+                // Create classes and their features
+                componentDefinitionEClass = createEClass(COMPONENT_DEFINITION);
+                createEReference(componentDefinitionEClass, COMPONENT_DEFINITION__INPUT_EVENTS);
+                createEReference(componentDefinitionEClass, COMPONENT_DEFINITION__EVENT_DEFINITIONS);
+                createEReference(componentDefinitionEClass, COMPONENT_DEFINITION__OUTPUT_EVENTS);
+                createEAttribute(componentDefinitionEClass, COMPONENT_DEFINITION__NAME);
+
+                eventDefinitionEClass = createEClass(EVENT_DEFINITION);
+
+                gateDefinitionEClass = createEClass(GATE_DEFINITION);
+                createEReference(gateDefinitionEClass, GATE_DEFINITION__INPUT_EVENTS);
+
+                basicEventDefinitionEClass = createEClass(BASIC_EVENT_DEFINITION);
+                createEReference(basicEventDefinitionEClass, BASIC_EVENT_DEFINITION__DISTRIBUTION);
+
+                intputEventEClass = createEClass(INTPUT_EVENT);
+                createEAttribute(intputEventEClass, INTPUT_EVENT__MULTIPLE);
+
+                eventDeclarationEClass = createEClass(EVENT_DECLARATION);
+                createEAttribute(eventDeclarationEClass, EVENT_DECLARATION__NAME);
+
+                andGateDefinitionEClass = createEClass(AND_GATE_DEFINITION);
+
+                orGateDefinitionEClass = createEClass(OR_GATE_DEFINITION);
+
+                kOfMGateDefinitionEClass = createEClass(KOF_MGATE_DEFINITION);
+                createEAttribute(kOfMGateDefinitionEClass, KOF_MGATE_DEFINITION__K);
+                createEAttribute(kOfMGateDefinitionEClass, KOF_MGATE_DEFINITION__M);
+
+                componentFaultTreeEClass = createEClass(COMPONENT_FAULT_TREE);
+                createEReference(componentFaultTreeEClass, COMPONENT_FAULT_TREE__COMPONENTS);
+                createEReference(componentFaultTreeEClass, COMPONENT_FAULT_TREE__TOP_EVENT);
+
+                componentEClass = createEClass(COMPONENT);
+                createEReference(componentEClass, COMPONENT__INPUTS);
+                createEReference(componentEClass, COMPONENT__OUTPUTS);
+                createEReference(componentEClass, COMPONENT__COMPONENT_DEFINITION);
+
+                inputEClass = createEClass(INPUT);
+                createEReference(inputEClass, INPUT__INTPUT_EVENT);
+                createEReference(inputEClass, INPUT__COMPONENT);
+                createEReference(inputEClass, INPUT__INCOMING_CONNECTIONS);
+
+                outputEClass = createEClass(OUTPUT);
+                createEReference(outputEClass, OUTPUT__EVENT_DECLARATION);
+                createEReference(outputEClass, OUTPUT__OUTGOING_CONNECTIONS);
+                createEReference(outputEClass, OUTPUT__COMPONENT);
+
+                connectionEClass = createEClass(CONNECTION);
+                createEReference(connectionEClass, CONNECTION__INPUT);
+                createEReference(connectionEClass, CONNECTION__OUTPUT);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private boolean isInitialized = false;
+
+        /**
+         * Complete the initialization of the package and its meta-model.  This
+         * method is guarded to have no affect on any invocation but its first.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void initializePackageContents() {
+                if (isInitialized) return;
+                isInitialized = true;
+
+                // Initialize package
+                setName(eNAME);
+                setNsPrefix(eNS_PREFIX);
+                setNsURI(eNS_URI);
+
+                // Obtain other dependent packages
+                FtPackage theFtPackage = (FtPackage)EPackage.Registry.INSTANCE.getEPackage(FtPackage.eNS_URI);
+
+                // Create type parameters
+
+                // Set bounds for type parameters
+
+                // Add supertypes to classes
+                eventDefinitionEClass.getESuperTypes().add(this.getEventDeclaration());
+                gateDefinitionEClass.getESuperTypes().add(this.getEventDefinition());
+                basicEventDefinitionEClass.getESuperTypes().add(this.getEventDefinition());
+                intputEventEClass.getESuperTypes().add(this.getEventDeclaration());
+                andGateDefinitionEClass.getESuperTypes().add(this.getGateDefinition());
+                orGateDefinitionEClass.getESuperTypes().add(this.getGateDefinition());
+                kOfMGateDefinitionEClass.getESuperTypes().add(this.getGateDefinition());
+
+                // Initialize classes, features, and operations; add parameters
+                initEClass(componentDefinitionEClass, ComponentDefinition.class, "ComponentDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getComponentDefinition_InputEvents(), this.getIntputEvent(), null, "inputEvents", null, 0, -1, ComponentDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getComponentDefinition_EventDefinitions(), this.getEventDefinition(), null, "eventDefinitions", null, 0, -1, ComponentDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getComponentDefinition_OutputEvents(), this.getEventDeclaration(), null, "outputEvents", null, 0, -1, ComponentDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getComponentDefinition_Name(), ecorePackage.getEString(), "name", null, 0, 1, ComponentDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(eventDefinitionEClass, EventDefinition.class, "EventDefinition", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(gateDefinitionEClass, GateDefinition.class, "GateDefinition", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getGateDefinition_InputEvents(), this.getEventDeclaration(), null, "inputEvents", null, 0, -1, GateDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(basicEventDefinitionEClass, BasicEventDefinition.class, "BasicEventDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getBasicEventDefinition_Distribution(), theFtPackage.getDistribution(), null, "distribution", null, 1, 1, BasicEventDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(intputEventEClass, IntputEvent.class, "IntputEvent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getIntputEvent_Multiple(), ecorePackage.getEBoolean(), "multiple", null, 0, 1, IntputEvent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(eventDeclarationEClass, EventDeclaration.class, "EventDeclaration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getEventDeclaration_Name(), ecorePackage.getEString(), "name", null, 0, 1, EventDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(andGateDefinitionEClass, AndGateDefinition.class, "AndGateDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(orGateDefinitionEClass, OrGateDefinition.class, "OrGateDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(kOfMGateDefinitionEClass, KOfMGateDefinition.class, "KOfMGateDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getKOfMGateDefinition_K(), ecorePackage.getEInt(), "k", null, 0, 1, KOfMGateDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getKOfMGateDefinition_M(), ecorePackage.getEInt(), "m", null, 0, 1, KOfMGateDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(componentFaultTreeEClass, ComponentFaultTree.class, "ComponentFaultTree", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getComponentFaultTree_Components(), this.getComponent(), null, "components", null, 0, -1, ComponentFaultTree.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getComponentFaultTree_TopEvent(), this.getOutput(), null, "topEvent", null, 1, 1, ComponentFaultTree.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(componentEClass, Component.class, "Component", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getComponent_Inputs(), this.getInput(), this.getInput_Component(), "inputs", null, 0, -1, Component.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getComponent_Outputs(), this.getOutput(), this.getOutput_Component(), "outputs", null, 0, -1, Component.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getComponent_ComponentDefinition(), this.getComponentDefinition(), null, "componentDefinition", null, 1, 1, Component.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(inputEClass, Input.class, "Input", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getInput_IntputEvent(), this.getIntputEvent(), null, "intputEvent", null, 1, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getInput_Component(), this.getComponent(), this.getComponent_Inputs(), "component", null, 1, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getInput_IncomingConnections(), this.getConnection(), this.getConnection_Input(), "incomingConnections", null, 0, -1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(outputEClass, Output.class, "Output", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getOutput_EventDeclaration(), this.getEventDeclaration(), null, "eventDeclaration", null, 1, 1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getOutput_OutgoingConnections(), this.getConnection(), this.getConnection_Output(), "outgoingConnections", null, 0, -1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getOutput_Component(), this.getComponent(), this.getComponent_Outputs(), "component", null, 1, 1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(connectionEClass, Connection.class, "Connection", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getConnection_Input(), this.getInput(), this.getInput_IncomingConnections(), "input", null, 1, 1, Connection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getConnection_Output(), this.getOutput(), this.getOutput_OutgoingConnections(), "output", null, 1, 1, Connection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                // Create resource
+                createResource(eNS_URI);
+        }
+
+} //CftPackageImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentDefinitionImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentDefinitionImpl.java
new file mode 100644
index 00000000..58a476f3
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentDefinitionImpl.java
@@ -0,0 +1,300 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.IntputEvent;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Component Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentDefinitionImpl#getInputEvents <em>Input Events</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentDefinitionImpl#getEventDefinitions <em>Event Definitions</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentDefinitionImpl#getOutputEvents <em>Output Events</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentDefinitionImpl#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ComponentDefinitionImpl extends MinimalEObjectImpl.Container implements ComponentDefinition {
+        /**
+         * The cached value of the '{@link #getInputEvents() <em>Input Events</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getInputEvents()
+         * @generated
+         * @ordered
+         */
+        protected EList<IntputEvent> inputEvents;
+
+        /**
+         * The cached value of the '{@link #getEventDefinitions() <em>Event Definitions</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getEventDefinitions()
+         * @generated
+         * @ordered
+         */
+        protected EList<EventDefinition> eventDefinitions;
+
+        /**
+         * The cached value of the '{@link #getOutputEvents() <em>Output Events</em>}' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getOutputEvents()
+         * @generated
+         * @ordered
+         */
+        protected EList<EventDeclaration> outputEvents;
+
+        /**
+         * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getName()
+         * @generated
+         * @ordered
+         */
+        protected static final String NAME_EDEFAULT = null;
+
+        /**
+         * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getName()
+         * @generated
+         * @ordered
+         */
+        protected String name = NAME_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ComponentDefinitionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CftPackage.Literals.COMPONENT_DEFINITION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EList<IntputEvent> getInputEvents() {
+                if (inputEvents == null) {
+                        inputEvents = new EObjectContainmentEList<IntputEvent>(IntputEvent.class, this, CftPackage.COMPONENT_DEFINITION__INPUT_EVENTS);
+                }
+                return inputEvents;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EList<EventDefinition> getEventDefinitions() {
+                if (eventDefinitions == null) {
+                        eventDefinitions = new EObjectContainmentEList<EventDefinition>(EventDefinition.class, this, CftPackage.COMPONENT_DEFINITION__EVENT_DEFINITIONS);
+                }
+                return eventDefinitions;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EList<EventDeclaration> getOutputEvents() {
+                if (outputEvents == null) {
+                        outputEvents = new EObjectResolvingEList<EventDeclaration>(EventDeclaration.class, this, CftPackage.COMPONENT_DEFINITION__OUTPUT_EVENTS);
+                }
+                return outputEvents;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String getName() {
+                return name;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setName(String newName) {
+                String oldName = name;
+                name = newName;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.COMPONENT_DEFINITION__NAME, oldName, name));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case CftPackage.COMPONENT_DEFINITION__INPUT_EVENTS:
+                                return ((InternalEList<?>)getInputEvents()).basicRemove(otherEnd, msgs);
+                        case CftPackage.COMPONENT_DEFINITION__EVENT_DEFINITIONS:
+                                return ((InternalEList<?>)getEventDefinitions()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case CftPackage.COMPONENT_DEFINITION__INPUT_EVENTS:
+                                return getInputEvents();
+                        case CftPackage.COMPONENT_DEFINITION__EVENT_DEFINITIONS:
+                                return getEventDefinitions();
+                        case CftPackage.COMPONENT_DEFINITION__OUTPUT_EVENTS:
+                                return getOutputEvents();
+                        case CftPackage.COMPONENT_DEFINITION__NAME:
+                                return getName();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case CftPackage.COMPONENT_DEFINITION__INPUT_EVENTS:
+                                getInputEvents().clear();
+                                getInputEvents().addAll((Collection<? extends IntputEvent>)newValue);
+                                return;
+                        case CftPackage.COMPONENT_DEFINITION__EVENT_DEFINITIONS:
+                                getEventDefinitions().clear();
+                                getEventDefinitions().addAll((Collection<? extends EventDefinition>)newValue);
+                                return;
+                        case CftPackage.COMPONENT_DEFINITION__OUTPUT_EVENTS:
+                                getOutputEvents().clear();
+                                getOutputEvents().addAll((Collection<? extends EventDeclaration>)newValue);
+                                return;
+                        case CftPackage.COMPONENT_DEFINITION__NAME:
+                                setName((String)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case CftPackage.COMPONENT_DEFINITION__INPUT_EVENTS:
+                                getInputEvents().clear();
+                                return;
+                        case CftPackage.COMPONENT_DEFINITION__EVENT_DEFINITIONS:
+                                getEventDefinitions().clear();
+                                return;
+                        case CftPackage.COMPONENT_DEFINITION__OUTPUT_EVENTS:
+                                getOutputEvents().clear();
+                                return;
+                        case CftPackage.COMPONENT_DEFINITION__NAME:
+                                setName(NAME_EDEFAULT);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case CftPackage.COMPONENT_DEFINITION__INPUT_EVENTS:
+                                return inputEvents != null && !inputEvents.isEmpty();
+                        case CftPackage.COMPONENT_DEFINITION__EVENT_DEFINITIONS:
+                                return eventDefinitions != null && !eventDefinitions.isEmpty();
+                        case CftPackage.COMPONENT_DEFINITION__OUTPUT_EVENTS:
+                                return outputEvents != null && !outputEvents.isEmpty();
+                        case CftPackage.COMPONENT_DEFINITION__NAME:
+                                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+                }
+                return super.eIsSet(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy()) return super.toString();
+
+                StringBuilder result = new StringBuilder(super.toString());
+                result.append(" (name: ");
+                result.append(name);
+                result.append(')');
+                return result.toString();
+        }
+
+} //ComponentDefinitionImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentFaultTreeImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentFaultTreeImpl.java
new file mode 100644
index 00000000..b84b6436
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentFaultTreeImpl.java
@@ -0,0 +1,218 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentFaultTree;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Component Fault Tree</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentFaultTreeImpl#getComponents <em>Components</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentFaultTreeImpl#getTopEvent <em>Top Event</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ComponentFaultTreeImpl extends MinimalEObjectImpl.Container implements ComponentFaultTree {
+        /**
+         * The cached value of the '{@link #getComponents() <em>Components</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getComponents()
+         * @generated
+         * @ordered
+         */
+        protected EList<Component> components;
+
+        /**
+         * The cached value of the '{@link #getTopEvent() <em>Top Event</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getTopEvent()
+         * @generated
+         * @ordered
+         */
+        protected Output topEvent;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ComponentFaultTreeImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CftPackage.Literals.COMPONENT_FAULT_TREE;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EList<Component> getComponents() {
+                if (components == null) {
+                        components = new EObjectContainmentEList<Component>(Component.class, this, CftPackage.COMPONENT_FAULT_TREE__COMPONENTS);
+                }
+                return components;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Output getTopEvent() {
+                if (topEvent != null && topEvent.eIsProxy()) {
+                        InternalEObject oldTopEvent = (InternalEObject)topEvent;
+                        topEvent = (Output)eResolveProxy(oldTopEvent);
+                        if (topEvent != oldTopEvent) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, CftPackage.COMPONENT_FAULT_TREE__TOP_EVENT, oldTopEvent, topEvent));
+                        }
+                }
+                return topEvent;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Output basicGetTopEvent() {
+                return topEvent;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setTopEvent(Output newTopEvent) {
+                Output oldTopEvent = topEvent;
+                topEvent = newTopEvent;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.COMPONENT_FAULT_TREE__TOP_EVENT, oldTopEvent, topEvent));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case CftPackage.COMPONENT_FAULT_TREE__COMPONENTS:
+                                return ((InternalEList<?>)getComponents()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case CftPackage.COMPONENT_FAULT_TREE__COMPONENTS:
+                                return getComponents();
+                        case CftPackage.COMPONENT_FAULT_TREE__TOP_EVENT:
+                                if (resolve) return getTopEvent();
+                                return basicGetTopEvent();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case CftPackage.COMPONENT_FAULT_TREE__COMPONENTS:
+                                getComponents().clear();
+                                getComponents().addAll((Collection<? extends Component>)newValue);
+                                return;
+                        case CftPackage.COMPONENT_FAULT_TREE__TOP_EVENT:
+                                setTopEvent((Output)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case CftPackage.COMPONENT_FAULT_TREE__COMPONENTS:
+                                getComponents().clear();
+                                return;
+                        case CftPackage.COMPONENT_FAULT_TREE__TOP_EVENT:
+                                setTopEvent((Output)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case CftPackage.COMPONENT_FAULT_TREE__COMPONENTS:
+                                return components != null && !components.isEmpty();
+                        case CftPackage.COMPONENT_FAULT_TREE__TOP_EVENT:
+                                return topEvent != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //ComponentFaultTreeImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentImpl.java
new file mode 100644
index 00000000..6d23dc78
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentImpl.java
@@ -0,0 +1,273 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Component</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentImpl#getInputs <em>Inputs</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentImpl#getOutputs <em>Outputs</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentImpl#getComponentDefinition <em>Component Definition</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ComponentImpl extends MinimalEObjectImpl.Container implements Component {
+        /**
+         * The cached value of the '{@link #getInputs() <em>Inputs</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getInputs()
+         * @generated
+         * @ordered
+         */
+        protected EList<Input> inputs;
+
+        /**
+         * The cached value of the '{@link #getOutputs() <em>Outputs</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getOutputs()
+         * @generated
+         * @ordered
+         */
+        protected EList<Output> outputs;
+
+        /**
+         * The cached value of the '{@link #getComponentDefinition() <em>Component Definition</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getComponentDefinition()
+         * @generated
+         * @ordered
+         */
+        protected ComponentDefinition componentDefinition;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ComponentImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CftPackage.Literals.COMPONENT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EList<Input> getInputs() {
+                if (inputs == null) {
+                        inputs = new EObjectContainmentWithInverseEList<Input>(Input.class, this, CftPackage.COMPONENT__INPUTS, CftPackage.INPUT__COMPONENT);
+                }
+                return inputs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EList<Output> getOutputs() {
+                if (outputs == null) {
+                        outputs = new EObjectContainmentWithInverseEList<Output>(Output.class, this, CftPackage.COMPONENT__OUTPUTS, CftPackage.OUTPUT__COMPONENT);
+                }
+                return outputs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public ComponentDefinition getComponentDefinition() {
+                if (componentDefinition != null && componentDefinition.eIsProxy()) {
+                        InternalEObject oldComponentDefinition = (InternalEObject)componentDefinition;
+                        componentDefinition = (ComponentDefinition)eResolveProxy(oldComponentDefinition);
+                        if (componentDefinition != oldComponentDefinition) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, CftPackage.COMPONENT__COMPONENT_DEFINITION, oldComponentDefinition, componentDefinition));
+                        }
+                }
+                return componentDefinition;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ComponentDefinition basicGetComponentDefinition() {
+                return componentDefinition;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setComponentDefinition(ComponentDefinition newComponentDefinition) {
+                ComponentDefinition oldComponentDefinition = componentDefinition;
+                componentDefinition = newComponentDefinition;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.COMPONENT__COMPONENT_DEFINITION, oldComponentDefinition, componentDefinition));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case CftPackage.COMPONENT__INPUTS:
+                                return ((InternalEList<InternalEObject>)(InternalEList<?>)getInputs()).basicAdd(otherEnd, msgs);
+                        case CftPackage.COMPONENT__OUTPUTS:
+                                return ((InternalEList<InternalEObject>)(InternalEList<?>)getOutputs()).basicAdd(otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case CftPackage.COMPONENT__INPUTS:
+                                return ((InternalEList<?>)getInputs()).basicRemove(otherEnd, msgs);
+                        case CftPackage.COMPONENT__OUTPUTS:
+                                return ((InternalEList<?>)getOutputs()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case CftPackage.COMPONENT__INPUTS:
+                                return getInputs();
+                        case CftPackage.COMPONENT__OUTPUTS:
+                                return getOutputs();
+                        case CftPackage.COMPONENT__COMPONENT_DEFINITION:
+                                if (resolve) return getComponentDefinition();
+                                return basicGetComponentDefinition();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case CftPackage.COMPONENT__INPUTS:
+                                getInputs().clear();
+                                getInputs().addAll((Collection<? extends Input>)newValue);
+                                return;
+                        case CftPackage.COMPONENT__OUTPUTS:
+                                getOutputs().clear();
+                                getOutputs().addAll((Collection<? extends Output>)newValue);
+                                return;
+                        case CftPackage.COMPONENT__COMPONENT_DEFINITION:
+                                setComponentDefinition((ComponentDefinition)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case CftPackage.COMPONENT__INPUTS:
+                                getInputs().clear();
+                                return;
+                        case CftPackage.COMPONENT__OUTPUTS:
+                                getOutputs().clear();
+                                return;
+                        case CftPackage.COMPONENT__COMPONENT_DEFINITION:
+                                setComponentDefinition((ComponentDefinition)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case CftPackage.COMPONENT__INPUTS:
+                                return inputs != null && !inputs.isEmpty();
+                        case CftPackage.COMPONENT__OUTPUTS:
+                                return outputs != null && !outputs.isEmpty();
+                        case CftPackage.COMPONENT__COMPONENT_DEFINITION:
+                                return componentDefinition != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //ComponentImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ConnectionImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ConnectionImpl.java
new file mode 100644
index 00000000..7506e4d7
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ConnectionImpl.java
@@ -0,0 +1,289 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Connection</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ConnectionImpl#getInput <em>Input</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ConnectionImpl#getOutput <em>Output</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ConnectionImpl extends MinimalEObjectImpl.Container implements Connection {
+        /**
+         * The cached value of the '{@link #getOutput() <em>Output</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getOutput()
+         * @generated
+         * @ordered
+         */
+        protected Output output;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ConnectionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CftPackage.Literals.CONNECTION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Input getInput() {
+                if (eContainerFeatureID() != CftPackage.CONNECTION__INPUT) return null;
+                return (Input)eInternalContainer();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetInput(Input newInput, NotificationChain msgs) {
+                msgs = eBasicSetContainer((InternalEObject)newInput, CftPackage.CONNECTION__INPUT, msgs);
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setInput(Input newInput) {
+                if (newInput != eInternalContainer() || (eContainerFeatureID() != CftPackage.CONNECTION__INPUT && newInput != null)) {
+                        if (EcoreUtil.isAncestor(this, newInput))
+                                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+                        NotificationChain msgs = null;
+                        if (eInternalContainer() != null)
+                                msgs = eBasicRemoveFromContainer(msgs);
+                        if (newInput != null)
+                                msgs = ((InternalEObject)newInput).eInverseAdd(this, CftPackage.INPUT__INCOMING_CONNECTIONS, Input.class, msgs);
+                        msgs = basicSetInput(newInput, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.CONNECTION__INPUT, newInput, newInput));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Output getOutput() {
+                if (output != null && output.eIsProxy()) {
+                        InternalEObject oldOutput = (InternalEObject)output;
+                        output = (Output)eResolveProxy(oldOutput);
+                        if (output != oldOutput) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, CftPackage.CONNECTION__OUTPUT, oldOutput, output));
+                        }
+                }
+                return output;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Output basicGetOutput() {
+                return output;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetOutput(Output newOutput, NotificationChain msgs) {
+                Output oldOutput = output;
+                output = newOutput;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CftPackage.CONNECTION__OUTPUT, oldOutput, newOutput);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setOutput(Output newOutput) {
+                if (newOutput != output) {
+                        NotificationChain msgs = null;
+                        if (output != null)
+                                msgs = ((InternalEObject)output).eInverseRemove(this, CftPackage.OUTPUT__OUTGOING_CONNECTIONS, Output.class, msgs);
+                        if (newOutput != null)
+                                msgs = ((InternalEObject)newOutput).eInverseAdd(this, CftPackage.OUTPUT__OUTGOING_CONNECTIONS, Output.class, msgs);
+                        msgs = basicSetOutput(newOutput, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.CONNECTION__OUTPUT, newOutput, newOutput));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case CftPackage.CONNECTION__INPUT:
+                                if (eInternalContainer() != null)
+                                        msgs = eBasicRemoveFromContainer(msgs);
+                                return basicSetInput((Input)otherEnd, msgs);
+                        case CftPackage.CONNECTION__OUTPUT:
+                                if (output != null)
+                                        msgs = ((InternalEObject)output).eInverseRemove(this, CftPackage.OUTPUT__OUTGOING_CONNECTIONS, Output.class, msgs);
+                                return basicSetOutput((Output)otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case CftPackage.CONNECTION__INPUT:
+                                return basicSetInput(null, msgs);
+                        case CftPackage.CONNECTION__OUTPUT:
+                                return basicSetOutput(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+                switch (eContainerFeatureID()) {
+                        case CftPackage.CONNECTION__INPUT:
+                                return eInternalContainer().eInverseRemove(this, CftPackage.INPUT__INCOMING_CONNECTIONS, Input.class, msgs);
+                }
+                return super.eBasicRemoveFromContainerFeature(msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case CftPackage.CONNECTION__INPUT:
+                                return getInput();
+                        case CftPackage.CONNECTION__OUTPUT:
+                                if (resolve) return getOutput();
+                                return basicGetOutput();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case CftPackage.CONNECTION__INPUT:
+                                setInput((Input)newValue);
+                                return;
+                        case CftPackage.CONNECTION__OUTPUT:
+                                setOutput((Output)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case CftPackage.CONNECTION__INPUT:
+                                setInput((Input)null);
+                                return;
+                        case CftPackage.CONNECTION__OUTPUT:
+                                setOutput((Output)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case CftPackage.CONNECTION__INPUT:
+                                return getInput() != null;
+                        case CftPackage.CONNECTION__OUTPUT:
+                                return output != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //ConnectionImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/EventDeclarationImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/EventDeclarationImpl.java
new file mode 100644
index 00000000..e60a9427
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/EventDeclarationImpl.java
@@ -0,0 +1,163 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Event Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.EventDeclarationImpl#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class EventDeclarationImpl extends MinimalEObjectImpl.Container implements EventDeclaration {
+        /**
+         * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getName()
+         * @generated
+         * @ordered
+         */
+        protected static final String NAME_EDEFAULT = null;
+        /**
+         * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getName()
+         * @generated
+         * @ordered
+         */
+        protected String name = NAME_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected EventDeclarationImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CftPackage.Literals.EVENT_DECLARATION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String getName() {
+                return name;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setName(String newName) {
+                String oldName = name;
+                name = newName;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.EVENT_DECLARATION__NAME, oldName, name));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case CftPackage.EVENT_DECLARATION__NAME:
+                                return getName();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case CftPackage.EVENT_DECLARATION__NAME:
+                                setName((String)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case CftPackage.EVENT_DECLARATION__NAME:
+                                setName(NAME_EDEFAULT);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case CftPackage.EVENT_DECLARATION__NAME:
+                                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+                }
+                return super.eIsSet(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy()) return super.toString();
+
+                StringBuilder result = new StringBuilder(super.toString());
+                result.append(" (name: ");
+                result.append(name);
+                result.append(')');
+                return result.toString();
+        }
+
+} //EventDeclarationImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/EventDefinitionImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/EventDefinitionImpl.java
new file mode 100644
index 00000000..76b79f5b
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/EventDefinitionImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDefinition;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Event Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class EventDefinitionImpl extends EventDeclarationImpl implements EventDefinition {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected EventDefinitionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CftPackage.Literals.EVENT_DEFINITION;
+        }
+
+} //EventDefinitionImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/GateDefinitionImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/GateDefinitionImpl.java
new file mode 100644
index 00000000..2fb9a724
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/GateDefinitionImpl.java
@@ -0,0 +1,133 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.GateDefinition;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Gate Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.GateDefinitionImpl#getInputEvents <em>Input Events</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class GateDefinitionImpl extends EventDefinitionImpl implements GateDefinition {
+        /**
+         * The cached value of the '{@link #getInputEvents() <em>Input Events</em>}' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getInputEvents()
+         * @generated
+         * @ordered
+         */
+        protected EList<EventDeclaration> inputEvents;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected GateDefinitionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CftPackage.Literals.GATE_DEFINITION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EList<EventDeclaration> getInputEvents() {
+                if (inputEvents == null) {
+                        inputEvents = new EObjectResolvingEList<EventDeclaration>(EventDeclaration.class, this, CftPackage.GATE_DEFINITION__INPUT_EVENTS);
+                }
+                return inputEvents;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case CftPackage.GATE_DEFINITION__INPUT_EVENTS:
+                                return getInputEvents();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case CftPackage.GATE_DEFINITION__INPUT_EVENTS:
+                                getInputEvents().clear();
+                                getInputEvents().addAll((Collection<? extends EventDeclaration>)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case CftPackage.GATE_DEFINITION__INPUT_EVENTS:
+                                getInputEvents().clear();
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case CftPackage.GATE_DEFINITION__INPUT_EVENTS:
+                                return inputEvents != null && !inputEvents.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //GateDefinitionImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/InputImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/InputImpl.java
new file mode 100644
index 00000000..eda5fea0
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/InputImpl.java
@@ -0,0 +1,309 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.IntputEvent;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Input</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.InputImpl#getIntputEvent <em>Intput Event</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.InputImpl#getComponent <em>Component</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.InputImpl#getIncomingConnections <em>Incoming Connections</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class InputImpl extends MinimalEObjectImpl.Container implements Input {
+        /**
+         * The cached value of the '{@link #getIntputEvent() <em>Intput Event</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getIntputEvent()
+         * @generated
+         * @ordered
+         */
+        protected IntputEvent intputEvent;
+
+        /**
+         * The cached value of the '{@link #getIncomingConnections() <em>Incoming Connections</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getIncomingConnections()
+         * @generated
+         * @ordered
+         */
+        protected EList<Connection> incomingConnections;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected InputImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CftPackage.Literals.INPUT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public IntputEvent getIntputEvent() {
+                if (intputEvent != null && intputEvent.eIsProxy()) {
+                        InternalEObject oldIntputEvent = (InternalEObject)intputEvent;
+                        intputEvent = (IntputEvent)eResolveProxy(oldIntputEvent);
+                        if (intputEvent != oldIntputEvent) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, CftPackage.INPUT__INTPUT_EVENT, oldIntputEvent, intputEvent));
+                        }
+                }
+                return intputEvent;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public IntputEvent basicGetIntputEvent() {
+                return intputEvent;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setIntputEvent(IntputEvent newIntputEvent) {
+                IntputEvent oldIntputEvent = intputEvent;
+                intputEvent = newIntputEvent;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.INPUT__INTPUT_EVENT, oldIntputEvent, intputEvent));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Component getComponent() {
+                if (eContainerFeatureID() != CftPackage.INPUT__COMPONENT) return null;
+                return (Component)eInternalContainer();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetComponent(Component newComponent, NotificationChain msgs) {
+                msgs = eBasicSetContainer((InternalEObject)newComponent, CftPackage.INPUT__COMPONENT, msgs);
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setComponent(Component newComponent) {
+                if (newComponent != eInternalContainer() || (eContainerFeatureID() != CftPackage.INPUT__COMPONENT && newComponent != null)) {
+                        if (EcoreUtil.isAncestor(this, newComponent))
+                                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+                        NotificationChain msgs = null;
+                        if (eInternalContainer() != null)
+                                msgs = eBasicRemoveFromContainer(msgs);
+                        if (newComponent != null)
+                                msgs = ((InternalEObject)newComponent).eInverseAdd(this, CftPackage.COMPONENT__INPUTS, Component.class, msgs);
+                        msgs = basicSetComponent(newComponent, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.INPUT__COMPONENT, newComponent, newComponent));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EList<Connection> getIncomingConnections() {
+                if (incomingConnections == null) {
+                        incomingConnections = new EObjectContainmentWithInverseEList<Connection>(Connection.class, this, CftPackage.INPUT__INCOMING_CONNECTIONS, CftPackage.CONNECTION__INPUT);
+                }
+                return incomingConnections;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case CftPackage.INPUT__COMPONENT:
+                                if (eInternalContainer() != null)
+                                        msgs = eBasicRemoveFromContainer(msgs);
+                                return basicSetComponent((Component)otherEnd, msgs);
+                        case CftPackage.INPUT__INCOMING_CONNECTIONS:
+                                return ((InternalEList<InternalEObject>)(InternalEList<?>)getIncomingConnections()).basicAdd(otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case CftPackage.INPUT__COMPONENT:
+                                return basicSetComponent(null, msgs);
+                        case CftPackage.INPUT__INCOMING_CONNECTIONS:
+                                return ((InternalEList<?>)getIncomingConnections()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+                switch (eContainerFeatureID()) {
+                        case CftPackage.INPUT__COMPONENT:
+                                return eInternalContainer().eInverseRemove(this, CftPackage.COMPONENT__INPUTS, Component.class, msgs);
+                }
+                return super.eBasicRemoveFromContainerFeature(msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case CftPackage.INPUT__INTPUT_EVENT:
+                                if (resolve) return getIntputEvent();
+                                return basicGetIntputEvent();
+                        case CftPackage.INPUT__COMPONENT:
+                                return getComponent();
+                        case CftPackage.INPUT__INCOMING_CONNECTIONS:
+                                return getIncomingConnections();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case CftPackage.INPUT__INTPUT_EVENT:
+                                setIntputEvent((IntputEvent)newValue);
+                                return;
+                        case CftPackage.INPUT__COMPONENT:
+                                setComponent((Component)newValue);
+                                return;
+                        case CftPackage.INPUT__INCOMING_CONNECTIONS:
+                                getIncomingConnections().clear();
+                                getIncomingConnections().addAll((Collection<? extends Connection>)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case CftPackage.INPUT__INTPUT_EVENT:
+                                setIntputEvent((IntputEvent)null);
+                                return;
+                        case CftPackage.INPUT__COMPONENT:
+                                setComponent((Component)null);
+                                return;
+                        case CftPackage.INPUT__INCOMING_CONNECTIONS:
+                                getIncomingConnections().clear();
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case CftPackage.INPUT__INTPUT_EVENT:
+                                return intputEvent != null;
+                        case CftPackage.INPUT__COMPONENT:
+                                return getComponent() != null;
+                        case CftPackage.INPUT__INCOMING_CONNECTIONS:
+                                return incomingConnections != null && !incomingConnections.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //InputImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/IntputEventImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/IntputEventImpl.java
new file mode 100644
index 00000000..ea22452f
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/IntputEventImpl.java
@@ -0,0 +1,164 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.IntputEvent;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Intput Event</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.IntputEventImpl#isMultiple <em>Multiple</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class IntputEventImpl extends EventDeclarationImpl implements IntputEvent {
+        /**
+         * The default value of the '{@link #isMultiple() <em>Multiple</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #isMultiple()
+         * @generated
+         * @ordered
+         */
+        protected static final boolean MULTIPLE_EDEFAULT = false;
+
+        /**
+         * The cached value of the '{@link #isMultiple() <em>Multiple</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #isMultiple()
+         * @generated
+         * @ordered
+         */
+        protected boolean multiple = MULTIPLE_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected IntputEventImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CftPackage.Literals.INTPUT_EVENT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean isMultiple() {
+                return multiple;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setMultiple(boolean newMultiple) {
+                boolean oldMultiple = multiple;
+                multiple = newMultiple;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.INTPUT_EVENT__MULTIPLE, oldMultiple, multiple));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case CftPackage.INTPUT_EVENT__MULTIPLE:
+                                return isMultiple();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case CftPackage.INTPUT_EVENT__MULTIPLE:
+                                setMultiple((Boolean)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case CftPackage.INTPUT_EVENT__MULTIPLE:
+                                setMultiple(MULTIPLE_EDEFAULT);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case CftPackage.INTPUT_EVENT__MULTIPLE:
+                                return multiple != MULTIPLE_EDEFAULT;
+                }
+                return super.eIsSet(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy()) return super.toString();
+
+                StringBuilder result = new StringBuilder(super.toString());
+                result.append(" (multiple: ");
+                result.append(multiple);
+                result.append(')');
+                return result.toString();
+        }
+
+} //IntputEventImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/KOfMGateDefinitionImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/KOfMGateDefinitionImpl.java
new file mode 100644
index 00000000..fed17513
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/KOfMGateDefinitionImpl.java
@@ -0,0 +1,220 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>KOf MGate Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.KOfMGateDefinitionImpl#getK <em>K</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.KOfMGateDefinitionImpl#getM <em>M</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class KOfMGateDefinitionImpl extends GateDefinitionImpl implements KOfMGateDefinition {
+        /**
+         * The default value of the '{@link #getK() <em>K</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getK()
+         * @generated
+         * @ordered
+         */
+        protected static final int K_EDEFAULT = 0;
+
+        /**
+         * The cached value of the '{@link #getK() <em>K</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getK()
+         * @generated
+         * @ordered
+         */
+        protected int k = K_EDEFAULT;
+
+        /**
+         * The default value of the '{@link #getM() <em>M</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getM()
+         * @generated
+         * @ordered
+         */
+        protected static final int M_EDEFAULT = 0;
+
+        /**
+         * The cached value of the '{@link #getM() <em>M</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getM()
+         * @generated
+         * @ordered
+         */
+        protected int m = M_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected KOfMGateDefinitionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CftPackage.Literals.KOF_MGATE_DEFINITION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public int getK() {
+                return k;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setK(int newK) {
+                int oldK = k;
+                k = newK;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.KOF_MGATE_DEFINITION__K, oldK, k));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public int getM() {
+                return m;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setM(int newM) {
+                int oldM = m;
+                m = newM;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.KOF_MGATE_DEFINITION__M, oldM, m));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case CftPackage.KOF_MGATE_DEFINITION__K:
+                                return getK();
+                        case CftPackage.KOF_MGATE_DEFINITION__M:
+                                return getM();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case CftPackage.KOF_MGATE_DEFINITION__K:
+                                setK((Integer)newValue);
+                                return;
+                        case CftPackage.KOF_MGATE_DEFINITION__M:
+                                setM((Integer)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case CftPackage.KOF_MGATE_DEFINITION__K:
+                                setK(K_EDEFAULT);
+                                return;
+                        case CftPackage.KOF_MGATE_DEFINITION__M:
+                                setM(M_EDEFAULT);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case CftPackage.KOF_MGATE_DEFINITION__K:
+                                return k != K_EDEFAULT;
+                        case CftPackage.KOF_MGATE_DEFINITION__M:
+                                return m != M_EDEFAULT;
+                }
+                return super.eIsSet(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy()) return super.toString();
+
+                StringBuilder result = new StringBuilder(super.toString());
+                result.append(" (k: ");
+                result.append(k);
+                result.append(", m: ");
+                result.append(m);
+                result.append(')');
+                return result.toString();
+        }
+
+} //KOfMGateDefinitionImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/OrGateDefinitionImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/OrGateDefinitionImpl.java
new file mode 100644
index 00000000..d2275f60
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/OrGateDefinitionImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.OrGateDefinition;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Or Gate Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class OrGateDefinitionImpl extends GateDefinitionImpl implements OrGateDefinition {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected OrGateDefinitionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CftPackage.Literals.OR_GATE_DEFINITION;
+        }
+
+} //OrGateDefinitionImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/OutputImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/OutputImpl.java
new file mode 100644
index 00000000..31a81afe
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/OutputImpl.java
@@ -0,0 +1,309 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Output</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.OutputImpl#getEventDeclaration <em>Event Declaration</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.OutputImpl#getOutgoingConnections <em>Outgoing Connections</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.OutputImpl#getComponent <em>Component</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class OutputImpl extends MinimalEObjectImpl.Container implements Output {
+        /**
+         * The cached value of the '{@link #getEventDeclaration() <em>Event Declaration</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getEventDeclaration()
+         * @generated
+         * @ordered
+         */
+        protected EventDeclaration eventDeclaration;
+
+        /**
+         * The cached value of the '{@link #getOutgoingConnections() <em>Outgoing Connections</em>}' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getOutgoingConnections()
+         * @generated
+         * @ordered
+         */
+        protected EList<Connection> outgoingConnections;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected OutputImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CftPackage.Literals.OUTPUT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EventDeclaration getEventDeclaration() {
+                if (eventDeclaration != null && eventDeclaration.eIsProxy()) {
+                        InternalEObject oldEventDeclaration = (InternalEObject)eventDeclaration;
+                        eventDeclaration = (EventDeclaration)eResolveProxy(oldEventDeclaration);
+                        if (eventDeclaration != oldEventDeclaration) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, CftPackage.OUTPUT__EVENT_DECLARATION, oldEventDeclaration, eventDeclaration));
+                        }
+                }
+                return eventDeclaration;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EventDeclaration basicGetEventDeclaration() {
+                return eventDeclaration;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setEventDeclaration(EventDeclaration newEventDeclaration) {
+                EventDeclaration oldEventDeclaration = eventDeclaration;
+                eventDeclaration = newEventDeclaration;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.OUTPUT__EVENT_DECLARATION, oldEventDeclaration, eventDeclaration));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EList<Connection> getOutgoingConnections() {
+                if (outgoingConnections == null) {
+                        outgoingConnections = new EObjectWithInverseResolvingEList<Connection>(Connection.class, this, CftPackage.OUTPUT__OUTGOING_CONNECTIONS, CftPackage.CONNECTION__OUTPUT);
+                }
+                return outgoingConnections;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Component getComponent() {
+                if (eContainerFeatureID() != CftPackage.OUTPUT__COMPONENT) return null;
+                return (Component)eInternalContainer();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetComponent(Component newComponent, NotificationChain msgs) {
+                msgs = eBasicSetContainer((InternalEObject)newComponent, CftPackage.OUTPUT__COMPONENT, msgs);
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setComponent(Component newComponent) {
+                if (newComponent != eInternalContainer() || (eContainerFeatureID() != CftPackage.OUTPUT__COMPONENT && newComponent != null)) {
+                        if (EcoreUtil.isAncestor(this, newComponent))
+                                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+                        NotificationChain msgs = null;
+                        if (eInternalContainer() != null)
+                                msgs = eBasicRemoveFromContainer(msgs);
+                        if (newComponent != null)
+                                msgs = ((InternalEObject)newComponent).eInverseAdd(this, CftPackage.COMPONENT__OUTPUTS, Component.class, msgs);
+                        msgs = basicSetComponent(newComponent, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.OUTPUT__COMPONENT, newComponent, newComponent));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case CftPackage.OUTPUT__OUTGOING_CONNECTIONS:
+                                return ((InternalEList<InternalEObject>)(InternalEList<?>)getOutgoingConnections()).basicAdd(otherEnd, msgs);
+                        case CftPackage.OUTPUT__COMPONENT:
+                                if (eInternalContainer() != null)
+                                        msgs = eBasicRemoveFromContainer(msgs);
+                                return basicSetComponent((Component)otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case CftPackage.OUTPUT__OUTGOING_CONNECTIONS:
+                                return ((InternalEList<?>)getOutgoingConnections()).basicRemove(otherEnd, msgs);
+                        case CftPackage.OUTPUT__COMPONENT:
+                                return basicSetComponent(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+                switch (eContainerFeatureID()) {
+                        case CftPackage.OUTPUT__COMPONENT:
+                                return eInternalContainer().eInverseRemove(this, CftPackage.COMPONENT__OUTPUTS, Component.class, msgs);
+                }
+                return super.eBasicRemoveFromContainerFeature(msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case CftPackage.OUTPUT__EVENT_DECLARATION:
+                                if (resolve) return getEventDeclaration();
+                                return basicGetEventDeclaration();
+                        case CftPackage.OUTPUT__OUTGOING_CONNECTIONS:
+                                return getOutgoingConnections();
+                        case CftPackage.OUTPUT__COMPONENT:
+                                return getComponent();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case CftPackage.OUTPUT__EVENT_DECLARATION:
+                                setEventDeclaration((EventDeclaration)newValue);
+                                return;
+                        case CftPackage.OUTPUT__OUTGOING_CONNECTIONS:
+                                getOutgoingConnections().clear();
+                                getOutgoingConnections().addAll((Collection<? extends Connection>)newValue);
+                                return;
+                        case CftPackage.OUTPUT__COMPONENT:
+                                setComponent((Component)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case CftPackage.OUTPUT__EVENT_DECLARATION:
+                                setEventDeclaration((EventDeclaration)null);
+                                return;
+                        case CftPackage.OUTPUT__OUTGOING_CONNECTIONS:
+                                getOutgoingConnections().clear();
+                                return;
+                        case CftPackage.OUTPUT__COMPONENT:
+                                setComponent((Component)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case CftPackage.OUTPUT__EVENT_DECLARATION:
+                                return eventDeclaration != null;
+                        case CftPackage.OUTPUT__OUTGOING_CONNECTIONS:
+                                return outgoingConnections != null && !outgoingConnections.isEmpty();
+                        case CftPackage.OUTPUT__COMPONENT:
+                                return getComponent() != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //OutputImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/util/CftAdapterFactory.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/util/CftAdapterFactory.java
new file mode 100644
index 00000000..c6b82734
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/util/CftAdapterFactory.java
@@ -0,0 +1,354 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.util;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.*;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage
+ * @generated
+ */
+public class CftAdapterFactory extends AdapterFactoryImpl {
+        /**
+         * The cached model package.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected static CftPackage modelPackage;
+
+        /**
+         * Creates an instance of the adapter factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public CftAdapterFactory() {
+                if (modelPackage == null) {
+                        modelPackage = CftPackage.eINSTANCE;
+                }
+        }
+
+        /**
+         * Returns whether this factory is applicable for the type of the object.
+         * <!-- begin-user-doc -->
+         * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+         * <!-- end-user-doc -->
+         * @return whether this factory is applicable for the type of the object.
+         * @generated
+         */
+        @Override
+        public boolean isFactoryForType(Object object) {
+                if (object == modelPackage) {
+                        return true;
+                }
+                if (object instanceof EObject) {
+                        return ((EObject)object).eClass().getEPackage() == modelPackage;
+                }
+                return false;
+        }
+
+        /**
+         * The switch that delegates to the <code>createXXX</code> methods.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected CftSwitch<Adapter> modelSwitch =
+                new CftSwitch<Adapter>() {
+                        @Override
+                        public Adapter caseComponentDefinition(ComponentDefinition object) {
+                                return createComponentDefinitionAdapter();
+                        }
+                        @Override
+                        public Adapter caseEventDefinition(EventDefinition object) {
+                                return createEventDefinitionAdapter();
+                        }
+                        @Override
+                        public Adapter caseGateDefinition(GateDefinition object) {
+                                return createGateDefinitionAdapter();
+                        }
+                        @Override
+                        public Adapter caseBasicEventDefinition(BasicEventDefinition object) {
+                                return createBasicEventDefinitionAdapter();
+                        }
+                        @Override
+                        public Adapter caseIntputEvent(IntputEvent object) {
+                                return createIntputEventAdapter();
+                        }
+                        @Override
+                        public Adapter caseEventDeclaration(EventDeclaration object) {
+                                return createEventDeclarationAdapter();
+                        }
+                        @Override
+                        public Adapter caseAndGateDefinition(AndGateDefinition object) {
+                                return createAndGateDefinitionAdapter();
+                        }
+                        @Override
+                        public Adapter caseOrGateDefinition(OrGateDefinition object) {
+                                return createOrGateDefinitionAdapter();
+                        }
+                        @Override
+                        public Adapter caseKOfMGateDefinition(KOfMGateDefinition object) {
+                                return createKOfMGateDefinitionAdapter();
+                        }
+                        @Override
+                        public Adapter caseComponentFaultTree(ComponentFaultTree object) {
+                                return createComponentFaultTreeAdapter();
+                        }
+                        @Override
+                        public Adapter caseComponent(Component object) {
+                                return createComponentAdapter();
+                        }
+                        @Override
+                        public Adapter caseInput(Input object) {
+                                return createInputAdapter();
+                        }
+                        @Override
+                        public Adapter caseOutput(Output object) {
+                                return createOutputAdapter();
+                        }
+                        @Override
+                        public Adapter caseConnection(Connection object) {
+                                return createConnectionAdapter();
+                        }
+                        @Override
+                        public Adapter defaultCase(EObject object) {
+                                return createEObjectAdapter();
+                        }
+                };
+
+        /**
+         * Creates an adapter for the <code>target</code>.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param target the object to adapt.
+         * @return the adapter for the <code>target</code>.
+         * @generated
+         */
+        @Override
+        public Adapter createAdapter(Notifier target) {
+                return modelSwitch.doSwitch((EObject)target);
+        }
+
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition <em>Component Definition</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition
+         * @generated
+         */
+        public Adapter createComponentDefinitionAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDefinition <em>Event Definition</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDefinition
+         * @generated
+         */
+        public Adapter createEventDefinitionAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.GateDefinition <em>Gate Definition</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.GateDefinition
+         * @generated
+         */
+        public Adapter createGateDefinitionAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.BasicEventDefinition <em>Basic Event Definition</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.BasicEventDefinition
+         * @generated
+         */
+        public Adapter createBasicEventDefinitionAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.IntputEvent <em>Intput Event</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.IntputEvent
+         * @generated
+         */
+        public Adapter createIntputEventAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration <em>Event Declaration</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration
+         * @generated
+         */
+        public Adapter createEventDeclarationAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.AndGateDefinition <em>And Gate Definition</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.AndGateDefinition
+         * @generated
+         */
+        public Adapter createAndGateDefinitionAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.OrGateDefinition <em>Or Gate Definition</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.OrGateDefinition
+         * @generated
+         */
+        public Adapter createOrGateDefinitionAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition <em>KOf MGate Definition</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition
+         * @generated
+         */
+        public Adapter createKOfMGateDefinitionAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentFaultTree <em>Component Fault Tree</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentFaultTree
+         * @generated
+         */
+        public Adapter createComponentFaultTreeAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component <em>Component</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component
+         * @generated
+         */
+        public Adapter createComponentAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input <em>Input</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input
+         * @generated
+         */
+        public Adapter createInputAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output <em>Output</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output
+         * @generated
+         */
+        public Adapter createOutputAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection <em>Connection</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection
+         * @generated
+         */
+        public Adapter createConnectionAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for the default case.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @generated
+         */
+        public Adapter createEObjectAdapter() {
+                return null;
+        }
+
+} //CftAdapterFactory
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/util/CftSwitch.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/util/CftSwitch.java
new file mode 100644
index 00000000..f2ec9ffb
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/util/CftSwitch.java
@@ -0,0 +1,398 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.util;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.*;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage
+ * @generated
+ */
+public class CftSwitch<T> extends Switch<T> {
+        /**
+         * The cached model package
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected static CftPackage modelPackage;
+
+        /**
+         * Creates an instance of the switch.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public CftSwitch() {
+                if (modelPackage == null) {
+                        modelPackage = CftPackage.eINSTANCE;
+                }
+        }
+
+        /**
+         * Checks whether this is a switch for the given package.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param ePackage the package in question.
+         * @return whether this is a switch for the given package.
+         * @generated
+         */
+        @Override
+        protected boolean isSwitchFor(EPackage ePackage) {
+                return ePackage == modelPackage;
+        }
+
+        /**
+         * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the first non-null result returned by a <code>caseXXX</code> call.
+         * @generated
+         */
+        @Override
+        protected T doSwitch(int classifierID, EObject theEObject) {
+                switch (classifierID) {
+                        case CftPackage.COMPONENT_DEFINITION: {
+                                ComponentDefinition componentDefinition = (ComponentDefinition)theEObject;
+                                T result = caseComponentDefinition(componentDefinition);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case CftPackage.EVENT_DEFINITION: {
+                                EventDefinition eventDefinition = (EventDefinition)theEObject;
+                                T result = caseEventDefinition(eventDefinition);
+                                if (result == null) result = caseEventDeclaration(eventDefinition);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case CftPackage.GATE_DEFINITION: {
+                                GateDefinition gateDefinition = (GateDefinition)theEObject;
+                                T result = caseGateDefinition(gateDefinition);
+                                if (result == null) result = caseEventDefinition(gateDefinition);
+                                if (result == null) result = caseEventDeclaration(gateDefinition);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case CftPackage.BASIC_EVENT_DEFINITION: {
+                                BasicEventDefinition basicEventDefinition = (BasicEventDefinition)theEObject;
+                                T result = caseBasicEventDefinition(basicEventDefinition);
+                                if (result == null) result = caseEventDefinition(basicEventDefinition);
+                                if (result == null) result = caseEventDeclaration(basicEventDefinition);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case CftPackage.INTPUT_EVENT: {
+                                IntputEvent intputEvent = (IntputEvent)theEObject;
+                                T result = caseIntputEvent(intputEvent);
+                                if (result == null) result = caseEventDeclaration(intputEvent);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case CftPackage.EVENT_DECLARATION: {
+                                EventDeclaration eventDeclaration = (EventDeclaration)theEObject;
+                                T result = caseEventDeclaration(eventDeclaration);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case CftPackage.AND_GATE_DEFINITION: {
+                                AndGateDefinition andGateDefinition = (AndGateDefinition)theEObject;
+                                T result = caseAndGateDefinition(andGateDefinition);
+                                if (result == null) result = caseGateDefinition(andGateDefinition);
+                                if (result == null) result = caseEventDefinition(andGateDefinition);
+                                if (result == null) result = caseEventDeclaration(andGateDefinition);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case CftPackage.OR_GATE_DEFINITION: {
+                                OrGateDefinition orGateDefinition = (OrGateDefinition)theEObject;
+                                T result = caseOrGateDefinition(orGateDefinition);
+                                if (result == null) result = caseGateDefinition(orGateDefinition);
+                                if (result == null) result = caseEventDefinition(orGateDefinition);
+                                if (result == null) result = caseEventDeclaration(orGateDefinition);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case CftPackage.KOF_MGATE_DEFINITION: {
+                                KOfMGateDefinition kOfMGateDefinition = (KOfMGateDefinition)theEObject;
+                                T result = caseKOfMGateDefinition(kOfMGateDefinition);
+                                if (result == null) result = caseGateDefinition(kOfMGateDefinition);
+                                if (result == null) result = caseEventDefinition(kOfMGateDefinition);
+                                if (result == null) result = caseEventDeclaration(kOfMGateDefinition);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case CftPackage.COMPONENT_FAULT_TREE: {
+                                ComponentFaultTree componentFaultTree = (ComponentFaultTree)theEObject;
+                                T result = caseComponentFaultTree(componentFaultTree);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case CftPackage.COMPONENT: {
+                                Component component = (Component)theEObject;
+                                T result = caseComponent(component);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case CftPackage.INPUT: {
+                                Input input = (Input)theEObject;
+                                T result = caseInput(input);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case CftPackage.OUTPUT: {
+                                Output output = (Output)theEObject;
+                                T result = caseOutput(output);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case CftPackage.CONNECTION: {
+                                Connection connection = (Connection)theEObject;
+                                T result = caseConnection(connection);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        default: return defaultCase(theEObject);
+                }
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Component Definition</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Component Definition</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseComponentDefinition(ComponentDefinition object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Event Definition</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Event Definition</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseEventDefinition(EventDefinition object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Gate Definition</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Gate Definition</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseGateDefinition(GateDefinition object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Basic Event Definition</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Basic Event Definition</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseBasicEventDefinition(BasicEventDefinition object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Intput Event</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Intput Event</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseIntputEvent(IntputEvent object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Event Declaration</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Event Declaration</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseEventDeclaration(EventDeclaration object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>And Gate Definition</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>And Gate Definition</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseAndGateDefinition(AndGateDefinition object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Or Gate Definition</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Or Gate Definition</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseOrGateDefinition(OrGateDefinition object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>KOf MGate Definition</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>KOf MGate Definition</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseKOfMGateDefinition(KOfMGateDefinition object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Component Fault Tree</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Component Fault Tree</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseComponentFaultTree(ComponentFaultTree object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Component</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Component</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseComponent(Component object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Input</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Input</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseInput(Input object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Output</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Output</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseOutput(Output object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Connection</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Connection</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseConnection(Connection object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch, but this is the last case anyway.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+         * @generated
+         */
+        @Override
+        public T defaultCase(EObject object) {
+                return null;
+        }
+
+} //CftSwitch
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/AndGate.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/AndGate.java
new file mode 100644
index 00000000..5591557c
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/AndGate.java
@@ -0,0 +1,17 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>And Gate</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage#getAndGate()
+ * @model
+ * @generated
+ */
+public interface AndGate extends Gate {
+} // AndGate
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/BasicEvent.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/BasicEvent.java
new file mode 100644
index 00000000..acfc635b
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/BasicEvent.java
@@ -0,0 +1,49 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Basic Event</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.BasicEvent#getDistribution <em>Distribution</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage#getBasicEvent()
+ * @model
+ * @generated
+ */
+public interface BasicEvent extends Event {
+        /**
+         * Returns the value of the '<em><b>Distribution</b></em>' containment reference.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Distribution</em>' containment reference isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Distribution</em>' containment reference.
+         * @see #setDistribution(Distribution)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage#getBasicEvent_Distribution()
+         * @model containment="true" required="true"
+         * @generated
+         */
+        Distribution getDistribution();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.BasicEvent#getDistribution <em>Distribution</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Distribution</em>' containment reference.
+         * @see #getDistribution()
+         * @generated
+         */
+        void setDistribution(Distribution value);
+
+} // BasicEvent
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/ConstantDistribution.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/ConstantDistribution.java
new file mode 100644
index 00000000..873c1fd3
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/ConstantDistribution.java
@@ -0,0 +1,49 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Constant Distribution</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ConstantDistribution#getP <em>P</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage#getConstantDistribution()
+ * @model
+ * @generated
+ */
+public interface ConstantDistribution extends Distribution {
+        /**
+         * Returns the value of the '<em><b>P</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>P</em>' attribute isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>P</em>' attribute.
+         * @see #setP(double)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage#getConstantDistribution_P()
+         * @model
+         * @generated
+         */
+        double getP();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ConstantDistribution#getP <em>P</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>P</em>' attribute.
+         * @see #getP()
+         * @generated
+         */
+        void setP(double value);
+
+} // ConstantDistribution
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/Distribution.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/Distribution.java
new file mode 100644
index 00000000..4435f5ef
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/Distribution.java
@@ -0,0 +1,18 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Distribution</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage#getDistribution()
+ * @model abstract="true"
+ * @generated
+ */
+public interface Distribution extends EObject {
+} // Distribution
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/Event.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/Event.java
new file mode 100644
index 00000000..186e23b9
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/Event.java
@@ -0,0 +1,50 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Event</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Event#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage#getEvent()
+ * @model abstract="true"
+ * @generated
+ */
+public interface Event extends EObject {
+        /**
+         * Returns the value of the '<em><b>Name</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Name</em>' attribute isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Name</em>' attribute.
+         * @see #setName(String)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage#getEvent_Name()
+         * @model
+         * @generated
+         */
+        String getName();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Event#getName <em>Name</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Name</em>' attribute.
+         * @see #getName()
+         * @generated
+         */
+        void setName(String value);
+
+} // Event
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/ExponentialDistribution.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/ExponentialDistribution.java
new file mode 100644
index 00000000..7fdd448b
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/ExponentialDistribution.java
@@ -0,0 +1,49 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Exponential Distribution</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ExponentialDistribution#getLambda <em>Lambda</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage#getExponentialDistribution()
+ * @model
+ * @generated
+ */
+public interface ExponentialDistribution extends Distribution {
+        /**
+         * Returns the value of the '<em><b>Lambda</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Lambda</em>' attribute isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Lambda</em>' attribute.
+         * @see #setLambda(double)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage#getExponentialDistribution_Lambda()
+         * @model
+         * @generated
+         */
+        double getLambda();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ExponentialDistribution#getLambda <em>Lambda</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Lambda</em>' attribute.
+         * @see #getLambda()
+         * @generated
+         */
+        void setLambda(double value);
+
+} // ExponentialDistribution
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/FaultTree.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/FaultTree.java
new file mode 100644
index 00000000..247a9918
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/FaultTree.java
@@ -0,0 +1,69 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Fault Tree</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FaultTree#getEvents <em>Events</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FaultTree#getTopEvent <em>Top Event</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage#getFaultTree()
+ * @model
+ * @generated
+ */
+public interface FaultTree extends EObject {
+        /**
+         * Returns the value of the '<em><b>Events</b></em>' containment reference list.
+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Event}.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Events</em>' containment reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Events</em>' containment reference list.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage#getFaultTree_Events()
+         * @model containment="true"
+         * @generated
+         */
+        EList<Event> getEvents();
+
+        /**
+         * Returns the value of the '<em><b>Top Event</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Top Event</em>' reference isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Top Event</em>' reference.
+         * @see #setTopEvent(Event)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage#getFaultTree_TopEvent()
+         * @model required="true"
+         * @generated
+         */
+        Event getTopEvent();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FaultTree#getTopEvent <em>Top Event</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Top Event</em>' reference.
+         * @see #getTopEvent()
+         * @generated
+         */
+        void setTopEvent(Event value);
+
+} // FaultTree
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/FtFactory.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/FtFactory.java
new file mode 100644
index 00000000..20b71b1a
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/FtFactory.java
@@ -0,0 +1,96 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage
+ * @generated
+ */
+public interface FtFactory extends EFactory {
+        /**
+         * The singleton instance of the factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        FtFactory eINSTANCE = hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtFactoryImpl.init();
+
+        /**
+         * Returns a new object of class '<em>Fault Tree</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Fault Tree</em>'.
+         * @generated
+         */
+        FaultTree createFaultTree();
+
+        /**
+         * Returns a new object of class '<em>Basic Event</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Basic Event</em>'.
+         * @generated
+         */
+        BasicEvent createBasicEvent();
+
+        /**
+         * Returns a new object of class '<em>Constant Distribution</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Constant Distribution</em>'.
+         * @generated
+         */
+        ConstantDistribution createConstantDistribution();
+
+        /**
+         * Returns a new object of class '<em>Exponential Distribution</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Exponential Distribution</em>'.
+         * @generated
+         */
+        ExponentialDistribution createExponentialDistribution();
+
+        /**
+         * Returns a new object of class '<em>And Gate</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>And Gate</em>'.
+         * @generated
+         */
+        AndGate createAndGate();
+
+        /**
+         * Returns a new object of class '<em>Or Gate</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Or Gate</em>'.
+         * @generated
+         */
+        OrGate createOrGate();
+
+        /**
+         * Returns a new object of class '<em>KOf MGate</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>KOf MGate</em>'.
+         * @generated
+         */
+        KOfMGate createKOfMGate();
+
+        /**
+         * Returns the package supported by this factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the package supported by this factory.
+         * @generated
+         */
+        FtPackage getFtPackage();
+
+} //FtFactory
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/FtPackage.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/FtPackage.java
new file mode 100644
index 00000000..e376063c
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/FtPackage.java
@@ -0,0 +1,889 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface FtPackage extends EPackage {
+        /**
+         * The package name.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        String eNAME = "ft";
+
+        /**
+         * The package namespace URI.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        String eNS_URI = "http://www.bme.hu/mit/inf/dslreasoner/faulttree/model/ft";
+
+        /**
+         * The package namespace name.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        String eNS_PREFIX = "ft";
+
+        /**
+         * The singleton instance of the package.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        FtPackage eINSTANCE = hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl.init();
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FaultTreeImpl <em>Fault Tree</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FaultTreeImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl#getFaultTree()
+         * @generated
+         */
+        int FAULT_TREE = 0;
+
+        /**
+         * The feature id for the '<em><b>Events</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int FAULT_TREE__EVENTS = 0;
+
+        /**
+         * The feature id for the '<em><b>Top Event</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int FAULT_TREE__TOP_EVENT = 1;
+
+        /**
+         * The number of structural features of the '<em>Fault Tree</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int FAULT_TREE_FEATURE_COUNT = 2;
+
+        /**
+         * The number of operations of the '<em>Fault Tree</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int FAULT_TREE_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.EventImpl <em>Event</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.EventImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl#getEvent()
+         * @generated
+         */
+        int EVENT = 1;
+
+        /**
+         * The feature id for the '<em><b>Name</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int EVENT__NAME = 0;
+
+        /**
+         * The number of structural features of the '<em>Event</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int EVENT_FEATURE_COUNT = 1;
+
+        /**
+         * The number of operations of the '<em>Event</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int EVENT_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.BasicEventImpl <em>Basic Event</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.BasicEventImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl#getBasicEvent()
+         * @generated
+         */
+        int BASIC_EVENT = 2;
+
+        /**
+         * The feature id for the '<em><b>Name</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int BASIC_EVENT__NAME = EVENT__NAME;
+
+        /**
+         * The feature id for the '<em><b>Distribution</b></em>' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int BASIC_EVENT__DISTRIBUTION = EVENT_FEATURE_COUNT + 0;
+
+        /**
+         * The number of structural features of the '<em>Basic Event</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int BASIC_EVENT_FEATURE_COUNT = EVENT_FEATURE_COUNT + 1;
+
+        /**
+         * The number of operations of the '<em>Basic Event</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int BASIC_EVENT_OPERATION_COUNT = EVENT_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.GateImpl <em>Gate</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.GateImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl#getGate()
+         * @generated
+         */
+        int GATE = 3;
+
+        /**
+         * The feature id for the '<em><b>Name</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int GATE__NAME = EVENT__NAME;
+
+        /**
+         * The feature id for the '<em><b>Input Events</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int GATE__INPUT_EVENTS = EVENT_FEATURE_COUNT + 0;
+
+        /**
+         * The number of structural features of the '<em>Gate</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int GATE_FEATURE_COUNT = EVENT_FEATURE_COUNT + 1;
+
+        /**
+         * The number of operations of the '<em>Gate</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int GATE_OPERATION_COUNT = EVENT_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.DistributionImpl <em>Distribution</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.DistributionImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl#getDistribution()
+         * @generated
+         */
+        int DISTRIBUTION = 4;
+
+        /**
+         * The number of structural features of the '<em>Distribution</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int DISTRIBUTION_FEATURE_COUNT = 0;
+
+        /**
+         * The number of operations of the '<em>Distribution</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int DISTRIBUTION_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.ConstantDistributionImpl <em>Constant Distribution</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.ConstantDistributionImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl#getConstantDistribution()
+         * @generated
+         */
+        int CONSTANT_DISTRIBUTION = 5;
+
+        /**
+         * The feature id for the '<em><b>P</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CONSTANT_DISTRIBUTION__P = DISTRIBUTION_FEATURE_COUNT + 0;
+
+        /**
+         * The number of structural features of the '<em>Constant Distribution</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CONSTANT_DISTRIBUTION_FEATURE_COUNT = DISTRIBUTION_FEATURE_COUNT + 1;
+
+        /**
+         * The number of operations of the '<em>Constant Distribution</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CONSTANT_DISTRIBUTION_OPERATION_COUNT = DISTRIBUTION_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.ExponentialDistributionImpl <em>Exponential Distribution</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.ExponentialDistributionImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl#getExponentialDistribution()
+         * @generated
+         */
+        int EXPONENTIAL_DISTRIBUTION = 6;
+
+        /**
+         * The feature id for the '<em><b>Lambda</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int EXPONENTIAL_DISTRIBUTION__LAMBDA = DISTRIBUTION_FEATURE_COUNT + 0;
+
+        /**
+         * The number of structural features of the '<em>Exponential Distribution</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int EXPONENTIAL_DISTRIBUTION_FEATURE_COUNT = DISTRIBUTION_FEATURE_COUNT + 1;
+
+        /**
+         * The number of operations of the '<em>Exponential Distribution</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int EXPONENTIAL_DISTRIBUTION_OPERATION_COUNT = DISTRIBUTION_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.AndGateImpl <em>And Gate</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.AndGateImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl#getAndGate()
+         * @generated
+         */
+        int AND_GATE = 7;
+
+        /**
+         * The feature id for the '<em><b>Name</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int AND_GATE__NAME = GATE__NAME;
+
+        /**
+         * The feature id for the '<em><b>Input Events</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int AND_GATE__INPUT_EVENTS = GATE__INPUT_EVENTS;
+
+        /**
+         * The number of structural features of the '<em>And Gate</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int AND_GATE_FEATURE_COUNT = GATE_FEATURE_COUNT + 0;
+
+        /**
+         * The number of operations of the '<em>And Gate</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int AND_GATE_OPERATION_COUNT = GATE_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.OrGateImpl <em>Or Gate</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.OrGateImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl#getOrGate()
+         * @generated
+         */
+        int OR_GATE = 8;
+
+        /**
+         * The feature id for the '<em><b>Name</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int OR_GATE__NAME = GATE__NAME;
+
+        /**
+         * The feature id for the '<em><b>Input Events</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int OR_GATE__INPUT_EVENTS = GATE__INPUT_EVENTS;
+
+        /**
+         * The number of structural features of the '<em>Or Gate</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int OR_GATE_FEATURE_COUNT = GATE_FEATURE_COUNT + 0;
+
+        /**
+         * The number of operations of the '<em>Or Gate</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int OR_GATE_OPERATION_COUNT = GATE_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.KOfMGateImpl <em>KOf MGate</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.KOfMGateImpl
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl#getKOfMGate()
+         * @generated
+         */
+        int KOF_MGATE = 9;
+
+        /**
+         * The feature id for the '<em><b>Name</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int KOF_MGATE__NAME = GATE__NAME;
+
+        /**
+         * The feature id for the '<em><b>Input Events</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int KOF_MGATE__INPUT_EVENTS = GATE__INPUT_EVENTS;
+
+        /**
+         * The feature id for the '<em><b>K</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int KOF_MGATE__K = GATE_FEATURE_COUNT + 0;
+
+        /**
+         * The feature id for the '<em><b>M</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int KOF_MGATE__M = GATE_FEATURE_COUNT + 1;
+
+        /**
+         * The number of structural features of the '<em>KOf MGate</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int KOF_MGATE_FEATURE_COUNT = GATE_FEATURE_COUNT + 2;
+
+        /**
+         * The number of operations of the '<em>KOf MGate</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int KOF_MGATE_OPERATION_COUNT = GATE_OPERATION_COUNT + 0;
+
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FaultTree <em>Fault Tree</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Fault Tree</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FaultTree
+         * @generated
+         */
+        EClass getFaultTree();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FaultTree#getEvents <em>Events</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Events</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FaultTree#getEvents()
+         * @see #getFaultTree()
+         * @generated
+         */
+        EReference getFaultTree_Events();
+
+        /**
+         * Returns the meta object for the reference '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FaultTree#getTopEvent <em>Top Event</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference '<em>Top Event</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FaultTree#getTopEvent()
+         * @see #getFaultTree()
+         * @generated
+         */
+        EReference getFaultTree_TopEvent();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Event <em>Event</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Event</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Event
+         * @generated
+         */
+        EClass getEvent();
+
+        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Event#getName <em>Name</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Name</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Event#getName()
+         * @see #getEvent()
+         * @generated
+         */
+        EAttribute getEvent_Name();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.BasicEvent <em>Basic Event</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Basic Event</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.BasicEvent
+         * @generated
+         */
+        EClass getBasicEvent();
+
+        /**
+         * Returns the meta object for the containment reference '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.BasicEvent#getDistribution <em>Distribution</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference '<em>Distribution</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.BasicEvent#getDistribution()
+         * @see #getBasicEvent()
+         * @generated
+         */
+        EReference getBasicEvent_Distribution();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Gate <em>Gate</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Gate</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Gate
+         * @generated
+         */
+        EClass getGate();
+
+        /**
+         * Returns the meta object for the reference list '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Gate#getInputEvents <em>Input Events</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference list '<em>Input Events</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Gate#getInputEvents()
+         * @see #getGate()
+         * @generated
+         */
+        EReference getGate_InputEvents();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Distribution <em>Distribution</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Distribution</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Distribution
+         * @generated
+         */
+        EClass getDistribution();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ConstantDistribution <em>Constant Distribution</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Constant Distribution</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ConstantDistribution
+         * @generated
+         */
+        EClass getConstantDistribution();
+
+        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ConstantDistribution#getP <em>P</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>P</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ConstantDistribution#getP()
+         * @see #getConstantDistribution()
+         * @generated
+         */
+        EAttribute getConstantDistribution_P();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ExponentialDistribution <em>Exponential Distribution</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Exponential Distribution</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ExponentialDistribution
+         * @generated
+         */
+        EClass getExponentialDistribution();
+
+        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ExponentialDistribution#getLambda <em>Lambda</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Lambda</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ExponentialDistribution#getLambda()
+         * @see #getExponentialDistribution()
+         * @generated
+         */
+        EAttribute getExponentialDistribution_Lambda();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.AndGate <em>And Gate</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>And Gate</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.AndGate
+         * @generated
+         */
+        EClass getAndGate();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.OrGate <em>Or Gate</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Or Gate</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.OrGate
+         * @generated
+         */
+        EClass getOrGate();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.KOfMGate <em>KOf MGate</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>KOf MGate</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.KOfMGate
+         * @generated
+         */
+        EClass getKOfMGate();
+
+        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.KOfMGate#getK <em>K</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>K</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.KOfMGate#getK()
+         * @see #getKOfMGate()
+         * @generated
+         */
+        EAttribute getKOfMGate_K();
+
+        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.KOfMGate#getM <em>M</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>M</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.KOfMGate#getM()
+         * @see #getKOfMGate()
+         * @generated
+         */
+        EAttribute getKOfMGate_M();
+
+        /**
+         * Returns the factory that creates the instances of the model.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the factory that creates the instances of the model.
+         * @generated
+         */
+        FtFactory getFtFactory();
+
+        /**
+         * <!-- begin-user-doc -->
+         * Defines literals for the meta objects that represent
+         * <ul>
+         *   <li>each class,</li>
+         *   <li>each feature of each class,</li>
+         *   <li>each operation of each class,</li>
+         *   <li>each enum,</li>
+         *   <li>and each data type</li>
+         * </ul>
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        interface Literals {
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FaultTreeImpl <em>Fault Tree</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FaultTreeImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl#getFaultTree()
+                 * @generated
+                 */
+                EClass FAULT_TREE = eINSTANCE.getFaultTree();
+
+                /**
+                 * The meta object literal for the '<em><b>Events</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference FAULT_TREE__EVENTS = eINSTANCE.getFaultTree_Events();
+
+                /**
+                 * The meta object literal for the '<em><b>Top Event</b></em>' reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference FAULT_TREE__TOP_EVENT = eINSTANCE.getFaultTree_TopEvent();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.EventImpl <em>Event</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.EventImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl#getEvent()
+                 * @generated
+                 */
+                EClass EVENT = eINSTANCE.getEvent();
+
+                /**
+                 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute EVENT__NAME = eINSTANCE.getEvent_Name();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.BasicEventImpl <em>Basic Event</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.BasicEventImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl#getBasicEvent()
+                 * @generated
+                 */
+                EClass BASIC_EVENT = eINSTANCE.getBasicEvent();
+
+                /**
+                 * The meta object literal for the '<em><b>Distribution</b></em>' containment reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference BASIC_EVENT__DISTRIBUTION = eINSTANCE.getBasicEvent_Distribution();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.GateImpl <em>Gate</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.GateImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl#getGate()
+                 * @generated
+                 */
+                EClass GATE = eINSTANCE.getGate();
+
+                /**
+                 * The meta object literal for the '<em><b>Input Events</b></em>' reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference GATE__INPUT_EVENTS = eINSTANCE.getGate_InputEvents();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.DistributionImpl <em>Distribution</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.DistributionImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl#getDistribution()
+                 * @generated
+                 */
+                EClass DISTRIBUTION = eINSTANCE.getDistribution();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.ConstantDistributionImpl <em>Constant Distribution</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.ConstantDistributionImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl#getConstantDistribution()
+                 * @generated
+                 */
+                EClass CONSTANT_DISTRIBUTION = eINSTANCE.getConstantDistribution();
+
+                /**
+                 * The meta object literal for the '<em><b>P</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute CONSTANT_DISTRIBUTION__P = eINSTANCE.getConstantDistribution_P();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.ExponentialDistributionImpl <em>Exponential Distribution</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.ExponentialDistributionImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl#getExponentialDistribution()
+                 * @generated
+                 */
+                EClass EXPONENTIAL_DISTRIBUTION = eINSTANCE.getExponentialDistribution();
+
+                /**
+                 * The meta object literal for the '<em><b>Lambda</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute EXPONENTIAL_DISTRIBUTION__LAMBDA = eINSTANCE.getExponentialDistribution_Lambda();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.AndGateImpl <em>And Gate</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.AndGateImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl#getAndGate()
+                 * @generated
+                 */
+                EClass AND_GATE = eINSTANCE.getAndGate();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.OrGateImpl <em>Or Gate</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.OrGateImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl#getOrGate()
+                 * @generated
+                 */
+                EClass OR_GATE = eINSTANCE.getOrGate();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.KOfMGateImpl <em>KOf MGate</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.KOfMGateImpl
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FtPackageImpl#getKOfMGate()
+                 * @generated
+                 */
+                EClass KOF_MGATE = eINSTANCE.getKOfMGate();
+
+                /**
+                 * The meta object literal for the '<em><b>K</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute KOF_MGATE__K = eINSTANCE.getKOfMGate_K();
+
+                /**
+                 * The meta object literal for the '<em><b>M</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute KOF_MGATE__M = eINSTANCE.getKOfMGate_M();
+
+        }
+
+} //FtPackage
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/Gate.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/Gate.java
new file mode 100644
index 00000000..0df58bb4
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/Gate.java
@@ -0,0 +1,40 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Gate</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Gate#getInputEvents <em>Input Events</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage#getGate()
+ * @model abstract="true"
+ * @generated
+ */
+public interface Gate extends Event {
+        /**
+         * Returns the value of the '<em><b>Input Events</b></em>' reference list.
+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Event}.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Input Events</em>' reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Input Events</em>' reference list.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage#getGate_InputEvents()
+         * @model
+         * @generated
+         */
+        EList<Event> getInputEvents();
+
+} // Gate
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/KOfMGate.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/KOfMGate.java
new file mode 100644
index 00000000..33334083
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/KOfMGate.java
@@ -0,0 +1,76 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>KOf MGate</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.KOfMGate#getK <em>K</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.KOfMGate#getM <em>M</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage#getKOfMGate()
+ * @model
+ * @generated
+ */
+public interface KOfMGate extends Gate {
+        /**
+         * Returns the value of the '<em><b>K</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>K</em>' attribute isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>K</em>' attribute.
+         * @see #setK(int)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage#getKOfMGate_K()
+         * @model
+         * @generated
+         */
+        int getK();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.KOfMGate#getK <em>K</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>K</em>' attribute.
+         * @see #getK()
+         * @generated
+         */
+        void setK(int value);
+
+        /**
+         * Returns the value of the '<em><b>M</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>M</em>' attribute isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>M</em>' attribute.
+         * @see #setM(int)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage#getKOfMGate_M()
+         * @model
+         * @generated
+         */
+        int getM();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.KOfMGate#getM <em>M</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>M</em>' attribute.
+         * @see #getM()
+         * @generated
+         */
+        void setM(int value);
+
+} // KOfMGate
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/OrGate.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/OrGate.java
new file mode 100644
index 00000000..278a2d38
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/OrGate.java
@@ -0,0 +1,17 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Or Gate</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage#getOrGate()
+ * @model
+ * @generated
+ */
+public interface OrGate extends Gate {
+} // OrGate
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/AndGateImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/AndGateImpl.java
new file mode 100644
index 00000000..509843b1
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/AndGateImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.AndGate;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>And Gate</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class AndGateImpl extends GateImpl implements AndGate {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected AndGateImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return FtPackage.Literals.AND_GATE;
+        }
+
+} //AndGateImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/BasicEventImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/BasicEventImpl.java
new file mode 100644
index 00000000..8fd0f613
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/BasicEventImpl.java
@@ -0,0 +1,177 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.BasicEvent;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Distribution;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Basic Event</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.BasicEventImpl#getDistribution <em>Distribution</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class BasicEventImpl extends EventImpl implements BasicEvent {
+        /**
+         * The cached value of the '{@link #getDistribution() <em>Distribution</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getDistribution()
+         * @generated
+         * @ordered
+         */
+        protected Distribution distribution;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected BasicEventImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return FtPackage.Literals.BASIC_EVENT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Distribution getDistribution() {
+                return distribution;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetDistribution(Distribution newDistribution, NotificationChain msgs) {
+                Distribution oldDistribution = distribution;
+                distribution = newDistribution;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FtPackage.BASIC_EVENT__DISTRIBUTION, oldDistribution, newDistribution);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setDistribution(Distribution newDistribution) {
+                if (newDistribution != distribution) {
+                        NotificationChain msgs = null;
+                        if (distribution != null)
+                                msgs = ((InternalEObject)distribution).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FtPackage.BASIC_EVENT__DISTRIBUTION, null, msgs);
+                        if (newDistribution != null)
+                                msgs = ((InternalEObject)newDistribution).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FtPackage.BASIC_EVENT__DISTRIBUTION, null, msgs);
+                        msgs = basicSetDistribution(newDistribution, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, FtPackage.BASIC_EVENT__DISTRIBUTION, newDistribution, newDistribution));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case FtPackage.BASIC_EVENT__DISTRIBUTION:
+                                return basicSetDistribution(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case FtPackage.BASIC_EVENT__DISTRIBUTION:
+                                return getDistribution();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case FtPackage.BASIC_EVENT__DISTRIBUTION:
+                                setDistribution((Distribution)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case FtPackage.BASIC_EVENT__DISTRIBUTION:
+                                setDistribution((Distribution)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case FtPackage.BASIC_EVENT__DISTRIBUTION:
+                                return distribution != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //BasicEventImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/ConstantDistributionImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/ConstantDistributionImpl.java
new file mode 100644
index 00000000..7f85ed32
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/ConstantDistributionImpl.java
@@ -0,0 +1,164 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ConstantDistribution;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Constant Distribution</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.ConstantDistributionImpl#getP <em>P</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ConstantDistributionImpl extends DistributionImpl implements ConstantDistribution {
+        /**
+         * The default value of the '{@link #getP() <em>P</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getP()
+         * @generated
+         * @ordered
+         */
+        protected static final double P_EDEFAULT = 0.0;
+
+        /**
+         * The cached value of the '{@link #getP() <em>P</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getP()
+         * @generated
+         * @ordered
+         */
+        protected double p = P_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ConstantDistributionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return FtPackage.Literals.CONSTANT_DISTRIBUTION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public double getP() {
+                return p;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setP(double newP) {
+                double oldP = p;
+                p = newP;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, FtPackage.CONSTANT_DISTRIBUTION__P, oldP, p));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case FtPackage.CONSTANT_DISTRIBUTION__P:
+                                return getP();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case FtPackage.CONSTANT_DISTRIBUTION__P:
+                                setP((Double)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case FtPackage.CONSTANT_DISTRIBUTION__P:
+                                setP(P_EDEFAULT);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case FtPackage.CONSTANT_DISTRIBUTION__P:
+                                return p != P_EDEFAULT;
+                }
+                return super.eIsSet(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy()) return super.toString();
+
+                StringBuilder result = new StringBuilder(super.toString());
+                result.append(" (p: ");
+                result.append(p);
+                result.append(')');
+                return result.toString();
+        }
+
+} //ConstantDistributionImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/DistributionImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/DistributionImpl.java
new file mode 100644
index 00000000..171a58cd
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/DistributionImpl.java
@@ -0,0 +1,39 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Distribution;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Distribution</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class DistributionImpl extends MinimalEObjectImpl.Container implements Distribution {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected DistributionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return FtPackage.Literals.DISTRIBUTION;
+        }
+
+} //DistributionImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/EventImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/EventImpl.java
new file mode 100644
index 00000000..44ac0eb6
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/EventImpl.java
@@ -0,0 +1,165 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Event;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Event</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.EventImpl#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class EventImpl extends MinimalEObjectImpl.Container implements Event {
+        /**
+         * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getName()
+         * @generated
+         * @ordered
+         */
+        protected static final String NAME_EDEFAULT = null;
+
+        /**
+         * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getName()
+         * @generated
+         * @ordered
+         */
+        protected String name = NAME_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected EventImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return FtPackage.Literals.EVENT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String getName() {
+                return name;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setName(String newName) {
+                String oldName = name;
+                name = newName;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, FtPackage.EVENT__NAME, oldName, name));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case FtPackage.EVENT__NAME:
+                                return getName();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case FtPackage.EVENT__NAME:
+                                setName((String)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case FtPackage.EVENT__NAME:
+                                setName(NAME_EDEFAULT);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case FtPackage.EVENT__NAME:
+                                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+                }
+                return super.eIsSet(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy()) return super.toString();
+
+                StringBuilder result = new StringBuilder(super.toString());
+                result.append(" (name: ");
+                result.append(name);
+                result.append(')');
+                return result.toString();
+        }
+
+} //EventImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/ExponentialDistributionImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/ExponentialDistributionImpl.java
new file mode 100644
index 00000000..b3c7bd79
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/ExponentialDistributionImpl.java
@@ -0,0 +1,164 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ExponentialDistribution;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Exponential Distribution</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.ExponentialDistributionImpl#getLambda <em>Lambda</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ExponentialDistributionImpl extends DistributionImpl implements ExponentialDistribution {
+        /**
+         * The default value of the '{@link #getLambda() <em>Lambda</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getLambda()
+         * @generated
+         * @ordered
+         */
+        protected static final double LAMBDA_EDEFAULT = 0.0;
+
+        /**
+         * The cached value of the '{@link #getLambda() <em>Lambda</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getLambda()
+         * @generated
+         * @ordered
+         */
+        protected double lambda = LAMBDA_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ExponentialDistributionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return FtPackage.Literals.EXPONENTIAL_DISTRIBUTION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public double getLambda() {
+                return lambda;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setLambda(double newLambda) {
+                double oldLambda = lambda;
+                lambda = newLambda;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, FtPackage.EXPONENTIAL_DISTRIBUTION__LAMBDA, oldLambda, lambda));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case FtPackage.EXPONENTIAL_DISTRIBUTION__LAMBDA:
+                                return getLambda();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case FtPackage.EXPONENTIAL_DISTRIBUTION__LAMBDA:
+                                setLambda((Double)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case FtPackage.EXPONENTIAL_DISTRIBUTION__LAMBDA:
+                                setLambda(LAMBDA_EDEFAULT);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case FtPackage.EXPONENTIAL_DISTRIBUTION__LAMBDA:
+                                return lambda != LAMBDA_EDEFAULT;
+                }
+                return super.eIsSet(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy()) return super.toString();
+
+                StringBuilder result = new StringBuilder(super.toString());
+                result.append(" (lambda: ");
+                result.append(lambda);
+                result.append(')');
+                return result.toString();
+        }
+
+} //ExponentialDistributionImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/FaultTreeImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/FaultTreeImpl.java
new file mode 100644
index 00000000..9c716c21
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/FaultTreeImpl.java
@@ -0,0 +1,217 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Event;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FaultTree;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Fault Tree</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FaultTreeImpl#getEvents <em>Events</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.FaultTreeImpl#getTopEvent <em>Top Event</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class FaultTreeImpl extends MinimalEObjectImpl.Container implements FaultTree {
+        /**
+         * The cached value of the '{@link #getEvents() <em>Events</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getEvents()
+         * @generated
+         * @ordered
+         */
+        protected EList<Event> events;
+
+        /**
+         * The cached value of the '{@link #getTopEvent() <em>Top Event</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getTopEvent()
+         * @generated
+         * @ordered
+         */
+        protected Event topEvent;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected FaultTreeImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return FtPackage.Literals.FAULT_TREE;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EList<Event> getEvents() {
+                if (events == null) {
+                        events = new EObjectContainmentEList<Event>(Event.class, this, FtPackage.FAULT_TREE__EVENTS);
+                }
+                return events;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Event getTopEvent() {
+                if (topEvent != null && topEvent.eIsProxy()) {
+                        InternalEObject oldTopEvent = (InternalEObject)topEvent;
+                        topEvent = (Event)eResolveProxy(oldTopEvent);
+                        if (topEvent != oldTopEvent) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, FtPackage.FAULT_TREE__TOP_EVENT, oldTopEvent, topEvent));
+                        }
+                }
+                return topEvent;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Event basicGetTopEvent() {
+                return topEvent;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setTopEvent(Event newTopEvent) {
+                Event oldTopEvent = topEvent;
+                topEvent = newTopEvent;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, FtPackage.FAULT_TREE__TOP_EVENT, oldTopEvent, topEvent));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case FtPackage.FAULT_TREE__EVENTS:
+                                return ((InternalEList<?>)getEvents()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case FtPackage.FAULT_TREE__EVENTS:
+                                return getEvents();
+                        case FtPackage.FAULT_TREE__TOP_EVENT:
+                                if (resolve) return getTopEvent();
+                                return basicGetTopEvent();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case FtPackage.FAULT_TREE__EVENTS:
+                                getEvents().clear();
+                                getEvents().addAll((Collection<? extends Event>)newValue);
+                                return;
+                        case FtPackage.FAULT_TREE__TOP_EVENT:
+                                setTopEvent((Event)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case FtPackage.FAULT_TREE__EVENTS:
+                                getEvents().clear();
+                                return;
+                        case FtPackage.FAULT_TREE__TOP_EVENT:
+                                setTopEvent((Event)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case FtPackage.FAULT_TREE__EVENTS:
+                                return events != null && !events.isEmpty();
+                        case FtPackage.FAULT_TREE__TOP_EVENT:
+                                return topEvent != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //FaultTreeImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/FtFactoryImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/FtFactoryImpl.java
new file mode 100644
index 00000000..59364443
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/FtFactoryImpl.java
@@ -0,0 +1,169 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.*;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class FtFactoryImpl extends EFactoryImpl implements FtFactory {
+        /**
+         * Creates the default factory implementation.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public static FtFactory init() {
+                try {
+                        FtFactory theFtFactory = (FtFactory)EPackage.Registry.INSTANCE.getEFactory(FtPackage.eNS_URI);
+                        if (theFtFactory != null) {
+                                return theFtFactory;
+                        }
+                }
+                catch (Exception exception) {
+                        EcorePlugin.INSTANCE.log(exception);
+                }
+                return new FtFactoryImpl();
+        }
+
+        /**
+         * Creates an instance of the factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public FtFactoryImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EObject create(EClass eClass) {
+                switch (eClass.getClassifierID()) {
+                        case FtPackage.FAULT_TREE: return createFaultTree();
+                        case FtPackage.BASIC_EVENT: return createBasicEvent();
+                        case FtPackage.CONSTANT_DISTRIBUTION: return createConstantDistribution();
+                        case FtPackage.EXPONENTIAL_DISTRIBUTION: return createExponentialDistribution();
+                        case FtPackage.AND_GATE: return createAndGate();
+                        case FtPackage.OR_GATE: return createOrGate();
+                        case FtPackage.KOF_MGATE: return createKOfMGate();
+                        default:
+                                throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+                }
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public FaultTree createFaultTree() {
+                FaultTreeImpl faultTree = new FaultTreeImpl();
+                return faultTree;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public BasicEvent createBasicEvent() {
+                BasicEventImpl basicEvent = new BasicEventImpl();
+                return basicEvent;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public ConstantDistribution createConstantDistribution() {
+                ConstantDistributionImpl constantDistribution = new ConstantDistributionImpl();
+                return constantDistribution;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public ExponentialDistribution createExponentialDistribution() {
+                ExponentialDistributionImpl exponentialDistribution = new ExponentialDistributionImpl();
+                return exponentialDistribution;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public AndGate createAndGate() {
+                AndGateImpl andGate = new AndGateImpl();
+                return andGate;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public OrGate createOrGate() {
+                OrGateImpl orGate = new OrGateImpl();
+                return orGate;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public KOfMGate createKOfMGate() {
+                KOfMGateImpl kOfMGate = new KOfMGateImpl();
+                return kOfMGate;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public FtPackage getFtPackage() {
+                return (FtPackage)getEPackage();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @deprecated
+         * @generated
+         */
+        @Deprecated
+        public static FtPackage getPackage() {
+                return FtPackage.eINSTANCE;
+        }
+
+} //FtFactoryImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/FtPackageImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/FtPackageImpl.java
new file mode 100644
index 00000000..27ff09df
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/FtPackageImpl.java
@@ -0,0 +1,482 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.AndGate;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.BasicEvent;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ConstantDistribution;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Distribution;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Event;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ExponentialDistribution;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FaultTree;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtFactory;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Gate;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.KOfMGate;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.OrGate;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class FtPackageImpl extends EPackageImpl implements FtPackage {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass faultTreeEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass eventEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass basicEventEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass gateEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass distributionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass constantDistributionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass exponentialDistributionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass andGateEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass orGateEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass kOfMGateEClass = null;
+
+        /**
+         * Creates an instance of the model <b>Package</b>, registered with
+         * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+         * package URI value.
+         * <p>Note: the correct way to create the package is via the static
+         * factory method {@link #init init()}, which also performs
+         * initialization of the package, or returns the registered package,
+         * if one already exists.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.emf.ecore.EPackage.Registry
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage#eNS_URI
+         * @see #init()
+         * @generated
+         */
+        private FtPackageImpl() {
+                super(eNS_URI, FtFactory.eINSTANCE);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private static boolean isInited = false;
+
+        /**
+         * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+         *
+         * <p>This method is used to initialize {@link FtPackage#eINSTANCE} when that field is accessed.
+         * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #eNS_URI
+         * @see #createPackageContents()
+         * @see #initializePackageContents()
+         * @generated
+         */
+        public static FtPackage init() {
+                if (isInited) return (FtPackage)EPackage.Registry.INSTANCE.getEPackage(FtPackage.eNS_URI);
+
+                // Obtain or create and register package
+                Object registeredFtPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+                FtPackageImpl theFtPackage = registeredFtPackage instanceof FtPackageImpl ? (FtPackageImpl)registeredFtPackage : new FtPackageImpl();
+
+                isInited = true;
+
+                // Create package meta-data objects
+                theFtPackage.createPackageContents();
+
+                // Initialize created meta-data
+                theFtPackage.initializePackageContents();
+
+                // Mark meta-data to indicate it can't be changed
+                theFtPackage.freeze();
+
+                // Update the registry and return the package
+                EPackage.Registry.INSTANCE.put(FtPackage.eNS_URI, theFtPackage);
+                return theFtPackage;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getFaultTree() {
+                return faultTreeEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getFaultTree_Events() {
+                return (EReference)faultTreeEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getFaultTree_TopEvent() {
+                return (EReference)faultTreeEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getEvent() {
+                return eventEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EAttribute getEvent_Name() {
+                return (EAttribute)eventEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getBasicEvent() {
+                return basicEventEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getBasicEvent_Distribution() {
+                return (EReference)basicEventEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getGate() {
+                return gateEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getGate_InputEvents() {
+                return (EReference)gateEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getDistribution() {
+                return distributionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getConstantDistribution() {
+                return constantDistributionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EAttribute getConstantDistribution_P() {
+                return (EAttribute)constantDistributionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getExponentialDistribution() {
+                return exponentialDistributionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EAttribute getExponentialDistribution_Lambda() {
+                return (EAttribute)exponentialDistributionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getAndGate() {
+                return andGateEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getOrGate() {
+                return orGateEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getKOfMGate() {
+                return kOfMGateEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EAttribute getKOfMGate_K() {
+                return (EAttribute)kOfMGateEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EAttribute getKOfMGate_M() {
+                return (EAttribute)kOfMGateEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public FtFactory getFtFactory() {
+                return (FtFactory)getEFactoryInstance();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private boolean isCreated = false;
+
+        /**
+         * Creates the meta-model objects for the package.  This method is
+         * guarded to have no affect on any invocation but its first.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void createPackageContents() {
+                if (isCreated) return;
+                isCreated = true;
+
+                // Create classes and their features
+                faultTreeEClass = createEClass(FAULT_TREE);
+                createEReference(faultTreeEClass, FAULT_TREE__EVENTS);
+                createEReference(faultTreeEClass, FAULT_TREE__TOP_EVENT);
+
+                eventEClass = createEClass(EVENT);
+                createEAttribute(eventEClass, EVENT__NAME);
+
+                basicEventEClass = createEClass(BASIC_EVENT);
+                createEReference(basicEventEClass, BASIC_EVENT__DISTRIBUTION);
+
+                gateEClass = createEClass(GATE);
+                createEReference(gateEClass, GATE__INPUT_EVENTS);
+
+                distributionEClass = createEClass(DISTRIBUTION);
+
+                constantDistributionEClass = createEClass(CONSTANT_DISTRIBUTION);
+                createEAttribute(constantDistributionEClass, CONSTANT_DISTRIBUTION__P);
+
+                exponentialDistributionEClass = createEClass(EXPONENTIAL_DISTRIBUTION);
+                createEAttribute(exponentialDistributionEClass, EXPONENTIAL_DISTRIBUTION__LAMBDA);
+
+                andGateEClass = createEClass(AND_GATE);
+
+                orGateEClass = createEClass(OR_GATE);
+
+                kOfMGateEClass = createEClass(KOF_MGATE);
+                createEAttribute(kOfMGateEClass, KOF_MGATE__K);
+                createEAttribute(kOfMGateEClass, KOF_MGATE__M);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private boolean isInitialized = false;
+
+        /**
+         * Complete the initialization of the package and its meta-model.  This
+         * method is guarded to have no affect on any invocation but its first.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void initializePackageContents() {
+                if (isInitialized) return;
+                isInitialized = true;
+
+                // Initialize package
+                setName(eNAME);
+                setNsPrefix(eNS_PREFIX);
+                setNsURI(eNS_URI);
+
+                // Create type parameters
+
+                // Set bounds for type parameters
+
+                // Add supertypes to classes
+                basicEventEClass.getESuperTypes().add(this.getEvent());
+                gateEClass.getESuperTypes().add(this.getEvent());
+                constantDistributionEClass.getESuperTypes().add(this.getDistribution());
+                exponentialDistributionEClass.getESuperTypes().add(this.getDistribution());
+                andGateEClass.getESuperTypes().add(this.getGate());
+                orGateEClass.getESuperTypes().add(this.getGate());
+                kOfMGateEClass.getESuperTypes().add(this.getGate());
+
+                // Initialize classes, features, and operations; add parameters
+                initEClass(faultTreeEClass, FaultTree.class, "FaultTree", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getFaultTree_Events(), this.getEvent(), null, "events", null, 0, -1, FaultTree.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getFaultTree_TopEvent(), this.getEvent(), null, "topEvent", null, 1, 1, FaultTree.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(eventEClass, Event.class, "Event", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getEvent_Name(), ecorePackage.getEString(), "name", null, 0, 1, Event.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(basicEventEClass, BasicEvent.class, "BasicEvent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getBasicEvent_Distribution(), this.getDistribution(), null, "distribution", null, 1, 1, BasicEvent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(gateEClass, Gate.class, "Gate", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getGate_InputEvents(), this.getEvent(), null, "inputEvents", null, 0, -1, Gate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(distributionEClass, Distribution.class, "Distribution", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(constantDistributionEClass, ConstantDistribution.class, "ConstantDistribution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getConstantDistribution_P(), ecorePackage.getEDouble(), "p", null, 0, 1, ConstantDistribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(exponentialDistributionEClass, ExponentialDistribution.class, "ExponentialDistribution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getExponentialDistribution_Lambda(), ecorePackage.getEDouble(), "lambda", null, 0, 1, ExponentialDistribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(andGateEClass, AndGate.class, "AndGate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(orGateEClass, OrGate.class, "OrGate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(kOfMGateEClass, KOfMGate.class, "KOfMGate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getKOfMGate_K(), ecorePackage.getEInt(), "k", null, 0, 1, KOfMGate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getKOfMGate_M(), ecorePackage.getEInt(), "m", null, 0, 1, KOfMGate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                // Create resource
+                createResource(eNS_URI);
+        }
+
+} //FtPackageImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/GateImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/GateImpl.java
new file mode 100644
index 00000000..ae6d5a8d
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/GateImpl.java
@@ -0,0 +1,133 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Event;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Gate;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Gate</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.GateImpl#getInputEvents <em>Input Events</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class GateImpl extends EventImpl implements Gate {
+        /**
+         * The cached value of the '{@link #getInputEvents() <em>Input Events</em>}' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getInputEvents()
+         * @generated
+         * @ordered
+         */
+        protected EList<Event> inputEvents;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected GateImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return FtPackage.Literals.GATE;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EList<Event> getInputEvents() {
+                if (inputEvents == null) {
+                        inputEvents = new EObjectResolvingEList<Event>(Event.class, this, FtPackage.GATE__INPUT_EVENTS);
+                }
+                return inputEvents;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case FtPackage.GATE__INPUT_EVENTS:
+                                return getInputEvents();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case FtPackage.GATE__INPUT_EVENTS:
+                                getInputEvents().clear();
+                                getInputEvents().addAll((Collection<? extends Event>)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case FtPackage.GATE__INPUT_EVENTS:
+                                getInputEvents().clear();
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case FtPackage.GATE__INPUT_EVENTS:
+                                return inputEvents != null && !inputEvents.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //GateImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/KOfMGateImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/KOfMGateImpl.java
new file mode 100644
index 00000000..0f0dd205
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/KOfMGateImpl.java
@@ -0,0 +1,220 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.KOfMGate;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>KOf MGate</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.KOfMGateImpl#getK <em>K</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl.KOfMGateImpl#getM <em>M</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class KOfMGateImpl extends GateImpl implements KOfMGate {
+        /**
+         * The default value of the '{@link #getK() <em>K</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getK()
+         * @generated
+         * @ordered
+         */
+        protected static final int K_EDEFAULT = 0;
+
+        /**
+         * The cached value of the '{@link #getK() <em>K</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getK()
+         * @generated
+         * @ordered
+         */
+        protected int k = K_EDEFAULT;
+
+        /**
+         * The default value of the '{@link #getM() <em>M</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getM()
+         * @generated
+         * @ordered
+         */
+        protected static final int M_EDEFAULT = 0;
+
+        /**
+         * The cached value of the '{@link #getM() <em>M</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getM()
+         * @generated
+         * @ordered
+         */
+        protected int m = M_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected KOfMGateImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return FtPackage.Literals.KOF_MGATE;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public int getK() {
+                return k;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setK(int newK) {
+                int oldK = k;
+                k = newK;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, FtPackage.KOF_MGATE__K, oldK, k));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public int getM() {
+                return m;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setM(int newM) {
+                int oldM = m;
+                m = newM;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, FtPackage.KOF_MGATE__M, oldM, m));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case FtPackage.KOF_MGATE__K:
+                                return getK();
+                        case FtPackage.KOF_MGATE__M:
+                                return getM();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case FtPackage.KOF_MGATE__K:
+                                setK((Integer)newValue);
+                                return;
+                        case FtPackage.KOF_MGATE__M:
+                                setM((Integer)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case FtPackage.KOF_MGATE__K:
+                                setK(K_EDEFAULT);
+                                return;
+                        case FtPackage.KOF_MGATE__M:
+                                setM(M_EDEFAULT);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case FtPackage.KOF_MGATE__K:
+                                return k != K_EDEFAULT;
+                        case FtPackage.KOF_MGATE__M:
+                                return m != M_EDEFAULT;
+                }
+                return super.eIsSet(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy()) return super.toString();
+
+                StringBuilder result = new StringBuilder(super.toString());
+                result.append(" (k: ");
+                result.append(k);
+                result.append(", m: ");
+                result.append(m);
+                result.append(')');
+                return result.toString();
+        }
+
+} //KOfMGateImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/OrGateImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/OrGateImpl.java
new file mode 100644
index 00000000..88bd2bae
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/impl/OrGateImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.OrGate;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Or Gate</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class OrGateImpl extends GateImpl implements OrGate {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected OrGateImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return FtPackage.Literals.OR_GATE;
+        }
+
+} //OrGateImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/util/FtAdapterFactory.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/util/FtAdapterFactory.java
new file mode 100644
index 00000000..17daaad3
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/util/FtAdapterFactory.java
@@ -0,0 +1,282 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft.util;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.*;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage
+ * @generated
+ */
+public class FtAdapterFactory extends AdapterFactoryImpl {
+        /**
+         * The cached model package.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected static FtPackage modelPackage;
+
+        /**
+         * Creates an instance of the adapter factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public FtAdapterFactory() {
+                if (modelPackage == null) {
+                        modelPackage = FtPackage.eINSTANCE;
+                }
+        }
+
+        /**
+         * Returns whether this factory is applicable for the type of the object.
+         * <!-- begin-user-doc -->
+         * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+         * <!-- end-user-doc -->
+         * @return whether this factory is applicable for the type of the object.
+         * @generated
+         */
+        @Override
+        public boolean isFactoryForType(Object object) {
+                if (object == modelPackage) {
+                        return true;
+                }
+                if (object instanceof EObject) {
+                        return ((EObject)object).eClass().getEPackage() == modelPackage;
+                }
+                return false;
+        }
+
+        /**
+         * The switch that delegates to the <code>createXXX</code> methods.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected FtSwitch<Adapter> modelSwitch =
+                new FtSwitch<Adapter>() {
+                        @Override
+                        public Adapter caseFaultTree(FaultTree object) {
+                                return createFaultTreeAdapter();
+                        }
+                        @Override
+                        public Adapter caseEvent(Event object) {
+                                return createEventAdapter();
+                        }
+                        @Override
+                        public Adapter caseBasicEvent(BasicEvent object) {
+                                return createBasicEventAdapter();
+                        }
+                        @Override
+                        public Adapter caseGate(Gate object) {
+                                return createGateAdapter();
+                        }
+                        @Override
+                        public Adapter caseDistribution(Distribution object) {
+                                return createDistributionAdapter();
+                        }
+                        @Override
+                        public Adapter caseConstantDistribution(ConstantDistribution object) {
+                                return createConstantDistributionAdapter();
+                        }
+                        @Override
+                        public Adapter caseExponentialDistribution(ExponentialDistribution object) {
+                                return createExponentialDistributionAdapter();
+                        }
+                        @Override
+                        public Adapter caseAndGate(AndGate object) {
+                                return createAndGateAdapter();
+                        }
+                        @Override
+                        public Adapter caseOrGate(OrGate object) {
+                                return createOrGateAdapter();
+                        }
+                        @Override
+                        public Adapter caseKOfMGate(KOfMGate object) {
+                                return createKOfMGateAdapter();
+                        }
+                        @Override
+                        public Adapter defaultCase(EObject object) {
+                                return createEObjectAdapter();
+                        }
+                };
+
+        /**
+         * Creates an adapter for the <code>target</code>.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param target the object to adapt.
+         * @return the adapter for the <code>target</code>.
+         * @generated
+         */
+        @Override
+        public Adapter createAdapter(Notifier target) {
+                return modelSwitch.doSwitch((EObject)target);
+        }
+
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FaultTree <em>Fault Tree</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FaultTree
+         * @generated
+         */
+        public Adapter createFaultTreeAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Event <em>Event</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Event
+         * @generated
+         */
+        public Adapter createEventAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.BasicEvent <em>Basic Event</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.BasicEvent
+         * @generated
+         */
+        public Adapter createBasicEventAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Gate <em>Gate</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Gate
+         * @generated
+         */
+        public Adapter createGateAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Distribution <em>Distribution</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Distribution
+         * @generated
+         */
+        public Adapter createDistributionAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ConstantDistribution <em>Constant Distribution</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ConstantDistribution
+         * @generated
+         */
+        public Adapter createConstantDistributionAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ExponentialDistribution <em>Exponential Distribution</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.ExponentialDistribution
+         * @generated
+         */
+        public Adapter createExponentialDistributionAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.AndGate <em>And Gate</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.AndGate
+         * @generated
+         */
+        public Adapter createAndGateAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.OrGate <em>Or Gate</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.OrGate
+         * @generated
+         */
+        public Adapter createOrGateAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.ft.KOfMGate <em>KOf MGate</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.KOfMGate
+         * @generated
+         */
+        public Adapter createKOfMGateAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for the default case.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @generated
+         */
+        public Adapter createEObjectAdapter() {
+                return null;
+        }
+
+} //FtAdapterFactory
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/util/FtSwitch.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/util/FtSwitch.java
new file mode 100644
index 00000000..b1846705
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/ft/util/FtSwitch.java
@@ -0,0 +1,309 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.ft.util;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.*;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage
+ * @generated
+ */
+public class FtSwitch<T> extends Switch<T> {
+        /**
+         * The cached model package
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected static FtPackage modelPackage;
+
+        /**
+         * Creates an instance of the switch.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public FtSwitch() {
+                if (modelPackage == null) {
+                        modelPackage = FtPackage.eINSTANCE;
+                }
+        }
+
+        /**
+         * Checks whether this is a switch for the given package.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param ePackage the package in question.
+         * @return whether this is a switch for the given package.
+         * @generated
+         */
+        @Override
+        protected boolean isSwitchFor(EPackage ePackage) {
+                return ePackage == modelPackage;
+        }
+
+        /**
+         * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the first non-null result returned by a <code>caseXXX</code> call.
+         * @generated
+         */
+        @Override
+        protected T doSwitch(int classifierID, EObject theEObject) {
+                switch (classifierID) {
+                        case FtPackage.FAULT_TREE: {
+                                FaultTree faultTree = (FaultTree)theEObject;
+                                T result = caseFaultTree(faultTree);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case FtPackage.EVENT: {
+                                Event event = (Event)theEObject;
+                                T result = caseEvent(event);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case FtPackage.BASIC_EVENT: {
+                                BasicEvent basicEvent = (BasicEvent)theEObject;
+                                T result = caseBasicEvent(basicEvent);
+                                if (result == null) result = caseEvent(basicEvent);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case FtPackage.GATE: {
+                                Gate gate = (Gate)theEObject;
+                                T result = caseGate(gate);
+                                if (result == null) result = caseEvent(gate);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case FtPackage.DISTRIBUTION: {
+                                Distribution distribution = (Distribution)theEObject;
+                                T result = caseDistribution(distribution);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case FtPackage.CONSTANT_DISTRIBUTION: {
+                                ConstantDistribution constantDistribution = (ConstantDistribution)theEObject;
+                                T result = caseConstantDistribution(constantDistribution);
+                                if (result == null) result = caseDistribution(constantDistribution);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case FtPackage.EXPONENTIAL_DISTRIBUTION: {
+                                ExponentialDistribution exponentialDistribution = (ExponentialDistribution)theEObject;
+                                T result = caseExponentialDistribution(exponentialDistribution);
+                                if (result == null) result = caseDistribution(exponentialDistribution);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case FtPackage.AND_GATE: {
+                                AndGate andGate = (AndGate)theEObject;
+                                T result = caseAndGate(andGate);
+                                if (result == null) result = caseGate(andGate);
+                                if (result == null) result = caseEvent(andGate);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case FtPackage.OR_GATE: {
+                                OrGate orGate = (OrGate)theEObject;
+                                T result = caseOrGate(orGate);
+                                if (result == null) result = caseGate(orGate);
+                                if (result == null) result = caseEvent(orGate);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case FtPackage.KOF_MGATE: {
+                                KOfMGate kOfMGate = (KOfMGate)theEObject;
+                                T result = caseKOfMGate(kOfMGate);
+                                if (result == null) result = caseGate(kOfMGate);
+                                if (result == null) result = caseEvent(kOfMGate);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        default: return defaultCase(theEObject);
+                }
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Fault Tree</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Fault Tree</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseFaultTree(FaultTree object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Event</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Event</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseEvent(Event object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Basic Event</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Basic Event</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseBasicEvent(BasicEvent object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Gate</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Gate</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseGate(Gate object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Distribution</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Distribution</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseDistribution(Distribution object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Constant Distribution</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Constant Distribution</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseConstantDistribution(ConstantDistribution object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Exponential Distribution</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Exponential Distribution</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseExponentialDistribution(ExponentialDistribution object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>And Gate</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>And Gate</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseAndGate(AndGate object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Or Gate</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Or Gate</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseOrGate(OrGate object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>KOf MGate</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>KOf MGate</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseKOfMGate(KOfMGate object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch, but this is the last case anyway.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+         * @generated
+         */
+        @Override
+        public T defaultCase(EObject object) {
+                return null;
+        }
+
+} //FtSwitch
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore
new file mode 100644
index 00000000..f9bad301
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="cft" nsURI="http://www.bme.hu/mit/inf/dslreasoner/faulttree/model/cft"
+    nsPrefix="cft">
+  <eClassifiers xsi:type="ecore:EClass" name="ComponentDefinition">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="inputEvents" upperBound="-1"
+        eType="#//IntputEvent" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="eventDefinitions" upperBound="-1"
+        eType="#//EventDefinition" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="outputEvents" upperBound="-1"
+        eType="#//EventDeclaration"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="EventDefinition" abstract="true" eSuperTypes="#//EventDeclaration"/>
+  <eClassifiers xsi:type="ecore:EClass" name="GateDefinition" abstract="true" eSuperTypes="#//EventDefinition">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="inputEvents" upperBound="-1"
+        eType="#//EventDeclaration"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="BasicEventDefinition" eSuperTypes="#//EventDefinition">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="distribution" lowerBound="1"
+        eType="ecore:EClass ft.ecore#//Distribution" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IntputEvent" eSuperTypes="#//EventDeclaration">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiple" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="EventDeclaration" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AndGateDefinition" eSuperTypes="#//GateDefinition"/>
+  <eClassifiers xsi:type="ecore:EClass" name="OrGateDefinition" eSuperTypes="#//GateDefinition"/>
+  <eClassifiers xsi:type="ecore:EClass" name="KOfMGateDefinition" eSuperTypes="#//GateDefinition">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="k" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="m" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ComponentFaultTree">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="components" upperBound="-1"
+        eType="#//Component" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="topEvent" lowerBound="1"
+        eType="#//Output"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Component">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="inputs" upperBound="-1"
+        eType="#//Input" containment="true" eOpposite="#//Input/component"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="outputs" upperBound="-1"
+        eType="#//Output" containment="true" eOpposite="#//Output/component"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="componentDefinition" lowerBound="1"
+        eType="#//ComponentDefinition"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Input">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="intputEvent" lowerBound="1"
+        eType="#//IntputEvent"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="component" lowerBound="1"
+        eType="#//Component" eOpposite="#//Component/inputs"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="incomingConnections" upperBound="-1"
+        eType="#//Connection" containment="true" eOpposite="#//Connection/input"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Output">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="eventDeclaration" lowerBound="1"
+        eType="#//EventDeclaration"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="outgoingConnections" upperBound="-1"
+        eType="#//Connection" eOpposite="#//Connection/output"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="component" lowerBound="1"
+        eType="#//Component" eOpposite="#//Component/outputs"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Connection">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="input" lowerBound="1" eType="#//Input"
+        eOpposite="#//Input/incomingConnections"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="output" lowerBound="1"
+        eType="#//Output" eOpposite="#//Output/outgoingConnections"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.genmodel b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.genmodel
new file mode 100644
index 00000000..25b3cd39
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.genmodel
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen"
+    modelPluginID="hu.bme.mit.inf.dslreasoner.faulttree.model" modelName="Cft" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
+    usedGenPackages="ft.genmodel#//ft" operationReflection="true" importOrganizing="true">
+  <foreignModel>cft.ecore</foreignModel>
+  <genPackages prefix="Cft" basePackage="hu.bme.mit.inf.dslreasoner.faulttree.model"
+      disposableProviderFactory="true" ecorePackage="cft.ecore#/">
+    <genClasses ecoreClass="cft.ecore#//ComponentDefinition">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cft.ecore#//ComponentDefinition/inputEvents"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cft.ecore#//ComponentDefinition/eventDefinitions"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cft.ecore#//ComponentDefinition/outputEvents"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cft.ecore#//ComponentDefinition/name"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="cft.ecore#//EventDefinition"/>
+    <genClasses image="false" ecoreClass="cft.ecore#//GateDefinition">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cft.ecore#//GateDefinition/inputEvents"/>
+    </genClasses>
+    <genClasses ecoreClass="cft.ecore#//BasicEventDefinition">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cft.ecore#//BasicEventDefinition/distribution"/>
+    </genClasses>
+    <genClasses ecoreClass="cft.ecore#//IntputEvent">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cft.ecore#//IntputEvent/multiple"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="cft.ecore#//EventDeclaration">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cft.ecore#//EventDeclaration/name"/>
+    </genClasses>
+    <genClasses ecoreClass="cft.ecore#//AndGateDefinition"/>
+    <genClasses ecoreClass="cft.ecore#//OrGateDefinition"/>
+    <genClasses ecoreClass="cft.ecore#//KOfMGateDefinition">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cft.ecore#//KOfMGateDefinition/k"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cft.ecore#//KOfMGateDefinition/m"/>
+    </genClasses>
+    <genClasses ecoreClass="cft.ecore#//ComponentFaultTree">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cft.ecore#//ComponentFaultTree/components"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cft.ecore#//ComponentFaultTree/topEvent"/>
+    </genClasses>
+    <genClasses ecoreClass="cft.ecore#//Component">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cft.ecore#//Component/inputs"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cft.ecore#//Component/outputs"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cft.ecore#//Component/componentDefinition"/>
+    </genClasses>
+    <genClasses ecoreClass="cft.ecore#//Input">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cft.ecore#//Input/intputEvent"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference cft.ecore#//Input/component"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cft.ecore#//Input/incomingConnections"/>
+    </genClasses>
+    <genClasses ecoreClass="cft.ecore#//Output">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cft.ecore#//Output/eventDeclaration"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cft.ecore#//Output/outgoingConnections"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference cft.ecore#//Output/component"/>
+    </genClasses>
+    <genClasses ecoreClass="cft.ecore#//Connection">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference cft.ecore#//Connection/input"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cft.ecore#//Connection/output"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/ft.ecore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/ft.ecore
new file mode 100644
index 00000000..f1f410a7
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/ft.ecore
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="ft" nsURI="http://www.bme.hu/mit/inf/dslreasoner/faulttree/model/ft"
+    nsPrefix="ft">
+  <eClassifiers xsi:type="ecore:EClass" name="FaultTree">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="events" upperBound="-1"
+        eType="#//Event" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="topEvent" lowerBound="1"
+        eType="#//Event"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Event" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="BasicEvent" eSuperTypes="#//Event">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="distribution" lowerBound="1"
+        eType="#//Distribution" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Gate" abstract="true" eSuperTypes="#//Event">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="inputEvents" upperBound="-1"
+        eType="#//Event"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Distribution" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ConstantDistribution" eSuperTypes="#//Distribution">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="p" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ExponentialDistribution" eSuperTypes="#//Distribution">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lambda" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AndGate" eSuperTypes="#//Gate"/>
+  <eClassifiers xsi:type="ecore:EClass" name="OrGate" eSuperTypes="#//Gate"/>
+  <eClassifiers xsi:type="ecore:EClass" name="KOfMGate" eSuperTypes="#//Gate">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="k" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="m" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/ft.genmodel b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/ft.genmodel
new file mode 100644
index 00000000..b5f63c34
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/ft.genmodel
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen"
+    modelPluginID="hu.bme.mit.inf.dslreasoner.faulttree.model" modelName="Ft" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>ft.ecore</foreignModel>
+  <genPackages prefix="Ft" basePackage="hu.bme.mit.inf.dslreasoner.faulttree.model"
+      disposableProviderFactory="true" ecorePackage="ft.ecore#/">
+    <genClasses ecoreClass="ft.ecore#//FaultTree">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ft.ecore#//FaultTree/events"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ft.ecore#//FaultTree/topEvent"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="ft.ecore#//Event">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ft.ecore#//Event/name"/>
+    </genClasses>
+    <genClasses ecoreClass="ft.ecore#//BasicEvent">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ft.ecore#//BasicEvent/distribution"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="ft.ecore#//Gate">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ft.ecore#//Gate/inputEvents"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="ft.ecore#//Distribution"/>
+    <genClasses ecoreClass="ft.ecore#//ConstantDistribution">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ft.ecore#//ConstantDistribution/p"/>
+    </genClasses>
+    <genClasses ecoreClass="ft.ecore#//ExponentialDistribution">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ft.ecore#//ExponentialDistribution/lambda"/>
+    </genClasses>
+    <genClasses ecoreClass="ft.ecore#//AndGate"/>
+    <genClasses ecoreClass="ft.ecore#//OrGate"/>
+    <genClasses ecoreClass="ft.ecore#//KOfMGate">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ft.ecore#//KOfMGate/k"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ft.ecore#//KOfMGate/m"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/plugin.properties b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/plugin.properties
new file mode 100644
index 00000000..2936b0e7
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/plugin.properties
@@ -0,0 +1,4 @@
+#
+
+pluginName = Model
+providerName = www.example.org
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/plugin.xml b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/plugin.xml
new file mode 100644
index 00000000..754a53cb
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/plugin.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated ft -->
+      <package
+            uri="http://www.bme.hu/mit/inf/dslreasoner/faulttree/model/ft"
+            class="hu.bme.mit.inf.dslreasoner.faulttree.model.ft.FtPackage"
+            genModel="model/ft.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated cft -->
+      <package
+            uri="http://www.bme.hu/mit/inf/dslreasoner/faulttree/model/cft"
+            class="hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage"
+            genModel="model/cft.genmodel"/>
+   </extension>
+
+</plugin>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/representations.aird b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/representations.aird
new file mode 100644
index 00000000..083705fc
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/representations.aird
@@ -0,0 +1,1640 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
+  <viewpoint:DAnalysis uid="_VHfYACoZEemQnOUhg0mU1A" selectedViews="_WH8IYCoZEemQnOUhg0mU1A" version="14.1.0.201810161215">
+    <semanticResources>model/cft.ecore</semanticResources>
+    <semanticResources>model/ft.ecore</semanticResources>
+    <semanticResources>model/ft.genmodel</semanticResources>
+    <semanticResources>http://www.eclipse.org/emf/2002/Ecore</semanticResources>
+    <semanticResources>model/cft.genmodel</semanticResources>
+    <ownedViews xmi:type="viewpoint:DView" uid="_WH8IYCoZEemQnOUhg0mU1A">
+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_XdtogyoZEemQnOUhg0mU1A" name="cft class diagram" repPath="#_XdoI8CoZEemQnOUhg0mU1A">
+        <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+        <target xmi:type="ecore:EPackage" href="model/cft.ecore#/"/>
+      </ownedRepresentationDescriptors>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_BnlJEyohEemQnOUhg0mU1A" name="ft class diagram" repPath="#_Bnj68CohEemQnOUhg0mU1A">
+        <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+        <target xmi:type="ecore:EPackage" href="model/ft.ecore#/"/>
+      </ownedRepresentationDescriptors>
+    </ownedViews>
+  </viewpoint:DAnalysis>
+  <diagram:DSemanticDiagram uid="_XdoI8CoZEemQnOUhg0mU1A" name="cft class diagram">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_XdtogCoZEemQnOUhg0mU1A" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_XdtogSoZEemQnOUhg0mU1A">
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_lIXL4CofEemQnOUhg0mU1A" sourceArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_lIXL4SofEemQnOUhg0mU1A" showIcon="false" labelExpression="service:render">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </centerLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_lIXL4iofEemQnOUhg0mU1A" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_OkCM5iorEemQnOUhg0mU1A" sourceArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_OkCM5yorEemQnOUhg0mU1A" showIcon="false" labelExpression="service:render">
+            <labelFormat>bold</labelFormat>
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </centerLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_OkCM6CorEemQnOUhg0mU1A" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_IXsxGCosEemQnOUhg0mU1A" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_IXsxGSosEemQnOUhg0mU1A" showIcon="false" labelExpression="service:render">
+            <labelFormat>bold</labelFormat>
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </centerLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_IXsxGiosEemQnOUhg0mU1A" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_eyVLByosEemQnOUhg0mU1A" sourceArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <beginLabelStyleDescription xmi:type="style:BeginLabelStyleDescription" xmi:id="_eyVLCCosEemQnOUhg0mU1A" showIcon="false" labelExpression="service:renderEOpposite">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </beginLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_eyVLCSosEemQnOUhg0mU1A" showIcon="false" labelExpression="service:render">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_XduPkCoZEemQnOUhg0mU1A" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_XduPkSoZEemQnOUhg0mU1A" type="Sirius" element="_XdoI8CoZEemQnOUhg0mU1A" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_ZqDkQCoZEemQnOUhg0mU1A" type="2003" element="_Zp_54CoZEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_ZqDkQyoZEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_ZqELUCoZEemQnOUhg0mU1A" type="7004">
+            <children xmi:type="notation:Node" xmi:id="__Erj8CofEemQnOUhg0mU1A" type="3010" element="__EiaACofEemQnOUhg0mU1A">
+              <styles xmi:type="notation:FontStyle" xmi:id="__Erj8SofEemQnOUhg0mU1A" fontColor="2697711" fontName="Cantarell" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="__Erj8iofEemQnOUhg0mU1A"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_ZqELUSoZEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_ZqELUioZEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_ZqDkQSoZEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZqDkQioZEemQnOUhg0mU1A" x="169" y="195" width="133" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_cTz0wCoZEemQnOUhg0mU1A" type="2003" element="_cTwxcCoZEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_cTz0wyoZEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_cTz0xCoZEemQnOUhg0mU1A" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_cTz0xSoZEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_cTz0xioZEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_cTz0wSoZEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cTz0wioZEemQnOUhg0mU1A" x="273" y="520" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_C0IYkCodEemQnOUhg0mU1A" type="2003" element="_C0DgECodEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_C0I_oCodEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_C0I_oSodEemQnOUhg0mU1A" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_C0I_oiodEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_C0I_oyodEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_C0IYkSodEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C0IYkiodEemQnOUhg0mU1A" x="377" y="676" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_D1vmkCodEemQnOUhg0mU1A" type="2003" element="_D1quECodEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_D1vmkyodEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_D1vmlCodEemQnOUhg0mU1A" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_D1vmlSodEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_D1vmliodEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_D1vmkSodEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1vmkiodEemQnOUhg0mU1A" x="182" y="676" width="133" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_IejkxiodEemQnOUhg0mU1A" type="2003" element="_Iec3ECodEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_IekL0CodEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_IekL0SodEemQnOUhg0mU1A" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_0AgE0CofEemQnOUhg0mU1A" type="3010" element="_0AT3kCofEemQnOUhg0mU1A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_0AgE0SofEemQnOUhg0mU1A" fontColor="2697711" fontName="Cantarell" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_0AgE0iofEemQnOUhg0mU1A"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_IekL0iodEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_IekL0yodEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_IejkxyodEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IejkyCodEemQnOUhg0mU1A" x="59" y="520" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_QEEkoCodEemQnOUhg0mU1A" type="2003" element="_QD_FECodEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_QEFLsCodEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_QEFLsSodEemQnOUhg0mU1A" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_n86ZUCouEemQnOUhg0mU1A" type="3010" element="_n8pTkCouEemQnOUhg0mU1A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_n86ZUSouEemQnOUhg0mU1A" fontColor="2697711" fontName="Cantarell" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_n86ZUiouEemQnOUhg0mU1A"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_QEFLsiodEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_QEFLsyodEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_QEEkoSodEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QEEkoiodEemQnOUhg0mU1A" x="176" y="364" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_CL1lUCokEemQnOUhg0mU1A" type="2003" element="_CLrNQCokEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_CL1lUyokEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_CL1lVCokEemQnOUhg0mU1A" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_CL1lVSokEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_CL1lViokEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_CL1lUSokEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CL1lUiokEemQnOUhg0mU1A" x="221" y="845" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_DnK64CokEemQnOUhg0mU1A" type="2003" element="_DnAi0CokEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_DnLh8CokEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_DnLh8SokEemQnOUhg0mU1A" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_DnLh8iokEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_DnLh8yokEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_DnK64SokEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DnK64iokEemQnOUhg0mU1A" x="377" y="845" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_FjmyYCokEemQnOUhg0mU1A" type="2003" element="_FjbzQCokEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_FjmyYyokEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_FjmyZCokEemQnOUhg0mU1A" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_SuPjgCorEemQnOUhg0mU1A" type="3010" element="_St8BgCorEemQnOUhg0mU1A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_SuPjgSorEemQnOUhg0mU1A" fontColor="2697711" fontName="Cantarell" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_SuPjgiorEemQnOUhg0mU1A"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_TnXj4CorEemQnOUhg0mU1A" type="3010" element="_TnPBACorEemQnOUhg0mU1A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_TnXj4SorEemQnOUhg0mU1A" fontColor="2697711" fontName="Cantarell" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_TnXj4iorEemQnOUhg0mU1A"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_FjmyZSokEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_FjmyZiokEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_FjmyYSokEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FjmyYiokEemQnOUhg0mU1A" x="533" y="845" width="133" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_UtkzcCoqEemQnOUhg0mU1A" type="2003" element="_Utes0CoqEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_UtkzcyoqEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_UtlagCoqEemQnOUhg0mU1A" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_UtlagSoqEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_UtlagioqEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_UtkzcSoqEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8" italic="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UtkzcioqEemQnOUhg0mU1A" x="39" y="845"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_WnAk0CorEemQnOUhg0mU1A" type="2003" element="_Wm0XkCorEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_WnAk0yorEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_WnAk1CorEemQnOUhg0mU1A" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_WnAk1SorEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_WnAk1iorEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_WnAk0SorEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WnAk0iorEemQnOUhg0mU1A" x="845" y="26" width="146" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_bLbyQCorEemQnOUhg0mU1A" type="2003" element="_bLPlACorEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_bLbyQyorEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_bLbyRCorEemQnOUhg0mU1A" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_bLbyRSorEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_bLbyRiorEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_bLbyQSorEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bLbyQiorEemQnOUhg0mU1A" x="858" y="195" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_mUP5wCorEemQnOUhg0mU1A" type="2003" element="_mUETkCorEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_mUP5wyorEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_mUP5xCorEemQnOUhg0mU1A" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_mUP5xSorEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_mUP5xiorEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_mUP5wSorEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mUP5wiorEemQnOUhg0mU1A" x="767" y="455" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_nyhOkCorEemQnOUhg0mU1A" type="2003" element="_nyWPcCorEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_nyh1oiorEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_nyh1oyorEemQnOUhg0mU1A" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_nyh1pCorEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_nyh1pSorEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_nyh1oCorEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nyh1oSorEemQnOUhg0mU1A" x="949" y="364" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_Z4VWMCosEemQnOUhg0mU1A" type="2003" element="_Z4MMQCosEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_Z4VWMyosEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_Z4VWNCosEemQnOUhg0mU1A" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Z4VWNSosEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Z4VWNiosEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_Z4VWMSosEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z4VWMiosEemQnOUhg0mU1A" x="767" y="617" width="120" height="100"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_XduPkioZEemQnOUhg0mU1A"/>
+        <edges xmi:type="notation:Edge" xmi:id="_F_1fkCodEemQnOUhg0mU1A" type="4001" element="_F_tjwCodEemQnOUhg0mU1A" source="_D1vmkCodEemQnOUhg0mU1A" target="_cTz0wCoZEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_F_1flCodEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F_1flSodEemQnOUhg0mU1A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_F_1fliodEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F_1flyodEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_F_1fmCodEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F_1fmSodEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_F_1fkSodEemQnOUhg0mU1A" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_F_1fkiodEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_F_1fkyodEemQnOUhg0mU1A" points="[0, 0, -58, 58]$[58, -58, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_F_1fmiodEemQnOUhg0mU1A" id="(0.45038167938931295,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_F_1fmyodEemQnOUhg0mU1A" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_GWPNYCodEemQnOUhg0mU1A" type="4001" element="_GWJt1iodEemQnOUhg0mU1A" source="_C0IYkCodEemQnOUhg0mU1A" target="_cTz0wCoZEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_GWPNZCodEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GWPNZSodEemQnOUhg0mU1A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_GWPNZiodEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GWPNZyodEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_GWPNaCodEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GWPNaSodEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_GWPNYSodEemQnOUhg0mU1A" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_GWPNYiodEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GWPNYyodEemQnOUhg0mU1A" points="[0, 0, 78, 58]$[-78, -58, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GWPNaiodEemQnOUhg0mU1A" id="(0.4406779661016949,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GWPNayodEemQnOUhg0mU1A" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_Wl22oCodEemQnOUhg0mU1A" type="4001" element="_Wlx-JiodEemQnOUhg0mU1A" source="_IejkxiodEemQnOUhg0mU1A" target="_QEEkoCodEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_Wl22pCodEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wl22pSodEemQnOUhg0mU1A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Wl22piodEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wl22pyodEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Wl22qCodEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wl22qSodEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_Wl22oSodEemQnOUhg0mU1A" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_Wl22oiodEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Wl22oyodEemQnOUhg0mU1A" points="[0, 0, -155, 58]$[155, -58, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Wl3dsCodEemQnOUhg0mU1A" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Wl3dsSodEemQnOUhg0mU1A" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_W6ebwCodEemQnOUhg0mU1A" type="4001" element="_W6Y8NiodEemQnOUhg0mU1A" source="_cTz0wCoZEemQnOUhg0mU1A" target="_QEEkoCodEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_W6ebxCodEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W6ebxSodEemQnOUhg0mU1A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_W6ebxiodEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W6ebxyodEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_W6ebyCodEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W6ebySodEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_W6ebwSodEemQnOUhg0mU1A" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_W6ebwiodEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_W6ebwyodEemQnOUhg0mU1A" points="[0, 0, 117, 58]$[-117, -58, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_W6ebyiodEemQnOUhg0mU1A" id="(0.5508474576271186,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_W6ebyyodEemQnOUhg0mU1A" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_lIdSgCofEemQnOUhg0mU1A" type="4001" element="_lIWk0CofEemQnOUhg0mU1A" source="_ZqDkQCoZEemQnOUhg0mU1A" target="_IejkxiodEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_lIdShCofEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lIdShSofEemQnOUhg0mU1A" x="-49" y="-49"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_lIdShiofEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lIdShyofEemQnOUhg0mU1A" x="96" y="-18"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_lIdSiCofEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lIdSiSofEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_lIdSgSofEemQnOUhg0mU1A" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_lIdSgiofEemQnOUhg0mU1A" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lIdSgyofEemQnOUhg0mU1A" points="[-40, 0, 65, -227]$[-40, 32, 65, -195]$[-144, 32, -39, -195]$[-144, 227, -39, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lIdSiiofEemQnOUhg0mU1A" id="(0.5038167938931297,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lIdSiyofEemQnOUhg0mU1A" id="(0.6016949152542372,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_o7eRICofEemQnOUhg0mU1A" type="4001" element="_o7XjcCofEemQnOUhg0mU1A" source="_ZqDkQCoZEemQnOUhg0mU1A" target="_cTz0wCoZEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_o7eRJCofEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o7eRJSofEemQnOUhg0mU1A" x="-55" y="24"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_o7eRJiofEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o7eRJyofEemQnOUhg0mU1A" x="-26"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_o7eRKCofEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o7eRKSofEemQnOUhg0mU1A" x="3" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_o7eRISofEemQnOUhg0mU1A" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_o7eRIiofEemQnOUhg0mU1A" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o7eRIyofEemQnOUhg0mU1A" points="[13, 0, -59, -227]$[13, 32, -59, -195]$[104, 32, 32, -195]$[104, 227, 32, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o7e4MCofEemQnOUhg0mU1A" id="(0.6946564885496184,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o7e4MSofEemQnOUhg0mU1A" id="(0.5,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_vO0egCofEemQnOUhg0mU1A" type="4001" element="_vOuX4CofEemQnOUhg0mU1A" source="_ZqDkQCoZEemQnOUhg0mU1A" target="_QEEkoCodEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_vO1FkCofEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vO1FkSofEemQnOUhg0mU1A" x="16" y="-13"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_vO1FkiofEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vO1FkyofEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_vO1FlCofEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vO1FlSofEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_vO0egSofEemQnOUhg0mU1A" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_vO0egiofEemQnOUhg0mU1A" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vO0egyofEemQnOUhg0mU1A" points="[0, 0, 0, -71]$[0, 71, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vO1FliofEemQnOUhg0mU1A" id="(0.5038167938931297,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vO1FlyofEemQnOUhg0mU1A" id="(0.5,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_oV3NMCogEemQnOUhg0mU1A" type="4001" element="_6qFn9iofEemQnOUhg0mU1A" source="_C0IYkCodEemQnOUhg0mU1A" target="_QEEkoCodEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_oV30QCogEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oV30QSogEemQnOUhg0mU1A" x="56" y="-36"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_oV30QiogEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oV30QyogEemQnOUhg0mU1A" x="6" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_oV4bUCogEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oV4bUSogEemQnOUhg0mU1A" x="-7" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_oV3NMSogEemQnOUhg0mU1A" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_oV3NMiogEemQnOUhg0mU1A" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oV3NMyogEemQnOUhg0mU1A" points="[1, -18, 189, 261]$[1, -252, 189, 27]$[-159, -252, 29, 27]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oV9T0CogEemQnOUhg0mU1A" id="(0.65,0.19)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oV9T0SogEemQnOUhg0mU1A" id="(0.7583333333333333,0.53)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_HmYicCokEemQnOUhg0mU1A" type="4001" element="_HmJR-CokEemQnOUhg0mU1A" source="_CL1lUCokEemQnOUhg0mU1A" target="_C0IYkCodEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_HmYidCokEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HmYidSokEemQnOUhg0mU1A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_HmYidiokEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HmYidyokEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_HmZJgCokEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HmZJgSokEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_HmYicSokEemQnOUhg0mU1A" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_HmYiciokEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HmYicyokEemQnOUhg0mU1A" points="[0, 0, -156, 71]$[156, -71, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HmZJgiokEemQnOUhg0mU1A" id="(0.6610169491525424,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HmZJgyokEemQnOUhg0mU1A" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_H9jFQCokEemQnOUhg0mU1A" type="4001" element="_H9bJfCokEemQnOUhg0mU1A" source="_DnK64CokEemQnOUhg0mU1A" target="_C0IYkCodEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_H9jsUCokEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9jsUSokEemQnOUhg0mU1A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_H9jsUiokEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9jsUyokEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_H9kTYCokEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9kTYSokEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_H9jFQSokEemQnOUhg0mU1A" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_H9jFQiokEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H9jFQyokEemQnOUhg0mU1A" points="[0, 0, 0, 71]$[0, -71, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9kTYiokEemQnOUhg0mU1A" id="(0.36666666666666664,0.07)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9kTYyokEemQnOUhg0mU1A" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_Ic23cCokEemQnOUhg0mU1A" type="4001" element="_IctGjiokEemQnOUhg0mU1A" source="_FjmyYCokEemQnOUhg0mU1A" target="_C0IYkCodEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_Ic3egCokEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ic3egSokEemQnOUhg0mU1A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Ic3egiokEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ic3egyokEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Ic3ehCokEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ic3ehSokEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ic23cSokEemQnOUhg0mU1A" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_Ic23ciokEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ic23cyokEemQnOUhg0mU1A" points="[0, 0, 129, 143]$[-129, -143, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ic3ehiokEemQnOUhg0mU1A" id="(0.6946564885496184,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ic3ehyokEemQnOUhg0mU1A" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_N72LgCorEemQnOUhg0mU1A" type="4001" element="_N7tBliorEemQnOUhg0mU1A" source="_D1vmkCodEemQnOUhg0mU1A" target="_UtkzcCoqEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_N72LhCorEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N72LhSorEemQnOUhg0mU1A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_N72LhiorEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N72LhyorEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_N72LiCorEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N72LiSorEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_N72LgSorEemQnOUhg0mU1A" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_N72LgiorEemQnOUhg0mU1A" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_N72LgyorEemQnOUhg0mU1A" points="[0, 0, 124, -71]$[0, 35, 124, -36]$[-124, 35, 0, -36]$[-124, 71, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_N72LiiorEemQnOUhg0mU1A" id="(0.3053435114503817,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_N72LiyorEemQnOUhg0mU1A" id="(0.5,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_dgch0CorEemQnOUhg0mU1A" type="4001" element="_dgSJ2CorEemQnOUhg0mU1A" source="_WnAk0CorEemQnOUhg0mU1A" target="_bLbyQCorEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_dgch1CorEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dgch1SorEemQnOUhg0mU1A" x="3" y="49"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_dgch1iorEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dgch1yorEemQnOUhg0mU1A" x="-11" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_dgch2CorEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dgch2SorEemQnOUhg0mU1A" x="-30" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_dgch0SorEemQnOUhg0mU1A" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_dgch0iorEemQnOUhg0mU1A" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dgch0yorEemQnOUhg0mU1A" points="[39, 0, 39, -71]$[39, 71, 39, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dgdI4CorEemQnOUhg0mU1A" id="(0.2708333333333333,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dgdI4SorEemQnOUhg0mU1A" id="(0.22033898305084745,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_Ek3YkCosEemQnOUhg0mU1A" type="4001" element="_EktnnCosEemQnOUhg0mU1A" source="_WnAk0CorEemQnOUhg0mU1A" target="_nyhOkCorEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_Ek3YlCosEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ek3YlSosEemQnOUhg0mU1A" x="-42" y="18"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Ek3YliosEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ek3YlyosEemQnOUhg0mU1A" x="20" y="-69"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Ek3YmCosEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ek3YmSosEemQnOUhg0mU1A" x="-6" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ek3YkSosEemQnOUhg0mU1A" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_Ek3YkiosEemQnOUhg0mU1A" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ek3YkyosEemQnOUhg0mU1A" points="[-27, 59, -91, -240]$[-27, 117, -91, -182]$[51, 117, -13, -182]$[51, 299, -13, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ek3YmiosEemQnOUhg0mU1A" id="(1.0,0.3979591836734694)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ek3YmyosEemQnOUhg0mU1A" id="(0.8813559322033898,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_Ky7dUCosEemQnOUhg0mU1A" type="4001" element="_KyxFRiosEemQnOUhg0mU1A" source="_bLbyQCorEemQnOUhg0mU1A" target="_ZqDkQCoZEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_Ky8EYCosEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ky8EYSosEemQnOUhg0mU1A" x="-2" y="15"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Ky8EYiosEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ky8EYyosEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Ky8EZCosEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ky8EZSosEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ky7dUSosEemQnOUhg0mU1A" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_Ky7dUiosEemQnOUhg0mU1A" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ky7dUyosEemQnOUhg0mU1A" points="[0, 0, 558, 0]$[-558, 0, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ky8EZiosEemQnOUhg0mU1A" id="(0.0,0.4897959183673469)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ky8EZyosEemQnOUhg0mU1A" id="(1.0,0.4897959183673469)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_QheUgCosEemQnOUhg0mU1A" type="4001" element="_QhSuYiosEemQnOUhg0mU1A" source="_nyhOkCorEemQnOUhg0mU1A" target="_QEEkoCodEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_QheUhCosEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QheUhSosEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_QheUhiosEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QheUhyosEemQnOUhg0mU1A" x="2" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_QheUiCosEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QheUiSosEemQnOUhg0mU1A" x="-2" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_QheUgSosEemQnOUhg0mU1A" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_QheUgiosEemQnOUhg0mU1A" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QheUgyosEemQnOUhg0mU1A" points="[0, 13, 655, 26]$[-655, 13, 0, 26]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QheUiiosEemQnOUhg0mU1A" id="(0.0,0.2653061224489796)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QheUiyosEemQnOUhg0mU1A" id="(1.0,0.1326530612244898)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_UXEGACosEemQnOUhg0mU1A" type="4001" element="_UW5t9iosEemQnOUhg0mU1A" source="_mUP5wCorEemQnOUhg0mU1A" target="_IejkxiodEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_UXEGBCosEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UXEGBSosEemQnOUhg0mU1A" x="-117" y="6"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UXEGBiosEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UXEGByosEemQnOUhg0mU1A" x="6" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UXEGCCosEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UXEGCSosEemQnOUhg0mU1A" x="-65" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_UXEGASosEemQnOUhg0mU1A" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_UXEGAiosEemQnOUhg0mU1A" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UXEGAyosEemQnOUhg0mU1A" points="[0, -26, 613, -26]$[-614, -26, -1, -26]$[-614, 0, -1, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UXEtECosEemQnOUhg0mU1A" id="(0.0,0.6632653061224489)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UXEtESosEemQnOUhg0mU1A" id="(0.8083333333333333,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_eylpsCosEemQnOUhg0mU1A" type="4001" element="_eyVLBiosEemQnOUhg0mU1A" source="_bLbyQCorEemQnOUhg0mU1A" target="_mUP5wCorEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_eylptCosEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eylptSosEemQnOUhg0mU1A" x="-37" y="35"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_eymQwCosEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eymQwSosEemQnOUhg0mU1A" x="-7" y="51"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_eymQwiosEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eymQwyosEemQnOUhg0mU1A" x="15" y="37"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_eylpsSosEemQnOUhg0mU1A" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_eylpsiosEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eylpsyosEemQnOUhg0mU1A" points="[-33, 49, 4, -236]$[-33, 133, 4, -152]$[-92, 133, -55, -152]$[-92, 211, -55, -74]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eymQxCosEemQnOUhg0mU1A" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eymQxSosEemQnOUhg0mU1A" id="(0.9583333333333334,0.76)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_uHKnACosEemQnOUhg0mU1A" type="4001" element="_uHA2EiosEemQnOUhg0mU1A" source="_mUP5wCorEemQnOUhg0mU1A" target="_Z4VWMCosEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_uHKnBCosEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uHKnBSosEemQnOUhg0mU1A" x="-3" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_uHLOECosEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uHLOESosEemQnOUhg0mU1A" x="5" y="-33"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_uHLOEiosEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uHLOEyosEemQnOUhg0mU1A" x="-15" y="74"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_uHKnASosEemQnOUhg0mU1A" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_uHKnAiosEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uHKnAyosEemQnOUhg0mU1A" points="[0, 49, 0, -113]$[0, 113, 0, -49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uHLOFCosEemQnOUhg0mU1A" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uHLOFSosEemQnOUhg0mU1A" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_ykSSkCosEemQnOUhg0mU1A" type="4001" element="_ykJIrCosEemQnOUhg0mU1A" source="_nyhOkCorEemQnOUhg0mU1A" target="_Z4VWMCosEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_ykSSlCosEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ykSSlSosEemQnOUhg0mU1A" x="-89" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ykSSliosEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ykSSlyosEemQnOUhg0mU1A" x="-36" y="-36"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ykSSmCosEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ykSSmSosEemQnOUhg0mU1A" x="-26" y="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_ykSSkSosEemQnOUhg0mU1A" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_ykSSkiosEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ykSSkyosEemQnOUhg0mU1A" points="[-1, 49, 181, -204]$[-1, 253, 181, 0]$[-123, 253, 59, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ykSSmiosEemQnOUhg0mU1A" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ykSSmyosEemQnOUhg0mU1A" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_6ZWxYCosEemQnOUhg0mU1A" type="4001" element="_6ZNAkCosEemQnOUhg0mU1A" source="_bLbyQCorEemQnOUhg0mU1A" target="_nyhOkCorEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_6ZXYcCosEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6ZXYcSosEemQnOUhg0mU1A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_6ZXYciosEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6ZXYcyosEemQnOUhg0mU1A" x="15" y="-1"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_6ZXYdCosEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6ZXYdSosEemQnOUhg0mU1A" x="-8" y="5"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_6ZWxYSosEemQnOUhg0mU1A" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_6ZWxYiosEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6ZWxYyosEemQnOUhg0mU1A" points="[26, 0, -65, -169]$[45, 0, -46, -169]$[45, 169, -46, 0]$[64, 169, -27, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6ZXYdiosEemQnOUhg0mU1A" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6ZXYdyosEemQnOUhg0mU1A" id="(0.5,0.5)"/>
+        </edges>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Zp_54CoZEemQnOUhg0mU1A" name="ComponentDefinition" tooltipText="" outgoingEdges="_lIWk0CofEemQnOUhg0mU1A _o7XjcCofEemQnOUhg0mU1A _vOuX4CofEemQnOUhg0mU1A" incomingEdges="_KyxFRiosEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//ComponentDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//ComponentDefinition"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="__cBF4SofEemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="__EiaACofEemQnOUhg0mU1A" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="model/cft.ecore#//ComponentDefinition/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="model/cft.ecore#//ComponentDefinition/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="__cCUBSofEemQnOUhg0mU1A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_cTwxcCoZEemQnOUhg0mU1A" name="EventDefinition" tooltipText="" outgoingEdges="_W6Y8NiodEemQnOUhg0mU1A" incomingEdges="_F_tjwCodEemQnOUhg0mU1A _GWJt1iodEemQnOUhg0mU1A _o7XjcCofEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//EventDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//EventDefinition"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_FkfAUSodEemQnOUhg0mU1A" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_C0DgECodEemQnOUhg0mU1A" name="GateDefinition" tooltipText="" outgoingEdges="_GWJt1iodEemQnOUhg0mU1A _6qFn9iofEemQnOUhg0mU1A" incomingEdges="_HmJR-CokEemQnOUhg0mU1A _H9bJfCokEemQnOUhg0mU1A _IctGjiokEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//GateDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//GateDefinition"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_JJ48lSokEemQnOUhg0mU1A" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_D1quECodEemQnOUhg0mU1A" name="BasicEventDefinition" tooltipText="" outgoingEdges="_F_tjwCodEemQnOUhg0mU1A _N7tBliorEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//BasicEventDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//BasicEventDefinition"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_2kmZRCofEemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_F_tjwCodEemQnOUhg0mU1A" sourceNode="_D1quECodEemQnOUhg0mU1A" targetNode="_cTwxcCoZEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//BasicEventDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//BasicEventDefinition"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_2krRxiofEemQnOUhg0mU1A" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_2krRxyofEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_2krRyCofEemQnOUhg0mU1A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_GWJt1iodEemQnOUhg0mU1A" sourceNode="_C0DgECodEemQnOUhg0mU1A" targetNode="_cTwxcCoZEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//GateDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//GateDefinition"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_GWKU4CodEemQnOUhg0mU1A" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_GWKU4SodEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_GWKU4iodEemQnOUhg0mU1A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Iec3ECodEemQnOUhg0mU1A" name="IntputEvent" tooltipText="" outgoingEdges="_Wlx-JiodEemQnOUhg0mU1A" incomingEdges="_lIWk0CofEemQnOUhg0mU1A _UW5t9iosEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//IntputEvent"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//IntputEvent"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_0uB5MyofEemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_0AT3kCofEemQnOUhg0mU1A" name="multiple : EBoolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="model/cft.ecore#//IntputEvent/multiple"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="model/cft.ecore#//IntputEvent/multiple"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_0uDHUSofEemQnOUhg0mU1A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_QD_FECodEemQnOUhg0mU1A" name="EventDeclaration" tooltipText="" incomingEdges="_Wlx-JiodEemQnOUhg0mU1A _W6Y8NiodEemQnOUhg0mU1A _vOuX4CofEemQnOUhg0mU1A _6qFn9iofEemQnOUhg0mU1A _QhSuYiosEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//EventDeclaration"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//EventDeclaration"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_oZBtmSouEemQnOUhg0mU1A" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_n8pTkCouEemQnOUhg0mU1A" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="model/cft.ecore#//EventDeclaration/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="model/cft.ecore#//EventDeclaration/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_oZCUoiouEemQnOUhg0mU1A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Wlx-JiodEemQnOUhg0mU1A" sourceNode="_Iec3ECodEemQnOUhg0mU1A" targetNode="_QD_FECodEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//IntputEvent"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//IntputEvent"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_0uFjnCofEemQnOUhg0mU1A" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_0uFjnSofEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_0uFjniofEemQnOUhg0mU1A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_W6Y8NiodEemQnOUhg0mU1A" sourceNode="_cTwxcCoZEemQnOUhg0mU1A" targetNode="_QD_FECodEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//EventDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//EventDefinition"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_W6Y8NyodEemQnOUhg0mU1A" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_W6Y8OCodEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_W6Y8OSodEemQnOUhg0mU1A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_lIWk0CofEemQnOUhg0mU1A" name="[0..*] inputEvents" sourceNode="_Zp_54CoZEemQnOUhg0mU1A" targetNode="_Iec3ECodEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EReference" href="model/cft.ecore#//ComponentDefinition/inputEvents"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cft.ecore#//ComponentDefinition/inputEvents"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_lIXL4yofEemQnOUhg0mU1A" description="_lIXL4CofEemQnOUhg0mU1A" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_lIXL5SofEemQnOUhg0mU1A" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_lIXL5CofEemQnOUhg0mU1A" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_o7XjcCofEemQnOUhg0mU1A" name="[0..*] eventDefinitions" sourceNode="_Zp_54CoZEemQnOUhg0mU1A" targetNode="_cTwxcCoZEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EReference" href="model/cft.ecore#//ComponentDefinition/eventDefinitions"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cft.ecore#//ComponentDefinition/eventDefinitions"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_o7YKgCofEemQnOUhg0mU1A" description="_lIXL4CofEemQnOUhg0mU1A" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_o7YKgiofEemQnOUhg0mU1A" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_o7YKgSofEemQnOUhg0mU1A" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_vOuX4CofEemQnOUhg0mU1A" name="[0..*] outputEvents" sourceNode="_Zp_54CoZEemQnOUhg0mU1A" targetNode="_QD_FECodEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EReference" href="model/cft.ecore#//ComponentDefinition/outputEvents"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cft.ecore#//ComponentDefinition/outputEvents"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_vOuX4SofEemQnOUhg0mU1A" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_vOuX4yofEemQnOUhg0mU1A" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_vOuX4iofEemQnOUhg0mU1A" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_6qFn9iofEemQnOUhg0mU1A" name="[0..*] inputEvents" sourceNode="_C0DgECodEemQnOUhg0mU1A" targetNode="_QD_FECodEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EReference" href="model/cft.ecore#//GateDefinition/inputEvents"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cft.ecore#//GateDefinition/inputEvents"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_QqzsMiorEemQnOUhg0mU1A" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_QqzsNCorEemQnOUhg0mU1A" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_QqzsMyorEemQnOUhg0mU1A" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_CLrNQCokEemQnOUhg0mU1A" name="AndGateDefinition" tooltipText="" outgoingEdges="_HmJR-CokEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//AndGateDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//AndGateDefinition"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_CLr0UCokEemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_DnAi0CokEemQnOUhg0mU1A" name="OrGateDefinition" tooltipText="" outgoingEdges="_H9bJfCokEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//OrGateDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//OrGateDefinition"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_DnAi0SokEemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_FjbzQCokEemQnOUhg0mU1A" name="KOfMGateDefinition" tooltipText="" outgoingEdges="_IctGjiokEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//KOfMGateDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//KOfMGateDefinition"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_T8ZYwSorEemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_St8BgCorEemQnOUhg0mU1A" name="k : EInt" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="model/cft.ecore#//KOfMGateDefinition/k"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="model/cft.ecore#//KOfMGateDefinition/k"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_TFT_tSorEemQnOUhg0mU1A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_TnPBACorEemQnOUhg0mU1A" name="m : EInt" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="model/cft.ecore#//KOfMGateDefinition/m"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="model/cft.ecore#//KOfMGateDefinition/m"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_T8am0iorEemQnOUhg0mU1A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_HmJR-CokEemQnOUhg0mU1A" sourceNode="_CLrNQCokEemQnOUhg0mU1A" targetNode="_C0DgECodEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//AndGateDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//AndGateDefinition"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_HmJ48CokEemQnOUhg0mU1A" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_HmJ48SokEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_HmJ48iokEemQnOUhg0mU1A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_H9bJfCokEemQnOUhg0mU1A" sourceNode="_DnAi0CokEemQnOUhg0mU1A" targetNode="_C0DgECodEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//OrGateDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//OrGateDefinition"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_H9bJfSokEemQnOUhg0mU1A" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_H9bJfiokEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_H9bJfyokEemQnOUhg0mU1A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_IctGjiokEemQnOUhg0mU1A" sourceNode="_FjbzQCokEemQnOUhg0mU1A" targetNode="_C0DgECodEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//KOfMGateDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//KOfMGateDefinition"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_T8b1DiorEemQnOUhg0mU1A" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_T8b1DyorEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_T8b1ECorEemQnOUhg0mU1A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Utes0CoqEemQnOUhg0mU1A" name="Distribution" tooltipText="" incomingEdges="_N7tBliorEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/ft.ecore#//Distribution"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/ft.ecore#//Distribution"/>
+      <decorations xmi:type="viewpoint:Decoration" uid="_UtfT4CoqEemQnOUhg0mU1A">
+        <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
+      </decorations>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_Utes0SoqEemQnOUhg0mU1A" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_N7tBliorEemQnOUhg0mU1A" name="[1..1] distribution" sourceNode="_D1quECodEemQnOUhg0mU1A" targetNode="_Utes0CoqEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EReference" href="model/cft.ecore#//BasicEventDefinition/distribution"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cft.ecore#//BasicEventDefinition/distribution"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OkCM6SorEemQnOUhg0mU1A" description="_OkCM5iorEemQnOUhg0mU1A" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OkCM6yorEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OkCM6iorEemQnOUhg0mU1A" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Wm0XkCorEemQnOUhg0mU1A" name="ComponentFaultTree" tooltipText="" outgoingEdges="_dgSJ2CorEemQnOUhg0mU1A _EktnnCosEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//ComponentFaultTree"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//ComponentFaultTree"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_Wm0-oCorEemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bLPlACorEemQnOUhg0mU1A" name="Component" tooltipText="" outgoingEdges="_KyxFRiosEemQnOUhg0mU1A _eyVLBiosEemQnOUhg0mU1A _6ZNAkCosEemQnOUhg0mU1A" incomingEdges="_dgSJ2CorEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//Component"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//Component"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bLQzICorEemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_dgSJ2CorEemQnOUhg0mU1A" name="[0..*] components" sourceNode="_Wm0XkCorEemQnOUhg0mU1A" targetNode="_bLPlACorEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EReference" href="model/cft.ecore#//ComponentFaultTree/components"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cft.ecore#//ComponentFaultTree/components"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_dgSw0CorEemQnOUhg0mU1A" description="_lIXL4CofEemQnOUhg0mU1A" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_dgSw0iorEemQnOUhg0mU1A" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_dgSw0SorEemQnOUhg0mU1A" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_mUETkCorEemQnOUhg0mU1A" name="Input" tooltipText="" outgoingEdges="_UW5t9iosEemQnOUhg0mU1A _uHA2EiosEemQnOUhg0mU1A" incomingEdges="_eyVLBiosEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//Input"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//Input"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_mUETkSorEemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_nyWPcCorEemQnOUhg0mU1A" name="Output" tooltipText="" outgoingEdges="_QhSuYiosEemQnOUhg0mU1A _ykJIrCosEemQnOUhg0mU1A" incomingEdges="_EktnnCosEemQnOUhg0mU1A _6ZNAkCosEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//Output"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//Output"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_nyWPcSorEemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_EktnnCosEemQnOUhg0mU1A" name="[1..1] topEvent" sourceNode="_Wm0XkCorEemQnOUhg0mU1A" targetNode="_nyWPcCorEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EReference" href="model/cft.ecore#//ComponentFaultTree/topEvent"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cft.ecore#//ComponentFaultTree/topEvent"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_IXsxGyosEemQnOUhg0mU1A" description="_IXsxGCosEemQnOUhg0mU1A" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_IXsxHSosEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_IXsxHCosEemQnOUhg0mU1A" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_KyxFRiosEemQnOUhg0mU1A" name="[1..1] componentDefinition" sourceNode="_bLPlACorEemQnOUhg0mU1A" targetNode="_Zp_54CoZEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EReference" href="model/cft.ecore#//Component/componentDefinition"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cft.ecore#//Component/componentDefinition"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_M32iiCosEemQnOUhg0mU1A" description="_IXsxGCosEemQnOUhg0mU1A" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_M32iiiosEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_M32iiSosEemQnOUhg0mU1A" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_QhSuYiosEemQnOUhg0mU1A" name="[1..1] eventDeclaration" sourceNode="_nyWPcCorEemQnOUhg0mU1A" targetNode="_QD_FECodEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EReference" href="model/cft.ecore#//Output/eventDeclaration"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cft.ecore#//Output/eventDeclaration"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_YcmYEiosEemQnOUhg0mU1A" description="_IXsxGCosEemQnOUhg0mU1A" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_YcmYFCosEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_YcmYEyosEemQnOUhg0mU1A" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_UW5t9iosEemQnOUhg0mU1A" name="[1..1] intputEvent" sourceNode="_mUETkCorEemQnOUhg0mU1A" targetNode="_Iec3ECodEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EReference" href="model/cft.ecore#//Input/intputEvent"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cft.ecore#//Input/intputEvent"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Xs4LTCosEemQnOUhg0mU1A" description="_IXsxGCosEemQnOUhg0mU1A" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Xs4LTiosEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_Xs4LTSosEemQnOUhg0mU1A" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Z4MMQCosEemQnOUhg0mU1A" name="Connection" tooltipText="" incomingEdges="_uHA2EiosEemQnOUhg0mU1A _ykJIrCosEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//Connection"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//Connection"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_Z4MMQSosEemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_eyVLBiosEemQnOUhg0mU1A" sourceNode="_bLPlACorEemQnOUhg0mU1A" targetNode="_mUETkCorEemQnOUhg0mU1A" beginLabel="[1..1] component" endLabel="[0..*] inputs">
+      <target xmi:type="ecore:EReference" href="model/cft.ecore#//Component/inputs"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cft.ecore#//Input/component"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cft.ecore#//Component/inputs"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_eyVLCiosEemQnOUhg0mU1A" description="_eyVLByosEemQnOUhg0mU1A" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_eyVLCyosEemQnOUhg0mU1A" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_eyVLDCosEemQnOUhg0mU1A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_uHA2EiosEemQnOUhg0mU1A" sourceNode="_mUETkCorEemQnOUhg0mU1A" targetNode="_Z4MMQCosEemQnOUhg0mU1A" beginLabel="[1..1] input" endLabel="[0..*] incomingConnections">
+      <target xmi:type="ecore:EReference" href="model/cft.ecore#//Input/incomingConnections"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cft.ecore#//Input/incomingConnections"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cft.ecore#//Connection/input"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_uHBdECosEemQnOUhg0mU1A" description="_eyVLByosEemQnOUhg0mU1A" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_uHBdESosEemQnOUhg0mU1A" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_uHBdEiosEemQnOUhg0mU1A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ykJIrCosEemQnOUhg0mU1A" sourceNode="_nyWPcCorEemQnOUhg0mU1A" targetNode="_Z4MMQCosEemQnOUhg0mU1A" beginLabel="[1..1] output" endLabel="[0..*] outgoingConnections">
+      <target xmi:type="ecore:EReference" href="model/cft.ecore#//Output/outgoingConnections"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cft.ecore#//Output/outgoingConnections"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cft.ecore#//Connection/output"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_ykJIrSosEemQnOUhg0mU1A" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_ykJIriosEemQnOUhg0mU1A" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_ykJIryosEemQnOUhg0mU1A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_6ZNAkCosEemQnOUhg0mU1A" sourceNode="_bLPlACorEemQnOUhg0mU1A" targetNode="_nyWPcCorEemQnOUhg0mU1A" beginLabel="[1..1] component" endLabel="[0..*] outputs">
+      <target xmi:type="ecore:EReference" href="model/cft.ecore#//Component/outputs"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cft.ecore#//Output/component"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cft.ecore#//Component/outputs"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_6ZNncCosEemQnOUhg0mU1A" description="_eyVLByosEemQnOUhg0mU1A" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_6ZNncSosEemQnOUhg0mU1A" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_6ZNnciosEemQnOUhg0mU1A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_XdpXECoZEemQnOUhg0mU1A"/>
+    <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
+    <target xmi:type="ecore:EPackage" href="model/cft.ecore#/"/>
+  </diagram:DSemanticDiagram>
+  <diagram:DSemanticDiagram uid="_Bnj68CohEemQnOUhg0mU1A" name="ft class diagram">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_BnlJECohEemQnOUhg0mU1A" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_BnlJESohEemQnOUhg0mU1A">
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_RSXm8CohEemQnOUhg0mU1A" sourceArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_RSXm8SohEemQnOUhg0mU1A" showIcon="false" labelExpression="service:render">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </centerLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_RSXm8iohEemQnOUhg0mU1A" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_Um-LQCohEemQnOUhg0mU1A" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_Um-LQSohEemQnOUhg0mU1A" showIcon="false" labelExpression="service:render">
+            <labelFormat>bold</labelFormat>
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </centerLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_Um-LQiohEemQnOUhg0mU1A" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_n3A4mSohEemQnOUhg0mU1A" sourceArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_n3A4miohEemQnOUhg0mU1A" showIcon="false" labelExpression="service:render">
+            <labelFormat>bold</labelFormat>
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </centerLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_n3A4myohEemQnOUhg0mU1A" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_BnlwICohEemQnOUhg0mU1A" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_BnlwISohEemQnOUhg0mU1A" type="Sirius" element="_Bnj68CohEemQnOUhg0mU1A" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_DB1gkCohEemQnOUhg0mU1A" type="2003" element="_DBuy4CohEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_DB1gkyohEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_DB1glCohEemQnOUhg0mU1A" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_DB1glSohEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_DB1gliohEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_DB1gkSohEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DB1gkiohEemQnOUhg0mU1A" x="351" y="26" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_OHUAMCohEemQnOUhg0mU1A" type="2003" element="_OHKPMCohEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_OHUnQCohEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_OHUnQSohEemQnOUhg0mU1A" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_WsY_oCohEemQnOUhg0mU1A" type="3010" element="_WsKWICohEemQnOUhg0mU1A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_WsY_oSohEemQnOUhg0mU1A" fontColor="2697711" fontName="Cantarell" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_WsY_oiohEemQnOUhg0mU1A"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_OHUnQiohEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_OHUnQyohEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_OHUAMSohEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OHUAMiohEemQnOUhg0mU1A" x="351" y="208" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_PfLLACohEemQnOUhg0mU1A" type="2003" element="_PfCoICohEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_PfLyECohEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_PfLyESohEemQnOUhg0mU1A" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_PfLyEiohEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_PfLyEyohEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_PfLLASohEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PfLLAiohEemQnOUhg0mU1A" x="247" y="377" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_QR5BYCohEemQnOUhg0mU1A" type="2003" element="_QRvQYCohEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_QR5BYyohEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_QR5ocCohEemQnOUhg0mU1A" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_QR5ocSohEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_QR5ociohEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_QR5BYSohEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QR5BYiohEemQnOUhg0mU1A" x="455" y="377" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_fDJPMCohEemQnOUhg0mU1A" type="2003" element="_fC-3ICohEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_fDJPMyohEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_fDJPNCohEemQnOUhg0mU1A" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_fDJPNSohEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_fDJPNiohEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_fDJPMSohEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fDJPMiohEemQnOUhg0mU1A" x="143" y="546" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_g_4BoCohEemQnOUhg0mU1A" type="2003" element="_g_tpkCohEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_g_4BoyohEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_g_4BpCohEemQnOUhg0mU1A" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_UPL2ACokEemQnOUhg0mU1A" type="3010" element="_UPA24CokEemQnOUhg0mU1A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_UPL2ASokEemQnOUhg0mU1A" fontColor="2697711" fontName="Cantarell" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_UPL2AiokEemQnOUhg0mU1A"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_g_4BpSohEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_g_4BpiohEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_g_4BoSohEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_4BoiohEemQnOUhg0mU1A" x="39" y="715" width="133" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_kXPmFiohEemQnOUhg0mU1A" type="2003" element="_kXGcICohEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_kXQNICohEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_kXQNISohEemQnOUhg0mU1A" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_VVIKYCokEemQnOUhg0mU1A" type="3010" element="_VU8kMCokEemQnOUhg0mU1A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_VVIKYSokEemQnOUhg0mU1A" fontColor="2697711" fontName="Cantarell" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_VVIKYiokEemQnOUhg0mU1A"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_kXQNIiohEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_kXQNIyohEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_kXPmFyohEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kXPmGCohEemQnOUhg0mU1A" x="221" y="715" width="133" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_Jn0OsCokEemQnOUhg0mU1A" type="2003" element="_JnsS4CokEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_Jn0OsyokEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_Jn0OtCokEemQnOUhg0mU1A" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Jn0OtSokEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Jn0OtiokEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_Jn0OsSokEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jn0OsiokEemQnOUhg0mU1A" x="312" y="546" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J8rEYCokEemQnOUhg0mU1A" type="2003" element="_J8gFQCokEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_J8rEYyokEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J8rrcCokEemQnOUhg0mU1A" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J8rrcSokEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J8rrciokEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J8rEYSokEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J8rEYiokEemQnOUhg0mU1A" x="455" y="546" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_MS4GwCokEemQnOUhg0mU1A" type="2003" element="_MSuVwCokEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_MS4GwyokEemQnOUhg0mU1A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_MS4GxCokEemQnOUhg0mU1A" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_O6m-ACokEemQnOUhg0mU1A" type="3010" element="_O6aJsCokEemQnOUhg0mU1A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_O6m-ASokEemQnOUhg0mU1A" fontColor="2697711" fontName="Cantarell" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_O6m-AiokEemQnOUhg0mU1A"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_Pi5tECokEemQnOUhg0mU1A" type="3010" element="_Pis4wCokEemQnOUhg0mU1A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_Pi5tESokEemQnOUhg0mU1A" fontColor="2697711" fontName="Cantarell" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Pi5tEiokEemQnOUhg0mU1A"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_MS4GxSokEemQnOUhg0mU1A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_MS4GxiokEemQnOUhg0mU1A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_MS4GwSokEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MS4GwiokEemQnOUhg0mU1A" x="598" y="546" width="120" height="100"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_BnlwIiohEemQnOUhg0mU1A"/>
+        <edges xmi:type="notation:Edge" xmi:id="_RSe7sCohEemQnOUhg0mU1A" type="4001" element="_RSW_4CohEemQnOUhg0mU1A" source="_DB1gkCohEemQnOUhg0mU1A" target="_OHUAMCohEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_RSe7tCohEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RSe7tSohEemQnOUhg0mU1A" x="-3" y="37"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_RSe7tiohEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RSe7tyohEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_RSfiwCohEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RSfiwSohEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_RSe7sSohEemQnOUhg0mU1A" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_RSe7siohEemQnOUhg0mU1A" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RSe7syohEemQnOUhg0mU1A" points="[-20, 0, -20, -84]$[-20, 84, -20, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RSfiwiohEemQnOUhg0mU1A" id="(0.5,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RSfiwyohEemQnOUhg0mU1A" id="(0.5,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_Ty_JkCohEemQnOUhg0mU1A" type="4001" element="_Ty0KdiohEemQnOUhg0mU1A" source="_DB1gkCohEemQnOUhg0mU1A" target="_OHUAMCohEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_Ty_JlCohEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ty_JlSohEemQnOUhg0mU1A" x="-3" y="-39"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Ty_JliohEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ty_JlyohEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Ty_woCohEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ty_woSohEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ty_JkSohEemQnOUhg0mU1A" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_Ty_JkiohEemQnOUhg0mU1A" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ty_JkyohEemQnOUhg0mU1A" points="[-11, 0, -11, -84]$[-11, 84, -11, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ty_woiohEemQnOUhg0mU1A" id="(0.7542372881355932,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ty_woyohEemQnOUhg0mU1A" id="(0.7542372881355932,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_ahmWoCohEemQnOUhg0mU1A" type="4001" element="_ahdMsCohEemQnOUhg0mU1A" source="_PfLLACohEemQnOUhg0mU1A" target="_OHUAMCohEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_ahmWpCohEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ahmWpSohEemQnOUhg0mU1A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ahmWpiohEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ahm9sCohEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ahm9sSohEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ahm9siohEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_ahmWoSohEemQnOUhg0mU1A" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_ahmWoiohEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ahmWoyohEemQnOUhg0mU1A" points="[0, 0, -117, 71]$[117, -71, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ahm9syohEemQnOUhg0mU1A" id="(0.4406779661016949,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ahm9tCohEemQnOUhg0mU1A" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_a2bXICohEemQnOUhg0mU1A" type="4001" element="_a2TbUyohEemQnOUhg0mU1A" source="_QR5BYCohEemQnOUhg0mU1A" target="_OHUAMCohEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_a2b-MCohEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2b-MSohEemQnOUhg0mU1A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_a2b-MiohEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2b-MyohEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_a2b-NCohEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2b-NSohEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_a2bXISohEemQnOUhg0mU1A" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_a2bXIiohEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_a2bXIyohEemQnOUhg0mU1A" points="[0, 0, 104, 71]$[-104, -71, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a2b-NiohEemQnOUhg0mU1A" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a2b-NyohEemQnOUhg0mU1A" id="(0.5,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_nacRUCohEemQnOUhg0mU1A" type="4001" element="_naRSOSohEemQnOUhg0mU1A" source="_PfLLACohEemQnOUhg0mU1A" target="_fDJPMCohEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_nac4YCohEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nac4YSohEemQnOUhg0mU1A" x="3" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_nac4YiohEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nac4YyohEemQnOUhg0mU1A" x="2" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_nac4ZCohEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nac4ZSohEemQnOUhg0mU1A" x="-2" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_nacRUSohEemQnOUhg0mU1A" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_nacRUiohEemQnOUhg0mU1A" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nacRUyohEemQnOUhg0mU1A" points="[0, 0, 104, -71]$[0, 36, 104, -35]$[-104, 36, 0, -35]$[-104, 71, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nac4ZiohEemQnOUhg0mU1A" id="(0.5,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nac4ZyohEemQnOUhg0mU1A" id="(0.5,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_qWOtACohEemQnOUhg0mU1A" type="4001" element="_qWGKLCohEemQnOUhg0mU1A" source="_g_4BoCohEemQnOUhg0mU1A" target="_fDJPMCohEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_qWOtBCohEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWOtBSohEemQnOUhg0mU1A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_qWOtBiohEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWOtByohEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_qWOtCCohEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWOtCSohEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_qWOtASohEemQnOUhg0mU1A" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_qWOtAiohEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qWOtAyohEemQnOUhg0mU1A" points="[0, 0, -65, 71]$[65, -71, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qWOtCiohEemQnOUhg0mU1A" id="(0.6946564885496184,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qWOtCyohEemQnOUhg0mU1A" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_quUc4CohEemQnOUhg0mU1A" type="4001" element="_quKE2SohEemQnOUhg0mU1A" source="_kXPmFiohEemQnOUhg0mU1A" target="_fDJPMCohEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_quUc5CohEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_quUc5SohEemQnOUhg0mU1A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_quUc5iohEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_quUc5yohEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_quUc6CohEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_quUc6SohEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_quUc4SohEemQnOUhg0mU1A" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_quUc4iohEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_quUc4yohEemQnOUhg0mU1A" points="[0, 0, 52, 71]$[-52, -71, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_quVD8CohEemQnOUhg0mU1A" id="(0.3969465648854962,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_quVD8SohEemQnOUhg0mU1A" id="(0.5,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_NOxuUCokEemQnOUhg0mU1A" type="4001" element="_NOpLfCokEemQnOUhg0mU1A" source="_Jn0OsCokEemQnOUhg0mU1A" target="_QR5BYCohEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_NOxuVCokEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NOxuVSokEemQnOUhg0mU1A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_NOxuViokEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NOxuVyokEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_NOxuWCokEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NOxuWSokEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_NOxuUSokEemQnOUhg0mU1A" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_NOxuUiokEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NOxuUyokEemQnOUhg0mU1A" points="[0, 0, -91, 130]$[91, -130, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NOxuWiokEemQnOUhg0mU1A" id="(0.4406779661016949,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NOxuWyokEemQnOUhg0mU1A" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_NhqOECokEemQnOUhg0mU1A" type="4001" element="_NhfO9iokEemQnOUhg0mU1A" source="_J8rEYCokEemQnOUhg0mU1A" target="_QR5BYCohEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_NhqOFCokEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NhqOFSokEemQnOUhg0mU1A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_NhqOFiokEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NhqOFyokEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_NhqOGCokEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NhqOGSokEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_NhqOESokEemQnOUhg0mU1A" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_NhqOEiokEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NhqOEyokEemQnOUhg0mU1A" points="[0, 0, 0, 71]$[0, -71, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NhqOGiokEemQnOUhg0mU1A" id="(0.39166666666666666,0.07)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NhqOGyokEemQnOUhg0mU1A" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_NxBfwCokEemQnOUhg0mU1A" type="4001" element="_Nw0rfyokEemQnOUhg0mU1A" source="_MS4GwCokEemQnOUhg0mU1A" target="_QR5BYCohEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_NxCG0CokEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NxCG0SokEemQnOUhg0mU1A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_NxCG0iokEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NxCG0yokEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_NxCG1CokEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NxCG1SokEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_NxBfwSokEemQnOUhg0mU1A" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_NxBfwiokEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NxBfwyokEemQnOUhg0mU1A" points="[0, 0, 91, 71]$[-91, -71, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NxCG1iokEemQnOUhg0mU1A" id="(0.22033898305084745,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NxCG1yokEemQnOUhg0mU1A" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_RDmDwCokEemQnOUhg0mU1A" type="4001" element="_RDeH_CokEemQnOUhg0mU1A" source="_QR5BYCohEemQnOUhg0mU1A" target="_OHUAMCohEemQnOUhg0mU1A">
+          <children xmi:type="notation:Node" xmi:id="_RDmDxCokEemQnOUhg0mU1A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RDmDxSokEemQnOUhg0mU1A" x="31" y="-37"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_RDmDxiokEemQnOUhg0mU1A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RDmDxyokEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_RDmDyCokEemQnOUhg0mU1A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RDmDySokEemQnOUhg0mU1A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_RDmDwSokEemQnOUhg0mU1A" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_RDmDwiokEemQnOUhg0mU1A" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RDmDwyokEemQnOUhg0mU1A" points="[0, 0, 90, 120]$[0, -120, 90, 0]$[-90, -120, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RDmq0CokEemQnOUhg0mU1A" id="(0.8813559322033898,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RDmq0SokEemQnOUhg0mU1A" id="(1.0,0.5)"/>
+        </edges>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_DBuy4CohEemQnOUhg0mU1A" name="FaultTree" tooltipText="" outgoingEdges="_RSW_4CohEemQnOUhg0mU1A _Ty0KdiohEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/ft.ecore#//FaultTree"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/ft.ecore#//FaultTree"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_DBuy4SohEemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_OHKPMCohEemQnOUhg0mU1A" name="Event" tooltipText="" incomingEdges="_RSW_4CohEemQnOUhg0mU1A _Ty0KdiohEemQnOUhg0mU1A _ahdMsCohEemQnOUhg0mU1A _a2TbUyohEemQnOUhg0mU1A _RDeH_CokEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/ft.ecore#//Event"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/ft.ecore#//Event"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_XqltQyohEemQnOUhg0mU1A" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_WsKWICohEemQnOUhg0mU1A" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="model/ft.ecore#//Event/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="model/ft.ecore#//Event/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_XqmUVSohEemQnOUhg0mU1A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_PfCoICohEemQnOUhg0mU1A" name="BasicEvent" tooltipText="" outgoingEdges="_ahdMsCohEemQnOUhg0mU1A _naRSOSohEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/ft.ecore#//BasicEvent"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/ft.ecore#//BasicEvent"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_PfCoISohEemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_QRvQYCohEemQnOUhg0mU1A" name="Gate" tooltipText="" outgoingEdges="_a2TbUyohEemQnOUhg0mU1A _RDeH_CokEemQnOUhg0mU1A" incomingEdges="_NOpLfCokEemQnOUhg0mU1A _NhfO9iokEemQnOUhg0mU1A _Nw0rfyokEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/ft.ecore#//Gate"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/ft.ecore#//Gate"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_QRi7xyokEemQnOUhg0mU1A" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_RSW_4CohEemQnOUhg0mU1A" name="[0..*] events" sourceNode="_DBuy4CohEemQnOUhg0mU1A" targetNode="_OHKPMCohEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EReference" href="model/ft.ecore#//FaultTree/events"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/ft.ecore#//FaultTree/events"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_RSXm8yohEemQnOUhg0mU1A" description="_RSXm8CohEemQnOUhg0mU1A" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_RSXm9SohEemQnOUhg0mU1A" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_RSXm9CohEemQnOUhg0mU1A" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Ty0KdiohEemQnOUhg0mU1A" name="[1..1] topEvent" sourceNode="_DBuy4CohEemQnOUhg0mU1A" targetNode="_OHKPMCohEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EReference" href="model/ft.ecore#//FaultTree/topEvent"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/ft.ecore#//FaultTree/topEvent"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Um-LQyohEemQnOUhg0mU1A" description="_Um-LQCohEemQnOUhg0mU1A" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Um-LRSohEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_Um-LRCohEemQnOUhg0mU1A" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ahdMsCohEemQnOUhg0mU1A" sourceNode="_PfCoICohEemQnOUhg0mU1A" targetNode="_OHKPMCohEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EClass" href="model/ft.ecore#//BasicEvent"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/ft.ecore#//BasicEvent"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_ahdzwCohEemQnOUhg0mU1A" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_ahdzwSohEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_ahdzwiohEemQnOUhg0mU1A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_a2TbUyohEemQnOUhg0mU1A" sourceNode="_QRvQYCohEemQnOUhg0mU1A" targetNode="_OHKPMCohEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EClass" href="model/ft.ecore#//Gate"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/ft.ecore#//Gate"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_a2TbVCohEemQnOUhg0mU1A" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_a2TbVSohEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_a2TbViohEemQnOUhg0mU1A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_fC-3ICohEemQnOUhg0mU1A" name="Distribution" tooltipText="" incomingEdges="_naRSOSohEemQnOUhg0mU1A _qWGKLCohEemQnOUhg0mU1A _quKE2SohEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/ft.ecore#//Distribution"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/ft.ecore#//Distribution"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_gx2MsyohEemQnOUhg0mU1A" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g_tpkCohEemQnOUhg0mU1A" name="ConstantDistribution" tooltipText="" outgoingEdges="_qWGKLCohEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/ft.ecore#//ConstantDistribution"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/ft.ecore#//ConstantDistribution"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_UlyYKyokEemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_UPA24CokEemQnOUhg0mU1A" name="p : EDouble = 0.0" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="model/ft.ecore#//ConstantDistribution/p"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="model/ft.ecore#//ConstantDistribution/p"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_Uly_MiokEemQnOUhg0mU1A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_kXGcICohEemQnOUhg0mU1A" name="ExponentialDistribution" tooltipText="" outgoingEdges="_quKE2SohEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/ft.ecore#//ExponentialDistribution"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/ft.ecore#//ExponentialDistribution"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_V06dsyokEemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_VU8kMCokEemQnOUhg0mU1A" name="lambda : EDouble = 0.0" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="model/ft.ecore#//ExponentialDistribution/lambda"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="model/ft.ecore#//ExponentialDistribution/lambda"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_V07EwyokEemQnOUhg0mU1A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_naRSOSohEemQnOUhg0mU1A" name="[1..1] distribution" sourceNode="_PfCoICohEemQnOUhg0mU1A" targetNode="_fC-3ICohEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EReference" href="model/ft.ecore#//BasicEvent/distribution"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/ft.ecore#//BasicEvent/distribution"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_n3A4nCohEemQnOUhg0mU1A" description="_n3A4mSohEemQnOUhg0mU1A" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_n3A4niohEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_n3A4nSohEemQnOUhg0mU1A" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_qWGKLCohEemQnOUhg0mU1A" sourceNode="_g_tpkCohEemQnOUhg0mU1A" targetNode="_fC-3ICohEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EClass" href="model/ft.ecore#//ConstantDistribution"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/ft.ecore#//ConstantDistribution"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Ul00bCokEemQnOUhg0mU1A" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_Ul00bSokEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Ul00biokEemQnOUhg0mU1A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_quKE2SohEemQnOUhg0mU1A" sourceNode="_kXGcICohEemQnOUhg0mU1A" targetNode="_fC-3ICohEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EClass" href="model/ft.ecore#//ExponentialDistribution"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/ft.ecore#//ExponentialDistribution"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_V09hCSokEemQnOUhg0mU1A" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_V09hCiokEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_V09hCyokEemQnOUhg0mU1A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_JnsS4CokEemQnOUhg0mU1A" name="AndGate" tooltipText="" outgoingEdges="_NOpLfCokEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/ft.ecore#//AndGate"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/ft.ecore#//AndGate"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_Jns58CokEemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J8gFQCokEemQnOUhg0mU1A" name="OrGate" tooltipText="" outgoingEdges="_NhfO9iokEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/ft.ecore#//OrGate"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/ft.ecore#//OrGate"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8gsUCokEemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_MSuVwCokEemQnOUhg0mU1A" name="KOfMGate" tooltipText="" outgoingEdges="_Nw0rfyokEemQnOUhg0mU1A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/ft.ecore#//KOfMGate"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/ft.ecore#//KOfMGate"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_P4gwuSokEemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_O6aJsCokEemQnOUhg0mU1A" name="k : EInt" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="model/ft.ecore#//KOfMGate/k"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="model/ft.ecore#//KOfMGate/k"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_PNtgMyokEemQnOUhg0mU1A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_Pis4wCokEemQnOUhg0mU1A" name="m : EInt" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="model/ft.ecore#//KOfMGate/m"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="model/ft.ecore#//KOfMGate/m"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_P4hXwiokEemQnOUhg0mU1A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_NOpLfCokEemQnOUhg0mU1A" sourceNode="_JnsS4CokEemQnOUhg0mU1A" targetNode="_QRvQYCohEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EClass" href="model/ft.ecore#//AndGate"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/ft.ecore#//AndGate"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_NOpLfSokEemQnOUhg0mU1A" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_NOpLfiokEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_NOpLfyokEemQnOUhg0mU1A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_NhfO9iokEemQnOUhg0mU1A" sourceNode="_J8gFQCokEemQnOUhg0mU1A" targetNode="_QRvQYCohEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EClass" href="model/ft.ecore#//OrGate"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/ft.ecore#//OrGate"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_NhfO9yokEemQnOUhg0mU1A" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_NhfO-CokEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_NhfO-SokEemQnOUhg0mU1A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Nw0rfyokEemQnOUhg0mU1A" sourceNode="_MSuVwCokEemQnOUhg0mU1A" targetNode="_QRvQYCohEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EClass" href="model/ft.ecore#//KOfMGate"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/ft.ecore#//KOfMGate"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_P4il8CokEemQnOUhg0mU1A" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_P4il8SokEemQnOUhg0mU1A" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_P4il8iokEemQnOUhg0mU1A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_RDeH_CokEemQnOUhg0mU1A" name="[0..*] inputEvents" sourceNode="_QRvQYCohEemQnOUhg0mU1A" targetNode="_OHKPMCohEemQnOUhg0mU1A">
+      <target xmi:type="ecore:EReference" href="model/ft.ecore#//Gate/inputEvents"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/ft.ecore#//Gate/inputEvents"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_RDevACokEemQnOUhg0mU1A" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_RDevAiokEemQnOUhg0mU1A" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_RDevASokEemQnOUhg0mU1A" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_Bnj68SohEemQnOUhg0mU1A"/>
+    <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
+    <target xmi:type="ecore:EPackage" href="model/ft.ecore#/"/>
+  </diagram:DSemanticDiagram>
+</xmi:XMI>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/.classpath b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/.classpath
new file mode 100644
index 00000000..eca7bdba
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+        <classpathentry kind="src" path="src"/>
+        <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/.project b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/.project
new file mode 100644
index 00000000..bd1da900
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+        <name>hu.bme.mit.inf.dslreasoner.faulttree.transformation</name>
+        <comment></comment>
+        <projects>
+        </projects>
+        <buildSpec>
+                <buildCommand>
+                        <name>org.eclipse.jdt.core.javabuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.pde.ManifestBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.pde.SchemaBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+        </buildSpec>
+        <natures>
+                <nature>org.eclipse.pde.PluginNature</nature>
+                <nature>org.eclipse.jdt.core.javanature</nature>
+        </natures>
+</projectDescription>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/.settings/org.eclipse.jdt.core.prefs b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..0c68a61d
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/META-INF/MANIFEST.MF b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..ae23171b
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Transformation
+Bundle-SymbolicName: hu.bme.mit.inf.dslreasoner.faulttree.transformation
+Bundle-Version: 1.0.0.qualifier
+Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.faulttree.transformation
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/build.properties b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/build.properties
new file mode 100644
index 00000000..34d2e4d2
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .