Extract component fault tree model

63 files changed, 3631 insertions, 4594 deletions

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