VAMPIRE: Further Post-submission updates

68 files changed, 5381 insertions, 14 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend
index 79732baf..c9d38c7d 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend
@@ -198,7 +198,7 @@ class GenerationTaskExecutor {
                                         }

                                         

                                         // 7. Solver call

-                                        val ewsdzxA = solver.solve(problem,solverConfig,reasonerWorkspaceForRun)

+                                        val solution = solver.solve(problem,solverConfig,reasonerWorkspaceForRun)

                                         console.writeMessage(solution.soutionDescription.toString)

                                         

                                         //  8. Solution processing

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/META-INF/MANIFEST.MF b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/META-INF/MANIFEST.MF
index 83c90829..06b3abb3 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/META-INF/MANIFEST.MF
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
 Bundle-SymbolicName: hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;singleton:=true

 Bundle-Version: 1.0.0.qualifier

 Bundle-ClassPath: .

-Bundle-Vendor: %providerName

+Bundle-Vendor: %providerName 

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

 Export-Package: hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic,

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin
index d316c22e..9ecc00be 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin
index 5ba2ed57..c144df13 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin
index 443ff97b..979c3c20 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin
index 2371fa08..804df64e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageDescriptionLabelProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageDescriptionLabelProvider.xtendbin
index c5e94206..50db435b 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageDescriptionLabelProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageDescriptionLabelProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageLabelProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageLabelProvider.xtendbin
index f25baa86..904ac639 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageLabelProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageLabelProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/outline/.VampireLanguageOutlineTreeProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/outline/.VampireLanguageOutlineTreeProvider.xtendbin
index 24c441e9..082ca9ff 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/outline/.VampireLanguageOutlineTreeProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/outline/.VampireLanguageOutlineTreeProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/quickfix/.VampireLanguageQuickfixProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/quickfix/.VampireLanguageQuickfixProvider.xtendbin
index 59778187..5b68084b 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/quickfix/.VampireLanguageQuickfixProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/quickfix/.VampireLanguageQuickfixProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin
index 231f1e7d..7a054d7e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin
index 6b17f7c0..fa4872a5 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin
index 723bcc26..7cf878e2 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin
index 31350dd6..38132416 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin
index 8bab3b21..2b223516 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin
index 6a3c8495..5cda3bdc 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin
index 88e234fc..ec7ce5bf 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
index 8f9c0397..4d0599ac 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
index 07b7d4c3..885e7af1 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin
index 04a3303b..0793f3cb 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
index dbd48bbb..7fa7b29d 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin
index 4f4710d4..9e37d9b8 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
index 19ff819d..2cca61d2 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
index 2774bb57..20c757c7 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
index 9b636247..580ed0d8 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
index 739f0cd5..108846a5 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin
index 96506230..9a04f61e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin
index b7d9060d..1d3166e7 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin
index d8bc6614..002097ed 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin
index 512e8a06..769807cc 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/test/VampireTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/test/VampireTest.xtend
index bbb14f1f..aa7ce6a6 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/test/VampireTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/test/VampireTest.xtend
@@ -14,6 +14,8 @@ import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.Viatra2Lo
 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace

 import org.eclipse.emf.ecore.resource.Resource

 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl

+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasoner

+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration

 

 class VampireTest {

         

@@ -53,13 +55,13 @@ class VampireTest {
 

                 //problem.add(Assertion( Y && X <=> X) )

                 

-                println("Problem Created");

+                println("Problem Created")

                 

                 var LogicResult solution

                 var LogicReasoner reasoner

                 

-                reasoner = new VampireSolver

-                val vampireConfig = new VampireSolverConfiguration => [

+                reasoner = new ViatraReasoner

+                val vampireConfig = new ViatraReasonerConfiguration => [

                         //add configuration things, in config file first

                         it.documentationLevel = DocumentationLevel::FULL

                         it.typeScopes.minNewElements = 4

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
index b82c61fd..197ef5c9 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
index d04ea088..52c819c4 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
index bed60b34..b3b15fba 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
index 3324795c..03bcbad7 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin
index 164c4fac..0f06a39a 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
index 011b770c..5dcd3133 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin
index 8963964c..68ade593 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin
index 95c0ee09..80e7ebe0 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/VampireTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/VampireTest.java
index 7228b48a..0c1b3fe9 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/VampireTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/VampireTest.java
@@ -1,8 +1,6 @@
 package ca.mcgill.ecse.dslreasoner.vampire.test;

 

 import ca.mcgill.ecse.dslreasoner.VampireLanguageStandaloneSetup;

-import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver;

-import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration;

 import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.Ecore2logicannotationsPackage;

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel;

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicProblemBuilder;

@@ -26,6 +24,8 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;
 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage;

 import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult;

 import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.Viatra2LogicAnnotationsPackage;

+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasoner;

+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration;

 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;

 import java.util.Map;

 import org.eclipse.emf.common.util.EList;

@@ -65,14 +65,14 @@ public class VampireTest {
       InputOutput.<String>println("Problem Created");

       LogicResult solution = null;

       LogicReasoner reasoner = null;

-      VampireSolver _vampireSolver = new VampireSolver();

-      reasoner = _vampireSolver;

-      VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();

-      final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> {

+      ViatraReasoner _viatraReasoner = new ViatraReasoner();

+      reasoner = _viatraReasoner;

+      ViatraReasonerConfiguration _viatraReasonerConfiguration = new ViatraReasonerConfiguration();

+      final Procedure1<ViatraReasonerConfiguration> _function = (ViatraReasonerConfiguration it) -> {

         it.documentationLevel = DocumentationLevel.FULL;

         it.typeScopes.minNewElements = 4;

       };

-      final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function);

+      final ViatraReasonerConfiguration vampireConfig = ObjectExtensions.<ViatraReasonerConfiguration>operator_doubleArrow(_viatraReasonerConfiguration, _function);

       solution = reasoner.solve(problem, vampireConfig, workspace);

       InputOutput.<String>println("Problem Solved");

     } catch (Throwable _e) {

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/.classpath b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/.classpath
new file mode 100644
index 00000000..428337e5
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/.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/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/.gitignore b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/.project b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/.project
new file mode 100644
index 00000000..1701c3ba
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/.project
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+        <name>ca.mcgill.ecse.dslreasoner.yakindu.test</name>
+        <comment></comment>
+        <projects>
+        </projects>
+        <buildSpec>
+                <buildCommand>
+                        <name>org.eclipse.viatra.query.tooling.ui.projectbuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <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>
+                <nature>org.eclipse.viatra.query.projectnature</nature>
+        </natures>
+</projectDescription>
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/.settings/org.eclipse.jdt.core.prefs b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..0c68a61d
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/.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/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/META-INF/MANIFEST.MF b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..a2562b0f
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/META-INF/MANIFEST.MF
@@ -0,0 +1,39 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test
+Bundle-SymbolicName: ca.mcgill.ecse.dslreasoner.yakindu.test;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime,
+  org.eclipse.core.runtime,
+  org.eclipse.emf.ecore;visibility:=reexport,
+  org.eclipse.viatra.query.runtime.rete,
+  org.eclipse.viatra.query.runtime.localsearch,
+  com.google.guava,
+  org.eclipse.xtext.xbase.lib,
+  org.eclipse.xtend.lib,
+  org.eclipse.xtend.lib.macro,
+  ca.mcgill.ecse.dslreasoner.vampire.language;bundle-version="1.0.0",
+  hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0",
+  ca.mcgill.ecse.dslreasoner.vampire.reasoner;bundle-version="1.0.0",
+  hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
+  hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0",
+  org.eclipse.emf.ecore.xmi;bundle-version="2.13.0",
+  hu.bme.mit.inf.dlsreasoner.alloy.reasoner;bundle-version="1.0.0",
+  hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0",
+  hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner;bundle-version="1.0.0",
+  hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery;bundle-version="1.0.0",
+  hu.bme.mit.inf.dslreasoner.logic2ecore;bundle-version="1.0.0",
+  hu.bme.mit.inf.dslreasoner.visualisation;bundle-version="1.0.0",
+  ModelGenExampleFAM_plugin;bundle-version="1.0.0",
+  ModelGenExampleFAM_plugin.validation;bundle-version="0.0.1",
+  hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph;bundle-version="1.0.0",
+  hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.validation;bundle-version="0.0.1",
+  org.eclipse.viatra.query.runtime;bundle-version="2.1.0",
+  org.eclipse.collections;bundle-version="9.2.0",
+  hu.bme.mit.inf.dslreasoner.application.FAMTest;bundle-version="1.0.0",
+  ca.mcgill.ecse.dslreasoner.standalone.test;bundle-version="1.0.0",
+  hu.bme.mit.inf.dslreasoner.alloy.language;bundle-version="1.0.0",
+  hu.bme.mit.inf.dslreasoner.alloy.language.ui;bundle-version="1.0.0"
+Automatic-Module-Name: ca.mcgill.ecse.dslreasoner.yakindu.test
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: org.apache.log4j
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/build.properties b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/build.properties
new file mode 100644
index 00000000..34d2e4d2
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/input/Yakindu.xmi b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/input/Yakindu.xmi
new file mode 100644
index 00000000..d76b3929
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/input/Yakindu.xmi
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hu.bme.mit.inf.yakindumm:Statechart xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:hu.bme.mit.inf.yakindumm="hu.bme.mit.inf.yakindumm"
+    xsi:schemaLocation="hu.bme.mit.inf.yakindumm yakindu_simplified.ecore"/>
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/input/yakinduPatterns.vql_ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/input/yakinduPatterns.vql_
new file mode 100644
index 00000000..f52113ca
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/input/yakinduPatterns.vql_
@@ -0,0 +1,227 @@
+package ca.mcgill.ecse.dslreasoner.yakindu.queries
+
+import epackage "hu.bme.mit.inf.yakindumm"
+
+/////////
+// Entry
+/////////
+
+pattern entryInRegion(r1 : Region, e1 : Entry) {
+        Region.vertices(r1, e1);
+}
+
+@Constraint(severity="error", message="error", key = {r1})
+pattern noEntryInRegion(r1 : Region) {
+        neg find entryInRegion(r1, _);
+}
+
+@Constraint(severity="error", message="error", key = {r})
+pattern multipleEntryInRegion(r : Region) {
+        find entryInRegion(r, e1);
+        find entryInRegion(r, e2);
+        e1 != e2;
+}
+
+pattern transition(t : Transition, src : Vertex, trg : Vertex) {
+        Transition.source(t, src);
+        Transition.target(t, trg);
+}
+
+@Constraint(severity="error", message="error", key = {e})
+pattern incomingToEntry(t : Transition, e : Entry) {
+        find transition(t, _, e);
+}
+
+@Constraint(severity="error", message="error", key = {e})
+pattern noOutgoingTransitionFromEntry(e : Entry) {
+        neg find transition(_, e, _);
+}
+
+@Constraint(severity="error", message="error", key = {e})
+pattern multipleTransitionFromEntry(e : Entry, t1 : Transition, t2: Transition) {
+        Entry.outgoingTransitions(e,t1);
+        Entry.outgoingTransitions(e,t2);
+        t1!=t2;
+}
+
+/////////
+// Exit
+/////////
+
+@Constraint(severity="error", message="error", key = {e})
+pattern outgoingFromExit(t : Transition, e : Exit) {
+        Exit.outgoingTransitions(e,t);
+}
+
+/////////
+// Final
+/////////
+
+@Constraint(severity="error", message="error", key = {f})
+pattern outgoingFromFinal(t : Transition, f : FinalState) {
+        FinalState.outgoingTransitions(f,t);
+}
+
+/////////
+// State vs Region
+/////////
+
+@Constraint(severity="error", message="error", key = {region})
+pattern noStateInRegion(region: Region) {
+        neg find StateInRegion(region,_);
+}
+pattern StateInRegion(region: Region, state: State) {
+        Region.vertices(region,state);
+}
+
+/////////
+// Choice
+/////////
+
+@Constraint(severity="error", message="error", key = {c})
+pattern choiceHasNoOutgoing(c : Choice) {
+        neg find transition(_, c, _);
+}
+
+@Constraint(severity="error", message="error", key = {c})
+pattern choiceHasNoIncoming(c: Choice) {
+        neg find transition(_, _, c);
+}
+
+/////////
+// Synchronization
+/////////
+
+@Constraint(severity="error", message="error", key = {s})
+pattern synchHasNoOutgoing(s : Synchronization) {
+        neg find transition(_, s, _);
+}
+
+@Constraint(severity="error", message="error", key = {s})
+pattern synchHasNoIncoming(s : Synchronization) {
+        neg find transition(_, _, s);
+}
+
+@Constraint(severity="error", message="error", key = {s})
+pattern SynchronizedIncomingInSameRegion(s : Synchronization, v1 : Vertex, v2 : Vertex) {
+        find transition(t1, v1, s);
+        find transition(t2, v2, s);
+        t1!=t2;
+        Region.vertices(r, v1);
+        Region.vertices(r, v2);
+} or {
+        find transition(t1, s, v1);
+        find transition(t2, s, v2);
+        t1!=t2;
+        Region.vertices(r, v1);
+        Region.vertices(r, v2);
+}
+
+@Constraint(severity="error", message="error", key = {s})
+pattern notSynchronizingStates(s : Synchronization) {
+        neg find hasMultipleOutgoingTrainsition(s);
+        neg find hasMultipleIncomingTrainsition(s);
+}
+
+pattern hasMultipleOutgoingTrainsition(v : Synchronization) {
+        find transition(_, v, trg1);
+        find transition(_, v, trg2);
+        trg1 != trg2;
+}
+
+pattern hasMultipleIncomingTrainsition(v : Synchronization) {
+        find transition(_, src1, v);
+        find transition(_, src2, v);
+        src1 != src2;
+}
+
+@Constraint(severity="error", message="error", key = {s})
+pattern SynchronizedRegionsAreNotSiblings(s : Synchronization, v1 : Vertex, v2 : Vertex) {
+        find transition(_, v1, s);
+        find transition(_, v2, s);
+        CompositeElement.regions.vertices(r1, v1);
+        CompositeElement.regions.vertices(r2, v2);
+        r1 != r2;
+} or {
+        find transition(_, s, v1);
+        find transition(_, s, v2);
+        CompositeElement.regions.vertices(r1, v1);
+        CompositeElement.regions.vertices(r2, v2);
+        r1 != r2;
+}
+
+///////////////////////////////
+// Extra
+//
+//@Constraint(severity="error", message="error", key = {s})
+//pattern SynchronizedRegionDoesNotHaveParent(s : Synchronization, v : Vertex) {
+//      find transition(_, v, s);
+//      neg find child(_,v);
+//} or {
+//      find transition(_, s, v);
+//      neg find child(_,v);
+//}
+
+pattern child(parent: CompositeElement, child: Vertex) {
+        CompositeElement.regions.vertices(parent, child);
+}
+
+@Constraint(severity="error", message="error", key = {s})
+pattern SynchronizedRegionDoesNotHaveMultipleRegions(s : Synchronization, v : Vertex) {
+        find transition(_, v, s);
+        find child(c,v);
+        neg find hasMultipleRegions(c);
+} or {
+        find transition(_, s, v);
+        find child(c,v);
+        neg find hasMultipleRegions(c);
+}
+
+
+pattern hasMultipleRegions(composite: CompositeElement) {
+        CompositeElement.regions(composite,region1);
+        CompositeElement.regions(composite,region2);
+        region1 != region2;
+}
+
+/**
+ * Simplifying model generation
+ */
+@Constraint(severity="error", message="error", key = {s})
+pattern synchThree(s: Synchronization) {
+        Transition.target(t1,s);
+        Transition.target(t2,s);
+        Transition.target(t3,s);
+        t1!=t2;
+        t2!=t3;
+        t1!=t3;
+} or {
+        Transition.source(t1,s);
+        Transition.source(t2,s);
+        Transition.source(t3,s);
+        t1!=t2;
+        t2!=t3;
+        t1!=t3;
+}
+
+/**
+ * Simplifying model generation
+ */
+@Constraint(severity="error", message="error", key = {s1,s2})
+pattern twoSynch(s1 : Synchronization, s2 : Synchronization) {
+        Synchronization(s1);
+        Synchronization(s2);
+        s1 != s2;
+}
+
+/**
+ * Model generation task: at least one synch
+ */
+@Constraint(severity="error", message="error", key = {s})
+pattern noSynch(s:Statechart) {
+        Statechart(s);
+        neg find synch(_);
+}
+pattern synch(s:Synchronization) {
+        Synchronization(s);
+}
\ No newline at end of file
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/input/yakindu_simplified.aird b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/input/yakindu_simplified.aird
new file mode 100644
index 00000000..38b2b410
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/input/yakindu_simplified.aird
@@ -0,0 +1,704 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
+  <viewpoint:DAnalysis uid="_HYD4oOn9EemFBtgp5W26GA" selectedViews="_IBOxcOn9EemFBtgp5W26GA _IBa-sOn9EemFBtgp5W26GA _IBblwOn9EemFBtgp5W26GA _IBgeQOn9EemFBtgp5W26GA" version="14.1.0.201810161215">
+    <semanticResources>yakindu_simplified.ecore</semanticResources>
+    <semanticResources>yakindu_simplified.genmodel</semanticResources>
+    <ownedViews xmi:type="viewpoint:DView" uid="_IBOxcOn9EemFBtgp5W26GA">
+      <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="_JMbZQOn9EemFBtgp5W26GA" name="yakindumm class diagram" repPath="#_JKuwIOn9EemFBtgp5W26GA">
+        <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+        <target xmi:type="ecore:EPackage" href="yakindu_simplified.ecore#/"/>
+      </ownedRepresentationDescriptors>
+    </ownedViews>
+    <ownedViews xmi:type="viewpoint:DView" uid="_IBa-sOn9EemFBtgp5W26GA">
+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']"/>
+    </ownedViews>
+    <ownedViews xmi:type="viewpoint:DView" uid="_IBblwOn9EemFBtgp5W26GA">
+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']"/>
+    </ownedViews>
+    <ownedViews xmi:type="viewpoint:DView" uid="_IBgeQOn9EemFBtgp5W26GA">
+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Generation']"/>
+    </ownedViews>
+  </viewpoint:DAnalysis>
+  <diagram:DSemanticDiagram uid="_JKuwIOn9EemFBtgp5W26GA" name="yakindumm class diagram">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_JMS2YOn9EemFBtgp5W26GA" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_JMTdcOn9EemFBtgp5W26GA">
+        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_J83XsOn9EemFBtgp5W26GA" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
+          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <labelFormat>bold</labelFormat>
+          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_J9Dk8On9EemFBtgp5W26GA" sourceArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_J9Dk8en9EemFBtgp5W26GA" showIcon="false" labelExpression="service:render">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </centerLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_J9Dk8un9EemFBtgp5W26GA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_J9UqsOn9EemFBtgp5W26GA" sourceArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <beginLabelStyleDescription xmi:type="style:BeginLabelStyleDescription" xmi:id="_J9Uqsen9EemFBtgp5W26GA" showIcon="false" labelExpression="service:renderEOpposite">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </beginLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_J9Uqsun9EemFBtgp5W26GA" showIcon="false" labelExpression="service:render">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_JNGHoOn9EemFBtgp5W26GA" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_JNGHoen9EemFBtgp5W26GA" type="Sirius" element="_JKuwIOn9EemFBtgp5W26GA" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_J9aKQOn9EemFBtgp5W26GA" type="2003" element="_J8MpUOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9bYYOn9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9d0oOn9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9d0oen9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9d0oun9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9aKQen9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8" italic="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9aKQun9EemFBtgp5W26GA" x="480" y="324"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9ebsOn9EemFBtgp5W26GA" type="2003" element="_J8TXAOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9fCwOn9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9fCwen9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9fCwun9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9fCw-n9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9ebsen9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8" italic="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9ebsun9EemFBtgp5W26GA" x="696" y="156"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9fp0On9EemFBtgp5W26GA" type="2003" element="_J8VMMOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9fp0-n9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9fp1On9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9fp1en9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9fp1un9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9fp0en9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9fp0un9EemFBtgp5W26GA" x="876" y="324"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9gQ4On9EemFBtgp5W26GA" type="2003" element="_J8WaUOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9gQ4-n9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9gQ5On9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9gQ5en9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9gQ5un9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9gQ4en9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9gQ4un9EemFBtgp5W26GA" x="696"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9g38On9EemFBtgp5W26GA" type="2003" element="_J8XBYun9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9g38-n9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9g39On9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9g39en9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9g39un9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9g38en9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9g38un9EemFBtgp5W26GA" x="984" y="636"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9g39-n9EemFBtgp5W26GA" type="2003" element="_J8YPgen9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9hfAOn9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9hfAen9EemFBtgp5W26GA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_J9oMsOn9EemFBtgp5W26GA" type="3010" element="_J82JkOn9EemFBtgp5W26GA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_J9oMsen9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_J9oMsun9EemFBtgp5W26GA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9hfAun9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9hfA-n9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9g3-On9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9g3-en9EemFBtgp5W26GA" x="144" y="480"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9hfBOn9EemFBtgp5W26GA" type="2003" element="_J8ZdoOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9iGEOn9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9itIOn9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9itIen9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9itIun9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9hfBen9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9hfBun9EemFBtgp5W26GA" x="696" y="636"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9jUMOn9EemFBtgp5W26GA" type="2003" element="_J8arwOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9j7QOn9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9j7Qen9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9j7Qun9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9j7Q-n9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9jUMen9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8" italic="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9jUMun9EemFBtgp5W26GA" x="696" y="324"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9j7ROn9EemFBtgp5W26GA" type="2003" element="_J8b54On9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9j7R-n9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9kiUOn9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9kiUen9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9kiUun9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9j7Ren9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8" italic="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9j7Run9EemFBtgp5W26GA" x="984" y="480"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9kiU-n9EemFBtgp5W26GA" type="2003" element="_J8dvEOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9lJYOn9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9lJYen9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9lJYun9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9lJY-n9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9kiVOn9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9kiVen9EemFBtgp5W26GA" x="408" y="480"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9lJZOn9EemFBtgp5W26GA" type="2003" element="_J8fkQOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9lwcOn9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9lwcen9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9lwcun9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9lwc-n9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9lJZen9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9lJZun9EemFBtgp5W26GA" x="588" y="480"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9mXgOn9EemFBtgp5W26GA" type="2003" element="_J8gyYOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9mXg-n9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9m-kOn9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9m-ken9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9m-kun9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9mXgen9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9mXgun9EemFBtgp5W26GA" x="804" y="480"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9m-k-n9EemFBtgp5W26GA" type="2003" element="_J8iAgOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9m-lun9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9nloOn9EemFBtgp5W26GA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_J9ozwOn9EemFBtgp5W26GA" type="3010" element="_J883QOn9EemFBtgp5W26GA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_J9ozwen9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_J9ozwun9EemFBtgp5W26GA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_J9ozw-n9EemFBtgp5W26GA" type="3010" element="_J883Qun9EemFBtgp5W26GA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_J9ozxOn9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_J9ozxen9EemFBtgp5W26GA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_J9pa0On9EemFBtgp5W26GA" type="3010" element="_J89eUOn9EemFBtgp5W26GA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_J9pa0en9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_J9pa0un9EemFBtgp5W26GA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9nloen9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9nloun9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9m-lOn9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9m-len9EemFBtgp5W26GA" x="363" y="168"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_JNGHoun9EemFBtgp5W26GA"/>
+        <edges xmi:type="notation:Edge" xmi:id="_J9ykwOn9EemFBtgp5W26GA" type="4001" element="_J9BvwOn9EemFBtgp5W26GA" source="_J9fp0On9EemFBtgp5W26GA" target="_J9ebsOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9zL0On9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9zL0en9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J9zy4On9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9zy4en9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J90Z8On9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J90Z8en9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J9ykwen9EemFBtgp5W26GA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J9ykwun9EemFBtgp5W26GA" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J9ykw-n9EemFBtgp5W26GA" points="[0, 0, 180, 60]$[-180, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-AnMOn9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-AnMen9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-BOQOn9EemFBtgp5W26GA" type="4001" element="_J9H2YOn9EemFBtgp5W26GA" source="_J9j7ROn9EemFBtgp5W26GA" target="_J9fp0On9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-BOROn9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-BORen9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-B1UOn9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-B1Uen9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-B1Uun9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-B1U-n9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-BOQen9EemFBtgp5W26GA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-BOQun9EemFBtgp5W26GA" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-BOQ-n9EemFBtgp5W26GA" points="[0, 0, 106, 60]$[-106, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-B1VOn9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-B1Ven9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-B1Vun9EemFBtgp5W26GA" type="4001" element="_J9JrkOn9EemFBtgp5W26GA" source="_J9g38On9EemFBtgp5W26GA" target="_J9j7ROn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-CcYOn9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-CcYen9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-CcYun9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-CcY-n9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-CcZOn9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-CcZen9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-B1V-n9EemFBtgp5W26GA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-B1WOn9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-B1Wen9EemFBtgp5W26GA" points="[37, 0, 37, 58]$[37, -24, 37, 34]$[1, -24, 1, 34]$[1, -58, 1, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-DDcOn9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-DDcen9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-DDcun9EemFBtgp5W26GA" type="4001" element="_J9NV8-n9EemFBtgp5W26GA" source="_J9mXgOn9EemFBtgp5W26GA" target="_J9jUMOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-DDdun9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-DDd-n9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-DqgOn9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-Dqgen9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-Dqgun9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-Dqg-n9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-DDc-n9EemFBtgp5W26GA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-DDdOn9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-DDden9EemFBtgp5W26GA" points="[0, 0, 108, 58]$[0, -24, 108, 34]$[-107, -24, 1, 34]$[-107, -58, 1, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-ERkOn9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-ERken9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-ERkun9EemFBtgp5W26GA" type="4001" element="_J9OkEOn9EemFBtgp5W26GA" source="_J9g39-n9EemFBtgp5W26GA" target="_J9aKQOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-ERlun9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-ERl-n9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-ERmOn9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-ERmen9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-ERmun9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-ERm-n9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-ERk-n9EemFBtgp5W26GA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-ERlOn9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-ERlen9EemFBtgp5W26GA" points="[0, 0, -270, 60]$[270, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-E4oOn9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-E4oen9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-E4oun9EemFBtgp5W26GA" type="4001" element="_J9PLIOn9EemFBtgp5W26GA" source="_J9lJZOn9EemFBtgp5W26GA" target="_J9aKQOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-E4pun9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-E4p-n9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-E4qOn9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-E4qen9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-E4qun9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-E4q-n9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-E4o-n9EemFBtgp5W26GA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-E4pOn9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-E4pen9EemFBtgp5W26GA" points="[0, 0, 115, 60]$[-115, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-FfsOn9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-Ffsen9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-Ffsun9EemFBtgp5W26GA" type="4001" element="_J9PyMOn9EemFBtgp5W26GA" source="_J9hfBOn9EemFBtgp5W26GA" target="_J9jUMOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-Fftun9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-Fft-n9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-GGwOn9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-GGwen9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-GGwun9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-GGw-n9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-Ffs-n9EemFBtgp5W26GA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-FftOn9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-Fften9EemFBtgp5W26GA" points="[-35, 0, -35, 214]$[-35, -180, -35, 34]$[1, -180, 1, 34]$[1, -214, 1, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-GGxOn9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-GGxen9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-GGxun9EemFBtgp5W26GA" type="4001" element="_J9QZQOn9EemFBtgp5W26GA" source="_J9hfBOn9EemFBtgp5W26GA" target="_J9j7ROn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-Gt0On9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-Gt0en9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-Gt0un9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-Gt0-n9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-Gt1On9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-Gt1en9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-GGx-n9EemFBtgp5W26GA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-GGyOn9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-GGyen9EemFBtgp5W26GA" points="[0, 0, -288, 58]$[0, -24, -288, 34]$[289, -24, 1, 34]$[289, -58, 1, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-Gt1un9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-Gt1-n9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-Gt2On9EemFBtgp5W26GA" type="4001" element="_J9RAU-n9EemFBtgp5W26GA" source="_J9kiU-n9EemFBtgp5W26GA" target="_J9aKQOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-HU4On9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-HU4en9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-HU4un9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-HU4-n9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-HU5On9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-HU5en9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-Gt2en9EemFBtgp5W26GA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-Gt2un9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-Gt2-n9EemFBtgp5W26GA" points="[0, 0, -65, 60]$[65, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-H78On9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-H78en9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-H78un9EemFBtgp5W26GA" type="4001" element="_J9RnZun9EemFBtgp5W26GA" source="_J9aKQOn9EemFBtgp5W26GA" target="_J9ebsOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-H79un9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-H79-n9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-H7-On9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-H7-en9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-IjAOn9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-IjAen9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-H78-n9EemFBtgp5W26GA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-H79On9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-H79en9EemFBtgp5W26GA" points="[0, 0, -220, 60]$[220, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-IjAun9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-IjA-n9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-IjBOn9EemFBtgp5W26GA" type="4001" element="_J9SOdun9EemFBtgp5W26GA" source="_J9jUMOn9EemFBtgp5W26GA" target="_J9ebsOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-JKEOn9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-JKEen9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-JKEun9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-JKE-n9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-JKFOn9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-JKFen9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-IjBen9EemFBtgp5W26GA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-IjBun9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-IjB-n9EemFBtgp5W26GA" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-JKFun9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-JKF-n9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-JxIOn9EemFBtgp5W26GA" type="4001" element="_J9Tck-n9EemFBtgp5W26GA" source="_J9ebsOn9EemFBtgp5W26GA" target="_J9gQ4On9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-JxJOn9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-JxJen9EemFBtgp5W26GA" x="1" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-JxJun9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-JxJ-n9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-JxKOn9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-JxKen9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-JxIen9EemFBtgp5W26GA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-JxIun9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-JxI-n9EemFBtgp5W26GA" points="[-59, 50, -59, 108]$[-143, 50, -143, 108]$[-143, -106, -143, -48]$[-59, -106, -59, -48]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-JxKun9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-JxK-n9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-KYMOn9EemFBtgp5W26GA" type="4001" element="_J9VRw-n9EemFBtgp5W26GA" source="_J9ebsOn9EemFBtgp5W26GA" target="_J9gQ4On9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-KYNOn9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-KYNen9EemFBtgp5W26GA" x="1" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-KYNun9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-KYN-n9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-KYOOn9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-KYOen9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-KYMen9EemFBtgp5W26GA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-KYMun9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-KYM-n9EemFBtgp5W26GA" points="[59, 50, 59, 108]$[145, 50, 145, 108]$[145, -106, 145, -48]$[59, -106, 59, -48]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-K_QOn9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-K_Qen9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J8MpUOn9EemFBtgp5W26GA" name="Pseudostate" tooltipText="" outgoingEdges="_J9RnZun9EemFBtgp5W26GA" incomingEdges="_J9OkEOn9EemFBtgp5W26GA _J9PLIOn9EemFBtgp5W26GA _J9RAU-n9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Pseudostate"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Pseudostate"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8Q6wOn9EemFBtgp5W26GA" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J8TXAOn9EemFBtgp5W26GA" name="Vertex" tooltipText="" outgoingEdges="_J9Tck-n9EemFBtgp5W26GA _J9VRw-n9EemFBtgp5W26GA" incomingEdges="_J9BvwOn9EemFBtgp5W26GA _J9RnZun9EemFBtgp5W26GA _J9SOdun9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Vertex"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Vertex"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8T-EOn9EemFBtgp5W26GA" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J8VMMOn9EemFBtgp5W26GA" name="Region" tooltipText="" outgoingEdges="_J9BvwOn9EemFBtgp5W26GA" incomingEdges="_J9H2YOn9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Region"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Region"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8VMMen9EemFBtgp5W26GA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J8WaUOn9EemFBtgp5W26GA" name="Transition" tooltipText="" incomingEdges="_J9Tck-n9EemFBtgp5W26GA _J9VRw-n9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Transition"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Transition"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8XBYOn9EemFBtgp5W26GA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J8XBYun9EemFBtgp5W26GA" name="Statechart" tooltipText="" outgoingEdges="_J9JrkOn9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Statechart"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Statechart"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8XocOn9EemFBtgp5W26GA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J8YPgen9EemFBtgp5W26GA" name="Entry" tooltipText="" outgoingEdges="_J9OkEOn9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Entry"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Entry"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8Y2kOn9EemFBtgp5W26GA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_J82JkOn9EemFBtgp5W26GA" name="Type : EntryType = Normal" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="yakindu_simplified.ecore#//Entry/Type"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="yakindu_simplified.ecore#//Entry/Type"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_J85M4On9EemFBtgp5W26GA" labelAlignment="LEFT" description="_J83XsOn9EemFBtgp5W26GA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J8ZdoOn9EemFBtgp5W26GA" name="State" tooltipText="" outgoingEdges="_J9PyMOn9EemFBtgp5W26GA _J9QZQOn9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//State"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//State"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8aEsOn9EemFBtgp5W26GA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J8arwOn9EemFBtgp5W26GA" name="RegularState" tooltipText="" outgoingEdges="_J9SOdun9EemFBtgp5W26GA" incomingEdges="_J9NV8-n9EemFBtgp5W26GA _J9PyMOn9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//RegularState"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//RegularState"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8arwen9EemFBtgp5W26GA" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J8b54On9EemFBtgp5W26GA" name="CompositeElement" tooltipText="" outgoingEdges="_J9H2YOn9EemFBtgp5W26GA" incomingEdges="_J9JrkOn9EemFBtgp5W26GA _J9QZQOn9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//CompositeElement"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//CompositeElement"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8cg8On9EemFBtgp5W26GA" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J8dvEOn9EemFBtgp5W26GA" name="Choice" tooltipText="" outgoingEdges="_J9RAU-n9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Choice"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Choice"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8eWIOn9EemFBtgp5W26GA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J8fkQOn9EemFBtgp5W26GA" name="Exit" tooltipText="" outgoingEdges="_J9PLIOn9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Exit"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Exit"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8gLUOn9EemFBtgp5W26GA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J8gyYOn9EemFBtgp5W26GA" name="FinalState" tooltipText="" outgoingEdges="_J9NV8-n9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//FinalState"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//FinalState"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8gyYen9EemFBtgp5W26GA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J8iAgOn9EemFBtgp5W26GA" name="EntryType" tooltipText="" width="12" height="10">
+      <target xmi:type="ecore:EEnum" href="yakindu_simplified.ecore#//EntryType"/>
+      <semanticElements xmi:type="ecore:EEnum" href="yakindu_simplified.ecore#//EntryType"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8iAgen9EemFBtgp5W26GA" 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="_J883QOn9EemFBtgp5W26GA" name="Normal" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="yakindu_simplified.ecore#//EntryType/Normal"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="yakindu_simplified.ecore#//EntryType/Normal"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_J883Qen9EemFBtgp5W26GA" 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="_J883Qun9EemFBtgp5W26GA" name="History" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="yakindu_simplified.ecore#//EntryType/History"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="yakindu_simplified.ecore#//EntryType/History"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_J883Q-n9EemFBtgp5W26GA" 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="_J89eUOn9EemFBtgp5W26GA" name="DeepHistory" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="yakindu_simplified.ecore#//EntryType/DeepHistory"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="yakindu_simplified.ecore#//EntryType/DeepHistory"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_J89eUen9EemFBtgp5W26GA" 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:DEdge" uid="_J9BvwOn9EemFBtgp5W26GA" name="[0..*] vertices" sourceNode="_J8VMMOn9EemFBtgp5W26GA" targetNode="_J8TXAOn9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EReference" href="yakindu_simplified.ecore#//Region/vertices"/>
+      <semanticElements xmi:type="ecore:EReference" href="yakindu_simplified.ecore#//Region/vertices"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9EzEOn9EemFBtgp5W26GA" description="_J9Dk8On9EemFBtgp5W26GA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9FaIen9EemFBtgp5W26GA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_J9FaIOn9EemFBtgp5W26GA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_J9H2YOn9EemFBtgp5W26GA" name="[0..*] regions" sourceNode="_J8b54On9EemFBtgp5W26GA" targetNode="_J8VMMOn9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EReference" href="yakindu_simplified.ecore#//CompositeElement/regions"/>
+      <semanticElements xmi:type="ecore:EReference" href="yakindu_simplified.ecore#//CompositeElement/regions"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9IdcOn9EemFBtgp5W26GA" description="_J9Dk8On9EemFBtgp5W26GA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9Idcun9EemFBtgp5W26GA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_J9Idcen9EemFBtgp5W26GA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_J9JrkOn9EemFBtgp5W26GA" sourceNode="_J8XBYun9EemFBtgp5W26GA" targetNode="_J8b54On9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Statechart"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Statechart"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9MH0On9EemFBtgp5W26GA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_J9Mu4On9EemFBtgp5W26GA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9Mu4en9EemFBtgp5W26GA" 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="_J9NV8-n9EemFBtgp5W26GA" sourceNode="_J8gyYOn9EemFBtgp5W26GA" targetNode="_J8arwOn9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//FinalState"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//FinalState"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9N9AOn9EemFBtgp5W26GA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_J9N9Aen9EemFBtgp5W26GA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9N9Aun9EemFBtgp5W26GA" 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="_J9OkEOn9EemFBtgp5W26GA" sourceNode="_J8YPgen9EemFBtgp5W26GA" targetNode="_J8MpUOn9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Entry"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Entry"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9OkEen9EemFBtgp5W26GA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_J9OkEun9EemFBtgp5W26GA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9OkE-n9EemFBtgp5W26GA" 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="_J9PLIOn9EemFBtgp5W26GA" sourceNode="_J8fkQOn9EemFBtgp5W26GA" targetNode="_J8MpUOn9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Exit"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Exit"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9PLIen9EemFBtgp5W26GA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_J9PLIun9EemFBtgp5W26GA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9PLI-n9EemFBtgp5W26GA" 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="_J9PyMOn9EemFBtgp5W26GA" sourceNode="_J8ZdoOn9EemFBtgp5W26GA" targetNode="_J8arwOn9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//State"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//State"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9PyMen9EemFBtgp5W26GA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_J9PyMun9EemFBtgp5W26GA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9PyM-n9EemFBtgp5W26GA" 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="_J9QZQOn9EemFBtgp5W26GA" sourceNode="_J8ZdoOn9EemFBtgp5W26GA" targetNode="_J8b54On9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//State"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//State"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9QZQen9EemFBtgp5W26GA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_J9QZQun9EemFBtgp5W26GA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9QZQ-n9EemFBtgp5W26GA" 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="_J9RAU-n9EemFBtgp5W26GA" sourceNode="_J8dvEOn9EemFBtgp5W26GA" targetNode="_J8MpUOn9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Choice"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Choice"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9RnYOn9EemFBtgp5W26GA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_J9RnYen9EemFBtgp5W26GA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9RnYun9EemFBtgp5W26GA" 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="_J9RnZun9EemFBtgp5W26GA" sourceNode="_J8MpUOn9EemFBtgp5W26GA" targetNode="_J8TXAOn9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Pseudostate"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Pseudostate"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9SOcOn9EemFBtgp5W26GA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_J9SOcen9EemFBtgp5W26GA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9SOcun9EemFBtgp5W26GA" 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="_J9SOdun9EemFBtgp5W26GA" sourceNode="_J8arwOn9EemFBtgp5W26GA" targetNode="_J8TXAOn9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//RegularState"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//RegularState"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9S1gOn9EemFBtgp5W26GA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_J9S1gen9EemFBtgp5W26GA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9S1gun9EemFBtgp5W26GA" 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="_J9Tck-n9EemFBtgp5W26GA" sourceNode="_J8TXAOn9EemFBtgp5W26GA" targetNode="_J8WaUOn9EemFBtgp5W26GA" beginLabel="[0..1] source" endLabel="[0..*] outgoingTransitions">
+      <target xmi:type="ecore:EReference" href="yakindu_simplified.ecore#//Vertex/outgoingTransitions"/>
+      <semanticElements xmi:type="ecore:EReference" href="yakindu_simplified.ecore#//Vertex/outgoingTransitions"/>
+      <semanticElements xmi:type="ecore:EReference" href="yakindu_simplified.ecore#//Transition/source"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9Uqs-n9EemFBtgp5W26GA" description="_J9UqsOn9EemFBtgp5W26GA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_J9UqtOn9EemFBtgp5W26GA" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_J9Uqten9EemFBtgp5W26GA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_J9VRw-n9EemFBtgp5W26GA" sourceNode="_J8TXAOn9EemFBtgp5W26GA" targetNode="_J8WaUOn9EemFBtgp5W26GA" beginLabel="[1..1] target" endLabel="[0..*] incomingTransitions">
+      <target xmi:type="ecore:EReference" href="yakindu_simplified.ecore#//Vertex/incomingTransitions"/>
+      <semanticElements xmi:type="ecore:EReference" href="yakindu_simplified.ecore#//Vertex/incomingTransitions"/>
+      <semanticElements xmi:type="ecore:EReference" href="yakindu_simplified.ecore#//Transition/target"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9V40On9EemFBtgp5W26GA" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_J9V40en9EemFBtgp5W26GA" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_J9V40un9EemFBtgp5W26GA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_JLMDIOn9EemFBtgp5W26GA"/>
+    <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']/@ownedRepresentationExtensions[name='Entities%20With%20Archetypes']/@layers[name='Archetypes']"/>
+    <target xmi:type="ecore:EPackage" href="yakindu_simplified.ecore#/"/>
+  </diagram:DSemanticDiagram>
+</xmi:XMI>
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/input/yakindu_simplified.ecore b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/input/yakindu_simplified.ecore
new file mode 100644
index 00000000..02b57252
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/input/yakindu_simplified.ecore
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="yakindumm" nsURI="hu.bme.mit.inf.yakindumm" nsPrefix="ca.mcgill.ecse.yakindumm">
+  <eClassifiers xsi:type="ecore:EClass" name="Pseudostate" abstract="true" eSuperTypes="#//Vertex"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Vertex" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="incomingTransitions" ordered="false"
+        upperBound="-1" eType="#//Transition" eOpposite="#//Transition/target"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="outgoingTransitions" ordered="false"
+        upperBound="-1" eType="#//Transition" containment="true" eOpposite="#//Transition/source"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Region">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="vertices" ordered="false"
+        upperBound="-1" eType="#//Vertex" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Transition">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="target" ordered="false"
+        lowerBound="1" eType="#//Vertex" eOpposite="#//Vertex/incomingTransitions"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="source" ordered="false"
+        eType="#//Vertex" eOpposite="#//Vertex/outgoingTransitions"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Statechart" eSuperTypes="#//CompositeElement"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Entry" eSuperTypes="#//Pseudostate">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Type" lowerBound="1" eType="#//EntryType"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="State" eSuperTypes="#//RegularState #//CompositeElement"/>
+  <eClassifiers xsi:type="ecore:EClass" name="RegularState" abstract="true" eSuperTypes="#//Vertex"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CompositeElement" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="regions" upperBound="-1"
+        eType="#//Region" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Choice" eSuperTypes="#//Pseudostate"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Exit" eSuperTypes="#//Pseudostate"/>
+  <eClassifiers xsi:type="ecore:EClass" name="FinalState" eSuperTypes="#//RegularState"/>
+  <eClassifiers xsi:type="ecore:EEnum" name="EntryType">
+    <eLiterals name="Normal"/>
+    <eLiterals name="History"/>
+    <eLiterals name="DeepHistory"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/input/yakindu_simplified.genmodel b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/input/yakindu_simplified.genmodel
new file mode 100644
index 00000000..cfbafce6
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/input/yakindu_simplified.genmodel
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/ca.mcgill.ecse.dslreasoner.vampire.test/src" modelPluginID="ca.mcgill.ecse.dslreasoner.vampire.test"
+    modelName="yakindu_simplified" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>yakindu_simplified.ecore</foreignModel>
+  <genPackages prefix="Yakindumm" basePackage="ca.mcgill.ecse.dslreasoner.vampire"
+      disposableProviderFactory="true" ecorePackage="yakindu_simplified.ecore#/">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="yakindu_simplified.ecore#//EntryType">
+      <genEnumLiterals ecoreEnumLiteral="yakindu_simplified.ecore#//EntryType/Normal"/>
+      <genEnumLiterals ecoreEnumLiteral="yakindu_simplified.ecore#//EntryType/History"/>
+      <genEnumLiterals ecoreEnumLiteral="yakindu_simplified.ecore#//EntryType/DeepHistory"/>
+    </genEnums>
+    <genClasses image="false" ecoreClass="yakindu_simplified.ecore#//Pseudostate"/>
+    <genClasses image="false" ecoreClass="yakindu_simplified.ecore#//Vertex">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference yakindu_simplified.ecore#//Vertex/incomingTransitions"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference yakindu_simplified.ecore#//Vertex/outgoingTransitions"/>
+    </genClasses>
+    <genClasses ecoreClass="yakindu_simplified.ecore#//Region">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference yakindu_simplified.ecore#//Region/vertices"/>
+    </genClasses>
+    <genClasses ecoreClass="yakindu_simplified.ecore#//Transition">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference yakindu_simplified.ecore#//Transition/target"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference yakindu_simplified.ecore#//Transition/source"/>
+    </genClasses>
+    <genClasses ecoreClass="yakindu_simplified.ecore#//Statechart"/>
+    <genClasses ecoreClass="yakindu_simplified.ecore#//Entry">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute yakindu_simplified.ecore#//Entry/Type"/>
+    </genClasses>
+    <genClasses ecoreClass="yakindu_simplified.ecore#//State"/>
+    <genClasses image="false" ecoreClass="yakindu_simplified.ecore#//RegularState"/>
+    <genClasses image="false" ecoreClass="yakindu_simplified.ecore#//CompositeElement">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference yakindu_simplified.ecore#//CompositeElement/regions"/>
+    </genClasses>
+    <genClasses ecoreClass="yakindu_simplified.ecore#//Choice"/>
+    <genClasses ecoreClass="yakindu_simplified.ecore#//Exit"/>
+    <genClasses ecoreClass="yakindu_simplified.ecore#//FinalState"/>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/model1.xmi b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/model1.xmi
new file mode 100644
index 00000000..bdf68977
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/model1.xmi
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ASCII"?>
+<hu.bme.mit.inf.yakindumm:Statechart xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:hu.bme.mit.inf.yakindumm="hu.bme.mit.inf.yakindumm">
+  <regions>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry"/>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry"/>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice"/>
+  </regions>
+  <regions/>
+</hu.bme.mit.inf.yakindumm:Statechart>
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/model2.xmi b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/model2.xmi
new file mode 100644
index 00000000..8bb0e034
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/model2.xmi
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="ASCII"?>
+<hu.bme.mit.inf.yakindumm:Statechart xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:hu.bme.mit.inf.yakindumm="hu.bme.mit.inf.yakindumm">
+  <regions>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry"/>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry"/>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice"/>
+  </regions>
+  <regions>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State"/>
+  </regions>
+</hu.bme.mit.inf.yakindumm:Statechart>
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/model3.xmi b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/model3.xmi
new file mode 100644
index 00000000..344c4b81
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/model3.xmi
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ASCII"?>
+<hu.bme.mit.inf.yakindumm:Statechart xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:hu.bme.mit.inf.yakindumm="hu.bme.mit.inf.yakindumm">
+  <regions>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry"/>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Synchronization"/>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry"/>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice"/>
+  </regions>
+  <regions>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State"/>
+  </regions>
+</hu.bme.mit.inf.yakindumm:Statechart>
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/model4.xmi b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/model4.xmi
new file mode 100644
index 00000000..755c7646
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/model4.xmi
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ASCII"?>
+<hu.bme.mit.inf.yakindumm:Statechart xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:hu.bme.mit.inf.yakindumm="hu.bme.mit.inf.yakindumm">
+  <regions>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry"/>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Synchronization"/>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry"/>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice"/>
+  </regions>
+  <regions>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State"/>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:FinalState"/>
+  </regions>
+</hu.bme.mit.inf.yakindumm:Statechart>
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/model5.xmi b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/model5.xmi
new file mode 100644
index 00000000..3b601704
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/model5.xmi
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ASCII"?>
+<hu.bme.mit.inf.yakindumm:Statechart xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:hu.bme.mit.inf.yakindumm="hu.bme.mit.inf.yakindumm">
+  <regions>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry"/>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Synchronization"/>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Entry"/>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:Choice"/>
+  </regions>
+  <regions>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State"/>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:State"/>
+    <vertices xsi:type="hu.bme.mit.inf.yakindumm:FinalState"/>
+  </regions>
+</hu.bme.mit.inf.yakindumm:Statechart>
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/solution1Visualisation.gml b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/solution1Visualisation.gml
new file mode 100644
index 00000000..4c171e32
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/solution1Visualisation.gml
@@ -0,0 +1,646 @@
+graph
+[
+        node
+                [
+                        id      0
+                        graphics
+                        [
+                                w       217.8
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "Normal literal EntryType"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        EntryType enum
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      1
+                        graphics
+                        [
+                                w       226.60000000000002
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "History literal EntryType"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        EntryType enum
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      2
+                        graphics
+                        [
+                                w       261.8
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "DeepHistory literal EntryType"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        EntryType enum
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      3
+                        graphics
+                        [
+                                w       277.20000000000005
+                                h       82
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "o 1"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Statechart class DefinedPart
+        CompositeElement class DefinedPart
+        Statechart class
+        CompositeElement class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      4
+                        graphics
+                        [
+                                w       41.800000000000004
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "true"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      5
+                        graphics
+                        [
+                                w       50.6
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "false"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      6
+                        graphics
+                        [
+                                w       107.80000000000001
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Region class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      7
+                        graphics
+                        [
+                                w       146.3
+                                h       68
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Pseudostate class
+        Vertex class
+        Choice class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      8
+                        graphics
+                        [
+                                w       146.3
+                                h       68
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Pseudostate class
+        Vertex class
+        Entry class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      9
+                        graphics
+                        [
+                                w       146.3
+                                h       68
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Pseudostate class
+        Vertex class
+        Entry class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      10
+                        graphics
+                        [
+                                w       107.80000000000001
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Region class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      11
+                        graphics
+                        [
+                                w       112.2
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "New Integers"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      12
+                        graphics
+                        [
+                                w       85.80000000000001
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "New Reals"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      13
+                        graphics
+                        [
+                                w       103.4
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "New Strings"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      14
+                        graphics
+                        [
+                                w       103.4
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "New Objects"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        edge
+        [
+                source  6
+                target  7
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  6
+                target  8
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  6
+                target  9
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  3
+                target  6
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "regions reference CompositeElement"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  3
+                target  10
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "regions reference CompositeElement"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+]
+
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/solution2Visualisation.gml b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/solution2Visualisation.gml
new file mode 100644
index 00000000..f45394ea
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/solution2Visualisation.gml
@@ -0,0 +1,706 @@
+graph
+[
+        node
+                [
+                        id      0
+                        graphics
+                        [
+                                w       217.8
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "Normal literal EntryType"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        EntryType enum
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      1
+                        graphics
+                        [
+                                w       226.60000000000002
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "History literal EntryType"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        EntryType enum
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      2
+                        graphics
+                        [
+                                w       261.8
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "DeepHistory literal EntryType"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        EntryType enum
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      3
+                        graphics
+                        [
+                                w       277.20000000000005
+                                h       82
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "o 1"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Statechart class DefinedPart
+        CompositeElement class DefinedPart
+        Statechart class
+        CompositeElement class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      4
+                        graphics
+                        [
+                                w       41.800000000000004
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "true"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      5
+                        graphics
+                        [
+                                w       50.6
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "false"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      6
+                        graphics
+                        [
+                                w       107.80000000000001
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Region class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      7
+                        graphics
+                        [
+                                w       146.3
+                                h       68
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Pseudostate class
+        Vertex class
+        Choice class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      8
+                        graphics
+                        [
+                                w       146.3
+                                h       68
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Pseudostate class
+        Vertex class
+        Entry class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      9
+                        graphics
+                        [
+                                w       146.3
+                                h       68
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Pseudostate class
+        Vertex class
+        Entry class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      10
+                        graphics
+                        [
+                                w       107.80000000000001
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Region class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      11
+                        graphics
+                        [
+                                w       292.6
+                                h       96
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Vertex class
+        State class
+        RegularState class
+        CompositeElement class
+        CompositeElement class UndefinedPart
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      12
+                        graphics
+                        [
+                                w       112.2
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "New Integers"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      13
+                        graphics
+                        [
+                                w       85.80000000000001
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "New Reals"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      14
+                        graphics
+                        [
+                                w       103.4
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "New Strings"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      15
+                        graphics
+                        [
+                                w       103.4
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "New Objects"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        edge
+        [
+                source  6
+                target  7
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  6
+                target  8
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  6
+                target  9
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  10
+                target  11
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  3
+                target  6
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "regions reference CompositeElement"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  3
+                target  10
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "regions reference CompositeElement"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+]
+
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/solution3Visualisation.gml b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/solution3Visualisation.gml
new file mode 100644
index 00000000..b9f96971
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/solution3Visualisation.gml
@@ -0,0 +1,764 @@
+graph
+[
+        node
+                [
+                        id      0
+                        graphics
+                        [
+                                w       217.8
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "Normal literal EntryType"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        EntryType enum
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      1
+                        graphics
+                        [
+                                w       226.60000000000002
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "History literal EntryType"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        EntryType enum
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      2
+                        graphics
+                        [
+                                w       261.8
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "DeepHistory literal EntryType"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        EntryType enum
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      3
+                        graphics
+                        [
+                                w       277.20000000000005
+                                h       82
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "o 1"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Statechart class DefinedPart
+        CompositeElement class DefinedPart
+        Statechart class
+        CompositeElement class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      4
+                        graphics
+                        [
+                                w       41.800000000000004
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "true"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      5
+                        graphics
+                        [
+                                w       50.6
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "false"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      6
+                        graphics
+                        [
+                                w       107.80000000000001
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Region class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      7
+                        graphics
+                        [
+                                w       146.3
+                                h       68
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Pseudostate class
+        Vertex class
+        Choice class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      8
+                        graphics
+                        [
+                                w       146.3
+                                h       68
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Pseudostate class
+        Vertex class
+        Entry class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      9
+                        graphics
+                        [
+                                w       146.3
+                                h       68
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Pseudostate class
+        Vertex class
+        Entry class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      10
+                        graphics
+                        [
+                                w       107.80000000000001
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Region class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      11
+                        graphics
+                        [
+                                w       292.6
+                                h       96
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Vertex class
+        State class
+        RegularState class
+        CompositeElement class
+        CompositeElement class UndefinedPart
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      12
+                        graphics
+                        [
+                                w       177.10000000000002
+                                h       68
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Pseudostate class
+        Vertex class
+        Synchronization class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      13
+                        graphics
+                        [
+                                w       112.2
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "New Integers"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      14
+                        graphics
+                        [
+                                w       85.80000000000001
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "New Reals"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      15
+                        graphics
+                        [
+                                w       103.4
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "New Strings"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      16
+                        graphics
+                        [
+                                w       103.4
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "New Objects"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        edge
+        [
+                source  6
+                target  7
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  6
+                target  8
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  6
+                target  9
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  10
+                target  11
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  6
+                target  12
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  3
+                target  6
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "regions reference CompositeElement"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  3
+                target  10
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "regions reference CompositeElement"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+]
+
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/solution4Visualisation.gml b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/solution4Visualisation.gml
new file mode 100644
index 00000000..0e9040ed
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/solution4Visualisation.gml
@@ -0,0 +1,822 @@
+graph
+[
+        node
+                [
+                        id      0
+                        graphics
+                        [
+                                w       217.8
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "Normal literal EntryType"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        EntryType enum
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      1
+                        graphics
+                        [
+                                w       226.60000000000002
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "History literal EntryType"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        EntryType enum
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      2
+                        graphics
+                        [
+                                w       261.8
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "DeepHistory literal EntryType"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        EntryType enum
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      3
+                        graphics
+                        [
+                                w       277.20000000000005
+                                h       82
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "o 1"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Statechart class DefinedPart
+        CompositeElement class DefinedPart
+        Statechart class
+        CompositeElement class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      4
+                        graphics
+                        [
+                                w       41.800000000000004
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "true"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      5
+                        graphics
+                        [
+                                w       50.6
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "false"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      6
+                        graphics
+                        [
+                                w       107.80000000000001
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Region class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      7
+                        graphics
+                        [
+                                w       146.3
+                                h       68
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Pseudostate class
+        Vertex class
+        Choice class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      8
+                        graphics
+                        [
+                                w       146.3
+                                h       68
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Pseudostate class
+        Vertex class
+        Entry class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      9
+                        graphics
+                        [
+                                w       146.3
+                                h       68
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Pseudostate class
+        Vertex class
+        Entry class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      10
+                        graphics
+                        [
+                                w       107.80000000000001
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Region class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      11
+                        graphics
+                        [
+                                w       292.6
+                                h       96
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Vertex class
+        State class
+        RegularState class
+        CompositeElement class
+        CompositeElement class UndefinedPart
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      12
+                        graphics
+                        [
+                                w       177.10000000000002
+                                h       68
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Pseudostate class
+        Vertex class
+        Synchronization class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      13
+                        graphics
+                        [
+                                w       154.0
+                                h       68
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Vertex class
+        RegularState class
+        FinalState class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      14
+                        graphics
+                        [
+                                w       112.2
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "New Integers"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      15
+                        graphics
+                        [
+                                w       85.80000000000001
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "New Reals"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      16
+                        graphics
+                        [
+                                w       103.4
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "New Strings"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      17
+                        graphics
+                        [
+                                w       103.4
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "New Objects"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        edge
+        [
+                source  6
+                target  7
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  6
+                target  8
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  6
+                target  9
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  10
+                target  11
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  6
+                target  12
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  10
+                target  13
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  3
+                target  6
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "regions reference CompositeElement"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  3
+                target  10
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "regions reference CompositeElement"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+]
+
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/solution5Visualisation.gml b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/solution5Visualisation.gml
new file mode 100644
index 00000000..b6332fe3
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/output/solution5Visualisation.gml
@@ -0,0 +1,882 @@
+graph
+[
+        node
+                [
+                        id      0
+                        graphics
+                        [
+                                w       217.8
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "Normal literal EntryType"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        EntryType enum
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      1
+                        graphics
+                        [
+                                w       226.60000000000002
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "History literal EntryType"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        EntryType enum
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      2
+                        graphics
+                        [
+                                w       261.8
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "DeepHistory literal EntryType"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        EntryType enum
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      3
+                        graphics
+                        [
+                                w       277.20000000000005
+                                h       82
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "o 1"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Statechart class DefinedPart
+        CompositeElement class DefinedPart
+        Statechart class
+        CompositeElement class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      4
+                        graphics
+                        [
+                                w       41.800000000000004
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "true"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      5
+                        graphics
+                        [
+                                w       50.6
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "false"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      6
+                        graphics
+                        [
+                                w       107.80000000000001
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Region class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      7
+                        graphics
+                        [
+                                w       146.3
+                                h       68
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Pseudostate class
+        Vertex class
+        Choice class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      8
+                        graphics
+                        [
+                                w       146.3
+                                h       68
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Pseudostate class
+        Vertex class
+        Entry class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      9
+                        graphics
+                        [
+                                w       146.3
+                                h       68
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Pseudostate class
+        Vertex class
+        Entry class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      10
+                        graphics
+                        [
+                                w       107.80000000000001
+                                h       40
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Region class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      11
+                        graphics
+                        [
+                                w       292.6
+                                h       96
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Vertex class
+        State class
+        RegularState class
+        CompositeElement class
+        CompositeElement class UndefinedPart
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      12
+                        graphics
+                        [
+                                w       177.10000000000002
+                                h       68
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Pseudostate class
+        Vertex class
+        Synchronization class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      13
+                        graphics
+                        [
+                                w       154.0
+                                h       68
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Vertex class
+        RegularState class
+        FinalState class
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      14
+                        graphics
+                        [
+                                w       292.6
+                                h       96
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "null"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        Vertex class
+        State class
+        RegularState class
+        CompositeElement class
+        CompositeElement class UndefinedPart
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      15
+                        graphics
+                        [
+                                w       112.2
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "New Integers"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      16
+                        graphics
+                        [
+                                w       85.80000000000001
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "New Reals"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      17
+                        graphics
+                        [
+                                w       103.4
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "New Strings"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        
+        node
+                [
+                        id      18
+                        graphics
+                        [
+                                w       103.4
+                                h       26
+                                type    "rectangle"
+                                fill    "#FFFFFF"
+                                fill2   "#FFFFFF"
+                                outline "#000000"
+                        ]
+                        LabelGraphics
+                        [
+                                text    "New Objects"
+                                outline "#000000"
+                                fill    "#FFFFFF"
+                                fontSize        16
+                                fontName        "Monospace"
+                                autoSizePolicy  "node_width"
+                                anchor  "t"
+                                borderDistance  0.0
+                        ]
+                        LabelGraphics
+                        [
+                                text    "
+        "
+                                fontSize        14
+                                fontName        "Consolas"
+                                alignment       "left"
+                                anchor  "tl"
+                                borderDistance  6
+                        ]
+                ]
+        edge
+        [
+                source  6
+                target  7
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  6
+                target  8
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  6
+                target  9
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  10
+                target  11
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  6
+                target  12
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  10
+                target  13
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  10
+                target  14
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "vertices reference Region"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  3
+                target  6
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "regions reference CompositeElement"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+        edge
+        [
+                source  3
+                target  10
+                graphics
+                [
+                        fill    "#000000"
+                        width   3
+                        targetArrow     "standard"
+                ]
+                LabelGraphics
+                [
+                        text    "regions reference CompositeElement"
+                        fontSize        14
+                        fontName        "Consolas"
+                        configuration   "AutoFlippingLabel"
+                        model   "six_pos"
+                        position        "thead"
+                ]
+        ]
+]
+
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/plugin.xml b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/plugin.xml
new file mode 100644
index 00000000..c760d4ef
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/plugin.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><plugin/>
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/src/ca/mcgill/ecse/dslreasoner/yakindu/test/YakinduTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/src/ca/mcgill/ecse/dslreasoner/yakindu/test/YakinduTest.xtend
new file mode 100644
index 00000000..b6aae6ab
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/src/ca/mcgill/ecse/dslreasoner/yakindu/test/YakinduTest.xtend
@@ -0,0 +1,178 @@
+package ca.mcgill.ecse.dslreasoner.yakindu.test
+
+import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.YakindummPackage
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration
+import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicProblemBuilder
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicStructureBuilder
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult
+import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore
+import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasoner
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration
+import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace
+import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace
+import java.util.LinkedList
+import java.util.List
+import org.eclipse.emf.ecore.EAttribute
+import org.eclipse.emf.ecore.EClass
+import org.eclipse.emf.ecore.EEnum
+import org.eclipse.emf.ecore.EEnumLiteral
+import org.eclipse.emf.ecore.EObject
+import org.eclipse.emf.ecore.EPackage
+import org.eclipse.emf.ecore.EReference
+import org.eclipse.emf.ecore.resource.Resource
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.SolutionScope
+
+class YakinduTest {
+
+        static String inWS = "input"
+        static String outWS = "output"
+        static String imName = "Yakindu.xmi"
+
+        def static void main(String[] args) {
+                val Ecore2Logic ecore2Logic = new Ecore2Logic
+                val Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic)
+                val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic)
+                val InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic
+
+                // Workspace setup
+                val inputs = new FileSystemWorkspace(inWS + '''/''', "")
+                val workspace = new FileSystemWorkspace(outWS + '''/''', "")
+                workspace.initAndClear
+
+                // Logicproblem writing setup
+                val reg = Resource.Factory.Registry.INSTANCE
+                val map = reg.extensionToFactoryMap
+                map.put("logicproblem", new XMIResourceFactoryImpl)
+
+                println("Input and output workspaces are created")
+
+                //loading the modeling environment
+                val metamodel = loadMetamodel(YakindummPackage.eINSTANCE) // TODO
+                val partialModel = loadPartialModel(inputs, imName)
+//              val queries = loadQueries(metamodel, Patterns.instance)
+                val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, new Ecore2LogicConfiguration())
+                var modelExtensionProblem = instanceModel2Logic.transform(modelGenerationProblem, partialModel)
+//              var validModelExtensionProblem = viatra2Logic.transformQueries(queries, modelExtensionProblem, new Viatra2LogicConfiguration)
+                var problem = modelExtensionProblem.output
+                
+                println("Modelling environment Loaded")
+                
+
+                val ss = new SolutionScope()
+                ss.numberOfRequiredSolution = 5
+                
+                var reasoner = new ViatraReasoner
+                val vampireConfig = new ViatraReasonerConfiguration => [
+                        // add configuration things, in config file first
+//                      it.documentationLevel = DocumentationLevel::FULL
+                        it.solutionScope = ss
+                        it.typeScopes.maxNewElements = 10
+                        it.typeScopes.minNewElements = 5
+                ]
+                
+                println("Problem Ready")
+
+                var LogicResult solution = reasoner.solve(problem, vampireConfig, workspace)
+                
+                println("Problem solved")
+                
+                val interpretations = reasoner.getInterpretations(solution as ModelResult)
+                val models = new LinkedList
+                for (interpretation : interpretations) {
+//                      val extension b = new LogicStructureBuilder
+//                      val extension a = new LogicProblemBuilder
+
+                        val instanceModel = logic2Ecore.transformInterpretation(interpretation, modelGenerationProblem.trace)
+                        models += instanceModel
+                }
+
+                solution.writeSolution(workspace, models)
+//                              print((solution as ModelResult).representation.get(0))
+//                              val soln = ((solution as ModelResult).representation.get(0) as VampireModel)
+//                              println(soln.confirmations)
+//                              println((solution as ModelResult).representation)
+//                              modelFound = !soln.confirmations.filter [
+//                                      class == VLSFiniteModelImpl
+//                              ].isEmpty
+        }
+
+//      def static Map<Type, Integer> getTypeMap(Map<Class, Integer> classMap, EcoreMetamodelDescriptor metamodel,
+//              Ecore2Logic e2l, Ecore2Logic_Trace trace) {
+//              val typeMap = new HashMap<Type, Integer>
+//              val listMap = metamodel.classes.toMap[s|s.name]
+//
+//              for (Class  elem : classMap.keySet) {
+//                      typeMap.put(e2l.TypeofEClass(
+//                              trace,
+//                              listMap.get(elem.simpleName)
+//                      ), classMap.get(elem))
+//              }
+//              return typeMap
+//      }
+        def static loadMetamodel(EPackage pckg) {
+                val List<EClass> classes = pckg.getEClassifiers.filter(EClass).toList
+                val List<EEnum> enums = pckg.getEClassifiers.filter(EEnum).toList
+                val List<EEnumLiteral> literals = enums.map[getELiterals].flatten.toList
+                val List<EReference> references = classes.map[getEReferences].flatten.toList
+                val List<EAttribute> attributes = classes.map[getEAttributes].flatten.toList
+                return new EcoreMetamodelDescriptor(classes, #{}, false, enums, literals, references, attributes)
+        }
+
+        def static loadPartialModel(ReasonerWorkspace inputs, String path) {
+                Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("*", new XMIResourceFactoryImpl())
+                inputs.readModel(EObject, path).eResource.contents
+//              inputs.readModel(EObject,"FamInstance.xmi").eResource.allContents.toList
+        }
+
+//      def static loadQueries(EcoreMetamodelDescriptor metamodel, IQueryGroup i) {
+//              val patterns = i.specifications.toList
+//              val wfPatterns = patterns.filter[it.allAnnotations.exists[it.name == "Constraint"]].toSet
+//              val derivedFeatures = emptyMap
+//              // NO DERIVED FEATURES
+////            val derivedFeatures = new LinkedHashMap
+////            derivedFeatures.put(i.type,metamodel.attributes.filter[it.name == "type"].head)
+////            derivedFeatures.put(i.model,metamodel.references.filter[it.name == "model"].head)
+//              val res = new ViatraQuerySetDescriptor(
+//                      patterns,
+//                      wfPatterns,
+//                      derivedFeatures
+//              )
+//              return res
+//      }
+
+def static writeSolution(LogicResult solution, ReasonerWorkspace workspace, List<EObject> models) {
+                if(solution instanceof ModelResult) {
+                        val representations = solution.representation
+                        
+                        for(representationIndex : 0..<representations.size) {
+                                val representation = representations.get(representationIndex)
+                                val representationNumber = representationIndex + 1
+                                if(representation instanceof PartialInterpretation) {
+//                                      workspace.writeModel(representation, '''solution«representationNumber».partialinterpretation''')
+                                        val partialInterpretation2GML = new PartialInterpretation2Gml
+                                        val gml = partialInterpretation2GML.transform(representation)
+                                                //ecore2GML.transform(root)
+                                                workspace.writeText('''solution«representationNumber»Visualisation.gml''',gml)
+                                                
+                                } else {
+                                        workspace.writeText('''solution«representationNumber».txt''',representation.toString)
+                                }
+                        }
+                        
+                        for(modelIndex : 0..<models.size) {
+                                val model = models.get(modelIndex)
+                                val representationNumber = modelIndex + 1
+                                workspace.writeModel(model,'''model«representationNumber».xmi''')
+                        }
+                        println("Solution saved and visualised")
+                } 
+        }
+}
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/xtend-gen/ca/mcgill/ecse/dslreasoner/yakindu/test/.YakinduTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/xtend-gen/ca/mcgill/ecse/dslreasoner/yakindu/test/.YakinduTest.xtendbin
new file mode 100644
index 00000000..139dcdc7
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/xtend-gen/ca/mcgill/ecse/dslreasoner/yakindu/test/.YakinduTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/xtend-gen/ca/mcgill/ecse/dslreasoner/yakindu/test/.gitignore b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/xtend-gen/ca/mcgill/ecse/dslreasoner/yakindu/test/.gitignore
new file mode 100644
index 00000000..5d3de4ba
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/xtend-gen/ca/mcgill/ecse/dslreasoner/yakindu/test/.gitignore
@@ -0,0 +1 @@
+/.YakinduTest.java._trace
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/xtend-gen/ca/mcgill/ecse/dslreasoner/yakindu/test/YakinduTest.java b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/xtend-gen/ca/mcgill/ecse/dslreasoner/yakindu/test/YakinduTest.java
new file mode 100644
index 00000000..fd1d1f4c
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/xtend-gen/ca/mcgill/ecse/dslreasoner/yakindu/test/YakinduTest.java
@@ -0,0 +1,188 @@
+package ca.mcgill.ecse.dslreasoner.yakindu.test;
+
+import com.google.common.collect.Iterables;
+import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.YakindummPackage;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor;
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicModelInterpretation;
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.SolutionScope;
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult;
+import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore;
+import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasoner;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration;
+import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;
+import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
+import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.CollectionLiterals;
+import org.eclipse.xtext.xbase.lib.Exceptions;
+import org.eclipse.xtext.xbase.lib.ExclusiveRange;
+import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.InputOutput;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.ListExtensions;
+import org.eclipse.xtext.xbase.lib.ObjectExtensions;
+import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
+
+@SuppressWarnings("all")
+public class YakinduTest {
+  private static String inWS = "input";
+  
+  private static String outWS = "output";
+  
+  private static String imName = "Yakindu.xmi";
+  
+  public static void main(final String[] args) {
+    try {
+      final Ecore2Logic ecore2Logic = new Ecore2Logic();
+      final Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic);
+      final Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic);
+      final InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic();
+      StringConcatenation _builder = new StringConcatenation();
+      _builder.append("/");
+      String _plus = (YakinduTest.inWS + _builder);
+      final FileSystemWorkspace inputs = new FileSystemWorkspace(_plus, "");
+      StringConcatenation _builder_1 = new StringConcatenation();
+      _builder_1.append("/");
+      String _plus_1 = (YakinduTest.outWS + _builder_1);
+      final FileSystemWorkspace workspace = new FileSystemWorkspace(_plus_1, "");
+      workspace.initAndClear();
+      final Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;
+      final Map<String, Object> map = reg.getExtensionToFactoryMap();
+      XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl();
+      map.put("logicproblem", _xMIResourceFactoryImpl);
+      InputOutput.<String>println("Input and output workspaces are created");
+      final EcoreMetamodelDescriptor metamodel = YakinduTest.loadMetamodel(YakindummPackage.eINSTANCE);
+      final EList<EObject> partialModel = YakinduTest.loadPartialModel(inputs, YakinduTest.imName);
+      Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();
+      final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration);
+      TracedOutput<LogicProblem, Ecore2Logic_Trace> modelExtensionProblem = instanceModel2Logic.transform(modelGenerationProblem, partialModel);
+      LogicProblem problem = modelExtensionProblem.getOutput();
+      InputOutput.<String>println("Modelling environment Loaded");
+      final SolutionScope ss = new SolutionScope();
+      ss.numberOfRequiredSolution = 5;
+      ViatraReasoner reasoner = new ViatraReasoner();
+      ViatraReasonerConfiguration _viatraReasonerConfiguration = new ViatraReasonerConfiguration();
+      final Procedure1<ViatraReasonerConfiguration> _function = (ViatraReasonerConfiguration it) -> {
+        it.solutionScope = ss;
+        it.typeScopes.maxNewElements = 10;
+        it.typeScopes.minNewElements = 5;
+      };
+      final ViatraReasonerConfiguration vampireConfig = ObjectExtensions.<ViatraReasonerConfiguration>operator_doubleArrow(_viatraReasonerConfiguration, _function);
+      InputOutput.<String>println("Problem Ready");
+      LogicResult solution = reasoner.solve(problem, vampireConfig, workspace);
+      InputOutput.<String>println("Problem solved");
+      final List<? extends LogicModelInterpretation> interpretations = reasoner.getInterpretations(((ModelResult) solution));
+      final LinkedList<EObject> models = new LinkedList<EObject>();
+      for (final LogicModelInterpretation interpretation : interpretations) {
+        {
+          final EObject instanceModel = logic2Ecore.transformInterpretation(interpretation, modelGenerationProblem.getTrace());
+          models.add(instanceModel);
+        }
+      }
+      YakinduTest.writeSolution(solution, workspace, models);
+    } catch (Throwable _e) {
+      throw Exceptions.sneakyThrow(_e);
+    }
+  }
+  
+  public static EcoreMetamodelDescriptor loadMetamodel(final EPackage pckg) {
+    final List<EClass> classes = IterableExtensions.<EClass>toList(Iterables.<EClass>filter(pckg.getEClassifiers(), EClass.class));
+    final List<EEnum> enums = IterableExtensions.<EEnum>toList(Iterables.<EEnum>filter(pckg.getEClassifiers(), EEnum.class));
+    final Function1<EEnum, EList<EEnumLiteral>> _function = (EEnum it) -> {
+      return it.getELiterals();
+    };
+    final List<EEnumLiteral> literals = IterableExtensions.<EEnumLiteral>toList(Iterables.<EEnumLiteral>concat(ListExtensions.<EEnum, EList<EEnumLiteral>>map(enums, _function)));
+    final Function1<EClass, EList<EReference>> _function_1 = (EClass it) -> {
+      return it.getEReferences();
+    };
+    final List<EReference> references = IterableExtensions.<EReference>toList(Iterables.<EReference>concat(ListExtensions.<EClass, EList<EReference>>map(classes, _function_1)));
+    final Function1<EClass, EList<EAttribute>> _function_2 = (EClass it) -> {
+      return it.getEAttributes();
+    };
+    final List<EAttribute> attributes = IterableExtensions.<EAttribute>toList(Iterables.<EAttribute>concat(ListExtensions.<EClass, EList<EAttribute>>map(classes, _function_2)));
+    return new EcoreMetamodelDescriptor(classes, Collections.<EClass>unmodifiableSet(CollectionLiterals.<EClass>newHashSet()), false, enums, literals, references, attributes);
+  }
+  
+  public static EList<EObject> loadPartialModel(final ReasonerWorkspace inputs, final String path) {
+    EList<EObject> _xblockexpression = null;
+    {
+      Map<String, Object> _extensionToFactoryMap = Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap();
+      XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl();
+      _extensionToFactoryMap.put("*", _xMIResourceFactoryImpl);
+      _xblockexpression = inputs.<EObject>readModel(EObject.class, path).eResource().getContents();
+    }
+    return _xblockexpression;
+  }
+  
+  public static String writeSolution(final LogicResult solution, final ReasonerWorkspace workspace, final List<EObject> models) {
+    String _xifexpression = null;
+    if ((solution instanceof ModelResult)) {
+      String _xblockexpression = null;
+      {
+        final EList<Object> representations = ((ModelResult)solution).getRepresentation();
+        int _size = representations.size();
+        ExclusiveRange _doubleDotLessThan = new ExclusiveRange(0, _size, true);
+        for (final Integer representationIndex : _doubleDotLessThan) {
+          {
+            final Object representation = representations.get((representationIndex).intValue());
+            final int representationNumber = ((representationIndex).intValue() + 1);
+            if ((representation instanceof PartialInterpretation)) {
+              final PartialInterpretation2Gml partialInterpretation2GML = new PartialInterpretation2Gml();
+              final String gml = partialInterpretation2GML.transform(((PartialInterpretation)representation));
+              StringConcatenation _builder = new StringConcatenation();
+              _builder.append("solution");
+              _builder.append(representationNumber);
+              _builder.append("Visualisation.gml");
+              workspace.writeText(_builder.toString(), gml);
+            } else {
+              StringConcatenation _builder_1 = new StringConcatenation();
+              _builder_1.append("solution");
+              _builder_1.append(representationNumber);
+              _builder_1.append(".txt");
+              workspace.writeText(_builder_1.toString(), representation.toString());
+            }
+          }
+        }
+        int _size_1 = models.size();
+        ExclusiveRange _doubleDotLessThan_1 = new ExclusiveRange(0, _size_1, true);
+        for (final Integer modelIndex : _doubleDotLessThan_1) {
+          {
+            final EObject model = models.get((modelIndex).intValue());
+            final int representationNumber = ((modelIndex).intValue() + 1);
+            StringConcatenation _builder = new StringConcatenation();
+            _builder.append("model");
+            _builder.append(representationNumber);
+            _builder.append(".xmi");
+            workspace.writeModel(model, _builder.toString());
+          }
+        }
+        _xblockexpression = InputOutput.<String>println("Solution saved and visualised");
+      }
+      _xifexpression = _xblockexpression;
+    }
+    return _xifexpression;
+  }
+}
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
index 863a91c8..d3afb7f7 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
@@ -72,10 +72,10 @@ class SimpleRun {
                         it.typeScopes.maxNewElements = 40

                         it.typeScopes.minNewElements = 40

                         it.solutionScope.numberOfRequiredSolution = 1

-                        it.existingQueries = queries.patterns.map[it.internalQueryRepresentation]

+//                      it.existingQueries = queries.patterns.map[it.internalQueryRepresentation]

                         it.debugCongiguration.logging = false

                         it.debugCongiguration.partalInterpretationVisualisationFrequency = 1

-                        it.debugCongiguration.partialInterpretatioVisualiser = new GraphvizVisualisation

+//                      it.debugCongiguration.partialInterpretatioVisualiser = new GraphvizVisualisation

                 ]

                 solution = reasoner.solve(logicProblem,viatraConfig,workspace)

                 /*/

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/TestForDP.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/TestForDP.xtend
new file mode 100644
index 00000000..e112ab59
--- /dev/null
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/TestForDP.xtend
@@ -0,0 +1,5 @@
+package hu.bme.mit.inf.dslreasoner.run
+
+class TestForDP {
+        
+}
\ No newline at end of file