Fault tree transformation for partial models WIP

99 files changed, 1661 insertions, 101 deletions

diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/.CftLanguageIdeModule.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/.CftLanguageIdeModule.xtendbin
index 65b90333..56d1af9c 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/.CftLanguageIdeModule.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/.CftLanguageIdeModule.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/.CftLanguageIdeSetup.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/.CftLanguageIdeSetup.xtendbin
index 7fbd4ad1..29395cde 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/.CftLanguageIdeSetup.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/.CftLanguageIdeSetup.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/.gitignore
index 2fad95ba..e3c287dd 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/.gitignore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ide/.gitignore
@@ -1,2 +1,6 @@
 /.CftLanguageIdeModule.java._trace
 /.CftLanguageIdeSetup.java._trace
+/.CftLanguageIdeModule.xtendbin
+/.CftLanguageIdeSetup.xtendbin
+/CftLanguageIdeModule.java
+/CftLanguageIdeSetup.java
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/.CftLanguageUiModule.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/.CftLanguageUiModule.xtendbin
index 77bd6532..2207ff7a 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/.CftLanguageUiModule.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/.CftLanguageUiModule.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/.gitignore
index bee88ba2..725f385c 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/.gitignore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/.gitignore
@@ -1 +1,3 @@
 /.CftLanguageUiModule.java._trace
+/.CftLanguageUiModule.xtendbin
+/CftLanguageUiModule.java
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/.CftLanguageProposalProvider.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/.CftLanguageProposalProvider.xtendbin
index 33d0e601..e5445e66 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/.CftLanguageProposalProvider.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/.CftLanguageProposalProvider.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/.gitignore
index 31aac8dc..be23301b 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/.gitignore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/.gitignore
@@ -1 +1,3 @@
 /.CftLanguageProposalProvider.java._trace
+/.CftLanguageProposalProvider.xtendbin
+/CftLanguageProposalProvider.java
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageDescriptionLabelProvider.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageDescriptionLabelProvider.xtendbin
index 6617b26f..476652c0 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageDescriptionLabelProvider.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageDescriptionLabelProvider.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageLabelProvider.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageLabelProvider.xtendbin
index 82af00d7..bda30bf1 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageLabelProvider.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageLabelProvider.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.gitignore
index 20d80a0b..c75af38b 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.gitignore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.gitignore
@@ -1,2 +1,6 @@
 /.CftLanguageDescriptionLabelProvider.java._trace
 /.CftLanguageLabelProvider.java._trace
+/.CftLanguageDescriptionLabelProvider.xtendbin
+/.CftLanguageLabelProvider.xtendbin
+/CftLanguageDescriptionLabelProvider.java
+/CftLanguageLabelProvider.java
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/.CftLanguageOutlineTreeProvider.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/.CftLanguageOutlineTreeProvider.xtendbin
index adffb198..04bd4aea 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/.CftLanguageOutlineTreeProvider.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/.CftLanguageOutlineTreeProvider.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/.gitignore
index a0d017e3..61ad3c3f 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/.gitignore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/.gitignore
@@ -1 +1,3 @@
 /.CftLanguageOutlineTreeProvider.java._trace
+/.CftLanguageOutlineTreeProvider.xtendbin
+/CftLanguageOutlineTreeProvider.java
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/quickfix/.CftLanguageQuickfixProvider.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/quickfix/.CftLanguageQuickfixProvider.xtendbin
index 2ecc121e..3c8711bf 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/quickfix/.CftLanguageQuickfixProvider.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/quickfix/.CftLanguageQuickfixProvider.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/quickfix/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/quickfix/.gitignore
index 1f83fa55..e9319b3b 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/quickfix/.gitignore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/quickfix/.gitignore
@@ -1 +1,3 @@
 /.CftLanguageQuickfixProvider.java._trace
+/.CftLanguageQuickfixProvider.xtendbin
+/CftLanguageQuickfixProvider.java
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.CftLanguageSemanticHighlightingCalculator.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.CftLanguageSemanticHighlightingCalculator.xtendbin
index ce699deb..2f317914 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.CftLanguageSemanticHighlightingCalculator.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.CftLanguageSemanticHighlightingCalculator.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.CftLanguageTokenToAttributeIdMapper.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.CftLanguageTokenToAttributeIdMapper.xtendbin
index 86752345..26fbd35b 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.CftLanguageTokenToAttributeIdMapper.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.CftLanguageTokenToAttributeIdMapper.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.gitignore
index 3fdf4894..e1b01d74 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.gitignore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.gitignore
@@ -1,2 +1,6 @@
 /.CftLanguageSemanticHighlightingCalculator.java._trace
 /.CftLanguageTokenToAttributeIdMapper.java._trace
+/.CftLanguageSemanticHighlightingCalculator.xtendbin
+/.CftLanguageTokenToAttributeIdMapper.xtendbin
+/CftLanguageSemanticHighlightingCalculator.java
+/CftLanguageTokenToAttributeIdMapper.java
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 e95d8c91..f295f116 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
@@ -11,6 +11,7 @@ import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.LookupDefinit
 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.components.cftLanguage.impl.MappingDefinitionImpl
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition
 import org.eclipse.emf.common.notify.Notifier
 import org.eclipse.emf.ecore.EObject
@@ -68,7 +69,7 @@ class CftLanguageScopeProvider extends AbstractCftLanguageScopeProvider {
                 Iterable<? extends MappingDefinition> ruleDefinitions) {
                 val mappingDefinitionDescriptions = Lists.newArrayListWithExpectedSize(ruleDefinitions.size)
                 for (ruleDefinition : ruleDefinitions) {
-                        val pattern = ruleDefinition?.pattern
+                        val pattern = ruleDefinition.safelyGetPattern
                         if (pattern !== null) {
                                 val patternName = resourceDescriptions.getExportedObjectsByObject(pattern).head?.qualifiedName
                                 if (patternName !== null) {
@@ -79,6 +80,14 @@ class CftLanguageScopeProvider extends AbstractCftLanguageScopeProvider {
                 }
                 mappingDefinitionDescriptions
         }
+        
+        private def safelyGetPattern(MappingDefinition mappingDefinition) {
+                switch (mappingDefinition) {
+                        MappingDefinitionImpl: mappingDefinition.basicGetPattern
+                        case null: null
+                        default: mappingDefinition.pattern
+                }
+        }
 
         private def getResourceDescriptions(Notifier notifier) {
                 val resourceSet = EcoreUtil2.getResourceSet(notifier)
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 98b07e66..8a5136e8 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 2ae80aef..d00f661a 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/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/.gitignore
index b3125e3f..a5028502 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/.gitignore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/.gitignore
@@ -1,2 +1,6 @@
 /.CftLanguageRuntimeModule.java._trace
 /.CftLanguageStandaloneSetup.java._trace
+/.CftLanguageRuntimeModule.xtendbin
+/.CftLanguageStandaloneSetup.xtendbin
+/CftLanguageRuntimeModule.java
+/CftLanguageStandaloneSetup.java
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
index a97cd12c..426173d6 100644
--- 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
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
index 25b37e6d..2321885c 100644
--- 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
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
index 1cb9dafb..0a42ffb4 100644
--- 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
@@ -1,2 +1,6 @@
 /.OF_INTValueConverter.java._trace
 /.CftLanguageValueConverterService.java._trace
+/.CftLanguageValueConverterService.xtendbin
+/.OF_INTValueConverter.xtendbin
+/CftLanguageValueConverterService.java
+/OF_INTValueConverter.java
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 b2a0c833..57704448 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/generator/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/generator/.gitignore
index c1d8820b..943ab682 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/generator/.gitignore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/generator/.gitignore
@@ -1 +1,3 @@
 /.CftLanguageGenerator.java._trace
+/.CftLanguageGenerator.xtendbin
+/CftLanguageGenerator.java
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 cea3c7e0..f06a7a84 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 a0a97448..ad739f26 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/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/naming/.gitignore
index b982f16c..bb9e8b92 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/naming/.gitignore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/naming/.gitignore
@@ -1,2 +1,6 @@
 /.CftLanguageQualifiedNameProvider.java._trace
 /.PackageNameProvider.java._trace
+/.CftLanguageQualifiedNameProvider.xtendbin
+/.PackageNameProvider.xtendbin
+/CftLanguageQualifiedNameProvider.java
+/PackageNameProvider.java
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 a3aa3347..d1224c20 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 20f539ae..6c96cd87 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/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/scoping/.gitignore
index 75285868..e0a335bd 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/scoping/.gitignore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/scoping/.gitignore
@@ -2,3 +2,7 @@
 /.CftLanguageImportedNamespaceAwareScopeProvider.java._trace
 /.CftLanguageImportedNamespaceAwareScopeLocalProvider.java._trace
 /.CftLanguageImportedNamespaceAwareLocalScopeProvider.java._trace
+/.CftLanguageImportedNamespaceAwareLocalScopeProvider.xtendbin
+/.CftLanguageScopeProvider.xtendbin
+/CftLanguageImportedNamespaceAwareLocalScopeProvider.java
+/CftLanguageScopeProvider.java
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 9286d5ca..8d452f2a 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
@@ -14,6 +14,7 @@ import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.MappingDefini
 import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.MappingParameter;
 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.components.cftLanguage.impl.MappingDefinitionImpl;
 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;
@@ -108,11 +109,7 @@ public class CftLanguageScopeProvider extends AbstractCftLanguageScopeProvider {
       final ArrayList<IEObjectDescription> mappingDefinitionDescriptions = Lists.<IEObjectDescription>newArrayListWithExpectedSize(IterableExtensions.size(ruleDefinitions));
       for (final MappingDefinition ruleDefinition : ruleDefinitions) {
         {
-          Pattern _pattern = null;
-          if (ruleDefinition!=null) {
-            _pattern=ruleDefinition.getPattern();
-          }
-          final Pattern pattern = _pattern;
+          final Pattern pattern = this.safelyGetPattern(ruleDefinition);
           if ((pattern != null)) {
             IEObjectDescription _head = IterableExtensions.<IEObjectDescription>head(resourceDescriptions.getExportedObjectsByObject(pattern));
             QualifiedName _qualifiedName = null;
@@ -132,6 +129,25 @@ public class CftLanguageScopeProvider extends AbstractCftLanguageScopeProvider {
     return _xblockexpression;
   }
   
+  private Pattern safelyGetPattern(final MappingDefinition mappingDefinition) {
+    Pattern _switchResult = null;
+    boolean _matched = false;
+    if (mappingDefinition instanceof MappingDefinitionImpl) {
+      _matched=true;
+      _switchResult = ((MappingDefinitionImpl)mappingDefinition).basicGetPattern();
+    }
+    if (!_matched) {
+      if (Objects.equal(mappingDefinition, null)) {
+        _matched=true;
+        _switchResult = null;
+      }
+    }
+    if (!_matched) {
+      _switchResult = mappingDefinition.getPattern();
+    }
+    return _switchResult;
+  }
+  
   private IResourceDescriptions getResourceDescriptions(final Notifier notifier) {
     IResourceDescriptions _xblockexpression = null;
     {
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 719d28f8..c81d155d 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/validation/.CftLanguageValidator.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/validation/.CftLanguageValidator.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/validation/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/validation/.gitignore
index 9065804d..270d548b 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/validation/.gitignore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/validation/.gitignore
@@ -1 +1,3 @@
 /.CftLanguageValidator.java._trace
+/.CftLanguageValidator.xtendbin
+/CftLanguageValidator.java
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/.classpath b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/.classpath
index 5bc9ff04..1dc3c7fb 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/.classpath
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/.classpath
@@ -4,5 +4,6 @@
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
         <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
         <classpathentry kind="src" path="src"/>
+        <classpathentry kind="src" path="xtend-gen"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/META-INF/MANIFEST.MF b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/META-INF/MANIFEST.MF
index eeabfee3..0b8c7351 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/META-INF/MANIFEST.MF
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/META-INF/MANIFEST.MF
@@ -8,13 +8,18 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.faulttree.model
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: hu.bme.mit.inf.dslreasoner.faulttree.model.ft,
+Export-Package: hu.bme.mit.inf.dslreasoner.faulttree.model.cft,
+ hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl,
+ hu.bme.mit.inf.dslreasoner.faulttree.model.cft.util,
+ hu.bme.mit.inf.dslreasoner.faulttree.model.ft,
  hu.bme.mit.inf.dslreasoner.faulttree.model.ft.impl,
  hu.bme.mit.inf.dslreasoner.faulttree.model.ft.util,
- hu.bme.mit.inf.dslreasoner.faulttree.model.cft,
- hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl,
- hu.bme.mit.inf.dslreasoner.faulttree.model.cft.util
+ hu.bme.mit.inf.dslreasoner.faulttree.model.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- hu.bme.mit.inf.dslreasoner.faulttree.model;visibility:=reexport
+ hu.bme.mit.inf.dslreasoner.faulttree.model;visibility:=reexport,
+ com.google.guava,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtend.lib,
+ org.eclipse.xtend.lib.macro
 Bundle-ActivationPolicy: lazy
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/CftPackage.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/CftPackage.java
index d75710a2..07200ab2 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/CftPackage.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/CftPackage.java
@@ -4,6 +4,7 @@ package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 
@@ -535,6 +536,43 @@ public interface CftPackage extends EPackage {
         int COMPONENT_FAULT_TREE_OPERATION_COUNT = 0;
 
         /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ModalElement <em>Modal Element</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ModalElement
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getModalElement()
+         * @generated
+         */
+        int MODAL_ELEMENT = 14;
+
+        /**
+         * The feature id for the '<em><b>Exists</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int MODAL_ELEMENT__EXISTS = 0;
+
+        /**
+         * The number of structural features of the '<em>Modal Element</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int MODAL_ELEMENT_FEATURE_COUNT = 1;
+
+        /**
+         * The number of operations of the '<em>Modal Element</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int MODAL_ELEMENT_OPERATION_COUNT = 0;
+
+        /**
          * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentImpl <em>Component</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -545,13 +583,22 @@ public interface CftPackage extends EPackage {
         int COMPONENT = 10;
 
         /**
+         * The feature id for the '<em><b>Exists</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMPONENT__EXISTS = MODAL_ELEMENT__EXISTS;
+
+        /**
          * The feature id for the '<em><b>Inputs</b></em>' containment reference list.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int COMPONENT__INPUTS = 0;
+        int COMPONENT__INPUTS = MODAL_ELEMENT_FEATURE_COUNT + 0;
 
         /**
          * The feature id for the '<em><b>Outputs</b></em>' containment reference list.
@@ -560,7 +607,7 @@ public interface CftPackage extends EPackage {
          * @generated
          * @ordered
          */
-        int COMPONENT__OUTPUTS = 1;
+        int COMPONENT__OUTPUTS = MODAL_ELEMENT_FEATURE_COUNT + 1;
 
         /**
          * The feature id for the '<em><b>Component Definition</b></em>' reference.
@@ -569,7 +616,7 @@ public interface CftPackage extends EPackage {
          * @generated
          * @ordered
          */
-        int COMPONENT__COMPONENT_DEFINITION = 2;
+        int COMPONENT__COMPONENT_DEFINITION = MODAL_ELEMENT_FEATURE_COUNT + 2;
 
         /**
          * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -578,7 +625,16 @@ public interface CftPackage extends EPackage {
          * @generated
          * @ordered
          */
-        int COMPONENT__NAME = 3;
+        int COMPONENT__NAME = MODAL_ELEMENT_FEATURE_COUNT + 3;
+
+        /**
+         * The feature id for the '<em><b>Multiple Allowed</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMPONENT__MULTIPLE_ALLOWED = MODAL_ELEMENT_FEATURE_COUNT + 4;
 
         /**
          * The number of structural features of the '<em>Component</em>' class.
@@ -587,7 +643,7 @@ public interface CftPackage extends EPackage {
          * @generated
          * @ordered
          */
-        int COMPONENT_FEATURE_COUNT = 4;
+        int COMPONENT_FEATURE_COUNT = MODAL_ELEMENT_FEATURE_COUNT + 5;
 
         /**
          * The number of operations of the '<em>Component</em>' class.
@@ -596,7 +652,7 @@ public interface CftPackage extends EPackage {
          * @generated
          * @ordered
          */
-        int COMPONENT_OPERATION_COUNT = 0;
+        int COMPONENT_OPERATION_COUNT = MODAL_ELEMENT_OPERATION_COUNT + 0;
 
         /**
          * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.InputImpl <em>Input</em>}' class.
@@ -719,13 +775,22 @@ public interface CftPackage extends EPackage {
         int CONNECTION = 13;
 
         /**
+         * The feature id for the '<em><b>Exists</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CONNECTION__EXISTS = MODAL_ELEMENT__EXISTS;
+
+        /**
          * The feature id for the '<em><b>Input</b></em>' container reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int CONNECTION__INPUT = 0;
+        int CONNECTION__INPUT = MODAL_ELEMENT_FEATURE_COUNT + 0;
 
         /**
          * The feature id for the '<em><b>Output</b></em>' reference.
@@ -734,7 +799,7 @@ public interface CftPackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CONNECTION__OUTPUT = 1;
+        int CONNECTION__OUTPUT = MODAL_ELEMENT_FEATURE_COUNT + 1;
 
         /**
          * The number of structural features of the '<em>Connection</em>' class.
@@ -743,7 +808,7 @@ public interface CftPackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CONNECTION_FEATURE_COUNT = 2;
+        int CONNECTION_FEATURE_COUNT = MODAL_ELEMENT_FEATURE_COUNT + 2;
 
         /**
          * The number of operations of the '<em>Connection</em>' class.
@@ -752,7 +817,18 @@ public interface CftPackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CONNECTION_OPERATION_COUNT = 0;
+        int CONNECTION_OPERATION_COUNT = MODAL_ELEMENT_OPERATION_COUNT + 0;
+
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Modality <em>Modality</em>}' enum.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Modality
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getModality()
+         * @generated
+         */
+        int MODALITY = 15;
 
 
         /**
@@ -1042,6 +1118,17 @@ public interface CftPackage extends EPackage {
         EAttribute getComponent_Name();
 
         /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#isMultipleAllowed <em>Multiple Allowed</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Multiple Allowed</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#isMultipleAllowed()
+         * @see #getComponent()
+         * @generated
+         */
+        EAttribute getComponent_MultipleAllowed();
+
+        /**
          * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input <em>Input</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -1160,6 +1247,37 @@ public interface CftPackage extends EPackage {
         EReference getConnection_Output();
 
         /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ModalElement <em>Modal Element</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Modal Element</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ModalElement
+         * @generated
+         */
+        EClass getModalElement();
+
+        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ModalElement#getExists <em>Exists</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Exists</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ModalElement#getExists()
+         * @see #getModalElement()
+         * @generated
+         */
+        EAttribute getModalElement_Exists();
+
+        /**
+         * Returns the meta object for enum '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Modality <em>Modality</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for enum '<em>Modality</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Modality
+         * @generated
+         */
+        EEnum getModality();
+
+        /**
          * Returns the factory that creates the instances of the model.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -1421,6 +1539,14 @@ public interface CftPackage extends EPackage {
                 EAttribute COMPONENT__NAME = eINSTANCE.getComponent_Name();
 
                 /**
+                 * The meta object literal for the '<em><b>Multiple Allowed</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute COMPONENT__MULTIPLE_ALLOWED = eINSTANCE.getComponent_MultipleAllowed();
+
+                /**
                  * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.InputImpl <em>Input</em>}' class.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
@@ -1514,6 +1640,34 @@ public interface CftPackage extends EPackage {
                  */
                 EReference CONNECTION__OUTPUT = eINSTANCE.getConnection_Output();
 
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ModalElement <em>Modal Element</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ModalElement
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getModalElement()
+                 * @generated
+                 */
+                EClass MODAL_ELEMENT = eINSTANCE.getModalElement();
+
+                /**
+                 * The meta object literal for the '<em><b>Exists</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute MODAL_ELEMENT__EXISTS = eINSTANCE.getModalElement_Exists();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Modality <em>Modality</em>}' enum.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Modality
+                 * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.CftPackageImpl#getModality()
+                 * @generated
+                 */
+                EEnum MODALITY = eINSTANCE.getModality();
+
         }
 
 } //CftPackage
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Component.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Component.java
index 7d5055c9..9b1d0b24 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Component.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Component.java
@@ -4,8 +4,6 @@ package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
 
 import org.eclipse.emf.common.util.EList;
 
-import org.eclipse.emf.ecore.EObject;
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Component</b></em>'.
@@ -19,13 +17,14 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#getOutputs <em>Outputs</em>}</li>
  *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#getComponentDefinition <em>Component Definition</em>}</li>
  *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#getName <em>Name</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#isMultipleAllowed <em>Multiple Allowed</em>}</li>
  * </ul>
  *
  * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getComponent()
  * @model
  * @generated
  */
-public interface Component extends EObject {
+public interface Component extends ModalElement {
         /**
          * Returns the value of the '<em><b>Inputs</b></em>' containment reference list.
          * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input}.
@@ -114,4 +113,31 @@ public interface Component extends EObject {
          */
         void setName(String value);
 
+        /**
+         * Returns the value of the '<em><b>Multiple Allowed</b></em>' attribute.
+         * The default value is <code>"false"</code>.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Multiple Allowed</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 Allowed</em>' attribute.
+         * @see #setMultipleAllowed(boolean)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getComponent_MultipleAllowed()
+         * @model default="false"
+         * @generated
+         */
+        boolean isMultipleAllowed();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component#isMultipleAllowed <em>Multiple Allowed</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Multiple Allowed</em>' attribute.
+         * @see #isMultipleAllowed()
+         * @generated
+         */
+        void setMultipleAllowed(boolean value);
+
 } // Component
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Connection.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Connection.java
index c05e809b..9ca5b77f 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Connection.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Connection.java
@@ -2,8 +2,6 @@
  */
 package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
 
-import org.eclipse.emf.ecore.EObject;
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Connection</b></em>'.
@@ -21,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
  * @model
  * @generated
  */
-public interface Connection extends EObject {
+public interface Connection extends ModalElement {
         /**
          * Returns the value of the '<em><b>Input</b></em>' container reference.
          * It is bidirectional and its opposite is '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input#getIncomingConnections <em>Incoming Connections</em>}'.
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/ModalElement.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/ModalElement.java
new file mode 100644
index 00000000..9abb6558
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/ModalElement.java
@@ -0,0 +1,54 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Modal Element</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ModalElement#getExists <em>Exists</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getModalElement()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface ModalElement extends EObject {
+        /**
+         * Returns the value of the '<em><b>Exists</b></em>' attribute.
+         * The default value is <code>"MUST"</code>.
+         * The literals are from the enumeration {@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Modality}.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Exists</em>' attribute isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Exists</em>' attribute.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Modality
+         * @see #setExists(Modality)
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getModalElement_Exists()
+         * @model default="MUST"
+         * @generated
+         */
+        Modality getExists();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ModalElement#getExists <em>Exists</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Exists</em>' attribute.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Modality
+         * @see #getExists()
+         * @generated
+         */
+        void setExists(Modality value);
+
+} // ModalElement
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Modality.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Modality.java
new file mode 100644
index 00000000..6b7dc1e4
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/Modality.java
@@ -0,0 +1,244 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.faulttree.model.cft;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Modality</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage#getModality()
+ * @model
+ * @generated
+ */
+public enum Modality implements Enumerator {
+        /**
+         * The '<em><b>MAY</b></em>' literal object.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #MAY_VALUE
+         * @generated
+         * @ordered
+         */
+        MAY(0, "MAY", "MAY"),
+
+        /**
+         * The '<em><b>CURRENT</b></em>' literal object.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #CURRENT_VALUE
+         * @generated
+         * @ordered
+         */
+        CURRENT(1, "CURRENT", "CURRENT"),
+
+        /**
+         * The '<em><b>MUST</b></em>' literal object.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #MUST_VALUE
+         * @generated
+         * @ordered
+         */
+        MUST(2, "MUST", "MUST");
+
+        /**
+         * The '<em><b>MAY</b></em>' literal value.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of '<em><b>MAY</b></em>' literal object isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @see #MAY
+         * @model
+         * @generated
+         * @ordered
+         */
+        public static final int MAY_VALUE = 0;
+
+        /**
+         * The '<em><b>CURRENT</b></em>' literal value.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of '<em><b>CURRENT</b></em>' literal object isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @see #CURRENT
+         * @model
+         * @generated
+         * @ordered
+         */
+        public static final int CURRENT_VALUE = 1;
+
+        /**
+         * The '<em><b>MUST</b></em>' literal value.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of '<em><b>MUST</b></em>' literal object isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @see #MUST
+         * @model
+         * @generated
+         * @ordered
+         */
+        public static final int MUST_VALUE = 2;
+
+        /**
+         * An array of all the '<em><b>Modality</b></em>' enumerators.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private static final Modality[] VALUES_ARRAY =
+                new Modality[] {
+                        MAY,
+                        CURRENT,
+                        MUST,
+                };
+
+        /**
+         * A public read-only list of all the '<em><b>Modality</b></em>' enumerators.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public static final List<Modality> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+        /**
+         * Returns the '<em><b>Modality</b></em>' literal with the specified literal value.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param literal the literal.
+         * @return the matching enumerator or <code>null</code>.
+         * @generated
+         */
+        public static Modality get(String literal) {
+                for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+                        Modality result = VALUES_ARRAY[i];
+                        if (result.toString().equals(literal)) {
+                                return result;
+                        }
+                }
+                return null;
+        }
+
+        /**
+         * Returns the '<em><b>Modality</b></em>' literal with the specified name.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param name the name.
+         * @return the matching enumerator or <code>null</code>.
+         * @generated
+         */
+        public static Modality getByName(String name) {
+                for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+                        Modality result = VALUES_ARRAY[i];
+                        if (result.getName().equals(name)) {
+                                return result;
+                        }
+                }
+                return null;
+        }
+
+        /**
+         * Returns the '<em><b>Modality</b></em>' literal with the specified integer value.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the integer value.
+         * @return the matching enumerator or <code>null</code>.
+         * @generated
+         */
+        public static Modality get(int value) {
+                switch (value) {
+                        case MAY_VALUE: return MAY;
+                        case CURRENT_VALUE: return CURRENT;
+                        case MUST_VALUE: return MUST;
+                }
+                return null;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private final int value;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private final String name;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private final String literal;
+
+        /**
+         * Only this class can construct instances.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private Modality(int value, String name, String literal) {
+                this.value = value;
+                this.name = name;
+                this.literal = literal;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public int getValue() {
+          return value;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String getName() {
+          return name;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String getLiteral() {
+          return literal;
+        }
+
+        /**
+         * Returns the literal value of the enumerator, which is its string representation.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                return literal;
+        }
+        
+} //Modality
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftFactoryImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftFactoryImpl.java
index 6eac2861..6b07b541 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftFactoryImpl.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftFactoryImpl.java
@@ -5,6 +5,7 @@ package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.*;
 
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 
@@ -78,6 +79,36 @@ public class CftFactoryImpl extends EFactoryImpl implements CftFactory {
          * @generated
          */
         @Override
+        public Object createFromString(EDataType eDataType, String initialValue) {
+                switch (eDataType.getClassifierID()) {
+                        case CftPackage.MODALITY:
+                                return createModalityFromString(eDataType, initialValue);
+                        default:
+                                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+                }
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String convertToString(EDataType eDataType, Object instanceValue) {
+                switch (eDataType.getClassifierID()) {
+                        case CftPackage.MODALITY:
+                                return convertModalityToString(eDataType, instanceValue);
+                        default:
+                                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+                }
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
         public ComponentDefinition createComponentDefinition() {
                 ComponentDefinitionImpl componentDefinition = new ComponentDefinitionImpl();
                 return componentDefinition;
@@ -198,6 +229,26 @@ public class CftFactoryImpl extends EFactoryImpl implements CftFactory {
          * <!-- end-user-doc -->
          * @generated
          */
+        public Modality createModalityFromString(EDataType eDataType, String initialValue) {
+                Modality result = Modality.get(initialValue);
+                if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+                return result;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String convertModalityToString(EDataType eDataType, Object instanceValue) {
+                return instanceValue == null ? null : instanceValue.toString();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         @Override
         public CftPackage getCftPackage() {
                 return (CftPackage)getEPackage();
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftPackageImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftPackageImpl.java
index 1d6b6a23..2d70d7ce 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftPackageImpl.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/CftPackageImpl.java
@@ -16,6 +16,8 @@ import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.GateDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.InputEvent;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ModalElement;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Modality;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.OrGateDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output;
 
@@ -23,6 +25,7 @@ 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.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 
@@ -134,6 +137,20 @@ public class CftPackageImpl extends EPackageImpl implements CftPackage {
         private EClass connectionEClass = null;
 
         /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass modalElementEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EEnum modalityEEnum = null;
+
+        /**
          * Creates an instance of the model <b>Package</b>, registered with
          * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
          * package URI value.
@@ -473,6 +490,16 @@ public class CftPackageImpl extends EPackageImpl implements CftPackage {
          * @generated
          */
         @Override
+        public EAttribute getComponent_MultipleAllowed() {
+                return (EAttribute)componentEClass.getEStructuralFeatures().get(4);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
         public EClass getInput() {
                 return inputEClass;
         }
@@ -583,6 +610,36 @@ public class CftPackageImpl extends EPackageImpl implements CftPackage {
          * @generated
          */
         @Override
+        public EClass getModalElement() {
+                return modalElementEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EAttribute getModalElement_Exists() {
+                return (EAttribute)modalElementEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EEnum getModality() {
+                return modalityEEnum;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
         public CftFactory getCftFactory() {
                 return (CftFactory)getEFactoryInstance();
         }
@@ -643,6 +700,7 @@ public class CftPackageImpl extends EPackageImpl implements CftPackage {
                 createEReference(componentEClass, COMPONENT__OUTPUTS);
                 createEReference(componentEClass, COMPONENT__COMPONENT_DEFINITION);
                 createEAttribute(componentEClass, COMPONENT__NAME);
+                createEAttribute(componentEClass, COMPONENT__MULTIPLE_ALLOWED);
 
                 inputEClass = createEClass(INPUT);
                 createEReference(inputEClass, INPUT__INPUT_EVENT);
@@ -657,6 +715,12 @@ public class CftPackageImpl extends EPackageImpl implements CftPackage {
                 connectionEClass = createEClass(CONNECTION);
                 createEReference(connectionEClass, CONNECTION__INPUT);
                 createEReference(connectionEClass, CONNECTION__OUTPUT);
+
+                modalElementEClass = createEClass(MODAL_ELEMENT);
+                createEAttribute(modalElementEClass, MODAL_ELEMENT__EXISTS);
+
+                // Create enums
+                modalityEEnum = createEEnum(MODALITY);
         }
 
         /**
@@ -697,6 +761,8 @@ public class CftPackageImpl extends EPackageImpl implements CftPackage {
                 andGateDefinitionEClass.getESuperTypes().add(this.getGateDefinition());
                 orGateDefinitionEClass.getESuperTypes().add(this.getGateDefinition());
                 kOfMGateDefinitionEClass.getESuperTypes().add(this.getGateDefinition());
+                componentEClass.getESuperTypes().add(this.getModalElement());
+                connectionEClass.getESuperTypes().add(this.getModalElement());
 
                 // Initialize classes, features, and operations; add parameters
                 initEClass(componentDefinitionEClass, ComponentDefinition.class, "ComponentDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -736,6 +802,7 @@ public class CftPackageImpl extends EPackageImpl implements CftPackage {
                 initEReference(getComponent_Outputs(), this.getOutput(), this.getOutput_Component(), "outputs", null, 0, -1, Component.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEReference(getComponent_ComponentDefinition(), this.getComponentDefinition(), null, "componentDefinition", null, 1, 1, Component.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEAttribute(getComponent_Name(), ecorePackage.getEString(), "name", null, 0, 1, Component.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getComponent_MultipleAllowed(), ecorePackage.getEBoolean(), "multipleAllowed", "false", 0, 1, Component.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
                 initEClass(inputEClass, Input.class, "Input", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
                 initEReference(getInput_InputEvent(), this.getInputEvent(), null, "inputEvent", null, 1, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -751,6 +818,15 @@ public class CftPackageImpl extends EPackageImpl implements CftPackage {
                 initEReference(getConnection_Input(), this.getInput(), this.getInput_IncomingConnections(), "input", null, 1, 1, Connection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEReference(getConnection_Output(), this.getOutput(), this.getOutput_OutgoingConnections(), "output", null, 1, 1, Connection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+                initEClass(modalElementEClass, ModalElement.class, "ModalElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getModalElement_Exists(), this.getModality(), "exists", "MUST", 0, 1, ModalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                // Initialize enums and add enum literals
+                initEEnum(modalityEEnum, Modality.class, "Modality");
+                addEEnumLiteral(modalityEEnum, Modality.MAY);
+                addEEnumLiteral(modalityEEnum, Modality.CURRENT);
+                addEEnumLiteral(modalityEEnum, Modality.MUST);
+
                 // Create resource
                 createResource(eNS_URI);
         }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentImpl.java
index 847b6ee1..dcbf7660 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentImpl.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ComponentImpl.java
@@ -6,6 +6,7 @@ import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Modality;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output;
 
 import java.util.Collection;
@@ -32,16 +33,38 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * The following features are implemented:
  * </p>
  * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentImpl#getExists <em>Exists</em>}</li>
  *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentImpl#getInputs <em>Inputs</em>}</li>
  *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentImpl#getOutputs <em>Outputs</em>}</li>
  *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentImpl#getComponentDefinition <em>Component Definition</em>}</li>
  *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentImpl#getName <em>Name</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ComponentImpl#isMultipleAllowed <em>Multiple Allowed</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ComponentImpl extends MinimalEObjectImpl.Container implements Component {
         /**
+         * The default value of the '{@link #getExists() <em>Exists</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getExists()
+         * @generated
+         * @ordered
+         */
+        protected static final Modality EXISTS_EDEFAULT = Modality.MUST;
+
+        /**
+         * The cached value of the '{@link #getExists() <em>Exists</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getExists()
+         * @generated
+         * @ordered
+         */
+        protected Modality exists = EXISTS_EDEFAULT;
+
+        /**
          * The cached value of the '{@link #getInputs() <em>Inputs</em>}' containment reference list.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -92,6 +115,26 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo
         protected String name = NAME_EDEFAULT;
 
         /**
+         * The default value of the '{@link #isMultipleAllowed() <em>Multiple Allowed</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #isMultipleAllowed()
+         * @generated
+         * @ordered
+         */
+        protected static final boolean MULTIPLE_ALLOWED_EDEFAULT = false;
+
+        /**
+         * The cached value of the '{@link #isMultipleAllowed() <em>Multiple Allowed</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #isMultipleAllowed()
+         * @generated
+         * @ordered
+         */
+        protected boolean multipleAllowed = MULTIPLE_ALLOWED_EDEFAULT;
+
+        /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -204,6 +247,52 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo
          * <!-- end-user-doc -->
          * @generated
          */
+        @Override
+        public Modality getExists() {
+                return exists;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setExists(Modality newExists) {
+                Modality oldExists = exists;
+                exists = newExists == null ? EXISTS_EDEFAULT : newExists;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.COMPONENT__EXISTS, oldExists, exists));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean isMultipleAllowed() {
+                return multipleAllowed;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setMultipleAllowed(boolean newMultipleAllowed) {
+                boolean oldMultipleAllowed = multipleAllowed;
+                multipleAllowed = newMultipleAllowed;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.COMPONENT__MULTIPLE_ALLOWED, oldMultipleAllowed, multipleAllowed));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         @SuppressWarnings("unchecked")
         @Override
         public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
@@ -240,6 +329,8 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo
         @Override
         public Object eGet(int featureID, boolean resolve, boolean coreType) {
                 switch (featureID) {
+                        case CftPackage.COMPONENT__EXISTS:
+                                return getExists();
                         case CftPackage.COMPONENT__INPUTS:
                                 return getInputs();
                         case CftPackage.COMPONENT__OUTPUTS:
@@ -249,6 +340,8 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo
                                 return basicGetComponentDefinition();
                         case CftPackage.COMPONENT__NAME:
                                 return getName();
+                        case CftPackage.COMPONENT__MULTIPLE_ALLOWED:
+                                return isMultipleAllowed();
                 }
                 return super.eGet(featureID, resolve, coreType);
         }
@@ -262,6 +355,9 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo
         @Override
         public void eSet(int featureID, Object newValue) {
                 switch (featureID) {
+                        case CftPackage.COMPONENT__EXISTS:
+                                setExists((Modality)newValue);
+                                return;
                         case CftPackage.COMPONENT__INPUTS:
                                 getInputs().clear();
                                 getInputs().addAll((Collection<? extends Input>)newValue);
@@ -276,6 +372,9 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo
                         case CftPackage.COMPONENT__NAME:
                                 setName((String)newValue);
                                 return;
+                        case CftPackage.COMPONENT__MULTIPLE_ALLOWED:
+                                setMultipleAllowed((Boolean)newValue);
+                                return;
                 }
                 super.eSet(featureID, newValue);
         }
@@ -288,6 +387,9 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo
         @Override
         public void eUnset(int featureID) {
                 switch (featureID) {
+                        case CftPackage.COMPONENT__EXISTS:
+                                setExists(EXISTS_EDEFAULT);
+                                return;
                         case CftPackage.COMPONENT__INPUTS:
                                 getInputs().clear();
                                 return;
@@ -300,6 +402,9 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo
                         case CftPackage.COMPONENT__NAME:
                                 setName(NAME_EDEFAULT);
                                 return;
+                        case CftPackage.COMPONENT__MULTIPLE_ALLOWED:
+                                setMultipleAllowed(MULTIPLE_ALLOWED_EDEFAULT);
+                                return;
                 }
                 super.eUnset(featureID);
         }
@@ -312,6 +417,8 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo
         @Override
         public boolean eIsSet(int featureID) {
                 switch (featureID) {
+                        case CftPackage.COMPONENT__EXISTS:
+                                return exists != EXISTS_EDEFAULT;
                         case CftPackage.COMPONENT__INPUTS:
                                 return inputs != null && !inputs.isEmpty();
                         case CftPackage.COMPONENT__OUTPUTS:
@@ -320,6 +427,8 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo
                                 return componentDefinition != null;
                         case CftPackage.COMPONENT__NAME:
                                 return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+                        case CftPackage.COMPONENT__MULTIPLE_ALLOWED:
+                                return multipleAllowed != MULTIPLE_ALLOWED_EDEFAULT;
                 }
                 return super.eIsSet(featureID);
         }
@@ -334,8 +443,12 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo
                 if (eIsProxy()) return super.toString();
 
                 StringBuilder result = new StringBuilder(super.toString());
-                result.append(" (name: ");
+                result.append(" (exists: ");
+                result.append(exists);
+                result.append(", name: ");
                 result.append(name);
+                result.append(", multipleAllowed: ");
+                result.append(multipleAllowed);
                 result.append(')');
                 return result.toString();
         }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ConnectionImpl.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ConnectionImpl.java
index 7506e4d7..aea86ed4 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ConnectionImpl.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/impl/ConnectionImpl.java
@@ -5,6 +5,7 @@ package hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Modality;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output;
 
 import org.eclipse.emf.common.notify.Notification;
@@ -26,6 +27,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  * The following features are implemented:
  * </p>
  * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ConnectionImpl#getExists <em>Exists</em>}</li>
  *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ConnectionImpl#getInput <em>Input</em>}</li>
  *   <li>{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.impl.ConnectionImpl#getOutput <em>Output</em>}</li>
  * </ul>
@@ -34,6 +36,26 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  */
 public class ConnectionImpl extends MinimalEObjectImpl.Container implements Connection {
         /**
+         * The default value of the '{@link #getExists() <em>Exists</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getExists()
+         * @generated
+         * @ordered
+         */
+        protected static final Modality EXISTS_EDEFAULT = Modality.MUST;
+
+        /**
+         * The cached value of the '{@link #getExists() <em>Exists</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getExists()
+         * @generated
+         * @ordered
+         */
+        protected Modality exists = EXISTS_EDEFAULT;
+
+        /**
          * The cached value of the '{@link #getOutput() <em>Output</em>}' reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -173,6 +195,29 @@ public class ConnectionImpl extends MinimalEObjectImpl.Container implements Conn
          * @generated
          */
         @Override
+        public Modality getExists() {
+                return exists;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setExists(Modality newExists) {
+                Modality oldExists = exists;
+                exists = newExists == null ? EXISTS_EDEFAULT : newExists;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CftPackage.CONNECTION__EXISTS, oldExists, exists));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
         public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
                 switch (featureID) {
                         case CftPackage.CONNECTION__INPUT:
@@ -225,6 +270,8 @@ public class ConnectionImpl extends MinimalEObjectImpl.Container implements Conn
         @Override
         public Object eGet(int featureID, boolean resolve, boolean coreType) {
                 switch (featureID) {
+                        case CftPackage.CONNECTION__EXISTS:
+                                return getExists();
                         case CftPackage.CONNECTION__INPUT:
                                 return getInput();
                         case CftPackage.CONNECTION__OUTPUT:
@@ -242,6 +289,9 @@ public class ConnectionImpl extends MinimalEObjectImpl.Container implements Conn
         @Override
         public void eSet(int featureID, Object newValue) {
                 switch (featureID) {
+                        case CftPackage.CONNECTION__EXISTS:
+                                setExists((Modality)newValue);
+                                return;
                         case CftPackage.CONNECTION__INPUT:
                                 setInput((Input)newValue);
                                 return;
@@ -260,6 +310,9 @@ public class ConnectionImpl extends MinimalEObjectImpl.Container implements Conn
         @Override
         public void eUnset(int featureID) {
                 switch (featureID) {
+                        case CftPackage.CONNECTION__EXISTS:
+                                setExists(EXISTS_EDEFAULT);
+                                return;
                         case CftPackage.CONNECTION__INPUT:
                                 setInput((Input)null);
                                 return;
@@ -278,6 +331,8 @@ public class ConnectionImpl extends MinimalEObjectImpl.Container implements Conn
         @Override
         public boolean eIsSet(int featureID) {
                 switch (featureID) {
+                        case CftPackage.CONNECTION__EXISTS:
+                                return exists != EXISTS_EDEFAULT;
                         case CftPackage.CONNECTION__INPUT:
                                 return getInput() != null;
                         case CftPackage.CONNECTION__OUTPUT:
@@ -286,4 +341,20 @@ public class ConnectionImpl extends MinimalEObjectImpl.Container implements Conn
                 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(" (exists: ");
+                result.append(exists);
+                result.append(')');
+                return result.toString();
+        }
+
 } //ConnectionImpl
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/util/CftAdapterFactory.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/util/CftAdapterFactory.java
index e3a40888..f5d3bf83 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/util/CftAdapterFactory.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/util/CftAdapterFactory.java
@@ -124,6 +124,10 @@ public class CftAdapterFactory extends AdapterFactoryImpl {
                                 return createConnectionAdapter();
                         }
                         @Override
+                        public Adapter caseModalElement(ModalElement object) {
+                                return createModalElementAdapter();
+                        }
+                        @Override
                         public Adapter defaultCase(EObject object) {
                                 return createEObjectAdapter();
                         }
@@ -340,6 +344,20 @@ public class CftAdapterFactory extends AdapterFactoryImpl {
         }
 
         /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ModalElement <em>Modal Element</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ModalElement
+         * @generated
+         */
+        public Adapter createModalElementAdapter() {
+                return null;
+        }
+
+        /**
          * Creates a new adapter for the default case.
          * <!-- begin-user-doc -->
          * This default implementation returns null.
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/util/CftSwitch.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/util/CftSwitch.java
index e32d792b..3c5a4fd9 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/util/CftSwitch.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/ecore-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/cft/util/CftSwitch.java
@@ -144,6 +144,7 @@ public class CftSwitch<T> extends Switch<T> {
                         case CftPackage.COMPONENT: {
                                 Component component = (Component)theEObject;
                                 T result = caseComponent(component);
+                                if (result == null) result = caseModalElement(component);
                                 if (result == null) result = defaultCase(theEObject);
                                 return result;
                         }
@@ -162,6 +163,13 @@ public class CftSwitch<T> extends Switch<T> {
                         case CftPackage.CONNECTION: {
                                 Connection connection = (Connection)theEObject;
                                 T result = caseConnection(connection);
+                                if (result == null) result = caseModalElement(connection);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case CftPackage.MODAL_ELEMENT: {
+                                ModalElement modalElement = (ModalElement)theEObject;
+                                T result = caseModalElement(modalElement);
                                 if (result == null) result = defaultCase(theEObject);
                                 return result;
                         }
@@ -380,6 +388,21 @@ public class CftSwitch<T> extends Switch<T> {
         }
 
         /**
+         * Returns the result of interpreting the object as an instance of '<em>Modal Element</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>Modal Element</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseModalElement(ModalElement object) {
+                return null;
+        }
+
+        /**
          * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
          * <!-- begin-user-doc -->
          * This implementation returns null;
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore
index 2fc15d94..a843aeed 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.ecore
@@ -38,7 +38,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="topEvent" lowerBound="1"
         eType="#//Output"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Component">
+  <eClassifiers xsi:type="ecore:EClass" name="Component" eSuperTypes="#//ModalElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="inputs" upperBound="-1"
         eType="#//Input" containment="true" eOpposite="#//Input/component"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="outputs" upperBound="-1"
@@ -46,6 +46,8 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="componentDefinition" lowerBound="1"
         eType="#//ComponentDefinition"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multipleAllowed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Input">
     <eStructuralFeatures xsi:type="ecore:EReference" name="inputEvent" lowerBound="1"
@@ -63,10 +65,19 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="component" lowerBound="1"
         eType="#//Component" eOpposite="#//Component/outputs"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Connection">
+  <eClassifiers xsi:type="ecore:EClass" name="Connection" eSuperTypes="#//ModalElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="input" lowerBound="1" eType="#//Input"
         eOpposite="#//Input/incomingConnections"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="output" lowerBound="1"
         eType="#//Output" eOpposite="#//Output/outgoingConnections"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Modality">
+    <eLiterals name="MAY"/>
+    <eLiterals name="CURRENT" value="1"/>
+    <eLiterals name="MUST" value="2"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ModalElement" abstract="true" interface="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="exists" eType="#//Modality"
+        defaultValueLiteral="MUST"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.genmodel b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.genmodel
index 635a2f46..3cdc93c4 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.genmodel
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/model/cft.genmodel
@@ -7,6 +7,11 @@
   <foreignModel>cft.ecore</foreignModel>
   <genPackages prefix="Cft" basePackage="hu.bme.mit.inf.dslreasoner.faulttree.model"
       disposableProviderFactory="true" ecorePackage="cft.ecore#/">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="cft.ecore#//Modality">
+      <genEnumLiterals ecoreEnumLiteral="cft.ecore#//Modality/MAY"/>
+      <genEnumLiterals ecoreEnumLiteral="cft.ecore#//Modality/CURRENT"/>
+      <genEnumLiterals ecoreEnumLiteral="cft.ecore#//Modality/MUST"/>
+    </genEnums>
     <genClasses ecoreClass="cft.ecore#//ComponentDefinition">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cft.ecore#//ComponentDefinition/inputEvents"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cft.ecore#//ComponentDefinition/eventDefinitions"/>
@@ -41,6 +46,7 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cft.ecore#//Component/outputs"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cft.ecore#//Component/componentDefinition"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cft.ecore#//Component/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cft.ecore#//Component/multipleAllowed"/>
     </genClasses>
     <genClasses ecoreClass="cft.ecore#//Input">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cft.ecore#//Input/inputEvent"/>
@@ -56,5 +62,8 @@
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference cft.ecore#//Connection/input"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cft.ecore#//Connection/output"/>
     </genClasses>
+    <genClasses ecoreClass="cft.ecore#//ModalElement">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cft.ecore#//ModalElement/exists"/>
+    </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/representations.aird b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/representations.aird
index 16bc44f2..edd5ed20 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/representations.aird
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/representations.aird
@@ -6,6 +6,7 @@
     <semanticResources>model/ft.genmodel</semanticResources>
     <semanticResources>http://www.eclipse.org/emf/2002/Ecore</semanticResources>
     <semanticResources>model/cft.genmodel</semanticResources>
+    <semanticResources>src/hu/bme/mit/inf/dslreasoner/faulttree/model/util/CftExtensions.xtend</semanticResources>
     <ownedViews xmi:type="viewpoint:DView" uid="_WH8IYCoZEemQnOUhg0mU1A">
       <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
       <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_XdtogyoZEemQnOUhg0mU1A" name="cft class diagram" repPath="#_XdoI8CoZEemQnOUhg0mU1A">
@@ -189,11 +190,15 @@
               <styles xmi:type="notation:FontStyle" xmi:id="_sNmcQSr7EemQnOUhg0mU1A" fontColor="2697711" fontName="Cantarell" fontHeight="8"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_sNmcQir7EemQnOUhg0mU1A"/>
             </children>
+            <children xmi:type="notation:Node" xmi:id="_ODc_QD_rEem15JHY3tVwwA" type="3010" element="_ODSAID_rEem15JHY3tVwwA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_ODc_QT_rEem15JHY3tVwwA" fontColor="2697711" fontName="Cantarell" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_ODc_Qj_rEem15JHY3tVwwA"/>
+            </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_bLbyRSorEemQnOUhg0mU1A"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_bLbyRiorEemQnOUhg0mU1A"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_bLbyQSorEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bLbyQiorEemQnOUhg0mU1A" x="858" y="195" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bLbyQiorEemQnOUhg0mU1A" x="845" y="195" width="146" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_mUP5wCorEemQnOUhg0mU1A" type="2003" element="_mUETkCorEemQnOUhg0mU1A">
           <children xmi:type="notation:Node" xmi:id="_mUP5wyorEemQnOUhg0mU1A" type="5007"/>
@@ -222,6 +227,40 @@
           <styles xmi:type="notation:ShapeStyle" xmi:id="_Z4VWMSosEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z4VWMiosEemQnOUhg0mU1A" x="767" y="617" width="120" height="100"/>
         </children>
+        <children xmi:type="notation:Node" xmi:id="_ePcnwEAiEemLn8qDUFXPRg" type="2003" element="_ePE0UEAiEemLn8qDUFXPRg">
+          <children xmi:type="notation:Node" xmi:id="_ePfrEEAiEemLn8qDUFXPRg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_ePgSIEAiEemLn8qDUFXPRg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_iIrjIEAiEemLn8qDUFXPRg" type="3010" element="_iIadYEAiEemLn8qDUFXPRg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_iIrjIUAiEemLn8qDUFXPRg" fontName="Cantarell" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_iIrjIkAiEemLn8qDUFXPRg"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_jjjlsEAiEemLn8qDUFXPRg" type="3010" element="_jjXYcEAiEemLn8qDUFXPRg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_jjjlsUAiEemLn8qDUFXPRg" fontName="Cantarell" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_jjjlskAiEemLn8qDUFXPRg"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_kE3jAEAiEemLn8qDUFXPRg" type="3010" element="_kEmdQEAiEemLn8qDUFXPRg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_kE3jAUAiEemLn8qDUFXPRg" fontName="Cantarell" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_kE3jAkAiEemLn8qDUFXPRg"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_ePgSIUAiEemLn8qDUFXPRg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_ePgSIkAiEemLn8qDUFXPRg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_ePcnwUAiEemLn8qDUFXPRg" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ePcnwkAiEemLn8qDUFXPRg" x="481" y="26" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_o4GhIEAlEemLn8qDUFXPRg" type="2003" element="_o39XMEAlEemLn8qDUFXPRg">
+          <children xmi:type="notation:Node" xmi:id="_o4HIMEAlEemLn8qDUFXPRg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_o4HIMUAlEemLn8qDUFXPRg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_fUbWAEAmEemLn8qDUFXPRg" type="3010" element="_fUKQQUAmEemLn8qDUFXPRg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_fUbWAUAmEemLn8qDUFXPRg" fontName="Cantarell" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_fUbWAkAmEemLn8qDUFXPRg"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_o4HIMkAlEemLn8qDUFXPRg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_o4HIM0AlEemLn8qDUFXPRg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_o4GhIUAlEemLn8qDUFXPRg" fontName="Cantarell" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4GhIkAlEemLn8qDUFXPRg" x="663" y="26" width="120" height="100"/>
+        </children>
         <styles xmi:type="notation:DiagramStyle" xmi:id="_XduPkioZEemQnOUhg0mU1A"/>
         <edges xmi:type="notation:Edge" xmi:id="_F_1fkCodEemQnOUhg0mU1A" type="4001" element="_F_tjwCodEemQnOUhg0mU1A" source="_D1vmkCodEemQnOUhg0mU1A" target="_cTz0wCoZEemQnOUhg0mU1A">
           <children xmi:type="notation:Node" xmi:id="_F_1flCodEemQnOUhg0mU1A" type="6001">
@@ -429,7 +468,7 @@
           <styles xmi:type="notation:FontStyle" xmi:id="_dgch0iorEemQnOUhg0mU1A" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dgch0yorEemQnOUhg0mU1A" points="[39, 0, 39, -71]$[39, 71, 39, 0]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dgdI4CorEemQnOUhg0mU1A" id="(0.2708333333333333,1.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dgdI4SorEemQnOUhg0mU1A" id="(0.22033898305084745,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dgdI4SorEemQnOUhg0mU1A" id="(0.27083333333333337,0.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_Ek3YkCosEemQnOUhg0mU1A" type="4001" element="_EktnnCosEemQnOUhg0mU1A" source="_WnAk0CorEemQnOUhg0mU1A" target="_nyhOkCorEemQnOUhg0mU1A">
           <children xmi:type="notation:Node" xmi:id="_Ek3YlCosEemQnOUhg0mU1A" type="6001">
@@ -460,7 +499,7 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ky7dUSosEemQnOUhg0mU1A" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_Ky7dUiosEemQnOUhg0mU1A" fontColor="7490599" fontName="Cantarell" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ky7dUyosEemQnOUhg0mU1A" points="[0, 0, 558, 0]$[-558, 0, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ky8EZiosEemQnOUhg0mU1A" id="(0.0,0.4897959183673469)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ky8EZiosEemQnOUhg0mU1A" id="(0.0902777777777778,0.4897959183673469)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ky8EZyosEemQnOUhg0mU1A" id="(1.0,0.4897959183673469)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_QheUgCosEemQnOUhg0mU1A" type="4001" element="_QhSuYiosEemQnOUhg0mU1A" source="_nyhOkCorEemQnOUhg0mU1A" target="_QEEkoCodEemQnOUhg0mU1A">
@@ -519,7 +558,7 @@
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uHLOESosEemQnOUhg0mU1A" x="5" y="-33"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_uHLOEiosEemQnOUhg0mU1A" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uHLOEyosEemQnOUhg0mU1A" x="-15" y="74"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uHLOEyosEemQnOUhg0mU1A" x="-2" y="-69"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_uHKnASosEemQnOUhg0mU1A" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_uHKnAiosEemQnOUhg0mU1A" fontName="Cantarell" fontHeight="8"/>
@@ -559,6 +598,38 @@
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6ZXYdiosEemQnOUhg0mU1A" id="(0.5,0.5)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6ZXYdyosEemQnOUhg0mU1A" id="(0.5,0.5)"/>
         </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_hntnQEAmEemLn8qDUFXPRg" type="4001" element="_hniBOkAmEemLn8qDUFXPRg" source="_bLbyQCorEemQnOUhg0mU1A" target="_o4GhIEAlEemLn8qDUFXPRg">
+          <children xmi:type="notation:Node" xmi:id="_hnu1YEAmEemLn8qDUFXPRg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hnu1YUAmEemLn8qDUFXPRg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_hnvccEAmEemLn8qDUFXPRg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hnvccUAmEemLn8qDUFXPRg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_hnvcckAmEemLn8qDUFXPRg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hnvcc0AmEemLn8qDUFXPRg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_hntnQUAmEemLn8qDUFXPRg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_hntnQkAmEemLn8qDUFXPRg" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hntnQ0AmEemLn8qDUFXPRg" points="[0, 0, 129, 156]$[-129, -156, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hnwDgEAmEemLn8qDUFXPRg" id="(0.2708333333333333,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hnwDgUAmEemLn8qDUFXPRg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_jweDgEAmEemLn8qDUFXPRg" type="4001" element="_jwVguEAmEemLn8qDUFXPRg" source="_Z4VWMCosEemQnOUhg0mU1A" target="_o4GhIEAlEemLn8qDUFXPRg">
+          <children xmi:type="notation:Node" xmi:id="_jweqkEAmEemLn8qDUFXPRg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jweqkUAmEemLn8qDUFXPRg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_jweqkkAmEemLn8qDUFXPRg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jweqk0AmEemLn8qDUFXPRg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_jweqlEAmEemLn8qDUFXPRg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jweqlUAmEemLn8qDUFXPRg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_jweDgUAmEemLn8qDUFXPRg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_jweDgkAmEemLn8qDUFXPRg" fontName="Cantarell" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jweDg0AmEemLn8qDUFXPRg" points="[0, 0, 78, 493]$[-78, -493, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jweqlkAmEemLn8qDUFXPRg" id="(0.22033898305084745,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jweql0AmEemLn8qDUFXPRg" id="(0.5,0.5)"/>
+        </edges>
       </data>
     </ownedAnnotationEntries>
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Zp_54CoZEemQnOUhg0mU1A" name="ComponentDefinition" tooltipText="" outgoingEdges="_lIWk0CofEemQnOUhg0mU1A _o7XjcCofEemQnOUhg0mU1A _vOuX4CofEemQnOUhg0mU1A" incomingEdges="_KyxFRiosEemQnOUhg0mU1A" width="12" height="10">
@@ -874,13 +945,13 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bLPlACorEemQnOUhg0mU1A" name="Component" tooltipText="" outgoingEdges="_KyxFRiosEemQnOUhg0mU1A _eyVLBiosEemQnOUhg0mU1A _6ZNAkCosEemQnOUhg0mU1A" incomingEdges="_dgSJ2CorEemQnOUhg0mU1A" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bLPlACorEemQnOUhg0mU1A" name="Component" tooltipText="" outgoingEdges="_KyxFRiosEemQnOUhg0mU1A _eyVLBiosEemQnOUhg0mU1A _6ZNAkCosEemQnOUhg0mU1A _hniBOkAmEemLn8qDUFXPRg" incomingEdges="_dgSJ2CorEemQnOUhg0mU1A" width="12" height="10">
       <target xmi:type="ecore:EClass" href="model/cft.ecore#//Component"/>
       <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//Component"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_s21mjCr7EemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_OwTeMT_rEem15JHY3tVwwA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
@@ -892,6 +963,14 @@
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODSAID_rEem15JHY3tVwwA" name="multipleAllowed : EBoolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="model/cft.ecore#//Component/multipleAllowed"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="model/cft.ecore#//Component/multipleAllowed"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_OwUsVT_rEem15JHY3tVwwA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
     </ownedDiagramElements>
     <ownedDiagramElements xmi:type="diagram:DEdge" uid="_dgSJ2CorEemQnOUhg0mU1A" name="[0..*] components" sourceNode="_Wm0XkCorEemQnOUhg0mU1A" targetNode="_bLPlACorEemQnOUhg0mU1A">
       <target xmi:type="ecore:EReference" href="model/cft.ecore#//ComponentFaultTree/components"/>
@@ -923,7 +1002,7 @@
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_nyWPcSorEemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_M4H0nT_rEem15JHY3tVwwA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
@@ -972,13 +1051,13 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Z4MMQCosEemQnOUhg0mU1A" name="Connection" tooltipText="" incomingEdges="_uHA2EiosEemQnOUhg0mU1A _ykJIrCosEemQnOUhg0mU1A" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Z4MMQCosEemQnOUhg0mU1A" name="Connection" tooltipText="" outgoingEdges="_jwVguEAmEemLn8qDUFXPRg" incomingEdges="_uHA2EiosEemQnOUhg0mU1A _ykJIrCosEemQnOUhg0mU1A" width="12" height="10">
       <target xmi:type="ecore:EClass" href="model/cft.ecore#//Connection"/>
       <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//Connection"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_Z4MMQSosEemQnOUhg0mU1A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_-03UZUAaEemLn8qDUFXPRg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
@@ -1024,6 +1103,85 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
     </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_ePE0UEAiEemLn8qDUFXPRg" name="Modality" tooltipText="" width="12" height="10">
+      <target xmi:type="ecore:EEnum" href="model/cft.ecore#//Modality"/>
+      <semanticElements xmi:type="ecore:EEnum" href="model/cft.ecore#//Modality"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_ePE0UUAiEemLn8qDUFXPRg" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_iIadYEAiEemLn8qDUFXPRg" name="MAY" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="model/cft.ecore#//Modality/MAY"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="model/cft.ecore#//Modality/MAY"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_iIbEcEAiEemLn8qDUFXPRg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_jjXYcEAiEemLn8qDUFXPRg" name="CURRENT" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="model/cft.ecore#//Modality/CURRENT"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="model/cft.ecore#//Modality/CURRENT"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_jjXYcUAiEemLn8qDUFXPRg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_kEmdQEAiEemLn8qDUFXPRg" name="MUST" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="model/cft.ecore#//Modality/MUST"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="model/cft.ecore#//Modality/MUST"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_kEnEUEAiEemLn8qDUFXPRg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_o39XMEAlEemLn8qDUFXPRg" name="ModalElement" tooltipText="" incomingEdges="_hniBOkAmEemLn8qDUFXPRg _jwVguEAmEemLn8qDUFXPRg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//ModalElement"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//ModalElement"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_qKn4-UAlEemLn8qDUFXPRg" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.0/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_fUKQQUAmEemLn8qDUFXPRg" name="exists : Modality = MUST" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="model/cft.ecore#//ModalElement/exists"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="model/cft.ecore#//ModalElement/exists"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_fUK3UEAmEemLn8qDUFXPRg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_hniBOkAmEemLn8qDUFXPRg" sourceNode="_bLPlACorEemQnOUhg0mU1A" targetNode="_o39XMEAlEemLn8qDUFXPRg">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//Component"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//Component"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_hnioIEAmEemLn8qDUFXPRg" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_hnioIUAmEemLn8qDUFXPRg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_hnioIkAmEemLn8qDUFXPRg" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_jwVguEAmEemLn8qDUFXPRg" sourceNode="_Z4MMQCosEemQnOUhg0mU1A" targetNode="_o39XMEAlEemLn8qDUFXPRg">
+      <target xmi:type="ecore:EClass" href="model/cft.ecore#//Connection"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cft.ecore#//Connection"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_jwVguUAmEemLn8qDUFXPRg" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_jwVgukAmEemLn8qDUFXPRg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_jwVgu0AmEemLn8qDUFXPRg" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
     <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
     <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_XdpXECoZEemQnOUhg0mU1A"/>
     <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/src/hu/bme/mit/inf/dslreasoner/faulttree/model/util/CftExtensions.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/src/hu/bme/mit/inf/dslreasoner/faulttree/model/util/CftExtensions.xtend
new file mode 100644
index 00000000..ddf2c266
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/src/hu/bme/mit/inf/dslreasoner/faulttree/model/util/CftExtensions.xtend
@@ -0,0 +1,48 @@
+package hu.bme.mit.inf.dslreasoner.faulttree.model.util
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ModalElement
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Modality
+
+final class CftExtensions {
+        private new() {
+                throw new IllegalStateException("This is a static utility class and should not be instantiated directly.")
+        }
+
+        static def isMoreConcreteThan(Modality newModality, Modality original) {
+                switch (original) {
+                        case MAY: newModality != Modality.MAY
+                        case CURRENT: newModality == Modality.MUST
+                        case MUST: false
+                }
+        }
+
+        static def currentlyExists(ModalElement element) {
+                element.exists != Modality.MAY
+        }
+
+        static def mustExist(ModalElement element) {
+                element.exists == Modality.MUST
+        }
+
+        static def appearsExactlyOnce(Component componentInstance) {
+                componentInstance.mustExist && !componentInstance.multipleAllowed
+        }
+        
+        /**
+         * Checks whether the connection and its target component are both currently present.
+         * 
+         * A currently present connection without a present target component is a partial model error,
+         * so we throw an exception instead of returning <code>false</code>.
+         * 
+         * @param connection The connection to check.
+         * @throws IllegalStateException When the target component is not currently present.
+         */
+        static def isCurrentlyConnected(Connection connection) {
+                if (connection.output.component.currentlyExists) {
+                        throw new IllegalStateException("Inconsistent partial model: current connection to a component that may not currently exist")
+                }
+                connection.currentlyExists
+        }
+}
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/util/.CftExtensions.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/util/.CftExtensions.xtendbin
new file mode 100644
index 00000000..a6c01277
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/util/.CftExtensions.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/util/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/util/.gitignore
new file mode 100644
index 00000000..945e2c6c
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/util/.gitignore
@@ -0,0 +1 @@
+/.CftExtensions.java._trace
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/util/CftExtensions.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/util/CftExtensions.java
new file mode 100644
index 00000000..dbc6b279
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.model/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/model/util/CftExtensions.java
@@ -0,0 +1,69 @@
+package hu.bme.mit.inf.dslreasoner.faulttree.model.util;
+
+import com.google.common.base.Objects;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ModalElement;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Modality;
+
+@SuppressWarnings("all")
+public final class CftExtensions {
+  private CftExtensions() {
+    throw new IllegalStateException("This is a static utility class and should not be instantiated directly.");
+  }
+  
+  public static boolean isMoreConcreteThan(final Modality newModality, final Modality original) {
+    boolean _switchResult = false;
+    if (original != null) {
+      switch (original) {
+        case MAY:
+          _switchResult = (!Objects.equal(newModality, Modality.MAY));
+          break;
+        case CURRENT:
+          _switchResult = Objects.equal(newModality, Modality.MUST);
+          break;
+        case MUST:
+          _switchResult = false;
+          break;
+        default:
+          break;
+      }
+    }
+    return _switchResult;
+  }
+  
+  public static boolean currentlyExists(final ModalElement element) {
+    Modality _exists = element.getExists();
+    return (!Objects.equal(_exists, Modality.MAY));
+  }
+  
+  public static boolean mustExist(final ModalElement element) {
+    Modality _exists = element.getExists();
+    return Objects.equal(_exists, Modality.MUST);
+  }
+  
+  public static boolean appearsExactlyOnce(final Component componentInstance) {
+    return (CftExtensions.mustExist(componentInstance) && (!componentInstance.isMultipleAllowed()));
+  }
+  
+  /**
+   * Checks whether the connection and its target component are both currently present.
+   * 
+   * A currently present connection without a present target component is a partial model error,
+   * so we throw an exception instead of returning <code>false</code>.
+   * 
+   * @param connection The connection to check.
+   * @throws IllegalStateException When the target component is not currently present.
+   */
+  public static boolean isCurrentlyConnected(final Connection connection) {
+    boolean _xblockexpression = false;
+    {
+      boolean _currentlyExists = CftExtensions.currentlyExists(connection.getOutput().getComponent());
+      if (_currentlyExists) {
+        throw new IllegalStateException("Inconsistent partial model: current connection to a component that may not currently exist");
+      }
+      _xblockexpression = CftExtensions.currentlyExists(connection);
+    }
+    return _xblockexpression;
+  }
+}
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/META-INF/MANIFEST.MF b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/META-INF/MANIFEST.MF
index ce704acf..5ee6a4f1 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/META-INF/MANIFEST.MF
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@ Require-Bundle: com.google.guava,
  org.eclipse.viatra.query.runtime.localsearch,
  hu.bme.mit.inf.dslreasoner.faulttree.components,
  hu.bme.mit.inf.dslreasoner.logic.model,
- com.github.jnr.constants;bundle-version="0.9.8",
  org.apache.commons.lang;bundle-version="2.6.0"
 Export-Package: hu.bme.mit.inf.dslreasoner.faulttree.transformation.cft2ft,
  hu.bme.mit.inf.dslreasoner.faulttree.transformation.ecore2cft,
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/EventMaterializer.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/EventMaterializer.xtend
index c9aefe51..6b3ed0d0 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/EventMaterializer.xtend
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/EventMaterializer.xtend
@@ -17,6 +17,8 @@ import java.util.Map
 import org.eclipse.emf.ecore.util.EcoreUtil
 import org.eclipse.xtend.lib.annotations.Data
 
+import static extension hu.bme.mit.inf.dslreasoner.faulttree.model.util.CftExtensions.*
+
 class EventMaterializer {
         extension val FtFactory = FtFactory.eINSTANCE
 
@@ -169,8 +171,10 @@ class EventMaterializer {
                 val input = findInput(component, inputEvent)
                 val builder = EventCollection.builder
                 for (connection : input.incomingConnections) {
-                        val materializedEvent = getOrMaterialize(connection.output)
-                        builder.add(materializedEvent)
+                        if (connection.isCurrentlyConnected) {
+                                val materializedEvent = getOrMaterialize(connection.output)
+                                builder.add(materializedEvent)
+                        }
                 }
                 builder.build
         }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/ComponentFaultTreeTrace.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/ComponentFaultTreeTrace.xtend
index 7a3e377b..10c91fb4 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/ComponentFaultTreeTrace.xtend
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/ComponentFaultTreeTrace.xtend
@@ -2,6 +2,7 @@ package hu.bme.mit.inf.dslreasoner.faulttree.transformation.ecore2cft
 
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftFactory
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Modality
 import java.util.Map
 import org.eclipse.viatra.query.runtime.api.IPatternMatch
 import org.eclipse.xtend.lib.annotations.Accessors
@@ -13,10 +14,16 @@ class ComponentFaultTreeTrace {
         val Map<IPatternMatch, ComponentInstanceTrace> componentInstancesMap = newHashMap
 
         def instantiateComponent(IPatternMatch patternMatch, ComponentDefinition componenDefinition) {
+                instantiateComponent(patternMatch, componenDefinition, Modality.MUST, false)
+        }
+
+        def instantiateComponent(IPatternMatch patternMatch, ComponentDefinition componenDefinition, Modality exists,
+                boolean allowMultiple) {
                 if (componentInstancesMap.containsKey(patternMatch)) {
                         throw new IllegalArgumentException("Already instantiated component for match: " + patternMatch)
                 }
-                val componentTrace = new ComponentInstanceTrace(componentFaultTree, componenDefinition, nameGenerator)
+                val componentTrace = new ComponentInstanceTrace(componentFaultTree, componenDefinition, nameGenerator,
+                        exists, allowMultiple)
                 componentInstancesMap.put(patternMatch, componentTrace)
                 componentTrace
         }
@@ -30,6 +37,9 @@ class ComponentFaultTreeTrace {
                         throw new IllegalArgumentException("Top level component must have 1 output, got " + outputs.size +
                                 " instead")
                 }
+                if (!trace.appearsExactlyOnce) {
+                        throw new IllegalArgumentException("Top level must appear in the fault tree exactly once")
+                }
                 componentFaultTree.topEvent = outputs.head
         }
 
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/ComponentInstanceTrace.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/ComponentInstanceTrace.xtend
index 7353bfe5..158ab2e1 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/ComponentInstanceTrace.xtend
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/ComponentInstanceTrace.xtend
@@ -6,18 +6,23 @@ import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentFaultTree
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.InputEvent
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Modality
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output
 import java.util.Map
 
+import static extension hu.bme.mit.inf.dslreasoner.faulttree.model.util.CftExtensions.*
+
 class ComponentInstanceTrace {
         val componentInstance = CftFactory.eINSTANCE.createComponent
         val Map<InputEvent, InputTrace> inputEventsMap
         val Map<EventDeclaration, Output> outputEventsMap
 
         protected new(ComponentFaultTree faultTree, ComponentDefinition componentDefinition,
-                ComponentNameGenerator nameGenerator) {
+                ComponentNameGenerator nameGenerator, Modality exists, boolean multipleAllowed) {
                 componentInstance.componentDefinition = componentDefinition
                 componentInstance.name = nameGenerator.nextName(componentDefinition)
+                componentInstance.exists = exists
+                componentInstance.multipleAllowed = multipleAllowed
                 inputEventsMap = Maps.newHashMapWithExpectedSize(componentDefinition.inputEvents.size)
                 for (inputEvent : componentDefinition.inputEvents) {
                         val inputTrace = new InputTrace(componentInstance, inputEvent)
@@ -34,6 +39,11 @@ class ComponentInstanceTrace {
         }
 
         def void assign(EventDeclaration inputEvent, ComponentInstanceTrace sourceComponent, EventDeclaration outputEvent) {
+                assign(inputEvent, sourceComponent, outputEvent, Modality.MUST)
+        }
+
+        def void assign(EventDeclaration inputEvent, ComponentInstanceTrace sourceComponent, EventDeclaration outputEvent,
+                Modality exists) {
                 val inputTrace = inputEventsMap.get(inputEvent)
                 if (inputTrace === null) {
                         throw new IllegalArgumentException("Unknown input: " + inputEvent)
@@ -42,10 +52,14 @@ class ComponentInstanceTrace {
                 if (output === null) {
                         throw new IllegalArgumentException("Unknown output: " + outputEvent)
                 }
-                inputTrace.assign(output)
+                inputTrace.assign(output, exists)
         }
 
         protected def getOutputs() {
                 componentInstance.outputs
         }
+
+        protected def appearsExactlyOnce() {
+                componentInstance.appearsExactlyOnce
+        }
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/InputTrace.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/InputTrace.xtend
index c529a09b..b892eff1 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/InputTrace.xtend
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/InputTrace.xtend
@@ -5,9 +5,12 @@ import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.InputEvent
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Modality
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output
 import java.util.Map
 
+import static extension hu.bme.mit.inf.dslreasoner.faulttree.model.util.CftExtensions.*
+
 class InputTrace {
         val Input input = CftFactory.eINSTANCE.createInput
         val Map<Output, Connection> connectionsMap = newHashMap
@@ -17,13 +20,16 @@ class InputTrace {
                 component.inputs += input
         }
 
-        def void assign(Output output) {
+        def void assign(Output output, Modality exists) {
                 val connection = connectionsMap.get(output)
                 if (connection === null) {
                         val newConnection = CftFactory.eINSTANCE.createConnection
                         newConnection.output = output
+                        newConnection.exists = exists
                         input.incomingConnections += newConnection
                         connectionsMap.put(output, newConnection)
+                } else if (exists.isMoreConcreteThan(connection.exists)) {
+                        connection.exists = exists
                 }
         }
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ft2galileo/Ft2GalileoTransformation.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ft2galileo/Ft2GalileoTransformation.xtend
index 732d9fed..4a19e2cd 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ft2galileo/Ft2GalileoTransformation.xtend
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ft2galileo/Ft2GalileoTransformation.xtend
@@ -14,14 +14,15 @@ import org.eclipse.xtend2.lib.StringConcatenationClient
 
 class Ft2GalileoTransformation {
         def toGalileo(FaultTree faultTree) '''
-                toplevel «faultTree.topEvent.name»;
+                toplevel "«faultTree.topEvent.name»";
                 «FOR event : faultTree.events»
-                        «event.name» «defineEvent(event)»;
+                        "«event.name»" «defineEvent(event)»;
                 «ENDFOR»
         '''
 
         protected dispatch def defineEvent(BasicEvent basicEvent) {
-                defineDistribution(basicEvent.distribution)
+                // ft-diet (https://moves.rwth-aachen.de/ft-diet/) needs a dormancy factor.
+                '''«defineDistribution(basicEvent.distribution)» dorm=0.0'''
         }
 
         protected dispatch def StringConcatenationClient defineDistribution(ConstantDistribution distribution) {
@@ -37,7 +38,7 @@ class Ft2GalileoTransformation {
         }
 
         protected dispatch def StringConcatenationClient defineEvent(Gate gate) {
-                '''«defineGate(gate)» «FOR input : gate.inputEvents SEPARATOR " "»«input.name»«ENDFOR»'''
+                '''«defineGate(gate)» «FOR input : gate.inputEvents SEPARATOR " "»"«input.name»"«ENDFOR»'''
         }
 
         protected dispatch def StringConcatenationClient defineGate(AndGate gate) '''and'''
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/StormDftHandler.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/StormDftHandler.xtend
index 91c6a0d0..a250a955 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/StormDftHandler.xtend
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/src/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/StormDftHandler.xtend
@@ -8,8 +8,6 @@ import java.io.IOException
 import java.io.InputStream
 import java.io.InputStreamReader
 import java.util.regex.Pattern
-import jnr.constants.platform.Signal
-import org.apache.commons.lang.SystemUtils
 
 class StormDftException extends RuntimeException {
         new(String s) {
@@ -29,8 +27,9 @@ class StormDftHandler {
         static val RESULT_REGEX = '''^Result:\s*\[(?:(?<«SINGLE_RESULT_GROUP»>«DOUBLE_REGEX»)|\((?<«LOWER_BOUND_GROUP»>«DOUBLE_REGEX»),\s*(?<«UPPER_BOUND_GROUP»>«DOUBLE_REGEX»)\))\]'''
         static val RESULT_PATTERN = Pattern.compile(RESULT_REGEX)
 
-        // See http://hg.openjdk.java.net/jdk7/jdk7/jdk/file/jdk7-b147/src/solaris/native/java/lang/UNIXProcess_md.c#l332
-        static val SIGNAL_EXIT_VALUE_OFFSET = if(SystemUtils.IS_OS_SOLARIS) 0 else 0x80
+        static val SIGNAL_EXIT_VALUE_OFFSET = 0x80
+        static val SIGXCPU = 24
+        static val SIGXFSZ = 25
 
         static val STORM_GENERAL_ERROR = (-1).bitwiseAnd(0xff)
         static val STORM_TIMEOUT = (-2).bitwiseAnd(0xff)
@@ -166,18 +165,15 @@ class StormDftHandler {
                         case STORM_GENERAL_ERROR:
                                 throw new StormDftException("Storm error: " + error)
                         case STORM_TIMEOUT,
-                        case SIGNAL_EXIT_VALUE_OFFSET + Signal.SIGXCPU.intValue:
+                        case SIGNAL_EXIT_VALUE_OFFSET + SIGXCPU:
                                 ReliabilityResult.TIMEOUT
                         case STORM_MEMOUT,
-                        case SIGNAL_EXIT_VALUE_OFFSET + Signal.SIGXFSZ.intValue:
+                        case SIGNAL_EXIT_VALUE_OFFSET + SIGXFSZ:
                                 ReliabilityResult.MEMOUT
                         default: {
                                 if (exitValue > SIGNAL_EXIT_VALUE_OFFSET) {
                                         val signalNumber = exitValue - SIGNAL_EXIT_VALUE_OFFSET
-                                        val signal = Signal.values.findFirst[intValue == signalNumber]
-                                        if (signal !== null) {
-                                                throw new StormDftException("Storm unexpectedly killed by signal " + signal + ": " + error)
-                                        }
+                                        throw new StormDftException("Storm unexpectedly killed by signal " + signalNumber + ": " + error)
                                 }
                                 throw new StormDftException("Storm unexpectedly exit with status " + exitValue + ": " + error)
                         }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/.Cft2FtTransformation.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/.Cft2FtTransformation.xtendbin
index 226e6227..f68d0464 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/.Cft2FtTransformation.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/.Cft2FtTransformation.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/.EventCollection.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/.EventCollection.xtendbin
index 54ba3d09..6aebfa85 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/.EventCollection.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/.EventCollection.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/.EventMaterializer.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/.EventMaterializer.xtendbin
index 175ae3f1..323f40b2 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/.EventMaterializer.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/.EventMaterializer.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/.FaultTreeBuilder.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/.FaultTreeBuilder.xtendbin
index db3a7e73..45b228d3 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/.FaultTreeBuilder.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/.FaultTreeBuilder.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/.gitignore
index 75154a4c..058cff19 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/.gitignore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/.gitignore
@@ -6,3 +6,11 @@
 /.FaultTreeBuilder.java._trace
 /.FaultModelBuilder.java._trace
 /.EventCollection.java._trace
+/.Cft2FtTransformation.xtendbin
+/.EventCollection.xtendbin
+/.EventMaterializer.xtendbin
+/.FaultTreeBuilder.xtendbin
+/Cft2FtTransformation.java
+/EventCollection.java
+/EventMaterializer.java
+/FaultTreeBuilder.java
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/EventMaterializer.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/EventMaterializer.java
index ac1fc209..98a82b7d 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/EventMaterializer.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/cft2ft/EventMaterializer.java
@@ -22,6 +22,7 @@ import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.Gate;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.KOfMGate;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.OrGate;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.ft.RandomEvent;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.util.CftExtensions;
 import hu.bme.mit.inf.dslreasoner.faulttree.transformation.cft2ft.EventCollection;
 import java.util.LinkedHashSet;
 import java.util.Map;
@@ -416,7 +417,8 @@ public class EventMaterializer {
       final EventCollection.Builder builder = EventCollection.builder();
       EList<Connection> _incomingConnections = input.getIncomingConnections();
       for (final Connection connection : _incomingConnections) {
-        {
+        boolean _isCurrentlyConnected = CftExtensions.isCurrentlyConnected(connection);
+        if (_isCurrentlyConnected) {
           final Event materializedEvent = this.getOrMaterialize(connection.getOutput());
           builder.add(materializedEvent);
         }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.ComponentFaultTreeTrace.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.ComponentFaultTreeTrace.xtendbin
index f705fefe..59a21d5c 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.ComponentFaultTreeTrace.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.ComponentFaultTreeTrace.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.ComponentInstanceTrace.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.ComponentInstanceTrace.xtendbin
index bab76345..0a5c81fe 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.ComponentInstanceTrace.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.ComponentInstanceTrace.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.ComponentNameGenerator.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.ComponentNameGenerator.xtendbin
index 257bfc56..87965646 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.ComponentNameGenerator.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.ComponentNameGenerator.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.Ecore2CftTransformation.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.Ecore2CftTransformation.xtendbin
index a1339a18..cd930545 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.Ecore2CftTransformation.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.Ecore2CftTransformation.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.InputTrace.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.InputTrace.xtendbin
index ba19d0fb..2f779ecb 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.InputTrace.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.InputTrace.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.LookupHandler.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.LookupHandler.xtendbin
index 1e8612b2..93bad7e0 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.LookupHandler.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.LookupHandler.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.MappingHandler.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.MappingHandler.xtendbin
index ebe80f2e..fde76cfd 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.MappingHandler.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.MappingHandler.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.MappingQueries.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.MappingQueries.xtendbin
index 03bd16f8..4754c634 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.MappingQueries.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.MappingQueries.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.gitignore
index 33bb70d4..377aa872 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.gitignore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/.gitignore
@@ -7,3 +7,19 @@
 /.CftTransformation.java._trace
 /.Ecore2CftTransformation.java._trace
 /.ComponentNameGenerator.java._trace
+/.ComponentFaultTreeTrace.xtendbin
+/.ComponentInstanceTrace.xtendbin
+/.ComponentNameGenerator.xtendbin
+/.Ecore2CftTransformation.xtendbin
+/.InputTrace.xtendbin
+/.LookupHandler.xtendbin
+/.MappingHandler.xtendbin
+/.MappingQueries.xtendbin
+/ComponentFaultTreeTrace.java
+/ComponentInstanceTrace.java
+/ComponentNameGenerator.java
+/Ecore2CftTransformation.java
+/InputTrace.java
+/LookupHandler.java
+/MappingHandler.java
+/MappingQueries.java
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/ComponentFaultTreeTrace.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/ComponentFaultTreeTrace.java
index 46e711d9..ddcf9036 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/ComponentFaultTreeTrace.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/ComponentFaultTreeTrace.java
@@ -3,6 +3,7 @@ package hu.bme.mit.inf.dslreasoner.faulttree.transformation.ecore2cft;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftFactory;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentFaultTree;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Modality;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output;
 import hu.bme.mit.inf.dslreasoner.faulttree.transformation.ecore2cft.ComponentInstanceTrace;
 import hu.bme.mit.inf.dslreasoner.faulttree.transformation.ecore2cft.ComponentNameGenerator;
@@ -24,13 +25,17 @@ public class ComponentFaultTreeTrace {
   private final Map<IPatternMatch, ComponentInstanceTrace> componentInstancesMap = CollectionLiterals.<IPatternMatch, ComponentInstanceTrace>newHashMap();
   
   public ComponentInstanceTrace instantiateComponent(final IPatternMatch patternMatch, final ComponentDefinition componenDefinition) {
+    return this.instantiateComponent(patternMatch, componenDefinition, Modality.MUST, false);
+  }
+  
+  public ComponentInstanceTrace instantiateComponent(final IPatternMatch patternMatch, final ComponentDefinition componenDefinition, final Modality exists, final boolean allowMultiple) {
     ComponentInstanceTrace _xblockexpression = null;
     {
       boolean _containsKey = this.componentInstancesMap.containsKey(patternMatch);
       if (_containsKey) {
         throw new IllegalArgumentException(("Already instantiated component for match: " + patternMatch));
       }
-      final ComponentInstanceTrace componentTrace = new ComponentInstanceTrace(this.componentFaultTree, componenDefinition, this.nameGenerator);
+      final ComponentInstanceTrace componentTrace = new ComponentInstanceTrace(this.componentFaultTree, componenDefinition, this.nameGenerator, exists, allowMultiple);
       this.componentInstancesMap.put(patternMatch, componentTrace);
       _xblockexpression = componentTrace;
     }
@@ -53,6 +58,11 @@ public class ComponentFaultTreeTrace {
         " instead");
       throw new IllegalArgumentException(_plus_1);
     }
+    boolean _appearsExactlyOnce = trace.appearsExactlyOnce();
+    boolean _not = (!_appearsExactlyOnce);
+    if (_not) {
+      throw new IllegalArgumentException("Top level must appear in the fault tree exactly once");
+    }
     this.componentFaultTree.setTopEvent(IterableExtensions.<Output>head(outputs));
   }
   
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/ComponentInstanceTrace.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/ComponentInstanceTrace.java
index 840f501d..4034bdf3 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/ComponentInstanceTrace.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/ComponentInstanceTrace.java
@@ -7,7 +7,9 @@ import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentDefinition;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.ComponentFaultTree;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDeclaration;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.InputEvent;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Modality;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.util.CftExtensions;
 import hu.bme.mit.inf.dslreasoner.faulttree.transformation.ecore2cft.ComponentNameGenerator;
 import hu.bme.mit.inf.dslreasoner.faulttree.transformation.ecore2cft.InputTrace;
 import java.util.Map;
@@ -21,9 +23,11 @@ public class ComponentInstanceTrace {
   
   private final Map<EventDeclaration, Output> outputEventsMap;
   
-  protected ComponentInstanceTrace(final ComponentFaultTree faultTree, final ComponentDefinition componentDefinition, final ComponentNameGenerator nameGenerator) {
+  protected ComponentInstanceTrace(final ComponentFaultTree faultTree, final ComponentDefinition componentDefinition, final ComponentNameGenerator nameGenerator, final Modality exists, final boolean multipleAllowed) {
     this.componentInstance.setComponentDefinition(componentDefinition);
     this.componentInstance.setName(nameGenerator.nextName(componentDefinition));
+    this.componentInstance.setExists(exists);
+    this.componentInstance.setMultipleAllowed(multipleAllowed);
     this.inputEventsMap = Maps.<InputEvent, InputTrace>newHashMapWithExpectedSize(componentDefinition.getInputEvents().size());
     EList<InputEvent> _inputEvents = componentDefinition.getInputEvents();
     for (final InputEvent inputEvent : _inputEvents) {
@@ -48,6 +52,10 @@ public class ComponentInstanceTrace {
   }
   
   public void assign(final EventDeclaration inputEvent, final ComponentInstanceTrace sourceComponent, final EventDeclaration outputEvent) {
+    this.assign(inputEvent, sourceComponent, outputEvent, Modality.MUST);
+  }
+  
+  public void assign(final EventDeclaration inputEvent, final ComponentInstanceTrace sourceComponent, final EventDeclaration outputEvent, final Modality exists) {
     final InputTrace inputTrace = this.inputEventsMap.get(inputEvent);
     if ((inputTrace == null)) {
       throw new IllegalArgumentException(("Unknown input: " + inputEvent));
@@ -56,10 +64,14 @@ public class ComponentInstanceTrace {
     if ((output == null)) {
       throw new IllegalArgumentException(("Unknown output: " + outputEvent));
     }
-    inputTrace.assign(output);
+    inputTrace.assign(output, exists);
   }
   
   protected EList<Output> getOutputs() {
     return this.componentInstance.getOutputs();
   }
+  
+  protected boolean appearsExactlyOnce() {
+    return CftExtensions.appearsExactlyOnce(this.componentInstance);
+  }
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/InputTrace.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/InputTrace.java
index c12f2bae..2b30566f 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/InputTrace.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ecore2cft/InputTrace.java
@@ -5,7 +5,9 @@ import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Component;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Connection;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Input;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.InputEvent;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Modality;
 import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.Output;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.util.CftExtensions;
 import java.util.Map;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.xtext.xbase.lib.CollectionLiterals;
@@ -22,14 +24,20 @@ public class InputTrace {
     _inputs.add(this.input);
   }
   
-  public void assign(final Output output) {
+  public void assign(final Output output, final Modality exists) {
     final Connection connection = this.connectionsMap.get(output);
     if ((connection == null)) {
       final Connection newConnection = CftFactory.eINSTANCE.createConnection();
       newConnection.setOutput(output);
+      newConnection.setExists(exists);
       EList<Connection> _incomingConnections = this.input.getIncomingConnections();
       _incomingConnections.add(newConnection);
       this.connectionsMap.put(output, newConnection);
+    } else {
+      boolean _isMoreConcreteThan = CftExtensions.isMoreConcreteThan(exists, connection.getExists());
+      if (_isMoreConcreteThan) {
+        connection.setExists(exists);
+      }
     }
   }
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ft2galileo/.Ft2GalileoTransformation.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ft2galileo/.Ft2GalileoTransformation.xtendbin
index 9fe75a0f..25ddc417 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ft2galileo/.Ft2GalileoTransformation.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ft2galileo/.Ft2GalileoTransformation.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ft2galileo/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ft2galileo/.gitignore
index 3f932890..f4610b04 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ft2galileo/.gitignore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ft2galileo/.gitignore
@@ -1 +1,3 @@
 /.Ft2GalileoTransformation.java._trace
+/.Ft2GalileoTransformation.xtendbin
+/Ft2GalileoTransformation.java
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ft2galileo/Ft2GalileoTransformation.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ft2galileo/Ft2GalileoTransformation.java
index e900c62a..8748825d 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ft2galileo/Ft2GalileoTransformation.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/ft2galileo/Ft2GalileoTransformation.java
@@ -19,18 +19,19 @@ import org.eclipse.xtend2.lib.StringConcatenationClient;
 public class Ft2GalileoTransformation {
   public CharSequence toGalileo(final FaultTree faultTree) {
     StringConcatenation _builder = new StringConcatenation();
-    _builder.append("toplevel ");
+    _builder.append("toplevel \"");
     String _name = faultTree.getTopEvent().getName();
     _builder.append(_name);
-    _builder.append(";");
+    _builder.append("\";");
     _builder.newLineIfNotEmpty();
     {
       EList<RandomEvent> _events = faultTree.getEvents();
       for(final RandomEvent event : _events) {
+        _builder.append("\"");
         String _name_1 = event.getName();
         _builder.append(_name_1);
-        _builder.append(" ");
-        StringConcatenationClient _defineEvent = this.defineEvent(event);
+        _builder.append("\" ");
+        Object _defineEvent = this.defineEvent(event);
         _builder.append(_defineEvent);
         _builder.append(";");
         _builder.newLineIfNotEmpty();
@@ -39,8 +40,12 @@ public class Ft2GalileoTransformation {
     return _builder;
   }
   
-  protected StringConcatenationClient _defineEvent(final BasicEvent basicEvent) {
-    return this.defineDistribution(basicEvent.getDistribution());
+  protected Object _defineEvent(final BasicEvent basicEvent) {
+    StringConcatenation _builder = new StringConcatenation();
+    StringConcatenationClient _defineDistribution = this.defineDistribution(basicEvent.getDistribution());
+    _builder.append(_defineDistribution);
+    _builder.append(" dorm=0.0");
+    return _builder;
   }
   
   protected StringConcatenationClient _defineDistribution(final ConstantDistribution distribution) {
@@ -87,8 +92,10 @@ public class Ft2GalileoTransformation {
             } else {
               _builder.appendImmediate(" ", "");
             }
+            _builder.append("\"");
             String _name = input.getName();
             _builder.append(_name);
+            _builder.append("\"");
           }
         }
       }
@@ -138,7 +145,7 @@ public class Ft2GalileoTransformation {
     throw new IllegalArgumentException(("Unknown random even: " + randomEvent));
   }
   
-  protected StringConcatenationClient defineEvent(final RandomEvent basicEvent) {
+  protected Object defineEvent(final RandomEvent basicEvent) {
     if (basicEvent instanceof BasicEvent) {
       return _defineEvent((BasicEvent)basicEvent);
     } else if (basicEvent instanceof Gate) {
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/.ReliabilityResult.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/.ReliabilityResult.xtendbin
index 57c4608d..552c946a 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/.ReliabilityResult.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/.ReliabilityResult.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/.StormDftConfiguration.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/.StormDftConfiguration.xtendbin
index f5cb52f4..a3f9c647 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/.StormDftConfiguration.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/.StormDftConfiguration.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/.StormDftHandler.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/.StormDftHandler.xtendbin
index 5dad0728..d7f66fd0 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/.StormDftHandler.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/.StormDftHandler.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/.StormDftSolver.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/.StormDftSolver.xtendbin
index abd8a501..b9fdf395 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/.StormDftSolver.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/.StormDftSolver.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/.gitignore
index 59cc8fe8..8a74c101 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/.gitignore
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/.gitignore
@@ -7,3 +7,14 @@
 /.StormDftException.java._trace
 /.ReliabilityModelSolution.java._trace
 /.ReliabilityResult.java._trace
+/.ReliabilityResult.xtendbin
+/.StormDftConfiguration.xtendbin
+/.StormDftHandler.xtendbin
+/.StormDftSolver.xtendbin
+/ApproximationHeuristic.java
+/FtAnalysisObjective.java
+/ReliabilityResult.java
+/StormDftConfiguration.java
+/StormDftException.java
+/StormDftHandler.java
+/StormDftSolver.java
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/StormDftHandler.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/StormDftHandler.java
index 003d9cc5..46127425 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/StormDftHandler.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.transformation/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/transformation/solver/StormDftHandler.java
@@ -16,15 +16,11 @@ import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import jnr.constants.platform.Signal;
-import org.apache.commons.lang.SystemUtils;
 import org.eclipse.xtend2.lib.StringConcatenation;
 import org.eclipse.xtext.xbase.lib.CollectionLiterals;
-import org.eclipse.xtext.xbase.lib.Conversions;
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.eclipse.xtext.xbase.lib.Extension;
 import org.eclipse.xtext.xbase.lib.Functions.Function0;
-import org.eclipse.xtext.xbase.lib.Functions.Function1;
 import org.eclipse.xtext.xbase.lib.InputOutput;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
 
@@ -60,17 +56,11 @@ public class StormDftHandler {
   
   private static final Pattern RESULT_PATTERN = Pattern.compile(StormDftHandler.RESULT_REGEX);
   
-  private static final int SIGNAL_EXIT_VALUE_OFFSET = new Function0<Integer>() {
-    public Integer apply() {
-      int _xifexpression = (int) 0;
-      if (SystemUtils.IS_OS_SOLARIS) {
-        _xifexpression = 0;
-      } else {
-        _xifexpression = 0x80;
-      }
-      return _xifexpression;
-    }
-  }.apply().intValue();
+  private static final int SIGNAL_EXIT_VALUE_OFFSET = 0x80;
+  
+  private static final int SIGXCPU = 24;
+  
+  private static final int SIGXFSZ = 25;
   
   private static final int STORM_GENERAL_ERROR = ((-1) & 0xff);
   
@@ -305,9 +295,7 @@ public class StormDftHandler {
         _matched=true;
       }
       if (!_matched) {
-        int _intValue = Signal.SIGXCPU.intValue();
-        int _plus = (StormDftHandler.SIGNAL_EXIT_VALUE_OFFSET + _intValue);
-        if (Objects.equal(exitValue, _plus)) {
+        if (Objects.equal(exitValue, (StormDftHandler.SIGNAL_EXIT_VALUE_OFFSET + StormDftHandler.SIGXCPU))) {
           _matched=true;
         }
       }
@@ -320,9 +308,7 @@ public class StormDftHandler {
         _matched=true;
       }
       if (!_matched) {
-        int _intValue_1 = Signal.SIGXFSZ.intValue();
-        int _plus_1 = (StormDftHandler.SIGNAL_EXIT_VALUE_OFFSET + _intValue_1);
-        if (Objects.equal(exitValue, _plus_1)) {
+        if (Objects.equal(exitValue, (StormDftHandler.SIGNAL_EXIT_VALUE_OFFSET + StormDftHandler.SIGXFSZ))) {
           _matched=true;
         }
       }
@@ -334,14 +320,7 @@ public class StormDftHandler {
       {
         if ((exitValue > StormDftHandler.SIGNAL_EXIT_VALUE_OFFSET)) {
           final int signalNumber = (exitValue - StormDftHandler.SIGNAL_EXIT_VALUE_OFFSET);
-          final Function1<Signal, Boolean> _function = (Signal it) -> {
-            int _intValue_2 = it.intValue();
-            return Boolean.valueOf((_intValue_2 == signalNumber));
-          };
-          final Signal signal = IterableExtensions.<Signal>findFirst(((Iterable<Signal>)Conversions.doWrapArray(Signal.values())), _function);
-          if ((signal != null)) {
-            throw new StormDftException(((("Storm unexpectedly killed by signal " + signal) + ": ") + error));
-          }
+          throw new StormDftException(((("Storm unexpectedly killed by signal " + Integer.valueOf(signalNumber)) + ": ") + error));
         }
         throw new StormDftException(((("Storm unexpectedly exit with status " + Integer.valueOf(exitValue)) + ": ") + error));
       }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/.classpath b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/.classpath
new file mode 100644
index 00000000..428337e5
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+        <classpathentry kind="src" path="src"/>
+        <classpathentry kind="src" path="xtend-gen"/>
+        <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/.project b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/.project
new file mode 100644
index 00000000..98f85839
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+        <name>hu.bme.mit.inf.dslreasoner.faulttree.ui</name>
+        <comment></comment>
+        <projects>
+        </projects>
+        <buildSpec>
+                <buildCommand>
+                        <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.jdt.core.javabuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.pde.ManifestBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.pde.SchemaBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+        </buildSpec>
+        <natures>
+                <nature>org.eclipse.pde.PluginNature</nature>
+                <nature>org.eclipse.jdt.core.javanature</nature>
+                <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+        </natures>
+</projectDescription>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/.settings/org.eclipse.jdt.core.prefs b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..0c68a61d
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/META-INF/MANIFEST.MF b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..59c1c5f7
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Ui
+Bundle-SymbolicName: hu.bme.mit.inf.dslreasoner.faulttree.ui;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: hu.bme.mit.inf.dslreasoner.faulttree.ui.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ com.google.guava,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtend.lib,
+ org.eclipse.xtend.lib.macro,
+ org.eclipse.core.resources,
+ org.eclipse.emf.ecore,
+ org.eclipse.viatra.query.runtime,
+ org.eclipse.viatra.query.runtime.rete,
+ org.eclipse.viatra.query.runtime.localsearch,
+ hu.bme.mit.inf.dslreasoner.logic.model,
+ hu.bme.mit.inf.dslreasoner.faulttree.components,
+ hu.bme.mit.inf.dslreasoner.faulttree.transformation,
+ hu.bme.mit.inf.dslreasoner.application,
+ hu.bme.mit.inf.dslreasoner.application.ui
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.faulttree.ui
+Bundle-ActivationPolicy: lazy
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/bin/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/bin/.gitignore
new file mode 100644
index 00000000..1c0a02cd
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/bin/.gitignore
@@ -0,0 +1 @@
+/hu/
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/build.properties b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/build.properties
new file mode 100644
index 00000000..e9863e28
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/plugin.xml b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/plugin.xml
new file mode 100644
index 00000000..8a01c50c
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/plugin.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            allPopups="false"
+            locationURI="popup:hu.bme.mit.inf.dslreasoner.application.ui.menu?after=hu.bme.mit.inf.dslreasoner.application.ui.executescript">
+         <command
+               commandId="hu.bme.mit.inf.dslreasoner.faulttree.ui.reliabilityanalysis"
+               label="Reliability Analysis..."
+               style="push">
+         </command>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            defaultHandler="hu.bme.mit.inf.dslreasoner.faulttree.ui.handler.ReliabilityAnalysisHandler"
+            id="hu.bme.mit.inf.dslreasoner.faulttree.ui.reliabilityanalysis"
+            name="Execute Reliability Analysis">
+      </command>
+   </extension>
+
+</plugin>
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/ui/Activator.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/ui/Activator.java
new file mode 100644
index 00000000..4363fc63
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/ui/Activator.java
@@ -0,0 +1,44 @@
+package hu.bme.mit.inf.dslreasoner.faulttree.ui;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+        // The plug-in ID
+        public static final String PLUGIN_ID = "hu.bme.mit.inf.dslreasoner.faulttree.ui"; //$NON-NLS-1$
+
+        // The shared instance
+        private static Activator plugin;
+        
+        /**
+         * The constructor
+         */
+        public Activator() {
+        }
+
+        @Override
+        public void start(BundleContext context) throws Exception {
+                super.start(context);
+                plugin = this;
+        }
+
+        @Override
+        public void stop(BundleContext context) throws Exception {
+                plugin = null;
+                super.stop(context);
+        }
+
+        /**
+         * Returns the shared instance
+         *
+         * @return the shared instance
+         */
+        public static Activator getDefault() {
+                return plugin;
+        }
+
+}
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/ui/handler/ReliabilityAnalysisHandler.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/ui/handler/ReliabilityAnalysisHandler.xtend
new file mode 100644
index 00000000..5fa89148
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/ui/handler/ReliabilityAnalysisHandler.xtend
@@ -0,0 +1,128 @@
+package hu.bme.mit.inf.dslreasoner.faulttree.ui.handler
+
+import hu.bme.mit.inf.dslreasoner.application.execution.EclipseBasedProgressMonitor
+import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.CftModel
+import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.TransformationDefinition
+import hu.bme.mit.inf.dslreasoner.faulttree.transformation.cft2ft.Cft2FtTransformation
+import hu.bme.mit.inf.dslreasoner.faulttree.transformation.ecore2cft.Ecore2CftTransformation
+import hu.bme.mit.inf.dslreasoner.faulttree.transformation.solver.FtAnalysisObjective
+import hu.bme.mit.inf.dslreasoner.faulttree.transformation.solver.ReliabilityResult
+import hu.bme.mit.inf.dslreasoner.faulttree.transformation.solver.StormDftConfiguration
+import hu.bme.mit.inf.dslreasoner.faulttree.transformation.solver.StormDftSolver
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel
+import hu.bme.mit.inf.dslreasoner.workspace.ProjectWorkspace
+import org.eclipse.core.commands.AbstractHandler
+import org.eclipse.core.commands.ExecutionEvent
+import org.eclipse.core.commands.ExecutionException
+import org.eclipse.core.resources.IFile
+import org.eclipse.core.resources.IProject
+import org.eclipse.core.resources.IResource
+import org.eclipse.core.runtime.IProgressMonitor
+import org.eclipse.core.runtime.NullProgressMonitor
+import org.eclipse.emf.common.util.URI
+import org.eclipse.emf.ecore.resource.Resource
+import org.eclipse.emf.ecore.resource.ResourceSet
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl
+import org.eclipse.swt.widgets.MessageBox
+import org.eclipse.ui.PlatformUI
+import org.eclipse.ui.handlers.HandlerUtil
+import org.eclipse.viatra.query.runtime.api.AdvancedViatraQueryEngine
+import org.eclipse.viatra.query.runtime.emf.EMFScope
+
+class ReliabilityAnalysisHandler extends AbstractHandler {
+
+        override execute(ExecutionEvent event) throws ExecutionException {
+                val selection = HandlerUtil.getCurrentStructuredSelection(event)
+                val resourceSet = new ResourceSetImpl
+                val iterator = selection.iterator
+                var IProject targetProject = null
+                var Resource targetResource = null
+                var TransformationDefinition transformationDefinition = null
+                while (iterator.hasNext) {
+                        val selectedElement = iterator.next
+                        if (selectedElement instanceof IFile) {
+                                val resource = tryLoadResource(resourceSet, selectedElement)
+                                if (resource !== null && !resource.contents.empty) {
+                                        val rootElement = resource.contents.head
+                                        if (rootElement instanceof CftModel) {
+                                                if (rootElement.transformationDefinitions.empty) {
+                                                        throw new IllegalArgumentException("Selected cft file is not a transformation definition.")
+                                                }
+                                                if (transformationDefinition !== null) {
+                                                        throw new IllegalArgumentException(
+                                                                "Only a single transformation definition may be selected.")
+                                                }
+                                                transformationDefinition = rootElement.transformationDefinitions.head
+                                        } else {
+                                                if (targetResource !== null) {
+                                                        throw new IllegalArgumentException("Only a single architecture model may be selected.")
+                                                }
+                                                targetResource = resource
+                                                targetProject = selectedElement.project
+                                        }
+                                }
+                        }
+                }
+                if (targetResource === null || targetResource === null) {
+                        throw new IllegalArgumentException(
+                                "A transformation definition and an architecture model must be selected.")
+                }
+                runAnalysis(transformationDefinition, targetResource, targetProject, new NullProgressMonitor)
+                null
+        }
+
+        private static def tryLoadResource(ResourceSet resourceSet, IFile file) {
+                val fullPath = file.fullPath.toString
+                val uri = URI.createPlatformResourceURI(fullPath, true)
+                try {
+                        resourceSet.getResource(uri, true)
+                } catch (RuntimeException e) {
+                        null
+                }
+        }
+
+        private def runAnalysis(TransformationDefinition transformationDefinition, Resource resource, IProject project,
+                IProgressMonitor monitor) {
+                val workspace = createWorkspace(project, monitor)
+                val cft = createComponentFaultTree(transformationDefinition, resource)
+                workspace.writeModel(cft, "cft.xmi")
+                val cft2ft = new Cft2FtTransformation
+                val ft = cft2ft.createFaultTree(cft)
+                workspace.writeModel(ft, "ft.xmi")
+                val solver = new StormDftSolver
+                val config = new StormDftConfiguration
+                config.progressMonitor = new EclipseBasedProgressMonitor(monitor)
+                config.documentationLevel = DocumentationLevel.NORMAL
+                config.objective = FtAnalysisObjective.MTTF
+                val result = solver.solve(ft, config, workspace)
+                displayResult(result)
+        }
+
+        private def createWorkspace(IProject project, IProgressMonitor monitor) {
+                val folder = project.getFolder("debug")
+                if (!folder.exists) {
+                        folder.create(IResource.NONE, true, monitor)
+                }
+                val path = folder.fullPath.toString
+                val uri = URI.createPlatformResourceURI(path, true)
+                val workspace = new ProjectWorkspace(uri.toString, "")
+                workspace.initAndClear
+                workspace
+        }
+
+        private def createComponentFaultTree(TransformationDefinition transformationDefinition, Resource resource) {
+                val queryEngine = AdvancedViatraQueryEngine.createUnmanagedEngine(new EMFScope(resource))
+                try {
+                        val ecore2cft = new Ecore2CftTransformation(transformationDefinition, queryEngine)
+                        ecore2cft.createComponentFaultTree
+                } finally {
+                        queryEngine.dispose
+                }
+        }
+
+        private def displayResult(ReliabilityResult result) {
+                val messageBox = new MessageBox(PlatformUI.workbench.activeWorkbenchWindow.shell)
+                messageBox.message = result.toString
+                messageBox.open
+        }
+}
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/ui/handler/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/ui/handler/.gitignore
new file mode 100644
index 00000000..b271af76
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/ui/handler/.gitignore
@@ -0,0 +1,3 @@
+/.ReliabilityAnalysisHandler.java._trace
+/.ReliabilityAnalysisHandler.xtendbin
+/ReliabilityAnalysisHandler.java