209 files changed, 20991 insertions, 0 deletions

diff --git a/subprojects/language-ide/build.gradle b/subprojects/language-ide/build.gradle
new file mode 100644
index 00000000..3786762b
--- /dev/null
+++ b/subprojects/language-ide/build.gradle
@@ -0,0 +1,18 @@
+plugins {
+        id 'refinery-java-library'
+        id 'refinery-xtext-conventions'
+}
+
+dependencies {
+        api project(':refinery-language')
+        api libs.xtext.ide
+        api libs.xtext.xbase.ide
+}
+
+def generateXtextLanguage = project(':refinery-language').tasks.named('generateXtextLanguage')
+
+for (taskName in ['compileJava', 'processResources']) {
+        tasks.named(taskName) {
+                dependsOn generateXtextLanguage
+        }
+}
diff --git a/subprojects/language-ide/src/main/java/tools/refinery/language/ide/ProblemIdeModule.java b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/ProblemIdeModule.java
new file mode 100644
index 00000000..51cecf06
--- /dev/null
+++ b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/ProblemIdeModule.java
@@ -0,0 +1,30 @@
+/*
+ * generated by Xtext 2.25.0
+ */
+package tools.refinery.language.ide;
+
+import org.eclipse.xtext.ide.editor.contentassist.IPrefixMatcher;
+import org.eclipse.xtext.ide.editor.contentassist.IdeCrossrefProposalProvider;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.ISemanticHighlightingCalculator;
+
+import tools.refinery.language.ide.contentassist.FuzzyMatcher;
+import tools.refinery.language.ide.contentassist.ProblemCrossrefProposalProvider;
+import tools.refinery.language.ide.syntaxcoloring.ProblemSemanticHighlightingCalculator;
+
+/**
+ * Use this class to register ide components.
+ */
+public class ProblemIdeModule extends AbstractProblemIdeModule {
+        public Class<? extends ISemanticHighlightingCalculator> bindISemanticHighlightingCalculator() {
+                return ProblemSemanticHighlightingCalculator.class;
+        }
+
+        @Override
+        public Class<? extends IPrefixMatcher> bindIPrefixMatcher() {
+                return FuzzyMatcher.class;
+        }
+
+        public Class<? extends IdeCrossrefProposalProvider> bindIdeCrossrefProposalProvider() {
+                return ProblemCrossrefProposalProvider.class;
+        }
+}
diff --git a/subprojects/language-ide/src/main/java/tools/refinery/language/ide/ProblemIdeSetup.java b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/ProblemIdeSetup.java
new file mode 100644
index 00000000..5b88d41f
--- /dev/null
+++ b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/ProblemIdeSetup.java
@@ -0,0 +1,24 @@
+/*
+ * generated by Xtext 2.25.0
+ */
+package tools.refinery.language.ide;
+
+import org.eclipse.xtext.util.Modules2;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+import tools.refinery.language.ProblemRuntimeModule;
+import tools.refinery.language.ProblemStandaloneSetup;
+
+/**
+ * Initialization support for running Xtext languages as language servers.
+ */
+public class ProblemIdeSetup extends ProblemStandaloneSetup {
+
+        @Override
+        public Injector createInjector() {
+                return Guice.createInjector(Modules2.mixin(new ProblemRuntimeModule(), new ProblemIdeModule()));
+        }
+        
+}
diff --git a/subprojects/language-ide/src/main/java/tools/refinery/language/ide/contentassist/FuzzyMatcher.java b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/contentassist/FuzzyMatcher.java
new file mode 100644
index 00000000..fe722ca1
--- /dev/null
+++ b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/contentassist/FuzzyMatcher.java
@@ -0,0 +1,44 @@
+package tools.refinery.language.ide.contentassist;
+
+import org.eclipse.xtext.ide.editor.contentassist.IPrefixMatcher;
+
+import com.google.inject.Singleton;
+
+/**
+ * Implements the candidate matching algoritm used by CodeMirror 6.
+ * 
+ * Using this class ensures that the same candidates will be returned when
+ * filtering content assist proposals on the server as on the client.
+ * 
+ * The matching is "fuzzy" (<code>fzf</code>-like), i.e., the prefix characters
+ * may occur anywhere in the name, but must be in the same order as in the
+ * prefix.
+ * 
+ * @author Kristóf Marussy
+ */
+@Singleton
+public class FuzzyMatcher implements IPrefixMatcher {
+        @Override
+        public boolean isCandidateMatchingPrefix(String name, String prefix) {
+                var nameIgnoreCase = name.toLowerCase();
+                var prefixIgnoreCase = prefix.toLowerCase();
+                int prefixLength = prefixIgnoreCase.length();
+                if (prefixLength == 0) {
+                        return true;
+                }
+                int nameLength = nameIgnoreCase.length();
+                if (prefixLength > nameLength) {
+                        return false;
+                }
+                int prefixIndex = 0;
+                for (int nameIndex = 0; nameIndex < nameLength; nameIndex++) {
+                        if (nameIgnoreCase.charAt(nameIndex) == prefixIgnoreCase.charAt(prefixIndex)) {
+                                prefixIndex++;
+                                if (prefixIndex == prefixLength) {
+                                        return true;
+                                }
+                        }
+                }
+                return false;
+        }
+}
diff --git a/subprojects/language-ide/src/main/java/tools/refinery/language/ide/contentassist/ProblemCrossrefProposalProvider.java b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/contentassist/ProblemCrossrefProposalProvider.java
new file mode 100644
index 00000000..f828e836
--- /dev/null
+++ b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/contentassist/ProblemCrossrefProposalProvider.java
@@ -0,0 +1,77 @@
+package tools.refinery.language.ide.contentassist;
+
+import java.util.Objects;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.xtext.CrossReference;
+import org.eclipse.xtext.GrammarUtil;
+import org.eclipse.xtext.ide.editor.contentassist.ContentAssistContext;
+import org.eclipse.xtext.ide.editor.contentassist.ContentAssistEntry;
+import org.eclipse.xtext.ide.editor.contentassist.IdeCrossrefProposalProvider;
+import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
+import org.eclipse.xtext.resource.IEObjectDescription;
+
+import com.google.inject.Inject;
+
+import tools.refinery.language.model.ProblemUtil;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.resource.ReferenceCounter;
+
+public class ProblemCrossrefProposalProvider extends IdeCrossrefProposalProvider {
+        @Inject
+        private ReferenceCounter referenceCounter;
+
+        @Override
+        protected ContentAssistEntry createProposal(IEObjectDescription candidate, CrossReference crossRef,
+                        ContentAssistContext context) {
+                if (!shouldCreateProposal(candidate, crossRef, context)) {
+                        return null;
+                }
+                return super.createProposal(candidate, crossRef, context);
+        }
+
+        protected boolean shouldCreateProposal(IEObjectDescription candidate, CrossReference crossRef,
+                        ContentAssistContext context) {
+                var rootModel = context.getRootModel();
+                var eObjectOrProxy = candidate.getEObjectOrProxy();
+                if (!Objects.equals(rootModel.eResource(), eObjectOrProxy.eResource())) {
+                        return true;
+                }
+                var currentValue = getCurrentValue(crossRef, context);
+                if (currentValue == null) {
+                        return true;
+                }
+                var eObject = EcoreUtil.resolve(eObjectOrProxy, rootModel);
+                if (!Objects.equals(currentValue, eObject)) {
+                        return true;
+                }
+                if (!ProblemUtil.isImplicit(eObject)) {
+                        return true;
+                }
+                if (rootModel instanceof Problem problem) {
+                        return referenceCounter.countReferences(problem, eObject) >= 2;
+                }
+                return true;
+        }
+
+        protected EObject getCurrentValue(CrossReference crossRef, ContentAssistContext context) {
+                var value = getCurrentValue(crossRef, context.getCurrentModel());
+                if (value != null) {
+                        return value;
+                }
+                var currentNodeSemanticObject = NodeModelUtils.findActualSemanticObjectFor(context.getCurrentNode());
+                return getCurrentValue(crossRef, currentNodeSemanticObject);
+        }
+
+        protected EObject getCurrentValue(CrossReference crossRef, EObject context) {
+                if (context == null) {
+                        return null;
+                }
+                var eReference = GrammarUtil.getReference(crossRef, context.eClass());
+                if (eReference == null || eReference.isMany()) {
+                        return null;
+                }
+                return (EObject) context.eGet(eReference);
+        }
+}
diff --git a/subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
new file mode 100644
index 00000000..01ac33f7
--- /dev/null
+++ b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
@@ -0,0 +1,122 @@
+package tools.refinery.language.ide.syntaxcoloring;
+
+import java.util.List;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.DefaultSemanticHighlightingCalculator;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.IHighlightedPositionAcceptor;
+import org.eclipse.xtext.nodemodel.INode;
+import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
+import org.eclipse.xtext.service.OperationCanceledManager;
+import org.eclipse.xtext.util.CancelIndicator;
+
+import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+
+import tools.refinery.language.model.ProblemUtil;
+import tools.refinery.language.model.problem.ClassDeclaration;
+import tools.refinery.language.model.problem.NamedElement;
+import tools.refinery.language.model.problem.Node;
+import tools.refinery.language.model.problem.PredicateDefinition;
+import tools.refinery.language.model.problem.ProblemPackage;
+import tools.refinery.language.model.problem.ReferenceDeclaration;
+
+public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighlightingCalculator {
+        private static final String BUILTIN_CLASS = "builtin";
+        private static final String ABSTRACT_CLASS = "abstract";
+        private static final String CONTAINMENT_CLASS = "containment";
+        private static final String ERROR_CLASS = "error";
+        private static final String NODE_CLASS = "node";
+        private static final String INDIVIDUAL_NODE_CLASS = "individual";
+        private static final String NEW_NODE_CLASS = "new";
+
+        @Inject
+        private OperationCanceledManager operationCanceledManager;
+
+        @Override
+        protected boolean highlightElement(EObject object, IHighlightedPositionAcceptor acceptor,
+                        CancelIndicator cancelIndicator) {
+                highlightName(object, acceptor);
+                highlightCrossReferences(object, acceptor, cancelIndicator);
+                return false;
+        }
+
+        protected void highlightName(EObject object, IHighlightedPositionAcceptor acceptor) {
+                if (!(object instanceof NamedElement)) {
+                        return;
+                }
+                String[] highlightClass = getHighlightClass(object, null);
+                if (highlightClass.length > 0) {
+                        highlightFeature(acceptor, object, ProblemPackage.Literals.NAMED_ELEMENT__NAME, highlightClass);
+                }
+        }
+
+        protected void highlightCrossReferences(EObject object, IHighlightedPositionAcceptor acceptor,
+                        CancelIndicator cancelIndicator) {
+                for (EReference reference : object.eClass().getEAllReferences()) {
+                        if (reference.isContainment()) {
+                                continue;
+                        }
+                        operationCanceledManager.checkCanceled(cancelIndicator);
+                        if (reference.isMany()) {
+                                highlightManyValues(object, reference, acceptor);
+                        } else {
+                                highlightSingleValue(object, reference, acceptor);
+                        }
+                }
+        }
+
+        protected void highlightSingleValue(EObject object, EReference reference, IHighlightedPositionAcceptor acceptor) {
+                EObject valueObj = (EObject) object.eGet(reference);
+                String[] highlightClass = getHighlightClass(valueObj, reference);
+                if (highlightClass.length > 0) {
+                        highlightFeature(acceptor, object, reference, highlightClass);
+                }
+        }
+
+        protected void highlightManyValues(EObject object, EReference reference, IHighlightedPositionAcceptor acceptor) {
+                @SuppressWarnings("unchecked")
+                EList<? extends EObject> values = (EList<? extends EObject>) object.eGet(reference);
+                List<INode> nodes = NodeModelUtils.findNodesForFeature(object, reference);
+                int size = Math.min(values.size(), nodes.size());
+                for (var i = 0; i < size; i++) {
+                        EObject valueInList = values.get(i);
+                        INode node = nodes.get(i);
+                        String[] highlightClass = getHighlightClass(valueInList, reference);
+                        if (highlightClass.length > 0) {
+                                highlightNode(acceptor, node, highlightClass);
+                        }
+                }
+        }
+
+        protected String[] getHighlightClass(EObject eObject, EReference reference) {
+                if (ProblemUtil.isBuiltIn(eObject)) {
+                        return new String[] { BUILTIN_CLASS };
+                }
+                ImmutableList.Builder<String> classesBuilder = ImmutableList.builder();
+                if (eObject instanceof ClassDeclaration classDeclaration && classDeclaration.isAbstract()) {
+                        classesBuilder.add(ABSTRACT_CLASS);
+                }
+                if (eObject instanceof ReferenceDeclaration referenceDeclaration && referenceDeclaration.isContainment()) {
+                        classesBuilder.add(CONTAINMENT_CLASS);
+                }
+                if (eObject instanceof PredicateDefinition predicateDefinition && predicateDefinition.isError()) {
+                        classesBuilder.add(ERROR_CLASS);
+                }
+                if (eObject instanceof Node node) {
+                        if (reference == ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE) {
+                                classesBuilder.add(NODE_CLASS);
+                        }
+                        if (ProblemUtil.isIndividualNode(node)) {
+                                classesBuilder.add(INDIVIDUAL_NODE_CLASS);
+                        }
+                        if (ProblemUtil.isNewNode(node)) {
+                                classesBuilder.add(NEW_NODE_CLASS);
+                        }
+                }
+                List<String> classes = classesBuilder.build();
+                return classes.toArray(new String[0]);
+        }
+}
diff --git a/subprojects/language-model/META-INF/MANIFEST.MF b/subprojects/language-model/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..96617f85
--- /dev/null
+++ b/subprojects/language-model/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: language-model;singleton:=true
+Automatic-Module-Name: language-model
+Bundle-Version: 0.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-17
+Export-Package: tools.refinery.language.model.problem,
+ tools.refinery.language.model.problem.impl,
+ tools.refinery.language.model.problem.util
+Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.core.runtime
+Bundle-ActivationPolicy: lazy
diff --git a/subprojects/language-model/build.gradle b/subprojects/language-model/build.gradle
new file mode 100644
index 00000000..2cbddddb
--- /dev/null
+++ b/subprojects/language-model/build.gradle
@@ -0,0 +1,56 @@
+plugins {
+        id 'java-test-fixtures'
+        id 'refinery-java-library'
+        id 'refinery-mwe2'
+        id 'refinery-sonarqube'
+}
+
+dependencies {
+        api libs.ecore
+        api libs.ecore.xmi
+        mwe2 libs.ecore.codegen
+        mwe2 libs.mwe.utils
+        mwe2 libs.mwe2.lib
+        mwe2 libs.xtext.core
+        mwe2 libs.xtext.xbase
+}
+
+sourceSets {
+        main {
+                java.srcDirs += ['src/main/emf-gen']
+        }
+}
+
+def generateEPackage = tasks.register('generateEPackage', JavaExec) {
+        mainClass = 'org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher'
+        classpath = configurations.mwe2
+        inputs.file 'src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2'
+        inputs.file 'src/main/resources/model/problem.ecore'
+        inputs.file 'src/main/resources/model/problem.genmodel'
+        outputs.dir 'src/main/emf-gen'
+        args += 'src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2'
+        args += '-p'
+        args += "rootPath=/${projectDir}"
+}
+
+for (taskName in ['compileJava', 'processResources', 'generateEclipseSourceFolders']) {
+        tasks.named(taskName) {
+                dependsOn generateEPackage
+        }
+}
+
+tasks.named('clean') {
+        delete 'src/main/emf-gen'
+}
+
+sonarqube.properties {
+        properties['sonar.exclusions'] += [
+                'src/main/emf-gen/**',
+        ]
+}
+
+eclipse.project.natures += [
+        'org.eclipse.sirius.nature.modelingproject',
+        'org.eclipse.pde.PluginNature',
+        'org.eclipse.xtext.ui.shared.xtextNature'
+]
diff --git a/subprojects/language-model/build.properties b/subprojects/language-model/build.properties
new file mode 100644
index 00000000..65dfc7c4
--- /dev/null
+++ b/subprojects/language-model/build.properties
@@ -0,0 +1,11 @@
+#
+
+bin.includes = .,\
+               src/main/resources/model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src/main/emf-gen/,\
+           src/main/java/,\
+                   src/main/resources/
diff --git a/subprojects/language-model/plugin.properties b/subprojects/language-model/plugin.properties
new file mode 100644
index 00000000..c4fb7e23
--- /dev/null
+++ b/subprojects/language-model/plugin.properties
@@ -0,0 +1,4 @@
+#
+
+pluginName = tools.refinery.language.model
+providerName = refinery.tools
diff --git a/subprojects/language-model/plugin.xml b/subprojects/language-model/plugin.xml
new file mode 100644
index 00000000..4ca005a8
--- /dev/null
+++ b/subprojects/language-model/plugin.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated problem -->
+      <package
+            uri="https://refinery.tools/emf/2021/Problem"
+            class="tools.refinery.language.model.problem.ProblemPackage"
+            genModel="src/main/resources/model/problem.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.extension_parser">
+      <!-- @generated problem -->
+      <parser
+            type="problem_xmi"
+            class="tools.refinery.language.model.problem.util.ProblemResourceFactoryImpl"/>
+   </extension>
+
+</plugin>
diff --git a/subprojects/language-model/problem.aird b/subprojects/language-model/problem.aird
new file mode 100644
index 00000000..027070bf
--- /dev/null
+++ b/subprojects/language-model/problem.aird
@@ -0,0 +1,3646 @@
+<?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.3/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="_CqOewKA4EeuqkpDnuik1sg" selectedViews="_CsAAYKA4EeuqkpDnuik1sg" version="14.5.1.202106111100">
+    <semanticResources>src/main/resources/model/problem.ecore</semanticResources>
+    <semanticResources>src/main/resources/model/problem.genmodel</semanticResources>
+    <semanticResources>build/resources/main/model/problem.ecore</semanticResources>
+    <semanticResources>build/resources/main/model/problem.genmodel</semanticResources>
+    <ownedViews xmi:type="viewpoint:DView" uid="_CsAAYKA4EeuqkpDnuik1sg">
+      <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="_CsYa4KA4EeuqkpDnuik1sg" name="problem" repPath="#_CsUwgKA4EeuqkpDnuik1sg" changeId="0181b56c-ca28-4ed2-99c9-6ae4164f5993">
+        <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="src/main/resources/model/problem.ecore#/"/>
+      </ownedRepresentationDescriptors>
+    </ownedViews>
+  </viewpoint:DAnalysis>
+  <diagram:DSemanticDiagram uid="_CsUwgKA4EeuqkpDnuik1sg">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_CsZB8KA4EeuqkpDnuik1sg" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_CsZB8aA4EeuqkpDnuik1sg" type="Sirius" element="_CsUwgKA4EeuqkpDnuik1sg" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_D1D6MKA4EeuqkpDnuik1sg" type="2003" element="_D05iIKA4EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_D1EhQKA4EeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_D1FIUKA4EeuqkpDnuik1sg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_D1FIUaA4EeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_D1FIUqA4EeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_D1D6MaA4EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1D6MqA4EeuqkpDnuik1sg" x="804" y="180" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_EfWNUKA4EeuqkpDnuik1sg" type="2003" element="_EfNqcKA4EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_EfXbcKA4EeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_EfXbcaA4EeuqkpDnuik1sg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_EfXbcqA4EeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_EfXbc6A4EeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_EfWNUaA4EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfWNUqA4EeuqkpDnuik1sg" x="624" y="528" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_JT0o8KA4EeuqkpDnuik1sg" type="2003" element="_JTstIKA4EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_JT1QAKA4EeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_JT13EKA4EeuqkpDnuik1sg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_SrcfoKA4EeuqkpDnuik1sg" type="3010" element="_SrSuoKA4EeuqkpDnuik1sg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_SrcfoaA4EeuqkpDnuik1sg" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_SrcfoqA4EeuqkpDnuik1sg"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_JT13EaA4EeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_JT13EqA4EeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_JT0o8aA4EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JT0o8qA4EeuqkpDnuik1sg" x="672" y="720" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_c-HCQKA4EeuqkpDnuik1sg" type="2003" element="_c-A7oKA4EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_c-HCQ6A4EeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_c-HCRKA4EeuqkpDnuik1sg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_HjIR8KA5EeuqkpDnuik1sg" type="3010" element="_HjDZcKA5EeuqkpDnuik1sg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_HjIR8aA5EeuqkpDnuik1sg" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_HjIR8qA5EeuqkpDnuik1sg"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_c-HCRaA4EeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_c-HCRqA4EeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_c-HCQaA4EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c-HCQqA4EeuqkpDnuik1sg" x="588" y="960" width="147" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_RzZA0KA5EeuqkpDnuik1sg" type="2003" element="_RzK-YKA5EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_RzZn4KA5EeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_RzZn4aA5EeuqkpDnuik1sg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_S-2uYKA5EeuqkpDnuik1sg" type="3010" element="_S-lBkKA5EeuqkpDnuik1sg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_S-2uYaA5EeuqkpDnuik1sg" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_S-2uYqA5EeuqkpDnuik1sg"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_RzZn4qA5EeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_RzZn46A5EeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_RzZA0aA5EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RzZA0qA5EeuqkpDnuik1sg" x="1056" y="24" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_fit3kKA5EeuqkpDnuik1sg" type="2003" element="_fihqUKA5EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_fit3k6A5EeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_fit3lKA5EeuqkpDnuik1sg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_sv1ZIKA5EeuqkpDnuik1sg" type="3010" element="_svs2QKA5EeuqkpDnuik1sg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_sv1ZIaA5EeuqkpDnuik1sg" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_sv1ZIqA5EeuqkpDnuik1sg"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_7sgDoCrcEeyyC-O0_LlY9w" type="3010" element="_7sQzECrcEeyyC-O0_LlY9w">
+              <styles xmi:type="notation:FontStyle" xmi:id="_7sgDoSrcEeyyC-O0_LlY9w" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_7sgDoircEeyyC-O0_LlY9w"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_fit3laA5EeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_fit3lqA5EeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_fit3kaA5EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fit3kqA5EeuqkpDnuik1sg" x="1385" y="720" width="150" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_QKLK0KA6EeuqkpDnuik1sg" type="2003" element="_QKD2EKA6EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_QKLK06A6EeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_QKLK1KA6EeuqkpDnuik1sg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_QKLK1aA6EeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_QKLK1qA6EeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_QKLK0aA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QKLK0qA6EeuqkpDnuik1sg" x="1236" y="960" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_jP6FkKA6EeuqkpDnuik1sg" type="2003" element="_jPpm4KA6EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_jP6soKA6EeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_jP6soaA6EeuqkpDnuik1sg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_jP6soqA6EeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_jP6so6A6EeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_jP6FkaA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jP6FkqA6EeuqkpDnuik1sg" x="1236" y="720" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_sdPX0KA6EeuqkpDnuik1sg" type="2003" element="_sc_gMKA6EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_sdP-4KA6EeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_sdP-4aA6EeuqkpDnuik1sg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_sdP-4qA6EeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_sdP-46A6EeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_sdPX0aA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sdPX0qA6EeuqkpDnuik1sg" x="1416" y="960" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_4k5GIKA6EeuqkpDnuik1sg" type="2003" element="_4k00sKA6EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_4k5GI6A6EeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_4k5GJKA6EeuqkpDnuik1sg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_4k5GJaA6EeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_4k5GJqA6EeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_4k5GIaA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4k5GIqA6EeuqkpDnuik1sg" x="1360" y="1128" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_6KEUMKA6EeuqkpDnuik1sg" type="2003" element="_6J_bsKA6EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_6KEUM6A6EeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_6KEUNKA6EeuqkpDnuik1sg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_UAq-cKA-EeuqkpDnuik1sg" type="3010" element="_UAle4KA-EeuqkpDnuik1sg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_UAq-caA-EeuqkpDnuik1sg" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_UAq-cqA-EeuqkpDnuik1sg"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_6KEUNaA6EeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_6KEUNqA6EeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_6KEUMaA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6KEUMqA6EeuqkpDnuik1sg" x="1236" y="1284" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_-O-UEKA6EeuqkpDnuik1sg" type="2003" element="_-O6CoKA6EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_-O-7IKA6EeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_-O-7IaA6EeuqkpDnuik1sg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_-O-7IqA6EeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_-O-7I6A6EeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_-O-UEaA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-O-UEqA6EeuqkpDnuik1sg" x="1656" y="1752" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_V6pfMKA7EeuqkpDnuik1sg" type="2003" element="_V6YZcKA7EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_V6qGQKA7EeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_V6qGQaA7EeuqkpDnuik1sg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_V6qGQqA7EeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_V6qGQ6A7EeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_V6pfMaA7EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V6pfMqA7EeuqkpDnuik1sg" x="1546" y="1452" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_rRhWIKA7EeuqkpDnuik1sg" type="2003" element="_rRcdoKA7EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_rRh9MKA7EeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_rRh9MaA7EeuqkpDnuik1sg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_rRh9MqA7EeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_rRh9M6A7EeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_rRhWIaA7EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rRhWIqA7EeuqkpDnuik1sg" x="1620" y="720" width="147" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_p9wywKA8EeuqkpDnuik1sg" type="2003" element="_p9d30KA8EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_p9xZ0KA8EeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_p9xZ0aA8EeuqkpDnuik1sg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_NAri8KA9EeuqkpDnuik1sg" type="3010" element="_NAnRgKA9EeuqkpDnuik1sg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_NAri8aA9EeuqkpDnuik1sg" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_NAri8qA9EeuqkpDnuik1sg"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_Y3GDAAGzEey7cfH5K6RyCw" type="3010" element="_Y2m60AGzEey7cfH5K6RyCw">
+              <styles xmi:type="notation:FontStyle" xmi:id="_Y3GDAQGzEey7cfH5K6RyCw" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Y3GDAgGzEey7cfH5K6RyCw"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_p9xZ0qA8EeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_p9xZ06A8EeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_p9wywaA8EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p9wywqA8EeuqkpDnuik1sg" x="2163" y="528" width="120" height="111"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_xsq_MKA8EeuqkpDnuik1sg" type="2003" element="_xsYrUKA8EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_xsrmQKA8EeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_xsrmQaA8EeuqkpDnuik1sg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_xsrmQqA8EeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_xsrmQ6A8EeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_xsq_MaA8EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xsq_MqA8EeuqkpDnuik1sg" x="1020" y="336" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_BMfjMKA9EeuqkpDnuik1sg" type="2003" element="_BMXnYKA9EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_BMfjM6A9EeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_BMfjNKA9EeuqkpDnuik1sg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_B6eDgKA9EeuqkpDnuik1sg" type="3010" element="_B6IFQKA9EeuqkpDnuik1sg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_B6eDgaA9EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_B6eDgqA9EeuqkpDnuik1sg"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_D8xScKA9EeuqkpDnuik1sg" type="3010" element="_D8ciUKA9EeuqkpDnuik1sg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_D8xScaA9EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_D8xScqA9EeuqkpDnuik1sg"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_JW_fcKA9EeuqkpDnuik1sg" type="3010" element="_JWqvUKA9EeuqkpDnuik1sg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_JW_fcaA9EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_JW_fcqA9EeuqkpDnuik1sg"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_9LOjcAGzEey7cfH5K6RyCw" type="3010" element="_9K7BcAGzEey7cfH5K6RyCw">
+              <styles xmi:type="notation:FontStyle" xmi:id="_9LOjcQGzEey7cfH5K6RyCw" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_9LOjcgGzEey7cfH5K6RyCw"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_BMfjNaA9EeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_BMfjNqA9EeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_BMfjMaA9EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BMfjMqA9EeuqkpDnuik1sg" x="1917" y="180" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_QUDYMKA9EeuqkpDnuik1sg" type="2003" element="_QTzgkKA9EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_QUDYM6A9EeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_QUDYNKA9EeuqkpDnuik1sg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_QUDYNaA9EeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_QUDYNqA9EeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_QUDYMaA9EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QUDYMqA9EeuqkpDnuik1sg" x="336" y="528" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_e73WIKA9EeuqkpDnuik1sg" type="2003" element="_e7ydoKA9EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_e73WI6A9EeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_e73WJKA9EeuqkpDnuik1sg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_e73WJaA9EeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_e73WJqA9EeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_e73WIaA9EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e73WIqA9EeuqkpDnuik1sg" x="804" y="336" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_zaq8oKA9EeuqkpDnuik1sg" type="2003" element="_zac6MKA9EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_zarjsKA9EeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_zarjsaA9EeuqkpDnuik1sg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_BtMnEKA-EeuqkpDnuik1sg" type="3010" element="_BtHHgKA-EeuqkpDnuik1sg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_BtMnEaA-EeuqkpDnuik1sg" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_BtMnEqA-EeuqkpDnuik1sg"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_zarjsqA9EeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_zarjs6A9EeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_zaq8oaA9EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zaq8oqA9EeuqkpDnuik1sg" x="336" y="720" width="120" height="99"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_Ren3cKBJEeuqkpDnuik1sg" type="2003" element="_ReiX4KBJEeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_Ren3c6BJEeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_Ren3dKBJEeuqkpDnuik1sg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Ren3daBJEeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Ren3dqBJEeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_Ren3caBJEeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ren3cqBJEeuqkpDnuik1sg" x="336" y="960" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_Tx6IsKBJEeuqkpDnuik1sg" type="2003" element="_Tx0CEKBJEeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_Tx6Is6BJEeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_Tx6ItKBJEeuqkpDnuik1sg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_icxaoKBJEeuqkpDnuik1sg" type="3010" element="_iccDcKBJEeuqkpDnuik1sg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_icxaoaBJEeuqkpDnuik1sg" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_icxaoqBJEeuqkpDnuik1sg"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_kKwmcKBJEeuqkpDnuik1sg" type="3010" element="_kKaoMKBJEeuqkpDnuik1sg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_kKwmcaBJEeuqkpDnuik1sg" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_kKwmcqBJEeuqkpDnuik1sg"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Tx6ItaBJEeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Tx6ItqBJEeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_Tx6IsaBJEeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tx6IsqBJEeuqkpDnuik1sg" x="240" y="1128" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_aPNjUKBJEeuqkpDnuik1sg" type="2003" element="_aPIDwKBJEeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_aPOKYKBJEeuqkpDnuik1sg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_aPOKYaBJEeuqkpDnuik1sg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_lhdToKBJEeuqkpDnuik1sg" type="3010" element="_lhXNAKBJEeuqkpDnuik1sg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_lhdToaBJEeuqkpDnuik1sg" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_lhdToqBJEeuqkpDnuik1sg"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_aPOKYqBJEeuqkpDnuik1sg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_aPOKY6BJEeuqkpDnuik1sg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_aPNjUaBJEeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aPNjUqBJEeuqkpDnuik1sg" x="408" y="1128" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_D-lH8NYBEeuF_d0WEhR3Xw" type="2003" element="_D9_5INYBEeuF_d0WEhR3Xw">
+          <children xmi:type="notation:Node" xmi:id="_D-lvANYBEeuF_d0WEhR3Xw" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_D-lvAdYBEeuF_d0WEhR3Xw" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_D-lvAtYBEeuF_d0WEhR3Xw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_D-lvA9YBEeuF_d0WEhR3Xw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_D-lH8dYBEeuF_d0WEhR3Xw" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D-lH8tYBEeuF_d0WEhR3Xw" x="48" y="1128" width="147" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_IwsqwNYPEeuF_d0WEhR3Xw" type="2003" element="_IwJ4MNYPEeuF_d0WEhR3Xw">
+          <children xmi:type="notation:Node" xmi:id="_IwtR0NYPEeuF_d0WEhR3Xw" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_IwtR0dYPEeuF_d0WEhR3Xw" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_IwtR0tYPEeuF_d0WEhR3Xw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_IwtR09YPEeuF_d0WEhR3Xw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_IwsqwdYPEeuF_d0WEhR3Xw" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IwsqwtYPEeuF_d0WEhR3Xw" x="1117" y="1607" width="159" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_M6O-0NbGEeuymriYTNxK2g" type="2003" element="_M58q8NbGEeuymriYTNxK2g">
+          <children xmi:type="notation:Node" xmi:id="_M6Pl4NbGEeuymriYTNxK2g" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_M6Pl4dbGEeuymriYTNxK2g" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_M6Pl4tbGEeuymriYTNxK2g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_M6Pl49bGEeuymriYTNxK2g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_M6O-0dbGEeuymriYTNxK2g" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M6O-0tbGEeuymriYTNxK2g" x="903" y="720" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_Kw-vINbNEeuymriYTNxK2g" type="2003" element="_KwtCUNbNEeuymriYTNxK2g">
+          <children xmi:type="notation:Node" xmi:id="_Kw_WMNbNEeuymriYTNxK2g" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_Kw_WMdbNEeuymriYTNxK2g" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Kw_WMtbNEeuymriYTNxK2g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Kw_WM9bNEeuymriYTNxK2g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_Kw-vIdbNEeuymriYTNxK2g" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Kw-vItbNEeuymriYTNxK2g" x="1137" y="180" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_IsM5ENd_EeufiOvRR5sVhg" type="2003" element="_IrcrINd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_IsRxkNd_EeufiOvRR5sVhg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_IsRxkdd_EeufiOvRR5sVhg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_IsRxktd_EeufiOvRR5sVhg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_IsRxk9d_EeufiOvRR5sVhg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_IsM5Edd_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IsM5Etd_EeufiOvRR5sVhg" x="2284" y="1607" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_KdsE0Nd_EeufiOvRR5sVhg" type="2003" element="_KdTqUNd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_Kdsr4Nd_EeufiOvRR5sVhg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_Kdsr4dd_EeufiOvRR5sVhg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_bremgNd_EeufiOvRR5sVhg" type="3010" element="_brB6kNd_EeufiOvRR5sVhg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_bremgdd_EeufiOvRR5sVhg" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_bremgtd_EeufiOvRR5sVhg"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Kdsr4td_EeufiOvRR5sVhg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Kdsr49d_EeufiOvRR5sVhg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_KdsE0dd_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KdsE0td_EeufiOvRR5sVhg" x="2140" y="1751" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_MAkM0Nd_EeufiOvRR5sVhg" type="2003" element="_MARR4Nd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_MAkM09d_EeufiOvRR5sVhg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_MAkM1Nd_EeufiOvRR5sVhg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_exbq0Nd_EeufiOvRR5sVhg" type="3010" element="_exQEoNd_EeufiOvRR5sVhg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_exbq0dd_EeufiOvRR5sVhg" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_exbq0td_EeufiOvRR5sVhg"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_MAkM1dd_EeufiOvRR5sVhg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_MAkM1td_EeufiOvRR5sVhg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_MAkM0dd_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MAkM0td_EeufiOvRR5sVhg" x="2284" y="1751" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_RwPFYNd_EeufiOvRR5sVhg" type="2003" element="_Rv9_oNd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_RwPFY9d_EeufiOvRR5sVhg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_RwPFZNd_EeufiOvRR5sVhg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_g44fgNd_EeufiOvRR5sVhg" type="3010" element="_g4rrMNd_EeufiOvRR5sVhg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_g44fgdd_EeufiOvRR5sVhg" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_g44fgtd_EeufiOvRR5sVhg"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_RwPFZdd_EeufiOvRR5sVhg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_RwPFZtd_EeufiOvRR5sVhg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_RwPFYdd_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RwPFYtd_EeufiOvRR5sVhg" x="2428" y="1751" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_mCh54Nd_EeufiOvRR5sVhg" type="2003" element="_mCSCQNd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_mCh549d_EeufiOvRR5sVhg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_mCig8Nd_EeufiOvRR5sVhg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_mCig8dd_EeufiOvRR5sVhg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_mCig8td_EeufiOvRR5sVhg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_mCh54dd_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mCh54td_EeufiOvRR5sVhg" x="1375" y="1607" width="135" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_rwMAQNd_EeufiOvRR5sVhg" type="2003" element="_rwC2UNd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_rwMAQ9d_EeufiOvRR5sVhg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_rwMARNd_EeufiOvRR5sVhg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_rwMARdd_EeufiOvRR5sVhg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_rwMARtd_EeufiOvRR5sVhg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_rwMAQdd_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rwMAQtd_EeufiOvRR5sVhg" x="1236" y="1452" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_OWhiINeAEeufiOvRR5sVhg" type="2003" element="_OWYYMNeAEeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_OWhiI9eAEeufiOvRR5sVhg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_OWhiJNeAEeufiOvRR5sVhg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_OWhiJdeAEeufiOvRR5sVhg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_OWhiJteAEeufiOvRR5sVhg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_OWhiIdeAEeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OWhiIteAEeufiOvRR5sVhg" x="2271" y="960" width="156" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_VikSENeAEeufiOvRR5sVhg" type="2003" element="_ViJbUNeAEeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_Vik5INeAEeufiOvRR5sVhg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_Vik5IdeAEeufiOvRR5sVhg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Vik5IteAEeufiOvRR5sVhg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Vik5I9eAEeufiOvRR5sVhg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_VikSEdeAEeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VikSEteAEeufiOvRR5sVhg" x="2155" y="708" width="135" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_dZlRoNeAEeufiOvRR5sVhg" type="2003" element="_dZVaANeAEeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_dZl4sNeAEeufiOvRR5sVhg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_dZl4sdeAEeufiOvRR5sVhg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_dZl4steAEeufiOvRR5sVhg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_dZl4s9eAEeufiOvRR5sVhg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_dZlRodeAEeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZlRoteAEeufiOvRR5sVhg" x="2038" y="960" width="188" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_9Tu6ENeAEeufiOvRR5sVhg" type="2003" element="_9TjT4NeAEeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_9Tu6E9eAEeufiOvRR5sVhg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_9Tu6FNeAEeufiOvRR5sVhg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_9Tu6FdeAEeufiOvRR5sVhg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_9Tu6FteAEeufiOvRR5sVhg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_9Tu6EdeAEeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Tu6EteAEeufiOvRR5sVhg" x="2384" y="527" width="144" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_pdJrwAGyEey7cfH5K6RyCw" type="2003" element="_pcXBkAGyEey7cfH5K6RyCw">
+          <children xmi:type="notation:Node" xmi:id="_pdOkQAGyEey7cfH5K6RyCw" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_pdOkQQGyEey7cfH5K6RyCw" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_pdOkQgGyEey7cfH5K6RyCw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_pdOkQwGyEey7cfH5K6RyCw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_pdJrwQGyEey7cfH5K6RyCw" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pdJrwgGyEey7cfH5K6RyCw" x="132" y="528" width="147" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_SNlYYAGzEey7cfH5K6RyCw" type="2003" element="_SNSdcAGzEey7cfH5K6RyCw">
+          <children xmi:type="notation:Node" xmi:id="_SNlYYwGzEey7cfH5K6RyCw" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_SNlYZAGzEey7cfH5K6RyCw" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_SNlYZQGzEey7cfH5K6RyCw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_SNlYZgGzEey7cfH5K6RyCw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_SNlYYQGzEey7cfH5K6RyCw" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SNlYYgGzEey7cfH5K6RyCw" x="2127" y="840" width="180" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_A9YrQCrZEeyyC-O0_LlY9w" type="2003" element="_A8hIkCrZEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_A9c8sCrZEeyyC-O0_LlY9w" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_A9eK0CrZEeyyC-O0_LlY9w" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_A9eK0SrZEeyyC-O0_LlY9w"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_A9eK0irZEeyyC-O0_LlY9w"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_A9YrQSrZEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A9YrQirZEeyyC-O0_LlY9w" x="1610" y="534" width="148" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_N0FQ4CrZEeyyC-O0_LlY9w" type="2003" element="_NzpMACrZEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_N0F38CrZEeyyC-O0_LlY9w" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_N0F38SrZEeyyC-O0_LlY9w" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_H_UDoCreEeyyC-O0_LlY9w" type="3010" element="_H_EMACreEeyyC-O0_LlY9w">
+              <styles xmi:type="notation:FontStyle" xmi:id="_H_UDoSreEeyyC-O0_LlY9w" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_H_UDoireEeyyC-O0_LlY9w"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_N0F38irZEeyyC-O0_LlY9w"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_N0F38yrZEeyyC-O0_LlY9w"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_N0FQ4SrZEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N0FQ4irZEeyyC-O0_LlY9w" x="1820" y="720" width="132" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_jzknACrZEeyyC-O0_LlY9w" type="2003" element="_jzRFACrZEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_jzknAyrZEeyyC-O0_LlY9w" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_jzknBCrZEeyyC-O0_LlY9w" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_jzknBSrZEeyyC-O0_LlY9w"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_jzknBirZEeyyC-O0_LlY9w"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_jzknASrZEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jzknAirZEeyyC-O0_LlY9w" x="1820" y="960" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_re7JICrZEeyyC-O0_LlY9w" type="2003" element="_remZACrZEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_re7JIyrZEeyyC-O0_LlY9w" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_re7JJCrZEeyyC-O0_LlY9w" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_re7JJSrZEeyyC-O0_LlY9w"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_re7JJirZEeyyC-O0_LlY9w"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_re7JISrZEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_re7JIirZEeyyC-O0_LlY9w" x="1820" y="1284" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_3aLaMCrZEeyyC-O0_LlY9w" type="2003" element="_3Z67gCrZEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_3aLaMyrZEeyyC-O0_LlY9w" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_3aLaNCrZEeyyC-O0_LlY9w" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_cSv_0CtbEeySS4mYSornnA" type="3010" element="_cSL_ICtbEeySS4mYSornnA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_cSv_0StbEeySS4mYSornnA" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_cSv_0itbEeySS4mYSornnA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_e2dSsCtbEeySS4mYSornnA" type="3010" element="_e16gICtbEeySS4mYSornnA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_e2dSsStbEeySS4mYSornnA" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_e2dSsitbEeySS4mYSornnA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_3aLaNSrZEeyyC-O0_LlY9w"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_3aLaNirZEeyyC-O0_LlY9w"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_3aLaMSrZEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3aLaMirZEeyyC-O0_LlY9w" x="1795" y="1452" width="135" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_9mWokCrZEeyyC-O0_LlY9w" type="2003" element="_9mHYACrZEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_9mXPoCrZEeyyC-O0_LlY9w" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_9mXPoSrZEeyyC-O0_LlY9w" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_9mXPoirZEeyyC-O0_LlY9w"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_9mXPoyrZEeyyC-O0_LlY9w"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_9mWokSrZEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9mWokirZEeyyC-O0_LlY9w" x="1965" y="1452" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_Av5zcCraEeyyC-O0_LlY9w" type="2003" element="_AvrxACraEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_Av5zcyraEeyyC-O0_LlY9w" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_Av6agCraEeyyC-O0_LlY9w" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Av6agSraEeyyC-O0_LlY9w"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Av6agiraEeyyC-O0_LlY9w"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_Av5zcSraEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Av5zciraEeyyC-O0_LlY9w" x="2119" y="1452" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_FmJJoCraEeyyC-O0_LlY9w" type="2003" element="_Fl5SACraEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_FmJJoyraEeyyC-O0_LlY9w" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_FmJwsCraEeyyC-O0_LlY9w" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_FmJwsSraEeyyC-O0_LlY9w"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_FmJwsiraEeyyC-O0_LlY9w"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_FmJJoSraEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FmJJoiraEeyyC-O0_LlY9w" x="2315" y="1452" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_XLYiACraEeyyC-O0_LlY9w" type="2003" element="_XLJ4gCraEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_XLYiAyraEeyyC-O0_LlY9w" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_XLYiBCraEeyyC-O0_LlY9w" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_XLYiBSraEeyyC-O0_LlY9w"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_XLYiBiraEeyyC-O0_LlY9w"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_XLYiASraEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XLYiAiraEeyyC-O0_LlY9w" x="1470" y="1284" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_jjhjYCraEeyyC-O0_LlY9w" type="2003" element="_jjUIACraEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_jjiKcCraEeyyC-O0_LlY9w" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_jjiKcSraEeyyC-O0_LlY9w" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_z_SVwCrbEeyyC-O0_LlY9w" type="3010" element="_z_B3ECrbEeyyC-O0_LlY9w">
+              <styles xmi:type="notation:FontStyle" xmi:id="_z_SVwSrbEeyyC-O0_LlY9w" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_z_SVwirbEeyyC-O0_LlY9w"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_jjiKciraEeyyC-O0_LlY9w"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_jjiKcyraEeyyC-O0_LlY9w"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_jjhjYSraEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jjhjYiraEeyyC-O0_LlY9w" x="1397" y="1452" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_q-1B4CrbEeyyC-O0_LlY9w" type="2003" element="_q-nmgCrbEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_q-1B4yrbEeyyC-O0_LlY9w" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_q-1o8CrbEeyyC-O0_LlY9w" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_GMAVsCtcEeySS4mYSornnA" type="3010" element="_GLYqoCtcEeySS4mYSornnA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_GMAVsStcEeySS4mYSornnA" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_GMAVsitcEeySS4mYSornnA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_q-1o8SrbEeyyC-O0_LlY9w"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_q-1o8irbEeyyC-O0_LlY9w"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_q-1B4SrbEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q-1B4irbEeyyC-O0_LlY9w" x="1855" y="1751" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_LPNZACrcEeyyC-O0_LlY9w" type="2003" element="_LO_WkCrcEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_LPNZAyrcEeyyC-O0_LlY9w" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_LPNZBCrcEeyyC-O0_LlY9w" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_M8-iYCrcEeyyC-O0_LlY9w" type="3010" element="_M8yVICrcEeyyC-O0_LlY9w">
+              <styles xmi:type="notation:FontStyle" xmi:id="_M8-iYSrcEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_M8-iYircEeyyC-O0_LlY9w"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_OHgb0CrcEeyyC-O0_LlY9w" type="3010" element="_OHUOkCrcEeyyC-O0_LlY9w">
+              <styles xmi:type="notation:FontStyle" xmi:id="_OHgb0SrcEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_OHgb0ircEeyyC-O0_LlY9w"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_LPNZBSrcEeyyC-O0_LlY9w"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_LPNZBircEeyyC-O0_LlY9w"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_LPNZASrcEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LPNZAircEeyyC-O0_LlY9w" x="2090" y="180" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_PSiEgCrcEeyyC-O0_LlY9w" type="2003" element="_PSV3QCrcEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_PSiEgyrcEeyyC-O0_LlY9w" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_PSiEhCrcEeyyC-O0_LlY9w" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_QZiv4CrcEeyyC-O0_LlY9w" type="3010" element="_QZVUgCrcEeyyC-O0_LlY9w">
+              <styles xmi:type="notation:FontStyle" xmi:id="_QZiv4SrcEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_QZiv4ircEeyyC-O0_LlY9w"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_PSiEhSrcEeyyC-O0_LlY9w"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_PSiEhircEeyyC-O0_LlY9w"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_PSiEgSrcEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSiEgircEeyyC-O0_LlY9w" x="2260" y="180" width="120" height="100"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_CsZB8qA4EeuqkpDnuik1sg"/>
+        <edges xmi:type="notation:Edge" xmi:id="_ODhSQKA4EeuqkpDnuik1sg" type="4001" element="_ODPlcKA4EeuqkpDnuik1sg" source="_JT0o8KA4EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_ODhSRKA4EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ODhSRaA4EeuqkpDnuik1sg" x="-36" y="-6"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ODh5UKA4EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ODh5UaA4EeuqkpDnuik1sg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ODh5UqA4EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ODh5U6A4EeuqkpDnuik1sg" x="22" y="4"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_ODhSQaA4EeuqkpDnuik1sg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_ODhSQqA4EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ODhSQ6A4EeuqkpDnuik1sg" points="[0, 0, 48, 143]$[0, -24, 48, 119]$[-47, -24, 1, 119]$[-47, -94, 1, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ODh5VKA4EeuqkpDnuik1sg" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ODh5VaA4EeuqkpDnuik1sg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_gR35EKA4EeuqkpDnuik1sg" type="4001" element="_gRoBcKA4EeuqkpDnuik1sg" source="_c-HCQKA4EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_gR4gIKA4EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gR4gIaA4EeuqkpDnuik1sg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_gR4gIqA4EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gR4gI6A4EeuqkpDnuik1sg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_gR4gJKA4EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gR4gJaA4EeuqkpDnuik1sg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_gR35EaA4EeuqkpDnuik1sg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_gR35EqA4EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gR35E6A4EeuqkpDnuik1sg" points="[0, 0, -36, 334]$[36, -334, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gR5HMKA4EeuqkpDnuik1sg" id="(0.3310344827586207,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gR5HMaA4EeuqkpDnuik1sg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_jlBE0KA4EeuqkpDnuik1sg" type="4001" element="_jk6-PKA4EeuqkpDnuik1sg" source="_JT0o8KA4EeuqkpDnuik1sg" target="_c-HCQKA4EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_jlBE1KA4EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jlBE1aA4EeuqkpDnuik1sg" x="-76" y="-14"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_jlBE1qA4EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jlBE16A4EeuqkpDnuik1sg" x="4" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_jlBE2KA4EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jlBE2aA4EeuqkpDnuik1sg" x="-4" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_jlBE0aA4EeuqkpDnuik1sg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_jlBE0qA4EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jlBE06A4EeuqkpDnuik1sg" points="[-24, 0, 35, -142]$[-24, 58, 35, -84]$[-59, 58, 0, -84]$[-59, 142, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jlBr4KA4EeuqkpDnuik1sg" id="(0.4067796610169492,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jlBr4aA4EeuqkpDnuik1sg" id="(0.503448275862069,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_0V8EUKA4EeuqkpDnuik1sg" type="4001" element="_0V3L1qA4EeuqkpDnuik1sg" source="_c-HCQKA4EeuqkpDnuik1sg" target="_c-HCQKA4EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_0V8rYKA4EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0V8rYaA4EeuqkpDnuik1sg" x="30" y="11"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_0V8rYqA4EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0V8rY6A4EeuqkpDnuik1sg" x="-8" y="2"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_0V8rZKA4EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0V8rZaA4EeuqkpDnuik1sg" x="9" y="3"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_0V8EUaA4EeuqkpDnuik1sg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_0V8EUqA4EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0V8EU6A4EeuqkpDnuik1sg" points="[0, 60, 145, 60]$[40, 60, 185, 60]$[40, 126, 185, 126]$[-73, 126, 72, 126]$[-73, 86, 72, 86]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0V8rZqA4EeuqkpDnuik1sg" id="(1.0,0.12244897959183673)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0V8rZ6A4EeuqkpDnuik1sg" id="(0.0,0.12244897959183673)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_XWh5QKA5EeuqkpDnuik1sg" type="4001" element="_XWbypqA5EeuqkpDnuik1sg" source="_EfWNUKA4EeuqkpDnuik1sg" target="_RzZA0KA5EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_XWh5RKA5EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XWh5RaA5EeuqkpDnuik1sg" x="-4" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_XWh5RqA5EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XWh5R6A5EeuqkpDnuik1sg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_XWh5SKA5EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XWh5SaA5EeuqkpDnuik1sg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_XWh5QaA5EeuqkpDnuik1sg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_XWh5QqA5EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XWh5Q6A5EeuqkpDnuik1sg" points="[0, 0, -11, 95]$[0, -24, -11, 71]$[12, -24, 1, 71]$[12, -46, 1, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XWigUKA5EeuqkpDnuik1sg" id="(0.2288135593220339,0.030612244897959183)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XWigUaA5EeuqkpDnuik1sg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_rUvUIKA5EeuqkpDnuik1sg" type="4001" element="_rUgDkKA5EeuqkpDnuik1sg" source="_fit3kKA5EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_rUvUJKA5EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rUvUJaA5EeuqkpDnuik1sg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_rUvUJqA5EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rUvUJ6A5EeuqkpDnuik1sg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_rUvUKKA5EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rUvUKaA5EeuqkpDnuik1sg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_rUvUIaA5EeuqkpDnuik1sg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_rUvUIqA5EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rUvUI6A5EeuqkpDnuik1sg" points="[0, 0, 278, 180]$[-278, -180, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rUv7MKA5EeuqkpDnuik1sg" id="(0.41882771042183686,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rUv7MaA5EeuqkpDnuik1sg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_onzXUKA6EeuqkpDnuik1sg" type="4001" element="_oni4rKA6EeuqkpDnuik1sg" source="_QKLK0KA6EeuqkpDnuik1sg" target="_jP6FkKA6EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_onz-YKA6EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_onz-YaA6EeuqkpDnuik1sg" x="-21" y="23"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_on0lcKA6EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_on0lcaA6EeuqkpDnuik1sg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_on0lcqA6EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_on0lc6A6EeuqkpDnuik1sg" x="-55" y="-7"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_onzXUaA6EeuqkpDnuik1sg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_onzXUqA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_onzXU6A6EeuqkpDnuik1sg" points="[0, 0, -23, 191]$[0, -72, -23, 119]$[24, -72, 1, 119]$[24, -142, 1, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_on1MgKA6EeuqkpDnuik1sg" id="(0.2033898305084746,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_on1MgaA6EeuqkpDnuik1sg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_BWCysKA7EeuqkpDnuik1sg" type="4001" element="_BVyUAKA7EeuqkpDnuik1sg" source="_-O-UEKA6EeuqkpDnuik1sg" target="_jP6FkKA6EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_BWCytKA7EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BWCytaA7EeuqkpDnuik1sg" x="-107" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_BWCytqA7EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BWCyt6A7EeuqkpDnuik1sg" x="-46" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_BWCyuKA7EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BWCyuaA7EeuqkpDnuik1sg" x="-95" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_BWCysaA7EeuqkpDnuik1sg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_BWCysqA7EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BWCys6A7EeuqkpDnuik1sg" points="[0, 0, 397, 983]$[0, -877, 397, 106]$[-396, -877, 1, 106]$[-396, -934, 1, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BWDZwKA7EeuqkpDnuik1sg" id="(0.3050847457627119,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BWDZwaA7EeuqkpDnuik1sg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_SyzkgKA7EeuqkpDnuik1sg" type="4001" element="_SykT9qA7EeuqkpDnuik1sg" source="_sdPX0KA6EeuqkpDnuik1sg" target="_4k5GIKA6EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_SyzkhKA7EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SyzkhaA7EeuqkpDnuik1sg" x="6" y="-45"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_SyzkhqA7EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Syzkh6A7EeuqkpDnuik1sg" x="52" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_SyzkiKA7EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SyzkiaA7EeuqkpDnuik1sg" x="4"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_SyzkgaA7EeuqkpDnuik1sg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_SyzkgqA7EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Syzkg6A7EeuqkpDnuik1sg" points="[-34, 0, 46, -70]$[-34, 70, 46, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Sy0LkKA7EeuqkpDnuik1sg" id="(0.6101694915254238,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Sy0LkaA7EeuqkpDnuik1sg" id="(0.4067796610169492,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_vWH0AKA7EeuqkpDnuik1sg" type="4001" element="_vWBGaKA7EeuqkpDnuik1sg" source="_sdPX0KA6EeuqkpDnuik1sg" target="_rRhWIKA7EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_vWH0BKA7EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vWH0BaA7EeuqkpDnuik1sg" x="-13" y="96"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_vWH0BqA7EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vWH0B6A7EeuqkpDnuik1sg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_vWH0CKA7EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vWH0CaA7EeuqkpDnuik1sg" x="66" y="-47"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_vWH0AaA7EeuqkpDnuik1sg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_vWH0AqA7EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vWH0A6A7EeuqkpDnuik1sg" points="[0, -10, -215, 191]$[0, -125, -215, 76]$[185, -125, -30, 76]$[185, -152, -30, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vWIbEKA7EeuqkpDnuik1sg" id="(0.5169491525423728,0.10204081632653061)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vWIbEaA7EeuqkpDnuik1sg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_yCqSwKA7EeuqkpDnuik1sg" type="4001" element="_yCjlHKA7EeuqkpDnuik1sg" source="_V6pfMKA7EeuqkpDnuik1sg" target="_rRhWIKA7EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_yCqSxKA7EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yCqSxaA7EeuqkpDnuik1sg" x="114" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_yCqSxqA7EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yCqSx6A7EeuqkpDnuik1sg" x="34" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_yCqSyKA7EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yCqSyaA7EeuqkpDnuik1sg" x="-59" y="-15"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_yCqSwaA7EeuqkpDnuik1sg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_yCqSwqA7EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yCqSw6A7EeuqkpDnuik1sg" points="[-1, -5, -56, 683]$[-1, -527, -56, 161]$[25, -527, -30, 161]$[25, -639, -30, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yCqSyqA7EeuqkpDnuik1sg" id="(0.7288135593220338,0.030612244897959183)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yCqSy6A7EeuqkpDnuik1sg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_0U2-4KA7EeuqkpDnuik1sg" type="4001" element="_0UtN5qA7EeuqkpDnuik1sg" source="_rRhWIKA7EeuqkpDnuik1sg" target="_-O-UEKA6EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_0U3l8KA7EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0U3l8aA7EeuqkpDnuik1sg" x="-438" y="-60"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_0U3l8qA7EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0U3l86A7EeuqkpDnuik1sg" x="-119" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_0U3l9KA7EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0U3l9aA7EeuqkpDnuik1sg" x="-673" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_0U2-4aA7EeuqkpDnuik1sg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_0U2-4qA7EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0U2-46A7EeuqkpDnuik1sg" points="[-1, 0, -23, -934]$[-1, 934, -23, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0U3l9qA7EeuqkpDnuik1sg" id="(0.696551724137931,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0U3l96A7EeuqkpDnuik1sg" id="(0.7372881355932204,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_D9xNcKA8EeuqkpDnuik1sg" type="4001" element="_D9lnQKA8EeuqkpDnuik1sg" source="_6KEUMKA6EeuqkpDnuik1sg" target="_4k5GIKA6EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_D9x0gKA8EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D9x0gaA8EeuqkpDnuik1sg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_D9x0gqA8EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D9x0g6A8EeuqkpDnuik1sg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_D9x0hKA8EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D9x0haA8EeuqkpDnuik1sg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_D9xNcaA8EeuqkpDnuik1sg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_D9xNcqA8EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_D9xNc6A8EeuqkpDnuik1sg" points="[0, -2, -128, 156]$[0, -42, -128, 116]$[137, -42, 9, 116]$[137, -60, 9, 98]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D9x0hqA8EeuqkpDnuik1sg" id="(0.4915254237288136,0.08163265306122448)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D9x0h6A8EeuqkpDnuik1sg" id="(0.4067796610169492,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_Vj1sQKA8EeuqkpDnuik1sg" type="4001" element="_VjwMzqA8EeuqkpDnuik1sg" source="_6KEUMKA6EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_Vj1sRKA8EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vj1sRaA8EeuqkpDnuik1sg" x="-42" y="526"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Vj1sRqA8EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vj1sR6A8EeuqkpDnuik1sg" x="174" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Vj1sSKA8EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vj1sSaA8EeuqkpDnuik1sg" x="-51" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_Vj1sQaA8EeuqkpDnuik1sg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_Vj1sQqA8EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Vj1sQ6A8EeuqkpDnuik1sg" points="[-48, 24, 553, 682]$[-720, 24, -119, 682]$[-720, -708, -119, -50]$[-660, -708, -59, -50]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Vj1sSqA8EeuqkpDnuik1sg" id="(0.4067796610169492,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Vj1sS6A8EeuqkpDnuik1sg" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_w-zMkKA8EeuqkpDnuik1sg" type="4001" element="_w-iG36A8EeuqkpDnuik1sg" source="_p9wywKA8EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_w-zMlKA8EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zMlaA8EeuqkpDnuik1sg" x="-564" y="-83"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_w-zzoKA8EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zzoaA8EeuqkpDnuik1sg" x="554" y="79"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_w-zzoqA8EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zzo6A8EeuqkpDnuik1sg" x="-230" y="72"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_w-zMkaA8EeuqkpDnuik1sg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_w-zMkqA8EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w-zMk6A8EeuqkpDnuik1sg" points="[0, 6, 1421, 6]$[-379, 6, 1042, 6]$[-379, -63, 1042, -63]$[-1034, -63, 387, -63]$[-1034, -1, 387, -1]$[-1421, -1, 0, -1]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w-zzpKA8EeuqkpDnuik1sg" id="(0.0,0.44954128440366975)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w-zzpaA8EeuqkpDnuik1sg" id="(1.0,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_4eaYwKA8EeuqkpDnuik1sg" type="4001" element="_4eU5TqA8EeuqkpDnuik1sg" source="_D1D6MKA4EeuqkpDnuik1sg" target="_xsq_MKA8EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_4ea_06A8EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ea_1KA8EeuqkpDnuik1sg" x="-36" y="-17"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_4ea_1aA8EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ea_1qA8EeuqkpDnuik1sg" x="8" y="-14"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_4ea_16A8EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ea_2KA8EeuqkpDnuik1sg" x="-124" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_4ea_0KA8EeuqkpDnuik1sg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_4ea_0aA8EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4ea_0qA8EeuqkpDnuik1sg" points="[-21, 50, -159, -58]$[-34, 84, -172, -24]$[137, 84, -1, -24]$[137, 107, -1, -1]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4ea_2aA8EeuqkpDnuik1sg" id="(1.0,0.4897959183673469)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4ea_2qA8EeuqkpDnuik1sg" id="(0.3389830508474576,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_hU_wsKA9EeuqkpDnuik1sg" type="4001" element="_hU64ZqA9EeuqkpDnuik1sg" source="_D1D6MKA4EeuqkpDnuik1sg" target="_e73WIKA9EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_hU_wtKA9EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hU_wtaA9EeuqkpDnuik1sg" x="-12" y="64"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_hU_wtqA9EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hU_wt6A9EeuqkpDnuik1sg" x="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_hU_wuKA9EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hU_wuaA9EeuqkpDnuik1sg" x="-10" y="9"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_hU_wsaA9EeuqkpDnuik1sg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_hU_wsqA9EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hU_ws6A9EeuqkpDnuik1sg" points="[0, 0, 0, -58]$[0, 58, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hU_wuqA9EeuqkpDnuik1sg" id="(0.5,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hU_wu6A9EeuqkpDnuik1sg" id="(0.5,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_mQXegKA9EeuqkpDnuik1sg" type="4001" element="_mQFKsqA9EeuqkpDnuik1sg" source="_p9wywKA8EeuqkpDnuik1sg" target="_e73WIKA9EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_mQYFkKA9EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQYFkaA9EeuqkpDnuik1sg" x="-88" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_mQYFkqA9EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQYFk6A9EeuqkpDnuik1sg" x="-88" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_mQYFlKA9EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQYFlaA9EeuqkpDnuik1sg" x="-88" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_mQXegaA9EeuqkpDnuik1sg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_mQXegqA9EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mQXeg6A9EeuqkpDnuik1sg" points="[0, -4, 1313, 142]$[0, -51, 1313, 95]$[-1312, -51, 1, 95]$[-1312, -97, 1, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQYFlqA9EeuqkpDnuik1sg" id="(0.4745762711864407,0.03669724770642201)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQYFl6A9EeuqkpDnuik1sg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_pldLAKA9EeuqkpDnuik1sg" type="4001" element="_plK3JqA9EeuqkpDnuik1sg" source="_JT0o8KA4EeuqkpDnuik1sg" target="_e73WIKA9EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_pldLBKA9EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pldLBaA9EeuqkpDnuik1sg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_pldLBqA9EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pldLB6A9EeuqkpDnuik1sg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_pldyEKA9EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pldyEaA9EeuqkpDnuik1sg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_pldLAaA9EeuqkpDnuik1sg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_pldLAqA9EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pldLA6A9EeuqkpDnuik1sg" points="[0, 0, -84, 286]$[84, -286, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pldyEqA9EeuqkpDnuik1sg" id="(0.8389830508474576,0.02040816326530612)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pldyE6A9EeuqkpDnuik1sg" id="(0.5,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_vd7aQKA9EeuqkpDnuik1sg" type="4001" element="_vdptgqA9EeuqkpDnuik1sg" source="_QUDYMKA9EeuqkpDnuik1sg" target="_e73WIKA9EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_vd8BUKA9EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vd8BUaA9EeuqkpDnuik1sg" x="-28" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_vd8BUqA9EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vd8BU6A9EeuqkpDnuik1sg" x="-28" y="6"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_vd8BVKA9EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vd8BVaA9EeuqkpDnuik1sg" x="-28" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_vd7aQaA9EeuqkpDnuik1sg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_vd7aQqA9EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vd7aQ6A9EeuqkpDnuik1sg" points="[0, -3, -476, 192]$[0, -51, -476, 144]$[477, -51, 1, 144]$[477, -97, 1, 98]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vd8BVqA9EeuqkpDnuik1sg" id="(0.4322033898305085,0.030612244897959183)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vd8BV6A9EeuqkpDnuik1sg" id="(0.5,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_2ko-QKA9EeuqkpDnuik1sg" type="4001" element="_2kWqbKA9EeuqkpDnuik1sg" source="_zaq8oKA9EeuqkpDnuik1sg" target="_JT0o8KA4EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_2ko-RKA9EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2ko-RaA9EeuqkpDnuik1sg" x="-53" y="-17"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_2ko-RqA9EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2ko-R6A9EeuqkpDnuik1sg" x="21" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_2ko-SKA9EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2ko-SaA9EeuqkpDnuik1sg" x="3" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_2ko-QaA9EeuqkpDnuik1sg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_2ko-QqA9EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2ko-Q6A9EeuqkpDnuik1sg" points="[0, 36, -218, 36]$[218, 36, 0, 36]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2ko-SqA9EeuqkpDnuik1sg" id="(1.0,0.24742268041237114)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2ko-S6A9EeuqkpDnuik1sg" id="(0.0,0.24489795918367346)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_F27ckKA-EeuqkpDnuik1sg" type="4001" element="_F2vPU6A-EeuqkpDnuik1sg" source="_QUDYMKA9EeuqkpDnuik1sg" target="_zaq8oKA9EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_F28DoKA-EeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F28DoaA-EeuqkpDnuik1sg" x="-6" y="-56"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_F28DoqA-EeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F28Do6A-EeuqkpDnuik1sg" x="-2" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_F28DpKA-EeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F28DpaA-EeuqkpDnuik1sg" x="-10" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_F27ckaA-EeuqkpDnuik1sg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_F27ckqA-EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_F27ck6A-EeuqkpDnuik1sg" points="[0, 0, 0, -94]$[0, 94, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_F28DpqA-EeuqkpDnuik1sg" id="(0.5,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_F28Dp6A-EeuqkpDnuik1sg" id="(0.5,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_c_hu0KBJEeuqkpDnuik1sg" type="4001" element="_c_boQqBJEeuqkpDnuik1sg" source="_Tx6IsKBJEeuqkpDnuik1sg" target="_Ren3cKBJEeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_c_hu1KBJEeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c_hu1aBJEeuqkpDnuik1sg" x="-16" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c_hu1qBJEeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c_hu16BJEeuqkpDnuik1sg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_c_hu2KBJEeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c_hu2aBJEeuqkpDnuik1sg" x="-17" y="-9"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_c_hu0aBJEeuqkpDnuik1sg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_c_hu0qBJEeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_c_hu06BJEeuqkpDnuik1sg" points="[0, 0, -108, 119]$[0, -36, -108, 83]$[109, -36, 1, 83]$[109, -70, 1, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c_hu2qBJEeuqkpDnuik1sg" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c_hu26BJEeuqkpDnuik1sg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_doLqQKBJEeuqkpDnuik1sg" type="4001" element="_dn26MqBJEeuqkpDnuik1sg" source="_aPNjUKBJEeuqkpDnuik1sg" target="_Ren3cKBJEeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_doLqRKBJEeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_doLqRaBJEeuqkpDnuik1sg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_doLqRqBJEeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_doLqR6BJEeuqkpDnuik1sg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_doLqSKBJEeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_doLqSaBJEeuqkpDnuik1sg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_doLqQaBJEeuqkpDnuik1sg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_doLqQqBJEeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_doLqQ6BJEeuqkpDnuik1sg" points="[0, 0, 108, 70]$[-108, -70, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_doLqSqBJEeuqkpDnuik1sg" id="(0.711864406779661,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_doLqS6BJEeuqkpDnuik1sg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_n5uykKBJEeuqkpDnuik1sg" type="4001" element="_n5fiHqBJEeuqkpDnuik1sg" source="_zaq8oKA9EeuqkpDnuik1sg" target="_Ren3cKBJEeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_n5uylKBJEeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n5uylaBJEeuqkpDnuik1sg" x="-5" y="-55"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_n5uylqBJEeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n5uyl6BJEeuqkpDnuik1sg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_n5uymKBJEeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n5uymaBJEeuqkpDnuik1sg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_n5uykaBJEeuqkpDnuik1sg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_n5uykqBJEeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_n5uyk6BJEeuqkpDnuik1sg" points="[0, 0, 0, -143]$[0, 143, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n5uymqBJEeuqkpDnuik1sg" id="(0.4067796610169492,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n5uym6BJEeuqkpDnuik1sg" id="(0.4067796610169492,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_p1cRUKBJEeuqkpDnuik1sg" type="4001" element="_p1JWcqBJEeuqkpDnuik1sg" source="_c-HCQKA4EeuqkpDnuik1sg" target="_Ren3cKBJEeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_p1c4YKBJEeuqkpDnuik1sg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p1c4YaBJEeuqkpDnuik1sg" x="10" y="-21"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_p1c4YqBJEeuqkpDnuik1sg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p1c4Y6BJEeuqkpDnuik1sg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_p1c4ZKBJEeuqkpDnuik1sg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p1c4ZaBJEeuqkpDnuik1sg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_p1cRUaBJEeuqkpDnuik1sg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_p1cRUqBJEeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_p1cRU6BJEeuqkpDnuik1sg" points="[0, -10, 134, -10]$[-134, -10, 0, -10]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_p1c4ZqBJEeuqkpDnuik1sg" id="(0.0,0.5918367346938775)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_p1c4Z6BJEeuqkpDnuik1sg" id="(1.0,0.5918367346938775)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_m_tfgNXtEeuF_d0WEhR3Xw" type="4001" element="_m-6OTNXtEeuF_d0WEhR3Xw" source="_D1D6MKA4EeuqkpDnuik1sg" target="_RzZA0KA5EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_m_wi0NXtEeuF_d0WEhR3Xw" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m_wi0dXtEeuF_d0WEhR3Xw" x="73" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_m_xJ4NXtEeuF_d0WEhR3Xw" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m_xJ4dXtEeuF_d0WEhR3Xw" x="-5" y="-9"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_m_xw8NXtEeuF_d0WEhR3Xw" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m_xw8dXtEeuF_d0WEhR3Xw" x="-4" y="24"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_m_tfgdXtEeuF_d0WEhR3Xw" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_m_tfgtXtEeuF_d0WEhR3Xw" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_m_tfg9XtEeuF_d0WEhR3Xw" points="[0, 0, 205, 107]$[0, -24, 205, 83]$[-204, -24, 1, 83]$[-204, -58, 1, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m_00QNXtEeuF_d0WEhR3Xw" id="(0.711864406779661,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m_00QdXtEeuF_d0WEhR3Xw" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_HUhwENYBEeuF_d0WEhR3Xw" type="4001" element="_HUJ8o9YBEeuF_d0WEhR3Xw" source="_D-lH8NYBEeuF_d0WEhR3Xw" target="_Ren3cKBJEeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_HUhwFNYBEeuF_d0WEhR3Xw" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HUhwFdYBEeuF_d0WEhR3Xw" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_HUhwFtYBEeuF_d0WEhR3Xw" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HUhwF9YBEeuF_d0WEhR3Xw" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_HUhwGNYBEeuF_d0WEhR3Xw" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HUhwGdYBEeuF_d0WEhR3Xw" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_HUhwEdYBEeuF_d0WEhR3Xw" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_HUhwEtYBEeuF_d0WEhR3Xw" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HUhwE9YBEeuF_d0WEhR3Xw" points="[0, 0, -228, 144]$[228, -144, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HUhwGtYBEeuF_d0WEhR3Xw" id="(0.41379310344827586,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HUhwG9YBEeuF_d0WEhR3Xw" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_byTTcNYPEeuF_d0WEhR3Xw" type="4001" element="_bx-jYtYPEeuF_d0WEhR3Xw" source="_IwsqwNYPEeuF_d0WEhR3Xw" target="_-O-UEKA6EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_byTTdNYPEeuF_d0WEhR3Xw" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_byTTddYPEeuF_d0WEhR3Xw" x="25" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_byTTdtYPEeuF_d0WEhR3Xw" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_byTTd9YPEeuF_d0WEhR3Xw" x="12" y="-447"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_byTTeNYPEeuF_d0WEhR3Xw" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_byTTedYPEeuF_d0WEhR3Xw" x="8" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_byTTcdYPEeuF_d0WEhR3Xw" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_byTTctYPEeuF_d0WEhR3Xw" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_byTTc9YPEeuF_d0WEhR3Xw" points="[19, 98, -508, -145]$[19, 181, -508, -62]$[479, 181, -48, -62]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_byT6gNYPEeuF_d0WEhR3Xw" id="(0.3821656050955414,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_byT6gdYPEeuF_d0WEhR3Xw" id="(0.4067796610169492,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_-X6xcNawEeuymriYTNxK2g" type="4001" element="_-XLKltawEeuymriYTNxK2g" source="_JT0o8KA4EeuqkpDnuik1sg" target="_xsq_MKA8EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_-X_C4NawEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-X_C4dawEeuymriYTNxK2g" x="11" y="-334"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_-X_p8NawEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-X_p8dawEeuymriYTNxK2g" x="-6" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_-YARANawEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-YARAdawEeuymriYTNxK2g" x="-312" y="-166"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_-X6xcdawEeuymriYTNxK2g" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_-X6xctawEeuymriYTNxK2g" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-X6xc9awEeuymriYTNxK2g" points="[-58, 86, -288, 422]$[-58, 132, -288, 468]$[314, 132, 84, 468]$[314, -298, 84, 38]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-YCtQNawEeuymriYTNxK2g" id="(1.0,0.12244897959183673)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-YCtQdawEeuymriYTNxK2g" id="(0.0,0.6122448979591837)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_W89dcNbFEeuymriYTNxK2g" type="4001" element="_Z7FrQKA6EeuqkpDnuik1sg" source="_QKLK0KA6EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_W89ddNbFEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W89dddbFEeuymriYTNxK2g" x="-338" y="-67"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_W8-EgNbFEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W8-EgdbFEeuymriYTNxK2g" x="-22" y="3"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_W8-EgtbFEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W8-Eg9bFEeuymriYTNxK2g" x="29" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_W89dcdbFEeuymriYTNxK2g" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_W89dctbFEeuymriYTNxK2g" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_W89dc9bFEeuymriYTNxK2g" points="[-75, 50, 505, 414]$[-182, 50, 398, 414]$[-182, -384, 398, -20]$[-569, -384, 11, -20]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_W8_SoNbFEeuymriYTNxK2g" id="(0.635593220338983,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_W8_SodbFEeuymriYTNxK2g" id="(0.9067796610169492,0.6938775510204082)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_ev0VwNbFEeuymriYTNxK2g" type="4001" element="_ufJ3IKA4EeuqkpDnuik1sg" source="_c-HCQKA4EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_ev0VxNbFEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ev0VxdbFEeuymriYTNxK2g" x="-218" y="-22"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ev0VxtbFEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ev0Vx9bFEeuymriYTNxK2g" x="2" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ev0VyNbFEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ev0VydbFEeuymriYTNxK2g" x="-2" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_ev0VwdbFEeuymriYTNxK2g" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_ev0VwtbFEeuymriYTNxK2g" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ev0Vw9bFEeuymriYTNxK2g" points="[37, 36, -4, 419]$[156, 36, 115, 419]$[156, -372, 115, 11]$[46, -372, 5, 11]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ev0VytbFEeuymriYTNxK2g" id="(0.7448275862068966,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ev080NbFEeuymriYTNxK2g" id="(0.9576271186440678,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_f-FfsNbFEeuymriYTNxK2g" type="4001" element="_VtPctqA4EeuqkpDnuik1sg" source="_JT0o8KA4EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_f-FftNbFEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f-FftdbFEeuymriYTNxK2g" x="6" y="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_f-FfttbFEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f-Fft9bFEeuymriYTNxK2g" x="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_f-FfuNbFEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f-FfudbFEeuymriYTNxK2g" x="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_f-FfsdbFEeuymriYTNxK2g" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_f-FfstbFEeuymriYTNxK2g" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f-Ffs9bFEeuymriYTNxK2g" points="[24, -98, -17, 129]$[24, -192, -17, 35]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f-GGwNbFEeuymriYTNxK2g" id="(0.2033898305084746,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f-GGwdbFEeuymriYTNxK2g" id="(0.9576271186440678,0.6428571428571429)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_UwuZ8NbGEeuymriYTNxK2g" type="4001" element="_UwbfHtbGEeuymriYTNxK2g" source="_M6O-0NbGEeuymriYTNxK2g" target="_EfWNUKA4EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_UwuZ9NbGEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UwuZ9dbGEeuymriYTNxK2g" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UwuZ9tbGEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UwuZ99bGEeuymriYTNxK2g" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UwuZ-NbGEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UwuZ-dbGEeuymriYTNxK2g" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_UwuZ8dbGEeuymriYTNxK2g" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_UwuZ8tbGEeuymriYTNxK2g" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UwuZ89bGEeuymriYTNxK2g" points="[0, 0, 220, 180]$[-220, -180, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UwvBANbGEeuymriYTNxK2g" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UwvBAdbGEeuymriYTNxK2g" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_WYV4ANbGEeuymriYTNxK2g" type="4001" element="_WX_5w9bGEeuymriYTNxK2g" source="_M6O-0NbGEeuymriYTNxK2g" target="_e73WIKA9EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_WYV4BNbGEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WYV4BdbGEeuymriYTNxK2g" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_WYV4BtbGEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WYV4B9bGEeuymriYTNxK2g" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_WYV4CNbGEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WYV4CdbGEeuymriYTNxK2g" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_WYV4AdbGEeuymriYTNxK2g" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_WYV4AtbGEeuymriYTNxK2g" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WYV4A9bGEeuymriYTNxK2g" points="[0, 0, 99, 384]$[0, -240, 99, 144]$[-98, -240, 1, 144]$[-98, -286, 1, 98]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WYV4CtbGEeuymriYTNxK2g" id="(0.2627118644067797,0.01020408163265306)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WYV4C9bGEeuymriYTNxK2g" id="(0.5,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_gRXLkNbGEeuymriYTNxK2g" type="4001" element="_gRDCgNbGEeuymriYTNxK2g" source="_M6O-0NbGEeuymriYTNxK2g" target="_xsq_MKA8EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_gRXLlNbGEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gRXLldbGEeuymriYTNxK2g" x="-2" y="-41"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_gRXyoNbGEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gRXyodbGEeuymriYTNxK2g" x="98" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_gRXyotbGEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gRXyo9bGEeuymriYTNxK2g" x="7" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_gRXLkdbGEeuymriYTNxK2g" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_gRXLktbGEeuymriYTNxK2g" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gRXLk9bGEeuymriYTNxK2g" points="[25, 48, -35, 334]$[82, 48, 22, 334]$[82, -286, 22, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gRXypNbGEeuymriYTNxK2g" id="(0.788135593220339,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gRXypdbGEeuymriYTNxK2g" id="(0.3050847457627119,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_Ql_asNbNEeuymriYTNxK2g" type="4001" element="_QlymotbNEeuymriYTNxK2g" source="_xsq_MKA8EeuqkpDnuik1sg" target="_Kw-vINbNEeuymriYTNxK2g">
+          <children xmi:type="notation:Node" xmi:id="_Ql_atNbNEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ql_atdbNEeuymriYTNxK2g" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_QmABwNbNEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QmABwdbNEeuymriYTNxK2g" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_QmABwtbNEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QmABw9bNEeuymriYTNxK2g" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ql_asdbNEeuymriYTNxK2g" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_Ql_astbNEeuymriYTNxK2g" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ql_as9bNEeuymriYTNxK2g" points="[0, 0, -84, 58]$[84, -58, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QmABxNbNEeuymriYTNxK2g" id="(0.7796610169491526,0.01020408163265306)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QmABxdbNEeuymriYTNxK2g" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_SmujYNbNEeuymriYTNxK2g" type="4001" element="_Smi9eNbNEeuymriYTNxK2g" source="_Kw-vINbNEeuymriYTNxK2g" target="_RzZA0KA5EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_SmvKcNbNEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SmvKcdbNEeuymriYTNxK2g" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_SmvKctbNEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SmvKc9bNEeuymriYTNxK2g" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_SmvKdNbNEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SmvKddbNEeuymriYTNxK2g" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_SmujYdbNEeuymriYTNxK2g" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_SmujYtbNEeuymriYTNxK2g" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SmujY9bNEeuymriYTNxK2g" points="[0, 0, 84, 58]$[-84, -58, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SmvKdtbNEeuymriYTNxK2g" id="(0.5423728813559322,0.07142857142857142)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SmvKd9bNEeuymriYTNxK2g" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_TuLToNbNEeuymriYTNxK2g" type="4001" element="_Tt9RRtbNEeuymriYTNxK2g" source="_jP6FkKA6EeuqkpDnuik1sg" target="_Kw-vINbNEeuymriYTNxK2g">
+          <children xmi:type="notation:Node" xmi:id="_TuLTpNbNEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TuLTpdbNEeuymriYTNxK2g" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_TuL6sNbNEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TuL6sdbNEeuymriYTNxK2g" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_TuL6stbNEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TuL6s9bNEeuymriYTNxK2g" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_TuLTodbNEeuymriYTNxK2g" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_TuLTotbNEeuymriYTNxK2g" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TuLTo9bNEeuymriYTNxK2g" points="[0, 0, 96, 442]$[-96, -442, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TuL6tNbNEeuymriYTNxK2g" id="(0.4067796610169492,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TuL6tdbNEeuymriYTNxK2g" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_UosbINbNEeuymriYTNxK2g" type="4001" element="_T1fN5tYPEeuF_d0WEhR3Xw" source="_IwsqwNYPEeuF_d0WEhR3Xw" target="_Kw-vINbNEeuymriYTNxK2g">
+          <children xmi:type="notation:Node" xmi:id="_UosbJNbNEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UosbJdbNEeuymriYTNxK2g" x="-600" y="6"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UotCMNbNEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UotCMdbNEeuymriYTNxK2g" x="-50" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UotCMtbNEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UotCM9bNEeuymriYTNxK2g" x="-9" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_UosbIdbNEeuymriYTNxK2g" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_UosbItbNEeuymriYTNxK2g" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UosbI9bNEeuymriYTNxK2g" points="[18, -18, 16, 1340]$[18, -1347, 16, 11]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UotCNNbNEeuymriYTNxK2g" id="(0.2356687898089172,0.1836734693877551)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UotCNdbNEeuymriYTNxK2g" id="(0.16101694915254236,0.8877551020408163)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_Vs_14Nd_EeufiOvRR5sVhg" type="4001" element="_Vsm0XNd_EeufiOvRR5sVhg" source="_KdsE0Nd_EeufiOvRR5sVhg" target="_IsM5ENd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_VtAc8Nd_EeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VtBEANd_EeufiOvRR5sVhg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_VtBEAdd_EeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VtBEAtd_EeufiOvRR5sVhg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_VtBrENd_EeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VtBrEdd_EeufiOvRR5sVhg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_Vs_14dd_EeufiOvRR5sVhg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_Vs_14td_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Vs_149d_EeufiOvRR5sVhg" points="[0, 0, -72, 120]$[72, -120, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VtEHUNd_EeufiOvRR5sVhg" id="(0.6101694915254238,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VtEHUdd_EeufiOvRR5sVhg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_WEehwNd_EeufiOvRR5sVhg" type="4001" element="_WEGuVtd_EeufiOvRR5sVhg" source="_MAkM0Nd_EeufiOvRR5sVhg" target="_IsM5ENd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_WEehxNd_EeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WEehxdd_EeufiOvRR5sVhg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_WEehxtd_EeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WEehx9d_EeufiOvRR5sVhg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_WEehyNd_EeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WEehydd_EeufiOvRR5sVhg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_WEehwdd_EeufiOvRR5sVhg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_WEehwtd_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WEehw9d_EeufiOvRR5sVhg" points="[0, 0, 0, 46]$[0, -46, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WEfI0Nd_EeufiOvRR5sVhg" id="(0.6101694915254238,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WEfI0dd_EeufiOvRR5sVhg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_Wa3BcNd_EeufiOvRR5sVhg" type="4001" element="_Waktldd_EeufiOvRR5sVhg" source="_RwPFYNd_EeufiOvRR5sVhg" target="_IsM5ENd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_Wa3ogNd_EeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wa3ogdd_EeufiOvRR5sVhg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Wa3ogtd_EeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wa3og9d_EeufiOvRR5sVhg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Wa3ohNd_EeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wa3ohdd_EeufiOvRR5sVhg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_Wa3Bcdd_EeufiOvRR5sVhg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_Wa3Bctd_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Wa3Bc9d_EeufiOvRR5sVhg" points="[0, 0, 85, 132]$[-85, -132, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Wa3ohtd_EeufiOvRR5sVhg" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Wa3oh9d_EeufiOvRR5sVhg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_tXLzQNd_EeufiOvRR5sVhg" type="4001" element="_KmxbkNYPEeuF_d0WEhR3Xw" source="_6KEUMKA6EeuqkpDnuik1sg" target="_rwMAQNd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_tXMaUNd_EeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tXMaUdd_EeufiOvRR5sVhg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_tXMaUtd_EeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tXMaU9d_EeufiOvRR5sVhg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_tXMaVNd_EeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tXMaVdd_EeufiOvRR5sVhg" x="-11" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tXLzQdd_EeufiOvRR5sVhg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_tXLzQtd_EeufiOvRR5sVhg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tXLzQ9d_EeufiOvRR5sVhg" points="[39, 38, -21, -81]$[39, 108, -21, -11]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tXNocNd_EeufiOvRR5sVhg" id="(0.0,0.6122448979591837)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tXNocdd_EeufiOvRR5sVhg" id="(0.5084745762711864,0.11224489795918367)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_zhTMINd_EeufiOvRR5sVhg" type="4001" element="_zhINQtd_EeufiOvRR5sVhg" source="_mCh54Nd_EeufiOvRR5sVhg" target="_rwMAQNd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_zhTzMNd_EeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zhTzMdd_EeufiOvRR5sVhg" x="-7" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_zhTzMtd_EeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zhTzM9d_EeufiOvRR5sVhg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_zhTzNNd_EeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zhTzNdd_EeufiOvRR5sVhg" x="-7" y="17"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_zhTMIdd_EeufiOvRR5sVhg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_zhTMItd_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zhTMI9d_EeufiOvRR5sVhg" points="[0, 0, 121, 106]$[0, -32, 121, 74]$[-120, -32, 1, 74]$[-120, -57, 1, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zhTzNtd_EeufiOvRR5sVhg" id="(0.5037593984962406,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zhTzN9d_EeufiOvRR5sVhg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_1HiKINd_EeufiOvRR5sVhg" type="4001" element="_1HYZXNd_EeufiOvRR5sVhg" source="_IwsqwNYPEeuF_d0WEhR3Xw" target="_rwMAQNd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_1HixMNd_EeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1HixMdd_EeufiOvRR5sVhg" x="-7" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_1HixMtd_EeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1HixM9d_EeufiOvRR5sVhg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_1HixNNd_EeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1HixNdd_EeufiOvRR5sVhg" x="-13" y="-4"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_1HiKIdd_EeufiOvRR5sVhg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_1HiKItd_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1HiKI9d_EeufiOvRR5sVhg" points="[0, 0, -85, 144]$[0, -32, -85, 112]$[85, -32, 0, 112]$[85, -57, 0, 87]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yI__ACraEeyyC-O0_LlY9w" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1HixN9d_EeufiOvRR5sVhg" id="(0.5084745762711864,0.11224489795918367)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_YAyoANeAEeufiOvRR5sVhg" type="4001" element="_YAoQHdeAEeufiOvRR5sVhg" source="_p9wywKA8EeuqkpDnuik1sg" target="_VikSENeAEeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_YAyoBNeAEeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YAyoBdeAEeufiOvRR5sVhg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_YAyoBteAEeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YAyoB9eAEeufiOvRR5sVhg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_YAyoCNeAEeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YAyoCdeAEeufiOvRR5sVhg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_YAyoAdeAEeufiOvRR5sVhg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_YAyoAteAEeufiOvRR5sVhg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YAyoA9eAEeufiOvRR5sVhg" points="[0, 0, 0, -82]$[0, 82, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YAzPENeAEeufiOvRR5sVhg" id="(0.4406779661016949,0.8990825688073395)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YAzPEdeAEeufiOvRR5sVhg" id="(0.45112781954887216,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_dDz18NeAEeufiOvRR5sVhg" type="4001" element="_dDd3wteAEeufiOvRR5sVhg" source="_OWhiINeAEeufiOvRR5sVhg" target="_VikSENeAEeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_dDz19NeAEeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dDz19deAEeufiOvRR5sVhg" x="-4" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_dDz19teAEeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dDz199eAEeufiOvRR5sVhg" x="-1" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_dDz1-NeAEeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dDz1-deAEeufiOvRR5sVhg" x="-7" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_dDz18deAEeufiOvRR5sVhg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_dDz18teAEeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dDz189eAEeufiOvRR5sVhg" points="[-1, 0, 109, 203]$[-1, -136, 109, 67]$[-117, -136, -7, 67]$[-117, -154, -7, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dDz1-teAEeufiOvRR5sVhg" id="(0.38961038961038963,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dDz1-9eAEeufiOvRR5sVhg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_g_pZYNeAEeufiOvRR5sVhg" type="4001" element="_g_aI1teAEeufiOvRR5sVhg" source="_dZlRoNeAEeufiOvRR5sVhg" target="_VikSENeAEeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_g_qAcNeAEeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_qAcdeAEeufiOvRR5sVhg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_g_qActeAEeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_qAc9eAEeufiOvRR5sVhg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_g_qAdNeAEeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_qAddeAEeufiOvRR5sVhg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_g_pZYdeAEeufiOvRR5sVhg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_g_pZYteAEeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g_pZY9eAEeufiOvRR5sVhg" points="[0, 0, -132, 154]$[132, -154, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g_qAdteAEeufiOvRR5sVhg" id="(0.27956989247311825,0.05102040816326531)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g_qAd9eAEeufiOvRR5sVhg" id="(0.45112781954887216,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_nucMoNeAEeufiOvRR5sVhg" type="4001" element="_nuG1dteAEeufiOvRR5sVhg" source="_mCh54Nd_EeufiOvRR5sVhg" target="_IsM5ENd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_nucMpNeAEeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nucMpdeAEeufiOvRR5sVhg" x="-329" y="-11"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_nucMpteAEeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nucMp9eAEeufiOvRR5sVhg" x="33" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_nucMqNeAEeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nucMqdeAEeufiOvRR5sVhg" x="-215" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_nucModeAEeufiOvRR5sVhg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_nucMoteAEeufiOvRR5sVhg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nucMo9eAEeufiOvRR5sVhg" points="[0, 10, -776, 23]$[776, 10, 0, 23]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nuczsNeAEeufiOvRR5sVhg" id="(1.0,0.6224489795918368)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nuczsdeAEeufiOvRR5sVhg" id="(0.0,0.4897959183673469)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_pMxL0NeAEeufiOvRR5sVhg" type="4001" element="_pMdCzNeAEeufiOvRR5sVhg" source="_dZlRoNeAEeufiOvRR5sVhg" target="_IsM5ENd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_pMxL1NeAEeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pMxL1deAEeufiOvRR5sVhg" x="-109" y="288"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_pMxL1teAEeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pMxL19eAEeufiOvRR5sVhg" x="117" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_pMxL2NeAEeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pMxL2deAEeufiOvRR5sVhg" x="93" y="25"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_pMxL0deAEeufiOvRR5sVhg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_pMxL0teAEeufiOvRR5sVhg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pMxL09eAEeufiOvRR5sVhg" points="[1, 0, -188, -549]$[1, 31, -188, -518]$[334, 31, 145, -518]$[334, 576, 145, 27]$[271, 576, 82, 27]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pMxy4NeAEeufiOvRR5sVhg" id="(0.5,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pMxy4deAEeufiOvRR5sVhg" id="(0.3050847457627119,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_vRxbMNeAEeufiOvRR5sVhg" type="4001" element="_vRo4VteAEeufiOvRR5sVhg" source="_OWhiINeAEeufiOvRR5sVhg" target="_xsq_MKA8EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_vRxbNNeAEeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vRxbNdeAEeufiOvRR5sVhg" x="-341" y="-535"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_vRyCQNeAEeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vRyCQdeAEeufiOvRR5sVhg" x="-43" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_vRyCQteAEeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vRyCQ9eAEeufiOvRR5sVhg" x="43" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_vRxbMdeAEeufiOvRR5sVhg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_vRxbMteAEeufiOvRR5sVhg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vRxbM9eAEeufiOvRR5sVhg" points="[0, 0, 1241, 564]$[0, -564, 1241, 0]$[-1241, -564, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vRyCRNeAEeufiOvRR5sVhg" id="(0.7012987012987013,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vRyCRdeAEeufiOvRR5sVhg" id="(1.0,0.6122448979591837)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_AmNXcNeBEeufiOvRR5sVhg" type="4001" element="_AmBxQNeBEeufiOvRR5sVhg" source="_9Tu6ENeAEeufiOvRR5sVhg" target="_xsq_MKA8EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_AmN-gNeBEeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AmN-gdeBEeufiOvRR5sVhg" x="-580" y="-139"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_AmN-gteBEeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AmN-g9eBEeufiOvRR5sVhg" x="427" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_AmN-hNeBEeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AmN-hdeBEeufiOvRR5sVhg" x="46" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_AmNXcdeBEeufiOvRR5sVhg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_AmNXcteBEeufiOvRR5sVhg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AmNXc9eBEeufiOvRR5sVhg" points="[70, -12, 1316, 155]$[70, -167, 1316, 0]$[-1246, -167, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AmN-hteBEeufiOvRR5sVhg" id="(0.0,0.12244897959183673)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AmN-h9eBEeufiOvRR5sVhg" id="(1.0,0.3673469387755102)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_DlH_oNeBEeufiOvRR5sVhg" type="4001" element="_DkzPhteBEeufiOvRR5sVhg" source="_9Tu6ENeAEeufiOvRR5sVhg" target="_e73WIKA9EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_DlH_pNeBEeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DlH_pdeBEeufiOvRR5sVhg" x="-12" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_DlH_pteBEeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DlH_p9eBEeufiOvRR5sVhg" x="-12" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_DlH_qNeBEeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DlH_qdeBEeufiOvRR5sVhg" x="-12" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_DlH_odeBEeufiOvRR5sVhg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_DlH_oteBEeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DlH_o9eBEeufiOvRR5sVhg" points="[0, -6, 1293, 192]$[0, -42, 1293, 156]$[-1292, -42, 1, 156]$[-1292, -100, 1, 98]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DlH_qteBEeufiOvRR5sVhg" id="(0.14084507042253522,0.061224489795918366)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DlH_q9eBEeufiOvRR5sVhg" id="(0.5,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_WiUCYNeBEeufiOvRR5sVhg" type="4001" element="_WiKRoteBEeufiOvRR5sVhg" source="_9Tu6ENeAEeufiOvRR5sVhg" target="_IsM5ENd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_WiUCZNeBEeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WiUCZdeBEeufiOvRR5sVhg" x="-532" y="2"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_WiUCZteBEeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WiUCZ9eBEeufiOvRR5sVhg" x="-7" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_WiUCaNeBEeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WiUCadeBEeufiOvRR5sVhg" x="-134" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_WiUCYdeBEeufiOvRR5sVhg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_WiUCYteBEeufiOvRR5sVhg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WiUCY9eBEeufiOvRR5sVhg" points="[39, 0, 115, -982]$[39, 1030, 115, 48]$[-54, 1030, 22, 48]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WiUCateBEeufiOvRR5sVhg" id="(0.5070422535211268,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WiUCa9eBEeufiOvRR5sVhg" id="(0.8135593220338984,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_s7wgoAGyEey7cfH5K6RyCw" type="4001" element="_s68oXAGyEey7cfH5K6RyCw" source="_pdJrwAGyEey7cfH5K6RyCw" target="_e73WIKA9EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_s7xuwAGyEey7cfH5K6RyCw" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7xuwQGyEey7cfH5K6RyCw" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_s7yV0AGyEey7cfH5K6RyCw" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7yV0QGyEey7cfH5K6RyCw" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_s7yV0gGyEey7cfH5K6RyCw" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s7yV0wGyEey7cfH5K6RyCw" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_s7wgoQGyEey7cfH5K6RyCw" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_s7wgogGyEey7cfH5K6RyCw" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s7wgowGyEey7cfH5K6RyCw" points="[0, -9, -684, 192]$[0, -45, -684, 156]$[685, -45, 1, 156]$[685, -103, 1, 98]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s71ZIAGyEey7cfH5K6RyCw" id="(0.5310344827586206,0.061224489795918366)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s71ZIQGyEey7cfH5K6RyCw" id="(0.5,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_zKMY0AGyEey7cfH5K6RyCw" type="4001" element="_zJpmRgGyEey7cfH5K6RyCw" source="_pdJrwAGyEey7cfH5K6RyCw" target="_xsq_MKA8EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_zKM_4AGyEey7cfH5K6RyCw" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKM_4QGyEey7cfH5K6RyCw" x="-463" y="19"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_zKM_4gGyEey7cfH5K6RyCw" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKM_4wGyEey7cfH5K6RyCw" x="-91" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_zKM_5AGyEey7cfH5K6RyCw" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKM_5QGyEey7cfH5K6RyCw" x="-88" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_zKMY0QGyEey7cfH5K6RyCw" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_zKMY0gGyEey7cfH5K6RyCw" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zKMY0wGyEey7cfH5K6RyCw" points="[-7, -15, -830, 120]$[-7, -63, -830, 72]$[859, -63, 36, 72]$[859, -109, 36, 26]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zKNm8AGyEey7cfH5K6RyCw" id="(0.4482758620689655,0.15306122448979592)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zKNm8QGyEey7cfH5K6RyCw" id="(0.0,0.7346938775510204)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_WAr2kAGzEey7cfH5K6RyCw" type="4001" element="_WAUqNgGzEey7cfH5K6RyCw" source="_SNlYYAGzEey7cfH5K6RyCw" target="_VikSENeAEeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_WAsdoAGzEey7cfH5K6RyCw" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WAsdoQGzEey7cfH5K6RyCw" x="3" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_WAsdogGzEey7cfH5K6RyCw" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WAsdowGzEey7cfH5K6RyCw" x="1" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_WAsdpAGzEey7cfH5K6RyCw" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WAsdpQGzEey7cfH5K6RyCw" x="-1" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_WAr2kQGzEey7cfH5K6RyCw" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_WAr2kgGzEey7cfH5K6RyCw" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WAr2kwGzEey7cfH5K6RyCw" points="[-1, -7, -43, 132]$[-1, -23, -43, 116]$[41, -23, -1, 116]$[41, -41, -1, 98]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WAsdpgGzEey7cfH5K6RyCw" id="(0.25842696629213485,0.07142857142857142)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WAsdpwGzEey7cfH5K6RyCw" id="(0.45112781954887216,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_deCBQCrZEeyyC-O0_LlY9w" type="4001" element="_ddmjcCrZEeyyC-O0_LlY9w" source="_fit3kKA5EeuqkpDnuik1sg" target="_A9YrQCrZEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_deCoUCrZEeyyC-O0_LlY9w" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_deCoUSrZEeyyC-O0_LlY9w" x="-18" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_deCoUirZEeyyC-O0_LlY9w" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_deCoUyrZEeyyC-O0_LlY9w" x="5" y="8"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_deDPYCrZEeyyC-O0_LlY9w" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_deDPYSrZEeyyC-O0_LlY9w" x="-20" y="-8"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_deCBQSrZEeyyC-O0_LlY9w" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_deCBQirZEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_deCBQyrZEeyyC-O0_LlY9w" points="[0, -13, -185, 137]$[0, -49, -185, 101]$[186, -49, 1, 101]$[186, -101, 1, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_deEdgCrZEeyyC-O0_LlY9w" id="(0.7339205882869473,0.1326530612244898)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_deEdgSrZEeyyC-O0_LlY9w" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_eGyDUCrZEeyyC-O0_LlY9w" type="4001" element="_eGZo7irZEeyyC-O0_LlY9w" source="_N0FQ4CrZEeyyC-O0_LlY9w" target="_A9YrQCrZEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_eGyDVCrZEeyyC-O0_LlY9w" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eGyDVSrZEeyyC-O0_LlY9w" x="15" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_eGyDVirZEeyyC-O0_LlY9w" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eGyDVyrZEeyyC-O0_LlY9w" x="39" y="-1"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_eGyDWCrZEeyyC-O0_LlY9w" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eGyDWSrZEeyyC-O0_LlY9w" x="6" y="-1"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_eGyDUSrZEeyyC-O0_LlY9w" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_eGyDUirZEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eGyDUyrZEeyyC-O0_LlY9w" points="[-1, 0, 161, 137]$[-1, -66, 161, 71]$[-161, -66, 1, 71]$[-161, -88, 1, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eGyDWirZEeyyC-O0_LlY9w" id="(0.3440366972477064,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eGyDWyrZEeyyC-O0_LlY9w" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_vfpzoCrZEeyyC-O0_LlY9w" type="4001" element="_vfYG6CrZEeyyC-O0_LlY9w" source="_jzknACrZEeyyC-O0_LlY9w" target="_re7JICrZEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_vfpzpCrZEeyyC-O0_LlY9w" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vfpzpSrZEeyyC-O0_LlY9w" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_vfpzpirZEeyyC-O0_LlY9w" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vfpzpyrZEeyyC-O0_LlY9w" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_vfpzqCrZEeyyC-O0_LlY9w" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vfpzqSrZEeyyC-O0_LlY9w" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_vfpzoSrZEeyyC-O0_LlY9w" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_vfpzoirZEeyyC-O0_LlY9w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vfpzoyrZEeyyC-O0_LlY9w" points="[0, 0, 0, -226]$[0, 226, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vfqasCrZEeyyC-O0_LlY9w" id="(0.4915254237288136,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vfqasSrZEeyyC-O0_LlY9w" id="(0.4915254237288136,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_KrtVQCraEeyyC-O0_LlY9w" type="4001" element="_KrcPniraEeyyC-O0_LlY9w" source="_3aLaMCrZEeyyC-O0_LlY9w" target="_re7JICrZEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_KrtVRCraEeyyC-O0_LlY9w" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KrtVRSraEeyyC-O0_LlY9w" x="-11" y="6"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_KrtVRiraEeyyC-O0_LlY9w" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KrtVRyraEeyyC-O0_LlY9w" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_KrtVSCraEeyyC-O0_LlY9w" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KrtVSSraEeyyC-O0_LlY9w" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_KrtVQSraEeyyC-O0_LlY9w" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_KrtVQiraEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KrtVQyraEeyyC-O0_LlY9w" points="[-1, -3, -17, 119]$[-1, -46, -17, 76]$[17, -46, 1, 76]$[17, -73, 1, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KrtVSiraEeyyC-O0_LlY9w" id="(0.4347727324353179,0.030612244897959183)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KrtVSyraEeyyC-O0_LlY9w" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_LMhjUCraEeyyC-O0_LlY9w" type="4001" element="_LMS50CraEeyyC-O0_LlY9w" source="_9mWokCrZEeyyC-O0_LlY9w" target="_re7JICrZEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_LMiKYCraEeyyC-O0_LlY9w" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LMiKYSraEeyyC-O0_LlY9w" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_LMiKYiraEeyyC-O0_LlY9w" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LMiKYyraEeyyC-O0_LlY9w" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_LMiKZCraEeyyC-O0_LlY9w" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LMiKZSraEeyyC-O0_LlY9w" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_LMhjUSraEeyyC-O0_LlY9w" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_LMhjUiraEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LMhjUyraEeyyC-O0_LlY9w" points="[0, 0, 195, 70]$[-195, -70, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LMiKZiraEeyyC-O0_LlY9w" id="(0.5,0.20408163265306123)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LMiKZyraEeyyC-O0_LlY9w" id="(0.4915254237288136,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_Lf3WECraEeyyC-O0_LlY9w" type="4001" element="_Lfp6vCraEeyyC-O0_LlY9w" source="_Av5zcCraEeyyC-O0_LlY9w" target="_re7JICrZEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_Lf39ICraEeyyC-O0_LlY9w" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lf39ISraEeyyC-O0_LlY9w" x="-9" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Lf39IiraEeyyC-O0_LlY9w" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lf39IyraEeyyC-O0_LlY9w" x="-9" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Lf39JCraEeyyC-O0_LlY9w" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lf39JSraEeyyC-O0_LlY9w" x="-9" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_Lf3WESraEeyyC-O0_LlY9w" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_Lf3WEiraEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Lf3WEyraEeyyC-O0_LlY9w" points="[-1, -49, 314, 168]$[-1, -92, 314, 125]$[-313, -92, 2, 125]$[-313, -119, 2, 98]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VZY7UCtbEeySS4mYSornnA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lf39JyraEeyyC-O0_LlY9w" id="(0.4915254237288136,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_NYC_sCraEeyyC-O0_LlY9w" type="4001" element="_NXzvMiraEeyyC-O0_LlY9w" source="_Av5zcCraEeyyC-O0_LlY9w" target="_FmJJoCraEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_NYC_tCraEeyyC-O0_LlY9w" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NYC_tSraEeyyC-O0_LlY9w" x="2" y="-14"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_NYC_tiraEeyyC-O0_LlY9w" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NYC_tyraEeyyC-O0_LlY9w" x="-3" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_NYC_uCraEeyyC-O0_LlY9w" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NYC_uSraEeyyC-O0_LlY9w" x="-16" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_NYC_sSraEeyyC-O0_LlY9w" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_NYC_siraEeyyC-O0_LlY9w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NYC_syraEeyyC-O0_LlY9w" points="[0, 0, -78, 0]$[78, 0, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NYC_uiraEeyyC-O0_LlY9w" id="(1.0,0.4387755102040816)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NYC_uyraEeyyC-O0_LlY9w" id="(0.0,0.4387755102040816)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_Y5paoCraEeyyC-O0_LlY9w" type="4001" element="_UJJy0qBDEeuqkpDnuik1sg" source="_XLYiACraEeyyC-O0_LlY9w" target="_6KEUMKA6EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_Y5papCraEeyyC-O0_LlY9w" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y5papSraEeyyC-O0_LlY9w" x="-11" y="11"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Y5papiraEeyyC-O0_LlY9w" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y5papyraEeyyC-O0_LlY9w" x="-16" y="4"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Y5paqCraEeyyC-O0_LlY9w" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y5paqSraEeyyC-O0_LlY9w" x="-72" y="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_Y5paoSraEeyyC-O0_LlY9w" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_Y5paoiraEeyyC-O0_LlY9w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Y5paoyraEeyyC-O0_LlY9w" points="[-26, -19, 116, 36]$[-142, -19, 0, 36]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Y5qBsCraEeyyC-O0_LlY9w" id="(0.22033898305084745,0.6836734693877551)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Y5qBsSraEeyyC-O0_LlY9w" id="(1.0,0.12244897959183673)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_ZSW1kCraEeyyC-O0_LlY9w" type="4001" element="_9OddBqA7EeuqkpDnuik1sg" source="_XLYiACraEeyyC-O0_LlY9w" target="_4k5GIKA6EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_ZSW1lCraEeyyC-O0_LlY9w" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZSW1lSraEeyyC-O0_LlY9w" x="4" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ZSW1liraEeyyC-O0_LlY9w" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZSW1lyraEeyyC-O0_LlY9w" x="1" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ZSW1mCraEeyyC-O0_LlY9w" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZSW1mSraEeyyC-O0_LlY9w" x="-1" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_ZSW1kSraEeyyC-O0_LlY9w" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_ZSW1kiraEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZSW1kyraEeyyC-O0_LlY9w" points="[-1, -9, 100, 156]$[-1, -49, 100, 116]$[-92, -49, 9, 116]$[-92, -67, 9, 98]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZSW1miraEeyyC-O0_LlY9w" id="(0.3305084745762712,0.09183673469387756)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZSW1myraEeyyC-O0_LlY9w" id="(0.4067796610169492,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_5CQ84CraEeyyC-O0_LlY9w" type="4001" element="_5CBsdCraEeyyC-O0_LlY9w" source="_jjhjYCraEeyyC-O0_LlY9w" target="_XLYiACraEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_5CQ85CraEeyyC-O0_LlY9w" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5CQ85SraEeyyC-O0_LlY9w" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_5CQ85iraEeyyC-O0_LlY9w" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5CQ85yraEeyyC-O0_LlY9w" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_5CRj8CraEeyyC-O0_LlY9w" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5CRj8SraEeyyC-O0_LlY9w" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_5CQ84SraEeyyC-O0_LlY9w" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_5CQ84iraEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5CQ84yraEeyyC-O0_LlY9w" points="[0, 0, -94, 70]$[94, -70, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4zEN0CrbEeyyC-O0_LlY9w" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5CRj8yraEeyyC-O0_LlY9w" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_5jTNYCraEeyyC-O0_LlY9w" type="4001" element="_5jFyVCraEeyyC-O0_LlY9w" source="_V6pfMKA7EeuqkpDnuik1sg" target="_XLYiACraEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_5jTNZCraEeyyC-O0_LlY9w" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5jTNZSraEeyyC-O0_LlY9w" x="-13" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_5jTNZiraEeyyC-O0_LlY9w" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5jTNZyraEeyyC-O0_LlY9w" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_5jTNaCraEeyyC-O0_LlY9w" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5jTNaSraEeyyC-O0_LlY9w" x="6" y="14"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_5jTNYSraEeyyC-O0_LlY9w" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_5jTNYiraEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5jTNYyraEeyyC-O0_LlY9w" points="[-1, -12, 71, 119]$[-1, -55, 71, 76]$[-71, -55, 1, 76]$[-71, -82, 1, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5jTNairaEeyyC-O0_LlY9w" id="(0.5169491525423728,0.12244897959183673)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5jTNayraEeyyC-O0_LlY9w" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_MiYGgCrbEeyyC-O0_LlY9w" type="4001" element="_MiDWeCrbEeyyC-O0_LlY9w" source="_3aLaMCrZEeyyC-O0_LlY9w" target="_6KEUMKA6EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_MiYtkCrbEeyyC-O0_LlY9w" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MiYtkSrbEeyyC-O0_LlY9w" x="-93" y="-247"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_MiYtkirbEeyyC-O0_LlY9w" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MiYtkyrbEeyyC-O0_LlY9w" x="-53" y="21"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_MiYtlCrbEeyyC-O0_LlY9w" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MiYtlSrbEeyyC-O0_LlY9w" x="-47" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_MiYGgSrbEeyyC-O0_LlY9w" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_MiYGgirbEeyyC-O0_LlY9w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MiYGgyrbEeyyC-O0_LlY9w" points="[0, -25, 441, 140]$[-46, -25, 395, 140]$[-46, -261, 395, -96]$[-473, -261, -32, -96]$[-473, -241, -32, -76]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MiYtlirbEeyyC-O0_LlY9w" id="(0.0,0.7448979591836735)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MiYtlyrbEeyyC-O0_LlY9w" id="(1.0,0.7755102040816326)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_btzH0CrbEeyyC-O0_LlY9w" type="4001" element="_btj3UirbEeyyC-O0_LlY9w" source="_9mWokCrZEeyyC-O0_LlY9w" target="_Kw-vINbNEeuymriYTNxK2g">
+          <children xmi:type="notation:Node" xmi:id="_btzH1CrbEeyyC-O0_LlY9w" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_btzH1SrbEeyyC-O0_LlY9w" x="-897" y="29"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_btzH1irbEeyyC-O0_LlY9w" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_btzH1yrbEeyyC-O0_LlY9w" x="5" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_btzH2CrbEeyyC-O0_LlY9w" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_btzH2SrbEeyyC-O0_LlY9w" x="146" y="106"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_btzH0SrbEeyyC-O0_LlY9w" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_btzH0irbEeyyC-O0_LlY9w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_btzH0yrbEeyyC-O0_LlY9w" points="[-71, 0, 794, 1174]$[-71, -1032, 794, 142]$[-883, -1032, -18, 142]$[-883, -1174, -18, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_btzH2irbEeyyC-O0_LlY9w" id="(0.7627118644067796,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_btzH2yrbEeyyC-O0_LlY9w" id="(0.4491525423728814,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_teMnUCrbEeyyC-O0_LlY9w" type="4001" element="_td_zEirbEeyyC-O0_LlY9w" source="_jjhjYCraEeyyC-O0_LlY9w" target="_q-1B4CrbEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_teNOYCrbEeyyC-O0_LlY9w" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_teNOYSrbEeyyC-O0_LlY9w" x="-226" y="-13"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_teN1cCrbEeyyC-O0_LlY9w" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_teN1cSrbEeyyC-O0_LlY9w" x="84" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_teOcgCrbEeyyC-O0_LlY9w" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_teOcgSrbEeyyC-O0_LlY9w" x="13"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_teMnUSrbEeyyC-O0_LlY9w" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_teMnUirbEeyyC-O0_LlY9w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_teMnUyrbEeyyC-O0_LlY9w" points="[-42, 49, -382, -220]$[-42, 83, -382, -186]$[397, 83, 57, -186]$[397, 250, 57, -19]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_teOcgirbEeyyC-O0_LlY9w" id="(1.0,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_teOcgyrbEeyyC-O0_LlY9w" id="(0.0,0.19387755102040816)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_WU57ECrcEeyyC-O0_LlY9w" type="4001" element="_WUsgHCrcEeyyC-O0_LlY9w" source="_N0FQ4CrZEeyyC-O0_LlY9w" target="_RzZA0KA5EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_WU6iICrcEeyyC-O0_LlY9w" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WU6iISrcEeyyC-O0_LlY9w" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_WU6iIircEeyyC-O0_LlY9w" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WU6iIyrcEeyyC-O0_LlY9w" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_WU6iJCrcEeyyC-O0_LlY9w" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WU6iJSrcEeyyC-O0_LlY9w" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_WU57ESrcEeyyC-O0_LlY9w" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_WU57EircEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WU57EyrcEeyyC-O0_LlY9w" points="[0, 0, 680, 598]$[-680, -598, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WU6iJircEeyyC-O0_LlY9w" id="(0.5504587155963302,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WU6iJyrcEeyyC-O0_LlY9w" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_dVu5gCrcEeyyC-O0_LlY9w" type="4001" element="_vDscvKA6EeuqkpDnuik1sg" source="_A9YrQCrZEeyyC-O0_LlY9w" target="_sdPX0KA6EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_dVu5hCrcEeyyC-O0_LlY9w" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dVu5hSrcEeyyC-O0_LlY9w" x="-134" y="-88"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_dVu5hircEeyyC-O0_LlY9w" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dVu5hyrcEeyyC-O0_LlY9w" x="56" y="-8"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_dVu5iCrcEeyyC-O0_LlY9w" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dVu5iSrcEeyyC-O0_LlY9w" x="-3"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_dVu5gSrcEeyyC-O0_LlY9w" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_dVu5gircEeyyC-O0_LlY9w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dVu5gyrcEeyyC-O0_LlY9w" points="[-38, 49, 189, -328]$[-38, 117, 189, -260]$[-89, 117, 138, -260]$[-89, 427, 138, 50]$[-149, 427, 78, 50]"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dVu5iyrcEeyyC-O0_LlY9w" id="(0.3389830508474576,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_vndkcCrcEeyyC-O0_LlY9w" type="4001" element="_Uy4bWaA6EeuqkpDnuik1sg" source="_A9YrQCrZEeyyC-O0_LlY9w" target="_QKLK0KA6EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_vndkdCrcEeyyC-O0_LlY9w" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vndkdSrcEeyyC-O0_LlY9w" x="-224" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_vndkdircEeyyC-O0_LlY9w" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vndkdyrcEeyyC-O0_LlY9w" x="-10" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_vndkeCrcEeyyC-O0_LlY9w" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vndkeSrcEeyyC-O0_LlY9w" x="-205" y="75"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_vndkcSrcEeyyC-O0_LlY9w" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_vndkcircEeyyC-O0_LlY9w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vndkcyrcEeyyC-O0_LlY9w" points="[-19, 9, 342, -328]$[-19, 57, 342, -280]$[-79, 57, 282, -280]$[-79, 282, 282, -55]$[-328, 282, 33, -55]$[-328, 337, 33, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vndkeircEeyyC-O0_LlY9w" id="(0.2602739726027397,0.9081632653061225)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vneLgCrcEeyyC-O0_LlY9w" id="(0.4322033898305085,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_0K6FACrdEeyyC-O0_LlY9w" type="4001" element="_0KiRnCrdEeyyC-O0_LlY9w" source="_FmJJoCraEeyyC-O0_LlY9w" target="_jP6FkKA6EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_0K6FBCrdEeyyC-O0_LlY9w" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0K6FBSrdEeyyC-O0_LlY9w" x="76" y="-164"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_0K6FBirdEeyyC-O0_LlY9w" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0K6FByrdEeyyC-O0_LlY9w" x="161" y="191"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_0K6FCCrdEeyyC-O0_LlY9w" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0K6FCSrdEeyyC-O0_LlY9w" x="16" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K6FASrdEeyyC-O0_LlY9w" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_0K6FAirdEeyyC-O0_LlY9w" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K6FAyrdEeyyC-O0_LlY9w" points="[20, 0, 1080, 683]$[20, -62, 1080, 621]$[-345, -62, 715, 621]$[-345, -577, 715, 106]$[-1059, -577, 1, 106]$[-1059, -634, 1, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0K6FCirdEeyyC-O0_LlY9w" id="(0.3389830508474576,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0K6FCyrdEeyyC-O0_LlY9w" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_s4W8oCtaEeySS4mYSornnA" type="4001" element="_mzziwKA9EeuqkpDnuik1sg" source="_A9YrQCrZEeyyC-O0_LlY9w" target="_e73WIKA9EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_s4dqUCtaEeySS4mYSornnA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s4dqUStaEeySS4mYSornnA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_s4eRYCtaEeySS4mYSornnA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s4eRYStaEeySS4mYSornnA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_s4ffgCtaEeySS4mYSornnA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s4ffgStaEeySS4mYSornnA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_s4W8oStaEeySS4mYSornnA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_s4W8oitaEeySS4mYSornnA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s4W8oytaEeySS4mYSornnA" points="[-1, -49, 819, 198]$[-1, -103, 819, 144]$[-819, -103, 1, 144]$[-819, -149, 1, 98]"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s4kYACtaEeySS4mYSornnA" id="(0.5,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_-iZVcCtaEeySS4mYSornnA" type="4001" element="_-hzfnCtaEeySS4mYSornnA" source="_N0FQ4CrZEeyyC-O0_LlY9w" target="_jzknACrZEeyyC-O0_LlY9w">
+          <children xmi:type="notation:Node" xmi:id="_-iZ8gCtaEeySS4mYSornnA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-iZ8gStaEeySS4mYSornnA" x="-43" y="-36"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_-iZ8gitaEeySS4mYSornnA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-iZ8gytaEeySS4mYSornnA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_-iZ8hCtaEeySS4mYSornnA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-iZ8hStaEeySS4mYSornnA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_-iZVcStaEeySS4mYSornnA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_-iZVcitaEeySS4mYSornnA" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-iZVcytaEeySS4mYSornnA" points="[0, 0, 0, -142]$[0, 142, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-iZ8hitaEeySS4mYSornnA" id="(0.4461538461538462,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-iZ8hytaEeySS4mYSornnA" id="(0.4915254237288136,0.0)"/>
+        </edges>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_Csiy8KA4EeuqkpDnuik1sg" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_Csiy8aA4EeuqkpDnuik1sg">
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_L-JhMaA4EeuqkpDnuik1sg" 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="_L-JhMqA4EeuqkpDnuik1sg" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_D05iIKA4EeuqkpDnuik1sg" name="Problem" tooltipText="" outgoingEdges="_4eU5TqA8EeuqkpDnuik1sg _hU64ZqA9EeuqkpDnuik1sg _m-6OTNXtEeuF_d0WEhR3Xw" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Problem"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Problem"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_D06wQKA4EeuqkpDnuik1sg" 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="_EfNqcKA4EeuqkpDnuik1sg" name="Relation" tooltipText="" outgoingEdges="_XWbypqA5EeuqkpDnuik1sg" incomingEdges="_ODPlcKA4EeuqkpDnuik1sg _gRoBcKA4EeuqkpDnuik1sg _rUgDkKA5EeuqkpDnuik1sg _VjwMzqA8EeuqkpDnuik1sg _w-iG36A8EeuqkpDnuik1sg _Z7FrQKA6EeuqkpDnuik1sg _ufJ3IKA4EeuqkpDnuik1sg _VtPctqA4EeuqkpDnuik1sg _UwbfHtbGEeuymriYTNxK2g" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Relation"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Relation"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_Hjy1waA4EeuqkpDnuik1sg" 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="_JTstIKA4EeuqkpDnuik1sg" name="ClassDeclaration" tooltipText="" outgoingEdges="_ODPlcKA4EeuqkpDnuik1sg _VtPctqA4EeuqkpDnuik1sg _jk6-PKA4EeuqkpDnuik1sg _plK3JqA9EeuqkpDnuik1sg _-XLKltawEeuymriYTNxK2g" incomingEdges="_2kWqbKA9EeuqkpDnuik1sg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ClassDeclaration"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ClassDeclaration"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_T_dFNaA4EeuqkpDnuik1sg" 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="_SrSuoKA4EeuqkpDnuik1sg" name="abstract : EBoolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//ClassDeclaration/abstract"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//ClassDeclaration/abstract"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_T_eTUaA4EeuqkpDnuik1sg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ODPlcKA4EeuqkpDnuik1sg" sourceNode="_JTstIKA4EeuqkpDnuik1sg" targetNode="_EfNqcKA4EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ClassDeclaration"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ClassDeclaration"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_T_fhcKA4EeuqkpDnuik1sg" 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="_T_fhcaA4EeuqkpDnuik1sg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_T_fhcqA4EeuqkpDnuik1sg" 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="_VtPctqA4EeuqkpDnuik1sg" name="[0..*] superTypes" sourceNode="_JTstIKA4EeuqkpDnuik1sg" targetNode="_EfNqcKA4EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ClassDeclaration/superTypes"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ClassDeclaration/superTypes"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_VtQDwKA4EeuqkpDnuik1sg" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_VtQDwqA4EeuqkpDnuik1sg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_VtQDwaA4EeuqkpDnuik1sg" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_c-A7oKA4EeuqkpDnuik1sg" name="ReferenceDeclaration" tooltipText="" outgoingEdges="_gRoBcKA4EeuqkpDnuik1sg _ufJ3IKA4EeuqkpDnuik1sg _0V3L1qA4EeuqkpDnuik1sg _p1JWcqBJEeuqkpDnuik1sg" incomingEdges="_jk6-PKA4EeuqkpDnuik1sg _0V3L1qA4EeuqkpDnuik1sg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ReferenceDeclaration"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ReferenceDeclaration"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_IMjpcqA5EeuqkpDnuik1sg" 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="_HjDZcKA5EeuqkpDnuik1sg" name="containment : EBoolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//ReferenceDeclaration/containment"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//ReferenceDeclaration/containment"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_IMmswaA5EeuqkpDnuik1sg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_gRoBcKA4EeuqkpDnuik1sg" sourceNode="_c-A7oKA4EeuqkpDnuik1sg" targetNode="_EfNqcKA4EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ReferenceDeclaration"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ReferenceDeclaration"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_IMsMUKA5EeuqkpDnuik1sg" 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="_IMsMUaA5EeuqkpDnuik1sg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_IMsMUqA5EeuqkpDnuik1sg" 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="_jk6-PKA4EeuqkpDnuik1sg" name="[0..*] referenceDeclarations" sourceNode="_JTstIKA4EeuqkpDnuik1sg" targetNode="_c-A7oKA4EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ClassDeclaration/referenceDeclarations"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ClassDeclaration/referenceDeclarations"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_jk7lQKA4EeuqkpDnuik1sg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_jk7lQqA4EeuqkpDnuik1sg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_jk7lQaA4EeuqkpDnuik1sg" 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="_ufJ3IKA4EeuqkpDnuik1sg" name="[0..1] referenceType" sourceNode="_c-A7oKA4EeuqkpDnuik1sg" targetNode="_EfNqcKA4EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ReferenceDeclaration/referenceType"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ReferenceDeclaration/referenceType"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_ufLFQKA4EeuqkpDnuik1sg" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_ufLFQqA4EeuqkpDnuik1sg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_ufLFQaA4EeuqkpDnuik1sg" 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="_0V3L1qA4EeuqkpDnuik1sg" name="[0..1] opposite" sourceNode="_c-A7oKA4EeuqkpDnuik1sg" targetNode="_c-A7oKA4EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ReferenceDeclaration/opposite"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ReferenceDeclaration/opposite"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_0V3y4KA4EeuqkpDnuik1sg" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_0V3y4qA4EeuqkpDnuik1sg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_0V3y4aA4EeuqkpDnuik1sg" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_RzK-YKA5EeuqkpDnuik1sg" name="NamedElement" tooltipText="" incomingEdges="_XWbypqA5EeuqkpDnuik1sg _m-6OTNXtEeuF_d0WEhR3Xw _Smi9eNbNEeuymriYTNxK2g _WUsgHCrcEeyyC-O0_LlY9w" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NamedElement"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NamedElement"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_TYmrIaA5EeuqkpDnuik1sg" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_S-lBkKA5EeuqkpDnuik1sg" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//NamedElement/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//NamedElement/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_TYqVgaA5EeuqkpDnuik1sg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_XWbypqA5EeuqkpDnuik1sg" sourceNode="_EfNqcKA4EeuqkpDnuik1sg" targetNode="_RzK-YKA5EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Relation"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Relation"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_XWbyp6A5EeuqkpDnuik1sg" 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="_XWbyqKA5EeuqkpDnuik1sg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_XWbyqaA5EeuqkpDnuik1sg" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_fihqUKA5EeuqkpDnuik1sg" name="PredicateDefinition" tooltipText="" outgoingEdges="_rUgDkKA5EeuqkpDnuik1sg _ddmjcCrZEeyyC-O0_LlY9w" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//PredicateDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//PredicateDefinition"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_-2UUSyrcEeyyC-O0_LlY9w" 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="_svs2QKA5EeuqkpDnuik1sg" name="error : EBoolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//PredicateDefinition/error"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//PredicateDefinition/error"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_tWLAYaA5EeuqkpDnuik1sg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_7sQzECrcEeyyC-O0_LlY9w" name="kind : PredicateKind = PARTIAL" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//PredicateDefinition/kind"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//PredicateDefinition/kind"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_-2ViayrcEeyyC-O0_LlY9w" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_rUgDkKA5EeuqkpDnuik1sg" sourceNode="_fihqUKA5EeuqkpDnuik1sg" targetNode="_EfNqcKA4EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//PredicateDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//PredicateDefinition"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_-2aa_ircEeyyC-O0_LlY9w" 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="_-2aa_yrcEeyyC-O0_LlY9w" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_-2abACrcEeyyC-O0_LlY9w" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_QKD2EKA6EeuqkpDnuik1sg" name="Parameter" tooltipText="" outgoingEdges="_Z7FrQKA6EeuqkpDnuik1sg _oni4rKA6EeuqkpDnuik1sg" incomingEdges="_Uy4bWaA6EeuqkpDnuik1sg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Parameter"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Parameter"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_QKD2EaA6EeuqkpDnuik1sg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Uy4bWaA6EeuqkpDnuik1sg" name="[0..*] parameters" sourceNode="_A8hIkCrZEeyyC-O0_LlY9w" targetNode="_QKD2EKA6EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ParametricDefinition/parameters"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ParametricDefinition/parameters"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Uy5pcKA6EeuqkpDnuik1sg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Uy5pcqA6EeuqkpDnuik1sg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_Uy5pcaA6EeuqkpDnuik1sg" 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="_Z7FrQKA6EeuqkpDnuik1sg" name="[0..1] parameterType" sourceNode="_QKD2EKA6EeuqkpDnuik1sg" targetNode="_EfNqcKA4EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Parameter/parameterType"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Parameter/parameterType"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Z7GSUKA6EeuqkpDnuik1sg" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Z7GSUqA6EeuqkpDnuik1sg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_Z7GSUaA6EeuqkpDnuik1sg" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_jPpm4KA6EeuqkpDnuik1sg" name="Variable" tooltipText="" outgoingEdges="_Tt9RRtbNEeuymriYTNxK2g" incomingEdges="_oni4rKA6EeuqkpDnuik1sg _BVyUAKA7EeuqkpDnuik1sg _0KiRnCrdEeyyC-O0_LlY9w" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Variable"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Variable"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_n6Wbd6A6EeuqkpDnuik1sg" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_oni4rKA6EeuqkpDnuik1sg" sourceNode="_QKD2EKA6EeuqkpDnuik1sg" targetNode="_jPpm4KA6EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Parameter"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Parameter"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_onjfsKA6EeuqkpDnuik1sg" 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="_onjfsaA6EeuqkpDnuik1sg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_onjfsqA6EeuqkpDnuik1sg" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_sc_gMKA6EeuqkpDnuik1sg" name="Conjunction" tooltipText="" outgoingEdges="_SykT9qA7EeuqkpDnuik1sg _vWBGaKA7EeuqkpDnuik1sg" incomingEdges="_vDscvKA6EeuqkpDnuik1sg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Conjunction"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Conjunction"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_sdAHQKA6EeuqkpDnuik1sg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_vDscvKA6EeuqkpDnuik1sg" name="[0..*] bodies" sourceNode="_A8hIkCrZEeyyC-O0_LlY9w" targetNode="_sc_gMKA6EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ParametricDefinition/bodies"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ParametricDefinition/bodies"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_vDtDwKA6EeuqkpDnuik1sg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_vDtDwqA6EeuqkpDnuik1sg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_vDtDwaA6EeuqkpDnuik1sg" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_4k00sKA6EeuqkpDnuik1sg" name="Literal" tooltipText="" incomingEdges="_SykT9qA7EeuqkpDnuik1sg _9OddBqA7EeuqkpDnuik1sg _D9lnQKA8EeuqkpDnuik1sg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Literal"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Literal"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_W9SoAqA7EeuqkpDnuik1sg" 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="_6J_bsKA6EeuqkpDnuik1sg" name="Atom" tooltipText="" outgoingEdges="_D9lnQKA8EeuqkpDnuik1sg _VjwMzqA8EeuqkpDnuik1sg _KmxbkNYPEeuF_d0WEhR3Xw" incomingEdges="_UJJy0qBDEeuqkpDnuik1sg _MiDWeCrbEeyyC-O0_LlY9w" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Atom"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Atom"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_Uy6TtqA-EeuqkpDnuik1sg" 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="_UAle4KA-EeuqkpDnuik1sg" name="transitiveClosure : EBoolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Atom/transitiveClosure"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Atom/transitiveClosure"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_Uy9XAaA-EeuqkpDnuik1sg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_-O6CoKA6EeuqkpDnuik1sg" name="ImplicitVariable" tooltipText="" outgoingEdges="_BVyUAKA7EeuqkpDnuik1sg" incomingEdges="_0UtN5qA7EeuqkpDnuik1sg _bx-jYtYPEeuF_d0WEhR3Xw" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ImplicitVariable"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ImplicitVariable"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_-O6CoaA6EeuqkpDnuik1sg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_BVyUAKA7EeuqkpDnuik1sg" sourceNode="_-O6CoKA6EeuqkpDnuik1sg" targetNode="_jPpm4KA6EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ImplicitVariable"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ImplicitVariable"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_BVyUAaA7EeuqkpDnuik1sg" 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="_BVyUAqA7EeuqkpDnuik1sg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_BVyUA6A7EeuqkpDnuik1sg" 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="_SykT9qA7EeuqkpDnuik1sg" name="[0..*] literals" sourceNode="_sc_gMKA6EeuqkpDnuik1sg" targetNode="_4k00sKA6EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Conjunction/literals"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Conjunction/literals"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Syk7AKA7EeuqkpDnuik1sg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Syk7AqA7EeuqkpDnuik1sg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_Syk7AaA7EeuqkpDnuik1sg" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_V6YZcKA7EeuqkpDnuik1sg" name="NegativeLiteral" tooltipText="" outgoingEdges="_yCjlHKA7EeuqkpDnuik1sg _5jFyVCraEeyyC-O0_LlY9w" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NegativeLiteral"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NegativeLiteral"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_V6ZAgKA7EeuqkpDnuik1sg" 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="_rRcdoKA7EeuqkpDnuik1sg" name="ExistentialQuantifier" tooltipText="" outgoingEdges="_0UtN5qA7EeuqkpDnuik1sg" incomingEdges="_vWBGaKA7EeuqkpDnuik1sg _yCjlHKA7EeuqkpDnuik1sg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ExistentialQuantifier"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ExistentialQuantifier"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_-1RCnqA7EeuqkpDnuik1sg" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.0/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_vWBGaKA7EeuqkpDnuik1sg" sourceNode="_sc_gMKA6EeuqkpDnuik1sg" targetNode="_rRcdoKA7EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Conjunction"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Conjunction"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_-1Te06A7EeuqkpDnuik1sg" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_-1Te1KA7EeuqkpDnuik1sg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_-1Te1aA7EeuqkpDnuik1sg" 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="_yCjlHKA7EeuqkpDnuik1sg" sourceNode="_V6YZcKA7EeuqkpDnuik1sg" targetNode="_rRcdoKA7EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NegativeLiteral"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NegativeLiteral"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_-1Te36A7EeuqkpDnuik1sg" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_-1Te4KA7EeuqkpDnuik1sg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_-1Te4aA7EeuqkpDnuik1sg" 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="_0UtN5qA7EeuqkpDnuik1sg" name="[0..*] implicitVariables" sourceNode="_rRcdoKA7EeuqkpDnuik1sg" targetNode="_-O6CoKA6EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ExistentialQuantifier/implicitVariables"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ExistentialQuantifier/implicitVariables"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_0UucAKA7EeuqkpDnuik1sg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_0UucAqA7EeuqkpDnuik1sg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_0UucAaA7EeuqkpDnuik1sg" 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="_9OddBqA7EeuqkpDnuik1sg" sourceNode="_XLJ4gCraEeyyC-O0_LlY9w" targetNode="_4k00sKA6EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//CompoundLiteral"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//CompoundLiteral"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_9OeD4KA7EeuqkpDnuik1sg" 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="_9OeD4aA7EeuqkpDnuik1sg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_9OeD4qA7EeuqkpDnuik1sg" 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="_D9lnQKA8EeuqkpDnuik1sg" sourceNode="_6J_bsKA6EeuqkpDnuik1sg" targetNode="_4k00sKA6EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Atom"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Atom"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_UzDduKA-EeuqkpDnuik1sg" 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="_UzDduaA-EeuqkpDnuik1sg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_UzDduqA-EeuqkpDnuik1sg" 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="_VjwMzqA8EeuqkpDnuik1sg" name="[0..1] relation" sourceNode="_6J_bsKA6EeuqkpDnuik1sg" targetNode="_EfNqcKA4EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Atom/relation"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Atom/relation"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_VjwMz6A8EeuqkpDnuik1sg" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_VjwM0aA8EeuqkpDnuik1sg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_VjwM0KA8EeuqkpDnuik1sg" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_p9d30KA8EeuqkpDnuik1sg" name="Assertion" tooltipText="" outgoingEdges="_w-iG36A8EeuqkpDnuik1sg _mQFKsqA9EeuqkpDnuik1sg _YAoQHdeAEeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Assertion"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Assertion"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_Zdc4dwGzEey7cfH5K6RyCw" 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="_NAnRgKA9EeuqkpDnuik1sg" name="value : LogicValue = TRUE" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Assertion/value"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Assertion/value"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_NgfEZ6A9EeuqkpDnuik1sg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_Y2m60AGzEey7cfH5K6RyCw" name="default : EBoolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Assertion/default"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Assertion/default"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_ZdetkwGzEey7cfH5K6RyCw" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_w-iG36A8EeuqkpDnuik1sg" name="[0..1] relation" sourceNode="_p9d30KA8EeuqkpDnuik1sg" targetNode="_EfNqcKA4EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Assertion/relation"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Assertion/relation"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_w-it4KA8EeuqkpDnuik1sg" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_w-it4qA8EeuqkpDnuik1sg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_w-it4aA8EeuqkpDnuik1sg" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_xsYrUKA8EeuqkpDnuik1sg" name="Node" tooltipText="" outgoingEdges="_QlymotbNEeuymriYTNxK2g" incomingEdges="_4eU5TqA8EeuqkpDnuik1sg _-XLKltawEeuymriYTNxK2g _gRDCgNbGEeuymriYTNxK2g _vRo4VteAEeufiOvRR5sVhg _AmBxQNeBEeufiOvRR5sVhg _zJpmRgGyEey7cfH5K6RyCw" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Node"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Node"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_McYjKaA9EeuqkpDnuik1sg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_4eU5TqA8EeuqkpDnuik1sg" name="[0..*] nodes" sourceNode="_D05iIKA4EeuqkpDnuik1sg" targetNode="_xsYrUKA8EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Problem/nodes"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Problem/nodes"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_4eU5T6A8EeuqkpDnuik1sg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_4eU5UaA8EeuqkpDnuik1sg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_4eU5UKA8EeuqkpDnuik1sg" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_BMXnYKA9EeuqkpDnuik1sg" name="LogicValue" tooltipText="" width="12" height="10">
+      <target xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//LogicValue"/>
+      <semanticElements xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//LogicValue"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_BMXnYaA9EeuqkpDnuik1sg" 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="_B6IFQKA9EeuqkpDnuik1sg" name="TRUE" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/TRUE"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/TRUE"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_B6IsUKA9EeuqkpDnuik1sg" 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="_D8ciUKA9EeuqkpDnuik1sg" name="FALSE" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/FALSE"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/FALSE"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_D8dJYKA9EeuqkpDnuik1sg" 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="_JWqvUKA9EeuqkpDnuik1sg" name="UNKNOWN" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/UNKNOWN"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/UNKNOWN"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_JWrWYKA9EeuqkpDnuik1sg" 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="_9K7BcAGzEey7cfH5K6RyCw" name="ERROR" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/ERROR"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/ERROR"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_9K8PkAGzEey7cfH5K6RyCw" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_QTzgkKA9EeuqkpDnuik1sg" name="ScopeDeclaration" tooltipText="" outgoingEdges="_vdptgqA9EeuqkpDnuik1sg _F2vPU6A-EeuqkpDnuik1sg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ScopeDeclaration"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ScopeDeclaration"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_QT0HoKA9EeuqkpDnuik1sg" 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="_e7ydoKA9EeuqkpDnuik1sg" name="Statement" tooltipText="" incomingEdges="_hU64ZqA9EeuqkpDnuik1sg _mQFKsqA9EeuqkpDnuik1sg _mzziwKA9EeuqkpDnuik1sg _plK3JqA9EeuqkpDnuik1sg _vdptgqA9EeuqkpDnuik1sg _WX_5w9bGEeuymriYTNxK2g _DkzPhteBEeufiOvRR5sVhg _s68oXAGyEey7cfH5K6RyCw" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Statement"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Statement"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_k_IgQ6A9EeuqkpDnuik1sg" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.0/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_hU64ZqA9EeuqkpDnuik1sg" name="[0..*] statements" sourceNode="_D05iIKA4EeuqkpDnuik1sg" targetNode="_e7ydoKA9EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Problem/statements"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Problem/statements"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_hU7fQKA9EeuqkpDnuik1sg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_hU7fQqA9EeuqkpDnuik1sg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_hU7fQaA9EeuqkpDnuik1sg" 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="_mQFKsqA9EeuqkpDnuik1sg" sourceNode="_p9d30KA8EeuqkpDnuik1sg" targetNode="_e7ydoKA9EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Assertion"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Assertion"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Zdk0XQGzEey7cfH5K6RyCw" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_Zdk0XgGzEey7cfH5K6RyCw" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Zdk0XwGzEey7cfH5K6RyCw" 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="_mzziwKA9EeuqkpDnuik1sg" sourceNode="_A8hIkCrZEeyyC-O0_LlY9w" targetNode="_e7ydoKA9EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ParametricDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ParametricDefinition"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_-2abBCrcEeyyC-O0_LlY9w" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_-2abBSrcEeyyC-O0_LlY9w" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_-2abBircEeyyC-O0_LlY9w" 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="_plK3JqA9EeuqkpDnuik1sg" sourceNode="_JTstIKA4EeuqkpDnuik1sg" targetNode="_e7ydoKA9EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ClassDeclaration"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ClassDeclaration"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_plK3J6A9EeuqkpDnuik1sg" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_plK3KKA9EeuqkpDnuik1sg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_plK3KaA9EeuqkpDnuik1sg" 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="_vdptgqA9EeuqkpDnuik1sg" sourceNode="_QTzgkKA9EeuqkpDnuik1sg" targetNode="_e7ydoKA9EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ScopeDeclaration"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ScopeDeclaration"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_vdqUgKA9EeuqkpDnuik1sg" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_vdqUgaA9EeuqkpDnuik1sg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_vdqUgqA9EeuqkpDnuik1sg" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_zac6MKA9EeuqkpDnuik1sg" name="TypeScope" tooltipText="" outgoingEdges="_2kWqbKA9EeuqkpDnuik1sg _n5fiHqBJEeuqkpDnuik1sg" incomingEdges="_F2vPU6A-EeuqkpDnuik1sg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//TypeScope"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//TypeScope"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_DlBrZqA-EeuqkpDnuik1sg" 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="_BtHHgKA-EeuqkpDnuik1sg" name="increment : EBoolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//TypeScope/increment"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//TypeScope/increment"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_DlEusaA-EeuqkpDnuik1sg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_2kWqbKA9EeuqkpDnuik1sg" name="[0..1] targetType" sourceNode="_zac6MKA9EeuqkpDnuik1sg" targetNode="_JTstIKA4EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//TypeScope/targetType"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//TypeScope/targetType"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_2kXRcKA9EeuqkpDnuik1sg" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_2kXRcqA9EeuqkpDnuik1sg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_2kXRcaA9EeuqkpDnuik1sg" 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="_F2vPU6A-EeuqkpDnuik1sg" name="[0..*] typeScopes" sourceNode="_QTzgkKA9EeuqkpDnuik1sg" targetNode="_zac6MKA9EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ScopeDeclaration/typeScopes"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ScopeDeclaration/typeScopes"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_F2v2YKA-EeuqkpDnuik1sg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_F2v2YqA-EeuqkpDnuik1sg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_F2v2YaA-EeuqkpDnuik1sg" 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="_UJJy0qBDEeuqkpDnuik1sg" name="[0..1] atom" sourceNode="_XLJ4gCraEeyyC-O0_LlY9w" targetNode="_6J_bsKA6EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//CompoundLiteral/atom"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//CompoundLiteral/atom"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_UJKZ0KBDEeuqkpDnuik1sg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_UJKZ0qBDEeuqkpDnuik1sg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_UJKZ0aBDEeuqkpDnuik1sg" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_ReiX4KBJEeuqkpDnuik1sg" name="Multiplicity" tooltipText="" incomingEdges="_c_boQqBJEeuqkpDnuik1sg _dn26MqBJEeuqkpDnuik1sg _n5fiHqBJEeuqkpDnuik1sg _p1JWcqBJEeuqkpDnuik1sg _HUJ8o9YBEeuF_d0WEhR3Xw" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Multiplicity"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Multiplicity"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_eULNnKBJEeuqkpDnuik1sg" 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="_Tx0CEKBJEeuqkpDnuik1sg" name="RangeMultiplicity" tooltipText="" outgoingEdges="_c_boQqBJEeuqkpDnuik1sg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RangeMultiplicity"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RangeMultiplicity"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_kxDKYaBJEeuqkpDnuik1sg" 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="_iccDcKBJEeuqkpDnuik1sg" name="lowerBound : EInt = 0" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//RangeMultiplicity/lowerBound"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//RangeMultiplicity/lowerBound"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_jDn_QaBJEeuqkpDnuik1sg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_kKaoMKBJEeuqkpDnuik1sg" name="upperBound : EInt = -1" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//RangeMultiplicity/upperBound"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//RangeMultiplicity/upperBound"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_kxFmoqBJEeuqkpDnuik1sg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aPIDwKBJEeuqkpDnuik1sg" name="ExactMultiplicity" tooltipText="" outgoingEdges="_dn26MqBJEeuqkpDnuik1sg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ExactMultiplicity"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ExactMultiplicity"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_nIZcRaBJEeuqkpDnuik1sg" 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="_lhXNAKBJEeuqkpDnuik1sg" name="exactValue : EInt = 1" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//ExactMultiplicity/exactValue"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//ExactMultiplicity/exactValue"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_nIsXNaBJEeuqkpDnuik1sg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_c_boQqBJEeuqkpDnuik1sg" sourceNode="_Tx0CEKBJEeuqkpDnuik1sg" targetNode="_ReiX4KBJEeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RangeMultiplicity"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RangeMultiplicity"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_kxLGYKBJEeuqkpDnuik1sg" 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="_kxLGYaBJEeuqkpDnuik1sg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_kxLGYqBJEeuqkpDnuik1sg" 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="_dn26MqBJEeuqkpDnuik1sg" sourceNode="_aPIDwKBJEeuqkpDnuik1sg" targetNode="_ReiX4KBJEeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ExactMultiplicity"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ExactMultiplicity"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_nIwopqBJEeuqkpDnuik1sg" 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="_nIwop6BJEeuqkpDnuik1sg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_nIwoqKBJEeuqkpDnuik1sg" 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="_n5fiHqBJEeuqkpDnuik1sg" name="[0..1] multiplicity" sourceNode="_zac6MKA9EeuqkpDnuik1sg" targetNode="_ReiX4KBJEeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//TypeScope/multiplicity"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//TypeScope/multiplicity"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_n5gJEKBJEeuqkpDnuik1sg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_n5gJEqBJEeuqkpDnuik1sg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_n5gJEaBJEeuqkpDnuik1sg" 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="_p1JWcqBJEeuqkpDnuik1sg" name="[0..1] multiplicity" sourceNode="_c-A7oKA4EeuqkpDnuik1sg" targetNode="_ReiX4KBJEeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ReferenceDeclaration/multiplicity"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ReferenceDeclaration/multiplicity"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_p1J9cKBJEeuqkpDnuik1sg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_p1J9cqBJEeuqkpDnuik1sg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_p1J9caBJEeuqkpDnuik1sg" 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="_m-6OTNXtEeuF_d0WEhR3Xw" sourceNode="_D05iIKA4EeuqkpDnuik1sg" targetNode="_RzK-YKA5EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Problem"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Problem"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_m-61UNXtEeuF_d0WEhR3Xw" 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="_m-61UdXtEeuF_d0WEhR3Xw" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_m-61UtXtEeuF_d0WEhR3Xw" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_D9_5INYBEeuF_d0WEhR3Xw" name="UnboundedMultiplicity" tooltipText="" outgoingEdges="_HUJ8o9YBEeuF_d0WEhR3Xw" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//UnboundedMultiplicity"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//UnboundedMultiplicity"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_D-DjgNYBEeuF_d0WEhR3Xw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_HUJ8o9YBEeuF_d0WEhR3Xw" sourceNode="_D9_5INYBEeuF_d0WEhR3Xw" targetNode="_ReiX4KBJEeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//UnboundedMultiplicity"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//UnboundedMultiplicity"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_HUKjsNYBEeuF_d0WEhR3Xw" 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="_HUKjsdYBEeuF_d0WEhR3Xw" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_HUKjstYBEeuF_d0WEhR3Xw" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_IwJ4MNYPEeuF_d0WEhR3Xw" name="VariableOrNodeArgument" tooltipText="" outgoingEdges="_T1fN5tYPEeuF_d0WEhR3Xw _bx-jYtYPEeuF_d0WEhR3Xw _1HYZXNd_EeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNodeArgument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNodeArgument"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_IwLtYNYPEeuF_d0WEhR3Xw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_KmxbkNYPEeuF_d0WEhR3Xw" name="[0..*] arguments" sourceNode="_6J_bsKA6EeuqkpDnuik1sg" targetNode="_rwC2UNd_EeufiOvRR5sVhg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Atom/arguments"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Atom/arguments"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_P-mb4NYPEeuF_d0WEhR3Xw" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_P-mb4tYPEeuF_d0WEhR3Xw" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_P-mb4dYPEeuF_d0WEhR3Xw" 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="_T1fN5tYPEeuF_d0WEhR3Xw" name="[0..1] variableOrNode" sourceNode="_IwJ4MNYPEeuF_d0WEhR3Xw" targetNode="_KwtCUNbNEeuymriYTNxK2g">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//VariableOrNodeArgument/variableOrNode"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//VariableOrNodeArgument/variableOrNode"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_T1fN59YPEeuF_d0WEhR3Xw" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_T1fN6dYPEeuF_d0WEhR3Xw" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_T1fN6NYPEeuF_d0WEhR3Xw" 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="_bx-jYtYPEeuF_d0WEhR3Xw" name="[0..1] singletonVariable" sourceNode="_IwJ4MNYPEeuF_d0WEhR3Xw" targetNode="_-O6CoKA6EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//VariableOrNodeArgument/singletonVariable"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//VariableOrNodeArgument/singletonVariable"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_dcHJ49YPEeuF_d0WEhR3Xw" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_dcHJ5dYPEeuF_d0WEhR3Xw" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_dcHJ5NYPEeuF_d0WEhR3Xw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_-XLKltawEeuymriYTNxK2g" name="[0..1] newNode" sourceNode="_JTstIKA4EeuqkpDnuik1sg" targetNode="_xsYrUKA8EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ClassDeclaration/newNode"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ClassDeclaration/newNode"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_-XMYsNawEeuymriYTNxK2g" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_-XMYstawEeuymriYTNxK2g" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_-XMYsdawEeuymriYTNxK2g" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_M58q8NbGEeuymriYTNxK2g" name="EnumDeclaration" tooltipText="" outgoingEdges="_UwbfHtbGEeuymriYTNxK2g _WX_5w9bGEeuymriYTNxK2g _gRDCgNbGEeuymriYTNxK2g" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//EnumDeclaration"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//EnumDeclaration"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_M59SANbGEeuymriYTNxK2g" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_UwbfHtbGEeuymriYTNxK2g" sourceNode="_M58q8NbGEeuymriYTNxK2g" targetNode="_EfNqcKA4EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//EnumDeclaration"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//EnumDeclaration"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_UwcGENbGEeuymriYTNxK2g" 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="_UwcGEdbGEeuymriYTNxK2g" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_UwcGEtbGEeuymriYTNxK2g" 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="_WX_5w9bGEeuymriYTNxK2g" sourceNode="_M58q8NbGEeuymriYTNxK2g" targetNode="_e7ydoKA9EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//EnumDeclaration"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//EnumDeclaration"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_WYAg0NbGEeuymriYTNxK2g" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_WYAg0dbGEeuymriYTNxK2g" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_WYAg0tbGEeuymriYTNxK2g" 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="_gRDCgNbGEeuymriYTNxK2g" name="[0..*] literals" sourceNode="_M58q8NbGEeuymriYTNxK2g" targetNode="_xsYrUKA8EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//EnumDeclaration/literals"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//EnumDeclaration/literals"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_gRDpkNbGEeuymriYTNxK2g" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_gRDpktbGEeuymriYTNxK2g" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_gRDpkdbGEeuymriYTNxK2g" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_KwtCUNbNEeuymriYTNxK2g" name="VariableOrNode" tooltipText="" outgoingEdges="_Smi9eNbNEeuymriYTNxK2g" incomingEdges="_QlymotbNEeuymriYTNxK2g _Tt9RRtbNEeuymriYTNxK2g _T1fN5tYPEeuF_d0WEhR3Xw _btj3UirbEeyyC-O0_LlY9w" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNode"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNode"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_QMf8vdbNEeuymriYTNxK2g" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_QlymotbNEeuymriYTNxK2g" sourceNode="_xsYrUKA8EeuqkpDnuik1sg" targetNode="_KwtCUNbNEeuymriYTNxK2g">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Node"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Node"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_QlzNcNbNEeuymriYTNxK2g" 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="_QlzNcdbNEeuymriYTNxK2g" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_QlzNctbNEeuymriYTNxK2g" 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="_Smi9eNbNEeuymriYTNxK2g" sourceNode="_KwtCUNbNEeuymriYTNxK2g" targetNode="_RzK-YKA5EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNode"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNode"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_SmjkQNbNEeuymriYTNxK2g" 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="_SmjkQdbNEeuymriYTNxK2g" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_SmjkQtbNEeuymriYTNxK2g" 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="_Tt9RRtbNEeuymriYTNxK2g" sourceNode="_jPpm4KA6EeuqkpDnuik1sg" targetNode="_KwtCUNbNEeuymriYTNxK2g">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Variable"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Variable"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Tt94QNbNEeuymriYTNxK2g" 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="_Tt94QdbNEeuymriYTNxK2g" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Tt94QtbNEeuymriYTNxK2g" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_IrcrINd_EeufiOvRR5sVhg" name="Constant" tooltipText="" incomingEdges="_Vsm0XNd_EeufiOvRR5sVhg _WEGuVtd_EeufiOvRR5sVhg _Waktldd_EeufiOvRR5sVhg _nuG1dteAEeufiOvRR5sVhg _pMdCzNeAEeufiOvRR5sVhg _WiKRoteBEeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Constant"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Constant"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J3H0Fdd_EeufiOvRR5sVhg" 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="_KdTqUNd_EeufiOvRR5sVhg" name="IntConstant" tooltipText="" outgoingEdges="_Vsm0XNd_EeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//IntConstant"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//IntConstant"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_cid45dd_EeufiOvRR5sVhg" 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="_brB6kNd_EeufiOvRR5sVhg" name="intValue : EInt = 0" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//IntConstant/intValue"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//IntConstant/intValue"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_cig8Mdd_EeufiOvRR5sVhg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_MARR4Nd_EeufiOvRR5sVhg" name="RealConstant" tooltipText="" outgoingEdges="_WEGuVtd_EeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RealConstant"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RealConstant"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_f7dN99d_EeufiOvRR5sVhg" 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="_exQEoNd_EeufiOvRR5sVhg" name="realValue : EDouble = 0.0" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//RealConstant/realValue"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//RealConstant/realValue"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_f7fqMtd_EeufiOvRR5sVhg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Rv9_oNd_EeufiOvRR5sVhg" name="StringConstant" tooltipText="" outgoingEdges="_Waktldd_EeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//StringConstant"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//StringConstant"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_h2BdN9d_EeufiOvRR5sVhg" 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="_g4rrMNd_EeufiOvRR5sVhg" name="stringValue : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//StringConstant/stringValue"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//StringConstant/stringValue"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_h2Egg9d_EeufiOvRR5sVhg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Vsm0XNd_EeufiOvRR5sVhg" sourceNode="_KdTqUNd_EeufiOvRR5sVhg" targetNode="_IrcrINd_EeufiOvRR5sVhg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//IntConstant"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//IntConstant"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_cioRGtd_EeufiOvRR5sVhg" 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="_cioRG9d_EeufiOvRR5sVhg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_cioRHNd_EeufiOvRR5sVhg" 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="_WEGuVtd_EeufiOvRR5sVhg" sourceNode="_MARR4Nd_EeufiOvRR5sVhg" targetNode="_IrcrINd_EeufiOvRR5sVhg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RealConstant"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RealConstant"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_f7lJ9td_EeufiOvRR5sVhg" 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="_f7lJ99d_EeufiOvRR5sVhg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_f7lJ-Nd_EeufiOvRR5sVhg" 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="_Waktldd_EeufiOvRR5sVhg" sourceNode="_Rv9_oNd_EeufiOvRR5sVhg" targetNode="_IrcrINd_EeufiOvRR5sVhg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//StringConstant"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//StringConstant"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_h2LONtd_EeufiOvRR5sVhg" 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="_h2LON9d_EeufiOvRR5sVhg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_h2LOONd_EeufiOvRR5sVhg" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_mCSCQNd_EeufiOvRR5sVhg" name="ConstantArgument" tooltipText="" outgoingEdges="_zhINQtd_EeufiOvRR5sVhg _nuG1dteAEeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ConstantArgument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ConstantArgument"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_mCSCQdd_EeufiOvRR5sVhg" 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="_rwC2UNd_EeufiOvRR5sVhg" name="Argument" tooltipText="" incomingEdges="_KmxbkNYPEeuF_d0WEhR3Xw _zhINQtd_EeufiOvRR5sVhg _1HYZXNd_EeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Argument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Argument"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_uH9wANd_EeufiOvRR5sVhg" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_zhINQtd_EeufiOvRR5sVhg" sourceNode="_mCSCQNd_EeufiOvRR5sVhg" targetNode="_rwC2UNd_EeufiOvRR5sVhg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ConstantArgument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ConstantArgument"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_zhI0ENd_EeufiOvRR5sVhg" 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="_zhI0Edd_EeufiOvRR5sVhg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_zhI0Etd_EeufiOvRR5sVhg" 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="_1HYZXNd_EeufiOvRR5sVhg" sourceNode="_IwJ4MNYPEeuF_d0WEhR3Xw" targetNode="_rwC2UNd_EeufiOvRR5sVhg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNodeArgument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNodeArgument"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_1HYZXdd_EeufiOvRR5sVhg" 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="_1HYZXtd_EeufiOvRR5sVhg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_1HYZX9d_EeufiOvRR5sVhg" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_OWYYMNeAEeufiOvRR5sVhg" name="NodeAssertionArgument" tooltipText="" outgoingEdges="_dDd3wteAEeufiOvRR5sVhg _vRo4VteAEeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NodeAssertionArgument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NodeAssertionArgument"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_OWY_QNeAEeufiOvRR5sVhg" 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="_ViJbUNeAEeufiOvRR5sVhg" name="AssertionArgument" tooltipText="" incomingEdges="_YAoQHdeAEeufiOvRR5sVhg _dDd3wteAEeufiOvRR5sVhg _g_aI1teAEeufiOvRR5sVhg _WAUqNgGzEey7cfH5K6RyCw" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionArgument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionArgument"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_XdUurteAEeufiOvRR5sVhg" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_YAoQHdeAEeufiOvRR5sVhg" name="[0..*] arguments" sourceNode="_p9d30KA8EeuqkpDnuik1sg" targetNode="_ViJbUNeAEeufiOvRR5sVhg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Assertion/arguments"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Assertion/arguments"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_YAo3ANeAEeufiOvRR5sVhg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_YAo3AteAEeufiOvRR5sVhg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_YAo3AdeAEeufiOvRR5sVhg" 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="_dDd3wteAEeufiOvRR5sVhg" sourceNode="_OWYYMNeAEeufiOvRR5sVhg" targetNode="_ViJbUNeAEeufiOvRR5sVhg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NodeAssertionArgument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NodeAssertionArgument"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_dDeewNeAEeufiOvRR5sVhg" 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="_dDeewdeAEeufiOvRR5sVhg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_dDeewteAEeufiOvRR5sVhg" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_dZVaANeAEeufiOvRR5sVhg" name="ConstantAssertionArgument" tooltipText="" outgoingEdges="_g_aI1teAEeufiOvRR5sVhg _pMdCzNeAEeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ConstantAssertionArgument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ConstantAssertionArgument"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_dZVaAdeAEeufiOvRR5sVhg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_g_aI1teAEeufiOvRR5sVhg" sourceNode="_dZVaANeAEeufiOvRR5sVhg" targetNode="_ViJbUNeAEeufiOvRR5sVhg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ConstantAssertionArgument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ConstantAssertionArgument"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_g_aI19eAEeufiOvRR5sVhg" 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="_g_aI2NeAEeufiOvRR5sVhg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_g_aI2deAEeufiOvRR5sVhg" 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="_nuG1dteAEeufiOvRR5sVhg" name="[0..1] constant" sourceNode="_mCSCQNd_EeufiOvRR5sVhg" targetNode="_IrcrINd_EeufiOvRR5sVhg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ConstantArgument/constant"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ConstantArgument/constant"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_nuG1d9eAEeufiOvRR5sVhg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_nuG1edeAEeufiOvRR5sVhg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_nuG1eNeAEeufiOvRR5sVhg" 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="_pMdCzNeAEeufiOvRR5sVhg" name="[0..1] constant" sourceNode="_dZVaANeAEeufiOvRR5sVhg" targetNode="_IrcrINd_EeufiOvRR5sVhg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ConstantAssertionArgument/constant"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ConstantAssertionArgument/constant"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_pMdp0NeAEeufiOvRR5sVhg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_pMdp0teAEeufiOvRR5sVhg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_pMdp0deAEeufiOvRR5sVhg" 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="_vRo4VteAEeufiOvRR5sVhg" name="[0..1] node" sourceNode="_OWYYMNeAEeufiOvRR5sVhg" targetNode="_xsYrUKA8EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NodeAssertionArgument/node"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NodeAssertionArgument/node"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_vRo4V9eAEeufiOvRR5sVhg" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_vRo4WdeAEeufiOvRR5sVhg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_vRo4WNeAEeufiOvRR5sVhg" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_9TjT4NeAEeufiOvRR5sVhg" name="NodeValueAssertion" tooltipText="" outgoingEdges="_AmBxQNeBEeufiOvRR5sVhg _DkzPhteBEeufiOvRR5sVhg _WiKRoteBEeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NodeValueAssertion"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NodeValueAssertion"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_9Tj68NeAEeufiOvRR5sVhg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_AmBxQNeBEeufiOvRR5sVhg" name="[0..1] node" sourceNode="_9TjT4NeAEeufiOvRR5sVhg" targetNode="_xsYrUKA8EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NodeValueAssertion/node"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NodeValueAssertion/node"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_AmBxQdeBEeufiOvRR5sVhg" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_AmBxQ9eBEeufiOvRR5sVhg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_AmBxQteBEeufiOvRR5sVhg" 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="_DkzPhteBEeufiOvRR5sVhg" sourceNode="_9TjT4NeAEeufiOvRR5sVhg" targetNode="_e7ydoKA9EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NodeValueAssertion"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NodeValueAssertion"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_DkzPh9eBEeufiOvRR5sVhg" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_DkzPiNeBEeufiOvRR5sVhg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_DkzPideBEeufiOvRR5sVhg" 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="_WiKRoteBEeufiOvRR5sVhg" name="[0..1] value" sourceNode="_9TjT4NeAEeufiOvRR5sVhg" targetNode="_IrcrINd_EeufiOvRR5sVhg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NodeValueAssertion/value"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NodeValueAssertion/value"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_WiK4cNeBEeufiOvRR5sVhg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_WiK4cteBEeufiOvRR5sVhg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_WiK4cdeBEeufiOvRR5sVhg" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_pcXBkAGyEey7cfH5K6RyCw" name="IndividualDeclaration" tooltipText="" outgoingEdges="_s68oXAGyEey7cfH5K6RyCw _zJpmRgGyEey7cfH5K6RyCw" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//IndividualDeclaration"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//IndividualDeclaration"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_pcYPsAGyEey7cfH5K6RyCw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_s68oXAGyEey7cfH5K6RyCw" sourceNode="_pcXBkAGyEey7cfH5K6RyCw" targetNode="_e7ydoKA9EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//IndividualDeclaration"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//IndividualDeclaration"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_s69PYAGyEey7cfH5K6RyCw" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_s69PYQGyEey7cfH5K6RyCw" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_s69PYgGyEey7cfH5K6RyCw" 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="_zJpmRgGyEey7cfH5K6RyCw" name="[0..*] nodes" sourceNode="_pcXBkAGyEey7cfH5K6RyCw" targetNode="_xsYrUKA8EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//IndividualDeclaration/nodes"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//IndividualDeclaration/nodes"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_zJqNUAGyEey7cfH5K6RyCw" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_zJqNUgGyEey7cfH5K6RyCw" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_zJqNUQGyEey7cfH5K6RyCw" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_SNSdcAGzEey7cfH5K6RyCw" name="WildcardAssertionArgument" tooltipText="" outgoingEdges="_WAUqNgGzEey7cfH5K6RyCw" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//WildcardAssertionArgument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//WildcardAssertionArgument"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_SNSdcQGzEey7cfH5K6RyCw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_WAUqNgGzEey7cfH5K6RyCw" sourceNode="_SNSdcAGzEey7cfH5K6RyCw" targetNode="_ViJbUNeAEeufiOvRR5sVhg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//WildcardAssertionArgument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//WildcardAssertionArgument"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_WAUqNwGzEey7cfH5K6RyCw" 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="_WAUqOAGzEey7cfH5K6RyCw" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_WAUqOQGzEey7cfH5K6RyCw" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_A8hIkCrZEeyyC-O0_LlY9w" name="ParametricDefinition" tooltipText="" outgoingEdges="_vDscvKA6EeuqkpDnuik1sg _Uy4bWaA6EeuqkpDnuik1sg _mzziwKA9EeuqkpDnuik1sg" incomingEdges="_ddmjcCrZEeyyC-O0_LlY9w _eGZo7irZEeyyC-O0_LlY9w" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ParametricDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ParametricDefinition"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_DKdm0irZEeyyC-O0_LlY9w" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.0/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_NzpMACrZEeyyC-O0_LlY9w" name="RuleDefinition" tooltipText="" outgoingEdges="_eGZo7irZEeyyC-O0_LlY9w _WUsgHCrcEeyyC-O0_LlY9w _-hzfnCtaEeySS4mYSornnA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RuleDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RuleDefinition"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J0F0EyreEeyyC-O0_LlY9w" 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="_H_EMACreEeyyC-O0_LlY9w" name="kind : RuleKind = DIRECT" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//RuleDefinition/kind"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//RuleDefinition/kind"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_J0HpISreEeyyC-O0_LlY9w" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ddmjcCrZEeyyC-O0_LlY9w" sourceNode="_fihqUKA5EeuqkpDnuik1sg" targetNode="_A8hIkCrZEeyyC-O0_LlY9w">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//PredicateDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//PredicateDefinition"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_-2bB8yrcEeyyC-O0_LlY9w" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_-2bB9CrcEeyyC-O0_LlY9w" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_-2bB9SrcEeyyC-O0_LlY9w" 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="_eGZo7irZEeyyC-O0_LlY9w" sourceNode="_NzpMACrZEeyyC-O0_LlY9w" targetNode="_A8hIkCrZEeyyC-O0_LlY9w">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RuleDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RuleDefinition"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J0NI5ireEeyyC-O0_LlY9w" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_J0NI5yreEeyyC-O0_LlY9w" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J0NI6CreEeyyC-O0_LlY9w" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_jzRFACrZEeyyC-O0_LlY9w" name="Action" tooltipText="" outgoingEdges="_vfYG6CrZEeyyC-O0_LlY9w" incomingEdges="_-hzfnCtaEeySS4mYSornnA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Action"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Action"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_jzRsECrZEeyyC-O0_LlY9w" 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="_remZACrZEeyyC-O0_LlY9w" name="ActionLiteral" tooltipText="" incomingEdges="_vfYG6CrZEeyyC-O0_LlY9w _KrcPniraEeyyC-O0_LlY9w _LMS50CraEeyyC-O0_LlY9w _Lfp6vCraEeyyC-O0_LlY9w" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ActionLiteral"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ActionLiteral"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_swnaiirZEeyyC-O0_LlY9w" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_vfYG6CrZEeyyC-O0_LlY9w" name="[0..*] actionLiterals" sourceNode="_jzRFACrZEeyyC-O0_LlY9w" targetNode="_remZACrZEeyyC-O0_LlY9w">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Action/actionLiterals"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Action/actionLiterals"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_vfYt4CrZEeyyC-O0_LlY9w" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_vfYt4irZEeyyC-O0_LlY9w" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_vfYt4SrZEeyyC-O0_LlY9w" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_3Z67gCrZEeyyC-O0_LlY9w" name="ValueActionLiteral" tooltipText="" outgoingEdges="_KrcPniraEeyyC-O0_LlY9w _MiDWeCrbEeyyC-O0_LlY9w" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ValueActionLiteral"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ValueActionLiteral"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_hymTwStbEeySS4mYSornnA" 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="_cSL_ICtbEeySS4mYSornnA" name="value : LogicValue = TRUE" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//ValueActionLiteral/value"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//ValueActionLiteral/value"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_d8_UEStbEeySS4mYSornnA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_e16gICtbEeySS4mYSornnA" name="refinement : EBoolean = FALSE" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//ValueActionLiteral/refinement"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//ValueActionLiteral/refinement"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_hypXAitbEeySS4mYSornnA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_9mHYACrZEeyyC-O0_LlY9w" name="DeleteActionLiteral" tooltipText="" outgoingEdges="_LMS50CraEeyyC-O0_LlY9w _btj3UirbEeyyC-O0_LlY9w" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//DeleteActionLiteral"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//DeleteActionLiteral"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_9mHYASrZEeyyC-O0_LlY9w" 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="_AvrxACraEeyyC-O0_LlY9w" name="NewActionLiteral" tooltipText="" outgoingEdges="_Lfp6vCraEeyyC-O0_LlY9w _NXzvMiraEeyyC-O0_LlY9w" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NewActionLiteral"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NewActionLiteral"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_AvsYECraEeyyC-O0_LlY9w" 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="_Fl5SACraEeyyC-O0_LlY9w" name="NewVariable" tooltipText="" outgoingEdges="_0KiRnCrdEeyyC-O0_LlY9w" incomingEdges="_NXzvMiraEeyyC-O0_LlY9w" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NewVariable"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NewVariable"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_Fl55ECraEeyyC-O0_LlY9w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_KrcPniraEeyyC-O0_LlY9w" sourceNode="_3Z67gCrZEeyyC-O0_LlY9w" targetNode="_remZACrZEeyyC-O0_LlY9w">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ValueActionLiteral"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ValueActionLiteral"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_hyx6FitbEeySS4mYSornnA" 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="_hyx6FytbEeySS4mYSornnA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_hyx6GCtbEeySS4mYSornnA" 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="_LMS50CraEeyyC-O0_LlY9w" sourceNode="_9mHYACrZEeyyC-O0_LlY9w" targetNode="_remZACrZEeyyC-O0_LlY9w">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//DeleteActionLiteral"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//DeleteActionLiteral"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_LMS50SraEeyyC-O0_LlY9w" 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="_LMS50iraEeyyC-O0_LlY9w" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_LMS50yraEeyyC-O0_LlY9w" 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="_Lfp6vCraEeyyC-O0_LlY9w" sourceNode="_AvrxACraEeyyC-O0_LlY9w" targetNode="_remZACrZEeyyC-O0_LlY9w">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NewActionLiteral"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NewActionLiteral"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Lfp6vSraEeyyC-O0_LlY9w" 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="_Lfp6viraEeyyC-O0_LlY9w" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Lfp6vyraEeyyC-O0_LlY9w" 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="_NXzvMiraEeyyC-O0_LlY9w" name="[0..1] variable" sourceNode="_AvrxACraEeyyC-O0_LlY9w" targetNode="_Fl5SACraEeyyC-O0_LlY9w">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NewActionLiteral/variable"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NewActionLiteral/variable"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_NXzvMyraEeyyC-O0_LlY9w" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_NXzvNSraEeyyC-O0_LlY9w" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_NXzvNCraEeyyC-O0_LlY9w" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_XLJ4gCraEeyyC-O0_LlY9w" name="CompoundLiteral" tooltipText="" outgoingEdges="_UJJy0qBDEeuqkpDnuik1sg _9OddBqA7EeuqkpDnuik1sg" incomingEdges="_5CBsdCraEeyyC-O0_LlY9w _5jFyVCraEeyyC-O0_LlY9w" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//CompoundLiteral"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//CompoundLiteral"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aK_KECreEeyyC-O0_LlY9w" 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="_jjUIACraEeyyC-O0_LlY9w" name="ValueLiteral" tooltipText="" outgoingEdges="_5CBsdCraEeyyC-O0_LlY9w _td_zEirbEeyyC-O0_LlY9w" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ValueLiteral"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ValueLiteral"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_1LZjoirbEeyyC-O0_LlY9w" 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="_z_B3ECrbEeyyC-O0_LlY9w" name="refinement : EBoolean = false" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//ValueLiteral/refinement"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//ValueLiteral/refinement"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_1LaxsirbEeyyC-O0_LlY9w" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_5CBsdCraEeyyC-O0_LlY9w" sourceNode="_jjUIACraEeyyC-O0_LlY9w" targetNode="_XLJ4gCraEeyyC-O0_LlY9w">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ValueLiteral"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ValueLiteral"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_1LgRUirbEeyyC-O0_LlY9w" 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="_1LgRUyrbEeyyC-O0_LlY9w" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_1LgRVCrbEeyyC-O0_LlY9w" 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="_5jFyVCraEeyyC-O0_LlY9w" sourceNode="_V6YZcKA7EeuqkpDnuik1sg" targetNode="_XLJ4gCraEeyyC-O0_LlY9w">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NegativeLiteral"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NegativeLiteral"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_5jFyVSraEeyyC-O0_LlY9w" 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="_5jFyViraEeyyC-O0_LlY9w" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_5jFyVyraEeyyC-O0_LlY9w" 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="_MiDWeCrbEeyyC-O0_LlY9w" name="[0..1] atom" sourceNode="_3Z67gCrZEeyyC-O0_LlY9w" targetNode="_6J_bsKA6EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ValueActionLiteral/atom"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ValueActionLiteral/atom"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_MiD9cCrbEeyyC-O0_LlY9w" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_MiD9cirbEeyyC-O0_LlY9w" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_MiD9cSrbEeyyC-O0_LlY9w" 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="_btj3UirbEeyyC-O0_LlY9w" name="[0..1] variableOrNode" sourceNode="_9mHYACrZEeyyC-O0_LlY9w" targetNode="_KwtCUNbNEeuymriYTNxK2g">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//DeleteActionLiteral/variableOrNode"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//DeleteActionLiteral/variableOrNode"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_btkeUCrbEeyyC-O0_LlY9w" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_btkeUirbEeyyC-O0_LlY9w" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_btkeUSrbEeyyC-O0_LlY9w" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_q-nmgCrbEeyyC-O0_LlY9w" name="LogicConstant" tooltipText="" incomingEdges="_td_zEirbEeyyC-O0_LlY9w" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//LogicConstant"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//LogicConstant"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_IvqlQStcEeySS4mYSornnA" 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="_GLYqoCtcEeySS4mYSornnA" name="value : LogicValue = TRUE" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//LogicConstant/value"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//LogicConstant/value"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_IvtBgStcEeySS4mYSornnA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_td_zEirbEeyyC-O0_LlY9w" name="[0..*] values" sourceNode="_jjUIACraEeyyC-O0_LlY9w" targetNode="_q-nmgCrbEeyyC-O0_LlY9w">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ValueLiteral/values"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ValueLiteral/values"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_td_zEyrbEeyyC-O0_LlY9w" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_td_zFSrbEeyyC-O0_LlY9w" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_td_zFCrbEeyyC-O0_LlY9w" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_LO_WkCrcEeyyC-O0_LlY9w" name="PredicateKind" tooltipText="" width="12" height="10">
+      <target xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//PredicateKind"/>
+      <semanticElements xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//PredicateKind"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_LO_9oCrcEeyyC-O0_LlY9w" 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="_M8yVICrcEeyyC-O0_LlY9w" name="PARTIAL" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//PredicateKind/PARTIAL"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//PredicateKind/PARTIAL"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_M8yVISrcEeyyC-O0_LlY9w" 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="_OHUOkCrcEeyyC-O0_LlY9w" name="DIRECT" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//PredicateKind/DIRECT"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//PredicateKind/DIRECT"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_OHUOkSrcEeyyC-O0_LlY9w" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_PSV3QCrcEeyyC-O0_LlY9w" name="RuleKind" tooltipText="" width="12" height="10">
+      <target xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//RuleKind"/>
+      <semanticElements xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//RuleKind"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_PSV3QSrcEeyyC-O0_LlY9w" 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="_QZVUgCrcEeyyC-O0_LlY9w" name="DIRECT" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//RuleKind/DIRECT"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//RuleKind/DIRECT"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_QZV7kCrcEeyyC-O0_LlY9w" 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="_WUsgHCrcEeyyC-O0_LlY9w" sourceNode="_NzpMACrZEeyyC-O0_LlY9w" targetNode="_RzK-YKA5EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RuleDefinition"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RuleDefinition"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J0NI7CreEeyyC-O0_LlY9w" 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="_J0NI7SreEeyyC-O0_LlY9w" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J0NI7ireEeyyC-O0_LlY9w" 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="_0KiRnCrdEeyyC-O0_LlY9w" sourceNode="_Fl5SACraEeyyC-O0_LlY9w" targetNode="_jPpm4KA6EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NewVariable"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NewVariable"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_0KiRnSrdEeyyC-O0_LlY9w" targetArrow="InputClosedArrow" routingStyle="manhattan">
+        <customFeatures>routingStyle</customFeatures>
+        <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="_0KiRnirdEeyyC-O0_LlY9w" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_0KiRnyrdEeyyC-O0_LlY9w" 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="_-hzfnCtaEeySS4mYSornnA" name="[0..1] action" sourceNode="_NzpMACrZEeyyC-O0_LlY9w" targetNode="_jzRFACrZEeyyC-O0_LlY9w">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//RuleDefinition/action"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//RuleDefinition/action"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_-h0GoCtaEeySS4mYSornnA" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_-h0GoitaEeySS4mYSornnA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_-h0GoStaEeySS4mYSornnA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_CsWlsKA4EeuqkpDnuik1sg"/>
+    <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
+    <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/>
+  </diagram:DSemanticDiagram>
+</xmi:XMI>
diff --git a/subprojects/language-model/src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2 b/subprojects/language-model/src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2
new file mode 100644
index 00000000..15198d69
--- /dev/null
+++ b/subprojects/language-model/src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2
@@ -0,0 +1,20 @@
+module tools.refinery.language.model.GenerateProblemModel
+
+Workflow {
+        bean = org.eclipse.emf.mwe.utils.StandaloneSetup {
+                projectMapping = {
+                        projectName = "tools.refinery.refinery-language-model"
+                        path = "."
+                }
+        }
+
+        component = org.eclipse.emf.mwe.utils.DirectoryCleaner {
+                directory = "src/main/emf-gen"
+        }
+
+        component = org.eclipse.emf.mwe2.ecore.EcoreGenerator {
+                generateCustomClasses = false
+                genModel = "platform:/resource/tools.refinery.refinery-language-model/src/main/resources/model/problem.genmodel"
+                srcPath = "platform:/resource/tools.refinery.refinery-language-model/src/main/emf-gen"
+        }
+}
diff --git a/subprojects/language-model/src/main/java/tools/refinery/language/model/ProblemEMFSetup.java b/subprojects/language-model/src/main/java/tools/refinery/language/model/ProblemEMFSetup.java
new file mode 100644
index 00000000..9383098b
--- /dev/null
+++ b/subprojects/language-model/src/main/java/tools/refinery/language/model/ProblemEMFSetup.java
@@ -0,0 +1,34 @@
+package tools.refinery.language.model;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.resource.Resource;
+
+import tools.refinery.language.model.problem.ProblemPackage;
+import tools.refinery.language.model.problem.impl.ProblemFactoryImpl;
+
+public class ProblemEMFSetup {
+        public static final String XMI_RESOURCE_EXTENSION = "problem_xmi";
+
+        private ProblemEMFSetup() {
+                throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
+        }
+
+        // Here we can't rely on java.util.HashMap#putIfAbsent, because
+        // org.eclipse.emf.ecore.impl.EPackageRegistryImpl#containsKey is overridden
+        // without also overriding putIfAbsent. We must make sure to call the
+        // overridden containsKey implementation.
+        @SuppressWarnings("squid:S3824")
+        public static void doEMFRegistration() {
+                if (!EPackage.Registry.INSTANCE.containsKey(ProblemPackage.eNS_URI)) {
+                        EPackage.Registry.INSTANCE.put(ProblemPackage.eNS_URI, ProblemPackage.eINSTANCE);
+                }
+
+                // This Resource.Factory is not actually used once
+                // tools.refinery.language.ProblemStandaloneSetup.createInjectorAndDoEMFRegistration()
+                // is called, because if will be replaced by
+                // tools.refinery.language.resource.ProblemXmiResourceFactory, which implements
+                // org.eclipse.xtext.resource.IResourceFactory as required by Xtext.
+                Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().putIfAbsent(XMI_RESOURCE_EXTENSION,
+                                new ProblemFactoryImpl());
+        }
+}
diff --git a/subprojects/language-model/src/main/java/tools/refinery/language/model/ProblemUtil.java b/subprojects/language-model/src/main/java/tools/refinery/language/model/ProblemUtil.java
new file mode 100644
index 00000000..d8958381
--- /dev/null
+++ b/subprojects/language-model/src/main/java/tools/refinery/language/model/ProblemUtil.java
@@ -0,0 +1,121 @@
+package tools.refinery.language.model;
+
+import java.util.ArrayDeque;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+
+import tools.refinery.language.model.problem.ClassDeclaration;
+import tools.refinery.language.model.problem.ImplicitVariable;
+import tools.refinery.language.model.problem.Node;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.ProblemPackage;
+import tools.refinery.language.model.problem.ReferenceDeclaration;
+import tools.refinery.language.model.problem.Relation;
+import tools.refinery.language.model.problem.Variable;
+
+public final class ProblemUtil {
+        public static final String BUILTIN_LIBRARY_NAME = "builtin";
+
+        public static final URI BUILTIN_LIBRARY_URI = getLibraryUri(BUILTIN_LIBRARY_NAME);
+
+        public static final String NODE_CLASS_NAME = "node";
+
+        private ProblemUtil() {
+                throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
+        }
+
+        public static boolean isSingletonVariable(Variable variable) {
+                return variable.eContainingFeature() == ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__SINGLETON_VARIABLE;
+        }
+        
+        public static boolean isImplicitVariable(Variable variable) {
+                return variable instanceof ImplicitVariable;
+        }
+        
+        public static boolean isImplicitNode(Node node) {
+                return node.eContainingFeature() == ProblemPackage.Literals.PROBLEM__NODES;
+        }
+        
+        public static boolean isImplicit(EObject eObject) {
+                if (eObject instanceof Node node) {
+                        return isImplicitNode(node);
+                } else if (eObject instanceof Variable variable) {
+                        return isImplicitVariable(variable);
+                } else {
+                        return false;
+                }
+        }
+
+        public static boolean isIndividualNode(Node node) {
+                var containingFeature = node.eContainingFeature();
+                return containingFeature == ProblemPackage.Literals.INDIVIDUAL_DECLARATION__NODES
+                                || containingFeature == ProblemPackage.Literals.ENUM_DECLARATION__LITERALS;
+        }
+
+        public static boolean isNewNode(Node node) {
+                return node.eContainingFeature() == ProblemPackage.Literals.CLASS_DECLARATION__NEW_NODE;
+        }
+
+        public static Optional<Problem> getBuiltInLibrary(EObject context) {
+                return Optional.ofNullable(context.eResource()).map(Resource::getResourceSet)
+                                .map(resourceSet -> resourceSet.getResource(BUILTIN_LIBRARY_URI, true)).map(Resource::getContents)
+                                .filter(contents -> !contents.isEmpty()).map(contents -> contents.get(0))
+                                .filter(Problem.class::isInstance).map(Problem.class::cast);
+        }
+
+        public static boolean isBuiltIn(EObject eObject) {
+                if (eObject != null) {
+                        var eResource = eObject.eResource();
+                        if (eResource != null) {
+                                return BUILTIN_LIBRARY_URI.equals(eResource.getURI());
+                        }
+                }
+                return false;
+        }
+
+        public static Optional<ClassDeclaration> getNodeClassDeclaration(EObject context) {
+                return getBuiltInLibrary(context).flatMap(problem -> problem.getStatements().stream()
+                                .filter(ClassDeclaration.class::isInstance).map(ClassDeclaration.class::cast)
+                                .filter(declaration -> NODE_CLASS_NAME.equals(declaration.getName())).findFirst());
+        }
+
+        public static Collection<ClassDeclaration> getSuperclassesAndSelf(ClassDeclaration classDeclaration) {
+                Set<ClassDeclaration> found = new HashSet<>();
+                getNodeClassDeclaration(classDeclaration).ifPresent(found::add);
+                Deque<ClassDeclaration> queue = new ArrayDeque<>();
+                queue.addLast(classDeclaration);
+                while (!queue.isEmpty()) {
+                        ClassDeclaration current = queue.removeFirst();
+                        if (!found.contains(current)) {
+                                found.add(current);
+                                for (Relation superType : current.getSuperTypes()) {
+                                        if (superType instanceof ClassDeclaration superDeclaration) {
+                                                queue.addLast(superDeclaration);
+                                        }
+                                }
+                        }
+                }
+                return found;
+        }
+
+        public static Collection<ReferenceDeclaration> getAllReferenceDeclarations(ClassDeclaration classDeclaration) {
+                Set<ReferenceDeclaration> referenceDeclarations = new HashSet<>();
+                for (ClassDeclaration superclass : getSuperclassesAndSelf(classDeclaration)) {
+                        referenceDeclarations.addAll(superclass.getReferenceDeclarations());
+                }
+                return referenceDeclarations;
+        }
+
+        private static URI getLibraryUri(String libraryName) {
+                return URI.createURI(ProblemUtil.class.getClassLoader()
+                                .getResource("model/" + libraryName + "." + ProblemEMFSetup.XMI_RESOURCE_EXTENSION)
+                                .toString());
+        }
+}
diff --git a/subprojects/language-model/src/main/resources/model/builtin.problem_xmi b/subprojects/language-model/src/main/resources/model/builtin.problem_xmi
new file mode 100644
index 00000000..9255ab66
--- /dev/null
+++ b/subprojects/language-model/src/main/resources/model/builtin.problem_xmi
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<problem:Problem
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:problem="https://refinery.tools/emf/2021/Problem"
+    xsi:schemaLocation="https://refinery.tools/emf/2021/Problem problem.ecore"
+    name="builtin">
+  <statements
+      xsi:type="problem:ClassDeclaration"
+      name="node"
+      abstract="true">
+    <referenceDeclarations
+        name="equals"
+        referenceType="//@statements.0"
+        opposite="//@statements.0/@referenceDeclarations.0">
+      <multiplicity
+          xsi:type="problem:UnboundedMultiplicity"/>
+    </referenceDeclarations>
+  </statements>
+  <statements
+      xsi:type="problem:PredicateDefinition"
+      name="exists">
+    <parameters
+        name="node"
+        parameterType="//@statements.0"/>
+  </statements>
+  <statements
+      xsi:type="problem:ClassDeclaration"
+      name="domain"
+      abstract="true"
+      superTypes="//@statements.0"/>
+  <statements
+      xsi:type="problem:ClassDeclaration"
+      name="data"
+      abstract="true"
+      superTypes="//@statements.0"/>
+  <statements
+      xsi:type="problem:EnumDeclaration"
+      name="bool">
+    <literals
+        name="false"/>
+    <literals
+        name="true"/>
+  </statements>
+  <statements
+      xsi:type="problem:ClassDeclaration"
+      name="real"
+      superTypes="//@statements.3">
+    <newNode
+        name="new"/>
+  </statements>
+  <statements
+      xsi:type="problem:ClassDeclaration"
+      name="int"
+      superTypes="//@statements.3">
+    <newNode
+        name="new"/>
+  </statements>
+  <statements
+      xsi:type="problem:ClassDeclaration"
+      name="string"
+      superTypes="//@statements.3">
+    <newNode
+        name="new"/>
+  </statements>
+</problem:Problem>
diff --git a/subprojects/language-model/src/main/resources/model/problem.ecore b/subprojects/language-model/src/main/resources/model/problem.ecore
new file mode 100644
index 00000000..582f67c8
--- /dev/null
+++ b/subprojects/language-model/src/main/resources/model/problem.ecore
@@ -0,0 +1,191 @@
+<?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="problem" nsURI="https://refinery.tools/emf/2021/Problem" nsPrefix="problem">
+  <eClassifiers xsi:type="ecore:EClass" name="Problem" eSuperTypes="#//NamedElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1"
+        eType="#//Node" transient="true" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="statements" upperBound="-1"
+        eType="#//Statement" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Relation" abstract="true" eSuperTypes="#//NamedElement"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ClassDeclaration" eSuperTypes="#//Relation #//Statement">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstract" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="superTypes" upperBound="-1"
+        eType="#//Relation"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="referenceDeclarations"
+        upperBound="-1" eType="#//ReferenceDeclaration" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="newNode" eType="#//Node"
+        transient="true" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ReferenceDeclaration" eSuperTypes="#//Relation">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="referenceType" eType="#//Relation"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="opposite" eType="#//ReferenceDeclaration"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="containment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="multiplicity" eType="#//Multiplicity"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="NamedElement" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="PredicateDefinition" eSuperTypes="#//Relation #//ParametricDefinition">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="error" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//PredicateKind"
+        defaultValueLiteral="PARTIAL"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Parameter" eSuperTypes="#//Variable">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parameterType" eType="#//Relation"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Variable" abstract="true" eSuperTypes="#//VariableOrNode"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Conjunction" eSuperTypes="#//ExistentialQuantifier">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="literals" upperBound="-1"
+        eType="#//Literal" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Literal" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Atom" eSuperTypes="#//Literal">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="transitiveClosure" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1"
+        eType="#//Argument" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ImplicitVariable" eSuperTypes="#//Variable"/>
+  <eClassifiers xsi:type="ecore:EClass" name="NegativeLiteral" eSuperTypes="#//ExistentialQuantifier #//CompoundLiteral"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ExistentialQuantifier" abstract="true"
+      interface="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="implicitVariables" upperBound="-1"
+        eType="#//ImplicitVariable" transient="true" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Assertion" eSuperTypes="#//Statement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//LogicValue"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1"
+        eType="#//AssertionArgument" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="default" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Node" eSuperTypes="#//VariableOrNode"/>
+  <eClassifiers xsi:type="ecore:EEnum" name="LogicValue">
+    <eLiterals name="TRUE" literal="TRUE"/>
+    <eLiterals name="FALSE" value="1"/>
+    <eLiterals name="UNKNOWN" value="2"/>
+    <eLiterals name="ERROR" value="3"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ScopeDeclaration" eSuperTypes="#//Statement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="typeScopes" upperBound="-1"
+        eType="#//TypeScope" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Statement" abstract="true" interface="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="TypeScope">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="targetType" eType="#//ClassDeclaration"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="increment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="multiplicity" eType="#//Multiplicity"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Multiplicity" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="RangeMultiplicity" eSuperTypes="#//Multiplicity">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lowerBound" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="upperBound" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="-1"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ExactMultiplicity" eSuperTypes="#//Multiplicity">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="exactValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="1"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="UnboundedMultiplicity" eSuperTypes="#//Multiplicity"/>
+  <eClassifiers xsi:type="ecore:EClass" name="VariableOrNodeArgument" eSuperTypes="#//Argument">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="variableOrNode" eType="#//VariableOrNode"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="singletonVariable" eType="#//ImplicitVariable"
+        transient="true" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="EnumDeclaration" eSuperTypes="#//Relation #//Statement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="literals" upperBound="-1"
+        eType="#//Node" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="VariableOrNode" abstract="true" eSuperTypes="#//NamedElement"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Constant" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="IntConstant" eSuperTypes="#//Constant">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="intValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="0"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="RealConstant" eSuperTypes="#//Constant">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="realValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="0.0"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="StringConstant" eSuperTypes="#//Constant">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stringValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ConstantArgument" eSuperTypes="#//Argument">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="constant" eType="#//Constant"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Argument" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="NodeAssertionArgument" eSuperTypes="#//AssertionArgument">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="node" eType="#//Node"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AssertionArgument" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ConstantAssertionArgument" eSuperTypes="#//AssertionArgument">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="constant" eType="#//Constant"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="NodeValueAssertion" eSuperTypes="#//Statement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="node" eType="#//Node"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//Constant"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IndividualDeclaration" eSuperTypes="#//Statement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1"
+        eType="#//Node" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="WildcardAssertionArgument" eSuperTypes="#//AssertionArgument"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ParametricDefinition" abstract="true"
+      interface="true" eSuperTypes="#//Statement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="bodies" upperBound="-1"
+        eType="#//Conjunction" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
+        eType="#//Parameter" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="RuleDefinition" eSuperTypes="#//ParametricDefinition #//NamedElement">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//RuleKind"
+        defaultValueLiteral="DIRECT"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="action" eType="#//Action"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Action">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="actionLiterals" upperBound="-1"
+        eType="#//ActionLiteral" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ActionLiteral" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ValueActionLiteral" eSuperTypes="#//ActionLiteral">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="atom" eType="#//Atom" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//LogicValue"
+        defaultValueLiteral="TRUE"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="refinement" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="FALSE"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="DeleteActionLiteral" eSuperTypes="#//ActionLiteral">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="variableOrNode" eType="#//VariableOrNode"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="NewActionLiteral" eSuperTypes="#//ActionLiteral">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//NewVariable"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="NewVariable" eSuperTypes="#//Variable"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CompoundLiteral" abstract="true" eSuperTypes="#//Literal">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="atom" eType="#//Atom" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ValueLiteral" eSuperTypes="#//CompoundLiteral">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"
+        eType="#//LogicConstant" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="refinement" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="LogicConstant">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//LogicValue"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="PredicateKind">
+    <eLiterals name="PARTIAL"/>
+    <eLiterals name="DIRECT" value="1"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="RuleKind">
+    <eLiterals name="DIRECT"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/subprojects/language-model/src/main/resources/model/problem.genmodel b/subprojects/language-model/src/main/resources/model/problem.genmodel
new file mode 100644
index 00000000..9ba2274b
--- /dev/null
+++ b/subprojects/language-model/src/main/resources/model/problem.genmodel
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel 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" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
+    modelDirectory="/tools.refinery.refinery-language-model/src/main/emf-gen"
+    creationIcons="false" editDirectory="/language-edit/src/main/emf-gen" editorDirectory="/org.eclipse.viatra.solver.language.model.editor/src-gen"
+    modelPluginID="language-model" modelName="Problem" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    copyrightFields="false" operationReflection="true" importOrganizing="true">
+  <foreignModel>problem.ecore</foreignModel>
+  <testsDirectory xsi:nil="true"/>
+  <genPackages prefix="Problem" basePackage="tools.refinery.language.model" resource="XMI"
+      disposableProviderFactory="true" fileExtensions="problem_xmi" ecorePackage="problem.ecore#/">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//LogicValue">
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//LogicValue/TRUE"/>
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//LogicValue/FALSE"/>
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//LogicValue/UNKNOWN"/>
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//LogicValue/ERROR"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//PredicateKind">
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//PredicateKind/PARTIAL"/>
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//PredicateKind/DIRECT"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//RuleKind">
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//RuleKind/DIRECT"/>
+    </genEnums>
+    <genClasses ecoreClass="problem.ecore#//Problem">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/nodes"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/statements"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//Relation"/>
+    <genClasses ecoreClass="problem.ecore#//ClassDeclaration">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ClassDeclaration/abstract"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//ClassDeclaration/superTypes"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ClassDeclaration/referenceDeclarations"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ClassDeclaration/newNode"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//ReferenceDeclaration">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//ReferenceDeclaration/referenceType"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//ReferenceDeclaration/opposite"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ReferenceDeclaration/containment"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ReferenceDeclaration/multiplicity"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//NamedElement">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//NamedElement/name"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//PredicateDefinition">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//PredicateDefinition/error"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//PredicateDefinition/kind"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//Parameter">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Parameter/parameterType"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//Variable"/>
+    <genClasses ecoreClass="problem.ecore#//Conjunction">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Conjunction/literals"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//Literal"/>
+    <genClasses ecoreClass="problem.ecore#//Atom">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Atom/relation"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//Atom/transitiveClosure"/>
+      <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Atom/arguments"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//ImplicitVariable"/>
+    <genClasses ecoreClass="problem.ecore#//NegativeLiteral"/>
+    <genClasses ecoreClass="problem.ecore#//ExistentialQuantifier">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ExistentialQuantifier/implicitVariables"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//Assertion">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Assertion/relation"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//Assertion/value"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Assertion/arguments"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//Assertion/default"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//Node"/>
+    <genClasses ecoreClass="problem.ecore#//ScopeDeclaration">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ScopeDeclaration/typeScopes"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//Statement"/>
+    <genClasses ecoreClass="problem.ecore#//TypeScope">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//TypeScope/targetType"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//TypeScope/increment"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//TypeScope/multiplicity"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//Multiplicity"/>
+    <genClasses ecoreClass="problem.ecore#//RangeMultiplicity">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//RangeMultiplicity/lowerBound"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//RangeMultiplicity/upperBound"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//ExactMultiplicity">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ExactMultiplicity/exactValue"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//UnboundedMultiplicity"/>
+    <genClasses ecoreClass="problem.ecore#//VariableOrNodeArgument">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//VariableOrNodeArgument/variableOrNode"/>
+      <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//VariableOrNodeArgument/singletonVariable"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//EnumDeclaration">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//EnumDeclaration/literals"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//VariableOrNode"/>
+    <genClasses ecoreClass="problem.ecore#//Constant"/>
+    <genClasses ecoreClass="problem.ecore#//IntConstant">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//IntConstant/intValue"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//RealConstant">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//RealConstant/realValue"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//StringConstant">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//StringConstant/stringValue"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//ConstantArgument">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ConstantArgument/constant"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//Argument"/>
+    <genClasses ecoreClass="problem.ecore#//NodeAssertionArgument">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//NodeAssertionArgument/node"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//AssertionArgument"/>
+    <genClasses ecoreClass="problem.ecore#//ConstantAssertionArgument">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ConstantAssertionArgument/constant"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//NodeValueAssertion">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//NodeValueAssertion/node"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//NodeValueAssertion/value"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//IndividualDeclaration">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//IndividualDeclaration/nodes"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//WildcardAssertionArgument"/>
+    <genClasses ecoreClass="problem.ecore#//ParametricDefinition">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ParametricDefinition/bodies"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ParametricDefinition/parameters"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//RuleDefinition">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//RuleDefinition/kind"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//RuleDefinition/action"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//Action">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Action/actionLiterals"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//ActionLiteral"/>
+    <genClasses ecoreClass="problem.ecore#//ValueActionLiteral">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ValueActionLiteral/atom"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ValueActionLiteral/value"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ValueActionLiteral/refinement"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//DeleteActionLiteral">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//DeleteActionLiteral/variableOrNode"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//NewActionLiteral">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//NewActionLiteral/variable"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//NewVariable"/>
+    <genClasses ecoreClass="problem.ecore#//CompoundLiteral">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//CompoundLiteral/atom"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//ValueLiteral">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ValueLiteral/values"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ValueLiteral/refinement"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//LogicConstant">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//LogicConstant/value"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/subprojects/language-model/src/testFixtures/java/tools/refinery/language/model/tests/ProblemTestUtil.java b/subprojects/language-model/src/testFixtures/java/tools/refinery/language/model/tests/ProblemTestUtil.java
new file mode 100644
index 00000000..d0990dc0
--- /dev/null
+++ b/subprojects/language-model/src/testFixtures/java/tools/refinery/language/model/tests/ProblemTestUtil.java
@@ -0,0 +1,197 @@
+package tools.refinery.language.model.tests;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+import tools.refinery.language.model.ProblemUtil;
+import tools.refinery.language.model.problem.ActionLiteral;
+import tools.refinery.language.model.problem.Argument;
+import tools.refinery.language.model.problem.Assertion;
+import tools.refinery.language.model.problem.AssertionArgument;
+import tools.refinery.language.model.problem.Atom;
+import tools.refinery.language.model.problem.ClassDeclaration;
+import tools.refinery.language.model.problem.Conjunction;
+import tools.refinery.language.model.problem.DeleteActionLiteral;
+import tools.refinery.language.model.problem.EnumDeclaration;
+import tools.refinery.language.model.problem.IndividualDeclaration;
+import tools.refinery.language.model.problem.Literal;
+import tools.refinery.language.model.problem.NamedElement;
+import tools.refinery.language.model.problem.NegativeLiteral;
+import tools.refinery.language.model.problem.NewActionLiteral;
+import tools.refinery.language.model.problem.Node;
+import tools.refinery.language.model.problem.NodeAssertionArgument;
+import tools.refinery.language.model.problem.NodeValueAssertion;
+import tools.refinery.language.model.problem.Parameter;
+import tools.refinery.language.model.problem.ParametricDefinition;
+import tools.refinery.language.model.problem.PredicateDefinition;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.ReferenceDeclaration;
+import tools.refinery.language.model.problem.Relation;
+import tools.refinery.language.model.problem.RuleDefinition;
+import tools.refinery.language.model.problem.Statement;
+import tools.refinery.language.model.problem.ValueActionLiteral;
+import tools.refinery.language.model.problem.ValueLiteral;
+import tools.refinery.language.model.problem.Variable;
+import tools.refinery.language.model.problem.VariableOrNode;
+import tools.refinery.language.model.problem.VariableOrNodeArgument;
+
+public class ProblemTestUtil {
+        public Problem builtin(Problem problem) {
+                return ProblemUtil.getBuiltInLibrary(problem).get();
+        }
+
+        public List<Diagnostic> errors(Problem problem) {
+                EcoreUtil.resolveAll(problem);
+                return problem.eResource().getErrors();
+        }
+
+        public List<String> nodeNames(Problem problem) {
+                return problem.getNodes().stream().map(node -> node.getName()).toList();
+        }
+
+        public PredicateDefinition pred(Problem problem, String name) {
+                return namedStatementOfType(problem, PredicateDefinition.class, name);
+        }
+
+        public RuleDefinition rule(Problem problem, String name) {
+                return namedStatementOfType(problem, RuleDefinition.class, name);
+        }
+
+        public Parameter param(ParametricDefinition definition, int i) {
+                return definition.getParameters().get(i);
+        }
+
+        public Conjunction conj(ParametricDefinition definition, int i) {
+                return definition.getBodies().get(i);
+        }
+
+        public Literal lit(Conjunction conjunction, int i) {
+                return conjunction.getLiterals().get(i);
+        }
+        
+        public ActionLiteral actionLit(RuleDefinition rule, int i) {
+                return rule.getAction().getActionLiterals().get(i);
+        }
+
+        public Atom valueAtom(Literal literal) {
+                return ((ValueLiteral) literal).getAtom();
+        }
+
+        public Atom negated(Literal literal) {
+                return ((NegativeLiteral) literal).getAtom();
+        }
+
+        public Relation relation(Literal literal) {
+                return ((Atom) literal).getRelation();
+        }
+
+        public Argument arg(Atom atom, int i) {
+                return atom.getArguments().get(i);
+        }
+
+        public Argument arg(Literal literal, int i) {
+                return arg((Atom) literal, i);
+        }
+
+        public VariableOrNode variableOrNode(Argument argument) {
+                return ((VariableOrNodeArgument) argument).getVariableOrNode();
+        }
+
+        public Variable variable(Argument argument) {
+                return (Variable) variableOrNode(argument);
+        }
+
+        public Variable variable(ValueActionLiteral valueActionLiteral, int i) {
+                return variable(arg(valueActionLiteral.getAtom(), i));
+        }
+        
+        public Variable variable(NewActionLiteral newActionLiteral) {
+                return newActionLiteral.getVariable();
+        }
+        
+        public VariableOrNode deleteVar(ActionLiteral actionLiteral) {
+                return ((DeleteActionLiteral) actionLiteral).getVariableOrNode();
+        }
+        
+        public VariableOrNode newVar(ActionLiteral actionLiteral) {
+                return ((NewActionLiteral) actionLiteral).getVariable();
+        }
+        
+        public Atom valueAtom(ActionLiteral actionLiteral) {
+                return ((ValueActionLiteral) actionLiteral).getAtom();
+        }
+        
+        public Variable variable(DeleteActionLiteral deleteActionLiteral) {
+                return (Variable) deleteActionLiteral.getVariableOrNode();
+        }
+
+        public Node node(Argument argument) {
+                return (Node) variableOrNode(argument);
+        }
+
+        public Assertion assertion(Problem problem, int i) {
+                return nthStatementOfType(problem, Assertion.class, i);
+        }
+
+        public AssertionArgument arg(Assertion assertion, int i) {
+                return assertion.getArguments().get(i);
+        }
+
+        public Node node(AssertionArgument argument) {
+                return ((NodeAssertionArgument) argument).getNode();
+        }
+
+        public Node node(Problem problem, String name) {
+                return named(problem.getNodes(), name);
+        }
+
+        public Node individualNode(Problem problem, String name) {
+                var uniqueNodes = statementsOfType(problem, IndividualDeclaration.class)
+                                .flatMap(declaration -> declaration.getNodes().stream());
+                return named(uniqueNodes, name);
+        }
+
+        public NodeValueAssertion nodeValueAssertion(Problem problem, int i) {
+                return nthStatementOfType(problem, NodeValueAssertion.class, i);
+        }
+
+        public ClassDeclaration findClass(Problem problem, String name) {
+                return namedStatementOfType(problem, ClassDeclaration.class, name);
+        }
+
+        public ReferenceDeclaration reference(ClassDeclaration declaration, String name) {
+                return named(declaration.getReferenceDeclarations(), name);
+        }
+
+        public EnumDeclaration findEnum(Problem problem, String name) {
+                return namedStatementOfType(problem, EnumDeclaration.class, name);
+        }
+
+        public Node literal(EnumDeclaration declaration, String name) {
+                return named(declaration.getLiterals(), name);
+        }
+
+        private <T extends NamedElement> T named(Stream<? extends T> stream, String name) {
+                return stream.filter(statement -> name.equals(statement.getName())).findAny().get();
+        }
+
+        private <T extends NamedElement> T named(List<? extends T> list, String name) {
+                return named(list.stream(), name);
+        }
+
+        private <T extends Statement> Stream<T> statementsOfType(Problem problem, Class<? extends T> type) {
+                return problem.getStatements().stream().filter(type::isInstance).map(type::cast);
+        }
+
+        private <T extends Statement & NamedElement> T namedStatementOfType(Problem problem, Class<? extends T> type,
+                        String name) {
+                return named(statementsOfType(problem, type), name);
+        }
+
+        private <T extends Statement> T nthStatementOfType(Problem problem, Class<? extends T> type, int n) {
+                return statementsOfType(problem, type).skip(n).findFirst().get();
+        }
+}
diff --git a/subprojects/language-to-store/build.gradle b/subprojects/language-to-store/build.gradle
new file mode 100644
index 00000000..f1c1564d
--- /dev/null
+++ b/subprojects/language-to-store/build.gradle
@@ -0,0 +1,10 @@
+plugins {
+        id 'refinery-java-library'
+        id 'refinery-xtext-conventions'
+}
+
+dependencies {
+        api project(':refinery-language-model')
+        api project(':refinery-store')
+        testImplementation testFixtures(project(':refinery-language'))
+}
diff --git a/subprojects/language-to-store/src/main/java/tools/refinery/language/mapping/PartialModelMapper.java b/subprojects/language-to-store/src/main/java/tools/refinery/language/mapping/PartialModelMapper.java
new file mode 100644
index 00000000..8f90a743
--- /dev/null
+++ b/subprojects/language-to-store/src/main/java/tools/refinery/language/mapping/PartialModelMapper.java
@@ -0,0 +1,239 @@
+package tools.refinery.language.mapping;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+
+import org.eclipse.emf.common.util.EList;
+
+import tools.refinery.language.model.ProblemUtil;
+import tools.refinery.language.model.problem.Assertion;
+import tools.refinery.language.model.problem.AssertionArgument;
+import tools.refinery.language.model.problem.ClassDeclaration;
+import tools.refinery.language.model.problem.EnumDeclaration;
+import tools.refinery.language.model.problem.IndividualDeclaration;
+import tools.refinery.language.model.problem.LogicValue;
+import tools.refinery.language.model.problem.Node;
+import tools.refinery.language.model.problem.NodeAssertionArgument;
+import tools.refinery.language.model.problem.PredicateDefinition;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.ReferenceDeclaration;
+import tools.refinery.language.model.problem.Statement;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.model.ModelStoreImpl;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.representation.Relation;
+import tools.refinery.store.model.representation.TruthValue;
+
+public class PartialModelMapper {
+        public PartialModelMapperDTO transformProblem(Problem problem) throws PartialModelMapperException {
+                // Defining an integer in order to assign different values to all the nodes
+                int[] nodeIter = new int[] { 0 };
+
+                // Getting the relations and the nodes from the given problem
+                PartialModelMapperDTO pmmDTO = initTransform(problem, nodeIter);
+
+                // Getting the relations and the nodes from the built in problem
+                Optional<Problem> builtinProblem = ProblemUtil.getBuiltInLibrary(problem);
+                if (builtinProblem.isEmpty())
+                        throw new PartialModelMapperException("builtin.problem not found");
+                PartialModelMapperDTO builtinProblemDTO = initTransform(builtinProblem.get(), nodeIter);
+
+                // Merging the relation and the nodes from the given problem and from the built
+                // in problem
+                pmmDTO.getRelationMap().putAll(builtinProblemDTO.getRelationMap());
+                pmmDTO.getNodeMap().putAll(builtinProblemDTO.getNodeMap());
+                pmmDTO.getEnumNodeMap().putAll(builtinProblemDTO.getEnumNodeMap());
+                pmmDTO.getNewNodeMap().putAll(builtinProblemDTO.getNewNodeMap());
+                pmmDTO.getUniqueNodeMap().putAll(builtinProblemDTO.getUniqueNodeMap());
+
+                // Definition of store and model
+                ModelStore store = new ModelStoreImpl(new HashSet<>(pmmDTO.getRelationMap().values()));
+                Model model = store.createModel();
+                pmmDTO.setModel(model);
+
+                // Collecting all the nodes in one map
+                Map<Node, Integer> allNodesMap = mergeNodeMaps(pmmDTO.getEnumNodeMap(), pmmDTO.getUniqueNodeMap(),
+                                pmmDTO.getNewNodeMap(), pmmDTO.getNodeMap());
+
+                // Filling up the relations with unknown truth values
+                for (tools.refinery.language.model.problem.Relation relation : pmmDTO.getRelationMap().keySet()) {
+                        if (!(relation instanceof PredicateDefinition pd && pd.isError())) {
+                                Relation<TruthValue> r = pmmDTO.getRelationMap().get(relation);
+                                if (r.getArity() == 1)
+                                        for (Integer i : allNodesMap.values()) {
+                                                pmmDTO.getModel().put(r, Tuple.of(i), TruthValue.UNKNOWN);
+                                        }
+                                else if (r.getArity() == 2)
+                                        for (Integer i : allNodesMap.values()) {
+                                                for (Integer j : allNodesMap.values()) {
+                                                        pmmDTO.getModel().put(r, Tuple.of(i, j), TruthValue.UNKNOWN);
+                                                }
+                                        }
+                                else
+                                        throw new PartialModelMapperException("Relation with arity above 2 is not supported");
+                        }
+                }
+
+                // Filling up the exists
+                tools.refinery.language.model.problem.Relation existsRelation = findingRelationInDTO(builtinProblemDTO,
+                                "exists", "The exists not found in built in problem");
+                for (Node n : allNodesMap.keySet()) {
+                        if (pmmDTO.getNewNodeMap().containsKey(n)) {
+                                pmmDTO.getModel().put(builtinProblemDTO.getRelationMap().get(existsRelation),
+                                                Tuple.of(allNodesMap.get(n)), TruthValue.UNKNOWN);
+                        } else {
+                                pmmDTO.getModel().put(builtinProblemDTO.getRelationMap().get(existsRelation),
+                                                Tuple.of(allNodesMap.get(n)), TruthValue.TRUE);
+                        }
+                }
+
+                // Filling up the equals
+                tools.refinery.language.model.problem.Relation equalsRelation = findingRelationInDTO(builtinProblemDTO,
+                                "equals", "The equals not found in built in problem");
+                for (Node n1 : allNodesMap.keySet()) {
+                        for (Node n2 : allNodesMap.keySet()) {
+                                if (n1.equals(n2)) {
+                                        if (pmmDTO.getNewNodeMap().containsKey(n1)) {
+                                                pmmDTO.getModel().put(builtinProblemDTO.getRelationMap().get(equalsRelation),
+                                                                Tuple.of(allNodesMap.get(n1), allNodesMap.get(n2)), TruthValue.UNKNOWN);
+                                        } else {
+                                                pmmDTO.getModel().put(builtinProblemDTO.getRelationMap().get(equalsRelation),
+                                                                Tuple.of(allNodesMap.get(n1), allNodesMap.get(n2)), TruthValue.TRUE);
+                                        }
+                                } else {
+                                        pmmDTO.getModel().put(builtinProblemDTO.getRelationMap().get(equalsRelation),
+                                                        Tuple.of(allNodesMap.get(n1), allNodesMap.get(n2)), TruthValue.FALSE);
+                                }
+                        }
+                }
+
+                // Transforming the assertions
+                processAssertions(problem, pmmDTO, allNodesMap);
+                processAssertions(builtinProblem.get(), pmmDTO, allNodesMap);
+
+                return pmmDTO;
+        }
+
+        // Searches for and gives back a relation in a PartialModelMapperDTO
+        private tools.refinery.language.model.problem.Relation findingRelationInDTO(
+                        PartialModelMapperDTO partialModelMapperDTO, String searchedRelation, String errorText)
+                        throws PartialModelMapperException {
+                for (tools.refinery.language.model.problem.Relation r : partialModelMapperDTO.getRelationMap().keySet()) {
+                        if (searchedRelation.equals(r.getName()))
+                                return r;
+                }
+                throw new PartialModelMapperException(errorText);
+        }
+
+        // Processing assertions and placing them in the model
+        private void processAssertions(Problem problem, PartialModelMapperDTO pmmDTO, Map<Node, Integer> allNodesMap) {
+                for (Statement s : problem.getStatements()) {
+                        if (s instanceof Assertion assertion) {
+                                Relation<TruthValue> r1 = pmmDTO.getRelationMap().get(assertion.getRelation());
+                                int i = 0;
+                                int[] integers = new int[assertion.getArguments().size()];
+                                for (AssertionArgument aa : assertion.getArguments()) {
+                                        if (aa instanceof NodeAssertionArgument nas) {
+                                                integers[i] = allNodesMap.get(nas.getNode());
+                                                i++;
+                                        }
+                                }
+                                pmmDTO.getModel().put(r1, Tuple.of(integers), logicValueToTruthValue(assertion.getValue()));
+                        } else if (s instanceof ClassDeclaration cd) {
+                                if (!cd.isAbstract())
+                                        pmmDTO.getModel().put(pmmDTO.getRelationMap().get(cd),
+                                                        Tuple.of(pmmDTO.getNewNodeMap().get(cd.getNewNode())), TruthValue.TRUE);
+                        } else if (s instanceof EnumDeclaration ed) {
+                                for (Node n : ed.getLiterals()) {
+                                        pmmDTO.getModel().put(pmmDTO.getRelationMap().get(ed), Tuple.of(pmmDTO.getEnumNodeMap().get(n)),
+                                                        TruthValue.TRUE);
+                                }
+                        }
+                }
+        }
+
+        // Getting the relations and nodes from the problem
+        private PartialModelMapperDTO initTransform(Problem problem, int[] nodeIter) {
+                // Defining needed Maps
+                Map<tools.refinery.language.model.problem.Relation, Relation<TruthValue>> relationMap = new HashMap<>();
+                Map<Node, Integer> enumNodeMap = new HashMap<>();
+                Map<Node, Integer> uniqueNodeMap = new HashMap<>();
+                Map<Node, Integer> newNodeMap = new HashMap<>();
+
+                // Definition of Relations, filling up the enumNodeMap, uniqueNodeMap,
+                // newNodeMap
+                EList<Statement> statements = problem.getStatements();
+                for (Statement s : statements) {
+                        if (s instanceof ClassDeclaration cd) {
+                                Relation<TruthValue> r1 = new Relation<>(cd.getName(), 1, TruthValue.FALSE);
+                                relationMap.put(cd, r1);
+                                if (!cd.isAbstract())
+                                        newNodeMap.put(cd.getNewNode(), nodeIter[0]++);
+                                EList<ReferenceDeclaration> refDeclList = cd.getReferenceDeclarations();
+                                for (ReferenceDeclaration refDec : refDeclList) {
+                                        Relation<TruthValue> r2 = new Relation<>(refDec.getName(), 2, TruthValue.FALSE);
+                                        relationMap.put(refDec, r2);
+                                }
+                        } else if (s instanceof EnumDeclaration ed) {
+                                Relation<TruthValue> r = new Relation<>(ed.getName(), 1, TruthValue.FALSE);
+                                relationMap.put(ed, r);
+                                for (Node n : ed.getLiterals()) {
+                                        enumNodeMap.put(n, nodeIter[0]++);
+                                }
+                        } else if (s instanceof IndividualDeclaration ud) {
+                                for (Node n : ud.getNodes()) {
+                                        uniqueNodeMap.put(n, nodeIter[0]++);
+                                }
+                        } else if (s instanceof PredicateDefinition pd) {
+                                Relation<TruthValue> r = new Relation<>(pd.getName(), 1, TruthValue.FALSE);
+                                relationMap.put(pd, r);
+                        }
+                }
+
+                // Filling the nodeMap up
+                Map<Node, Integer> nodeMap = new HashMap<>();
+                for (Node n : problem.getNodes()) {
+                        nodeMap.put(n, nodeIter[0]++);
+                }
+
+                return new PartialModelMapperDTO(null, relationMap, nodeMap, enumNodeMap, uniqueNodeMap, newNodeMap);
+        }
+
+        // Merging the maps of nodes into one map
+        private Map<Node, Integer> mergeNodeMaps(Map<Node, Integer> enumNodeMap, Map<Node, Integer> uniqueNodeMap,
+                        Map<Node, Integer> newNodeMap, Map<Node, Integer> nodeMap) {
+                Map<Node, Integer> out = new HashMap<>();
+                out.putAll(enumNodeMap);
+                out.putAll(uniqueNodeMap);
+                out.putAll(newNodeMap);
+                out.putAll(nodeMap);
+                return out;
+        }
+
+        // Exchange method from LogicValue to TruthValue
+        private TruthValue logicValueToTruthValue(LogicValue value) {
+                if (value.equals(LogicValue.TRUE))
+                        return TruthValue.TRUE;
+                else if (value.equals(LogicValue.FALSE))
+                        return TruthValue.FALSE;
+                else if (value.equals(LogicValue.UNKNOWN))
+                        return TruthValue.UNKNOWN;
+                else
+                        return TruthValue.ERROR;
+        }
+
+        public class PartialModelMapperException extends Exception {
+                private static final long serialVersionUID = 1L;
+
+                public PartialModelMapperException(String errorText) {
+                        super(errorText);
+                }
+
+                public PartialModelMapperException() {
+                        super();
+                }
+        }
+}
diff --git a/subprojects/language-to-store/src/main/java/tools/refinery/language/mapping/PartialModelMapperDTO.java b/subprojects/language-to-store/src/main/java/tools/refinery/language/mapping/PartialModelMapperDTO.java
new file mode 100644
index 00000000..3397b4bd
--- /dev/null
+++ b/subprojects/language-to-store/src/main/java/tools/refinery/language/mapping/PartialModelMapperDTO.java
@@ -0,0 +1,54 @@
+package tools.refinery.language.mapping;
+
+import java.util.Map;
+
+import tools.refinery.language.model.problem.Node;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.representation.Relation;
+import tools.refinery.store.model.representation.TruthValue;
+
+public class PartialModelMapperDTO {
+        private Model model;
+        private Map<tools.refinery.language.model.problem.Relation, Relation<TruthValue>> relationMap;
+        private Map<Node, Integer> nodeMap;
+        private Map<Node, Integer> enumNodeMap;
+        private Map<Node, Integer> uniqueNodeMap;
+        private Map<Node, Integer> newNodeMap;
+        
+        public PartialModelMapperDTO(Model model,
+                        Map<tools.refinery.language.model.problem.Relation, Relation<TruthValue>> relationMap,
+                        Map<Node, Integer> nodeMap,
+                        Map<Node, Integer> enumNodeMap,
+                        Map<Node, Integer> uniqueNodeMap,
+                        Map<Node, Integer> newNodeMap) {
+                this.model = model;
+                this.relationMap = relationMap;
+                this.nodeMap = nodeMap;
+                this.enumNodeMap = enumNodeMap;
+                this.uniqueNodeMap = uniqueNodeMap;
+                this.newNodeMap = newNodeMap;
+        }
+        
+        public Model getModel() { 
+                return this.model; 
+        }
+        public Map<tools.refinery.language.model.problem.Relation, Relation<TruthValue>> getRelationMap(){
+                return this.relationMap;
+        }
+        public Map<Node, Integer> getNodeMap() {
+                return this.nodeMap;
+        }
+        public Map<Node, Integer> getEnumNodeMap() {
+                return this.enumNodeMap;
+        }
+        public Map<Node, Integer> getUniqueNodeMap() {
+                return this.uniqueNodeMap;
+        }
+        public Map<Node, Integer> getNewNodeMap() {
+                return this.newNodeMap;
+        }
+
+        public void setModel(Model model) {
+                this.model = model;
+        }
+}
diff --git a/subprojects/language-to-store/src/test/java/tools/refinery/language/mapping/tests/PartialModelMapperTest.xtend b/subprojects/language-to-store/src/test/java/tools/refinery/language/mapping/tests/PartialModelMapperTest.xtend
new file mode 100644
index 00000000..b2fcbaa9
--- /dev/null
+++ b/subprojects/language-to-store/src/test/java/tools/refinery/language/mapping/tests/PartialModelMapperTest.xtend
@@ -0,0 +1,438 @@
+package tools.refinery.language.mapping.tests
+
+import com.google.inject.Inject
+import org.eclipse.emf.ecore.util.EcoreUtil
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.extensions.InjectionExtension
+import org.eclipse.xtext.testing.util.ParseHelper
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.^extension.ExtendWith
+import tools.refinery.language.mapping.PartialModelMapper
+import tools.refinery.language.model.problem.Problem
+import tools.refinery.language.model.tests.ProblemTestUtil
+import tools.refinery.language.tests.ProblemInjectorProvider
+import tools.refinery.store.model.Tuple
+import tools.refinery.store.model.representation.TruthValue
+
+import static org.hamcrest.MatcherAssert.assertThat
+import static org.hamcrest.Matchers.*
+import static org.junit.jupiter.api.Assertions.assertTrue
+
+@ExtendWith(InjectionExtension)
+@InjectWith(ProblemInjectorProvider)
+class PartialModelMapperTest {
+        @Inject
+        ParseHelper<Problem> parseHelper
+        
+        @Inject
+        extension ProblemTestUtil
+
+        PartialModelMapper mapper
+
+        @BeforeEach
+        def void beforeEach() {
+                mapper = new PartialModelMapper
+        }
+
+        //Testing the relation
+        @Test
+        def void relationTest() {
+                val problem = parseHelper.parse('''
+                        class Person {
+                                Person[0..*] friend
+                        }
+                        
+                        friend(a, b).
+                ''')
+                EcoreUtil.resolveAll(problem)
+                
+                val modelAndMaps = mapper.transformProblem(problem)
+                assertThat(modelAndMaps, notNullValue())
+                
+                val model = modelAndMaps.model
+                val relationMap = modelAndMaps.relationMap
+                val nodeMap = modelAndMaps.nodeMap
+                
+                val person = problem.findClass("Person")
+                val friend = problem.findClass("Person").reference("friend")
+                val a = problem.node("a")
+                val b = problem.node("b")
+                
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(person)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(friend)))
+                assertTrue(model.get(relationMap.get(friend), Tuple.of(nodeMap.get(a),nodeMap.get(b))).equals(TruthValue.TRUE))
+        }
+        
+        //Testing the class
+        @Test
+        def void classTest() {
+                val problem = parseHelper.parse('''
+                        class Person {
+                                Person[0..*] friend
+                        }
+                        
+                        Person(a).
+                ''')
+                EcoreUtil.resolveAll(problem)
+                
+                val modelAndMaps = mapper.transformProblem(problem)
+                assertThat(modelAndMaps, notNullValue())
+                
+                val model = modelAndMaps.model
+                val relationMap = modelAndMaps.relationMap
+                val nodeMap = modelAndMaps.nodeMap
+                
+                val person = problem.findClass("Person")
+                val friend = problem.findClass("Person").reference("friend")
+                val a = problem.node("a")
+                
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(person)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(friend)))
+                
+                assertTrue(model.get(relationMap.get(person), Tuple.of(nodeMap.get(a))).equals(TruthValue.TRUE))
+        }
+        
+        //Testing the equals and exists from the built in problem
+        @Test
+        def void equalsAndExistTest() {
+                val problem = parseHelper.parse('''
+                        node(a).
+                        node(b).
+                        
+                        class Person.
+                ''')
+                EcoreUtil.resolveAll(problem)
+                val builtin = problem.builtin
+                
+                val modelAndMaps = mapper.transformProblem(problem)
+                assertThat(modelAndMaps, notNullValue())
+                
+                val model = modelAndMaps.model
+                val relationMap = modelAndMaps.relationMap
+                val nodeMap = modelAndMaps.nodeMap
+                val newNodeMap = modelAndMaps.newNodeMap
+                
+                val a = problem.node("a")
+                val b = problem.node("b")
+                val Person = problem.findClass("Person")
+                val PersonNew = problem.findClass("Person").newNode
+                val exists = builtin.pred("exists")
+                val equals = builtin.findClass("node").reference("equals")
+                
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(Person)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(exists)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(equals)))
+                
+                assertTrue(model.get(relationMap.get(exists), Tuple.of(nodeMap.get(a))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(exists), Tuple.of(nodeMap.get(b))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(equals), Tuple.of(nodeMap.get(a), nodeMap.get(a))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(equals), Tuple.of(nodeMap.get(b), nodeMap.get(b))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(equals), Tuple.of(nodeMap.get(a), nodeMap.get(b))).equals(TruthValue.FALSE))
+                assertTrue(model.get(relationMap.get(equals), Tuple.of(nodeMap.get(b), nodeMap.get(a))).equals(TruthValue.FALSE))
+                
+                assertTrue(model.get(relationMap.get(exists), Tuple.of(newNodeMap.get(PersonNew))).equals(TruthValue.UNKNOWN))
+                assertTrue(model.get(relationMap.get(equals), Tuple.of(newNodeMap.get(PersonNew), newNodeMap.get(PersonNew))).equals(TruthValue.UNKNOWN))
+                assertTrue(model.get(relationMap.get(equals), Tuple.of(newNodeMap.get(PersonNew), nodeMap.get(a))).equals(TruthValue.FALSE))
+                assertTrue(model.get(relationMap.get(equals), Tuple.of(newNodeMap.get(PersonNew), nodeMap.get(b))).equals(TruthValue.FALSE))
+                assertTrue(model.get(relationMap.get(equals), Tuple.of(nodeMap.get(a), newNodeMap.get(PersonNew))).equals(TruthValue.FALSE))
+                assertTrue(model.get(relationMap.get(equals), Tuple.of(nodeMap.get(b), newNodeMap.get(PersonNew))).equals(TruthValue.FALSE))
+        }
+        
+        //Testing the equals and exists from the built in problem with a different example
+        @Test
+        def void equalsAndExistTest2() {
+                val problem = parseHelper.parse('''
+                        class Person.
+                        
+                        Person(a).
+                        Person(b).
+                ''')
+                val builtin = problem.builtin
+                EcoreUtil.resolveAll(problem)
+                
+                val modelAndMaps = mapper.transformProblem(problem)
+                assertThat(modelAndMaps, notNullValue())
+                
+                val model = modelAndMaps.model
+                val relationMap = modelAndMaps.relationMap
+                val nodeMap = modelAndMaps.nodeMap
+                val newNodeMap = modelAndMaps.newNodeMap
+                
+                val a = problem.node("a")
+                val b = problem.node("b")
+                val Person = problem.findClass("Person")
+                val PersonNew = problem.findClass("Person").newNode
+                val exists = builtin.pred("exists")
+                val equals = builtin.findClass("node").reference("equals")
+                
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(Person)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(exists)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(equals)))
+                
+                assertTrue(model.get(relationMap.get(exists), Tuple.of(nodeMap.get(a))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(exists), Tuple.of(nodeMap.get(b))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(equals), Tuple.of(nodeMap.get(a), nodeMap.get(a))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(equals), Tuple.of(nodeMap.get(b), nodeMap.get(b))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(equals), Tuple.of(nodeMap.get(a), nodeMap.get(b))).equals(TruthValue.FALSE))
+                assertTrue(model.get(relationMap.get(equals), Tuple.of(nodeMap.get(b), nodeMap.get(a))).equals(TruthValue.FALSE))
+                
+                assertTrue(model.get(relationMap.get(exists), Tuple.of(newNodeMap.get(PersonNew))).equals(TruthValue.UNKNOWN))
+                assertTrue(model.get(relationMap.get(equals), Tuple.of(newNodeMap.get(PersonNew), newNodeMap.get(PersonNew))).equals(TruthValue.UNKNOWN))
+                assertTrue(model.get(relationMap.get(equals), Tuple.of(newNodeMap.get(PersonNew), nodeMap.get(a))).equals(TruthValue.FALSE))
+                assertTrue(model.get(relationMap.get(equals), Tuple.of(newNodeMap.get(PersonNew), nodeMap.get(b))).equals(TruthValue.FALSE))
+                assertTrue(model.get(relationMap.get(equals), Tuple.of(nodeMap.get(a), newNodeMap.get(PersonNew))).equals(TruthValue.FALSE))
+                assertTrue(model.get(relationMap.get(equals), Tuple.of(nodeMap.get(b), newNodeMap.get(PersonNew))).equals(TruthValue.FALSE))
+        }
+        
+        //Testing the behavior of the newNodes
+        @Test
+        def void newNodeTest(){
+                val problem = parseHelper.parse('''
+                        class Person.
+                        abstract class Family.
+                ''')
+                EcoreUtil.resolveAll(problem)
+                
+                val modelAndMaps = mapper.transformProblem(problem)
+                assertThat(modelAndMaps, notNullValue())
+                
+                val model = modelAndMaps.model
+                val relationMap = modelAndMaps.relationMap
+                val newNodeMap = modelAndMaps.newNodeMap
+                
+                val Person = problem.findClass("Person")
+                val Family = problem.findClass("Family")
+                val PersonNew = problem.findClass("Person").newNode
+                
+                
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(Person)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(Family)))
+                
+                assertTrue(newNodeMap.size.equals(4)) //3 from builtin.problem, 1 from Person
+                assertTrue(model.get(relationMap.get(Person), Tuple.of(newNodeMap.get(PersonNew))).equals(TruthValue.TRUE))
+        }
+
+        //Testing the behavior of enumerations
+        @Test
+        def void enumTest(){
+                val problem = parseHelper.parse('''
+                        enum TaxStatus {
+                                child, student, adult, retired
+                        }
+                ''')
+                EcoreUtil.resolveAll(problem)
+                
+                val modelAndMaps = mapper.transformProblem(problem)
+                assertThat(modelAndMaps, notNullValue())
+                
+                val model = modelAndMaps.model
+                val relationMap = modelAndMaps.relationMap
+                val enumNodeMap = modelAndMaps.enumNodeMap
+                
+                val TaxStatus = problem.findEnum("TaxStatus")
+                val child = problem.findEnum("TaxStatus").literal("child")
+                val student = problem.findEnum("TaxStatus").literal("student")
+                val adult = problem.findEnum("TaxStatus").literal("adult")
+                val retired = problem.findEnum("TaxStatus").literal("retired")
+                
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(TaxStatus)))
+                assertTrue(model.get(relationMap.get(TaxStatus), Tuple.of(enumNodeMap.get(child))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(TaxStatus), Tuple.of(enumNodeMap.get(student))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(TaxStatus), Tuple.of(enumNodeMap.get(adult))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(TaxStatus), Tuple.of(enumNodeMap.get(retired))).equals(TruthValue.TRUE))
+        }
+        
+        //Testing the bool from the built in problem
+        @Test
+        def void builtinBoolTest(){
+                val problem = parseHelper.parse('''
+                        class Person.
+                ''')
+                EcoreUtil.resolveAll(problem)
+                val builtin = problem.builtin
+                
+                val modelAndMaps = mapper.transformProblem(problem)
+                assertThat(modelAndMaps, notNullValue())
+                
+                val model = modelAndMaps.model
+                val relationMap = modelAndMaps.relationMap
+                val enumNodeMap = modelAndMaps.enumNodeMap
+                
+                val bool = builtin.findEnum("bool")
+                val trueEnum = builtin.findEnum("bool").literal("true") //Emiatt nem sikerül a teszt
+                val falseEnum = builtin.findEnum("bool").literal("false")
+                
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(bool)))
+                assertTrue(model.get(relationMap.get(bool), Tuple.of(enumNodeMap.get(trueEnum))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(bool), Tuple.of(enumNodeMap.get(falseEnum))).equals(TruthValue.TRUE))
+        }
+        
+        //Testing different aspects of the behavior
+        @Test
+        def void compositeTest() {
+                val problem = parseHelper.parse('''
+                        class Family {
+                                contains Person[] members
+                        }
+                        
+                        class Person {
+                                Person[0..*] children
+                                Person[0..1] parent
+                                TaxStatus taxStatus
+                        }
+                        
+                        enum TaxStatus {
+                                child, student, adult, retired
+                        }
+                        
+                        % A child cannot have any dependents.
+                        error invalidTaxStatus(Person p) <->
+                                taxStatus(p, child), children(p, _q).
+                        
+                        indiv family.
+                        Family(family).
+                        members(family, anne): true.
+                        members(family, bob).
+                        members(family, ciri).
+                        children(anne, ciri).
+                        ?children(bob, ciri).
+                        taxStatus(anne, adult).
+                ''')
+                EcoreUtil.resolveAll(problem)
+                
+                val modelAndMaps = mapper.transformProblem(problem)
+                assertThat(modelAndMaps, notNullValue())
+                
+                val model = modelAndMaps.model
+                val relationMap = modelAndMaps.relationMap
+                val nodeMap = modelAndMaps.nodeMap
+                val uniqueNodeMap = modelAndMaps.uniqueNodeMap
+                val enumNodeMap = modelAndMaps.enumNodeMap
+                
+                val Family = problem.findClass("Family")
+                val members = problem.findClass("Family").reference("members")
+                val Person = problem.findClass("Person")
+                val children = problem.findClass("Person").reference("children")
+                val parent = problem.findClass("Person").reference("parent")
+                val taxStatus = problem.findClass("Person").reference("taxStatus")
+                val TaxStatus = problem.findEnum("TaxStatus")
+                val invalidTaxStatus = problem.pred("invalidTaxStatus")
+                
+                val anne = problem.node("anne")
+                val bob = problem.node("bob")
+                val ciri = problem.node("ciri")
+                val family = problem.individualNode("family")
+                val adult = problem.findEnum("TaxStatus").literal("adult")
+                
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(Family)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(members)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(Person)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(children)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(parent)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(taxStatus)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(TaxStatus)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(invalidTaxStatus)))
+                
+                assertTrue(model.get(relationMap.get(Family), Tuple.of(uniqueNodeMap.get(family))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(members), Tuple.of(uniqueNodeMap.get(family),nodeMap.get(anne))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(members), Tuple.of(uniqueNodeMap.get(family),nodeMap.get(bob))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(members), Tuple.of(uniqueNodeMap.get(family),nodeMap.get(ciri))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(children), Tuple.of(nodeMap.get(anne),nodeMap.get(ciri))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(children), Tuple.of(nodeMap.get(bob),nodeMap.get(ciri))).equals(TruthValue.UNKNOWN))
+                assertTrue(model.get(relationMap.get(taxStatus), Tuple.of(nodeMap.get(anne),enumNodeMap.get(adult))).equals(TruthValue.TRUE))
+        }
+
+        @Test
+        def void carCaseStudyTest(){
+                val problem = parseHelper.parse('''
+                        abstract class DynamicComponent {
+                                contains StaticComponent[1..1] placedOn
+                        }
+                        abstract class StaticComponent.
+                        class Car extends DynamicComponent.
+                        class Pedestrian extends DynamicComponent.
+                        class Road extends StaticComponent {
+                                contains LaneSegment[0..*] lanes
+                        }
+                        class LaneSegment extends StaticComponent {
+                                Lane[0..*] adjacentLanes
+                                Lane[0..*] sameDirLanes
+                        }
+                        
+                        Car(c1).
+                        Car(c2).
+                        Pedestrian(p1).
+                        Road(r1).
+                        LaneSegment(l1).
+                        LaneSegment(l2).
+                        LaneSegment(l3).
+                        placedOn(c1,l1).
+                        placedOn(c2,l2).
+                        placedOn(p1,l3).
+                        lanes(r1,l1).
+                        lanes(r1,l2).
+                        lanes(r1,l3).
+                        adjacentLanes(l1,l2).
+                        adjacentLanes(l2,l1).
+                        sameDirLanes(l1,l3).
+                        sameDirLanes(l3,l1).
+                ''')
+                EcoreUtil.resolveAll(problem)
+                
+                val modelAndMaps = mapper.transformProblem(problem)
+                assertThat(modelAndMaps, notNullValue())
+                
+                val model = modelAndMaps.model
+                val relationMap = modelAndMaps.relationMap
+                val nodeMap = modelAndMaps.nodeMap
+                
+                val DynamicComponent = problem.findClass("DynamicComponent")
+                val placedOn = problem.findClass("DynamicComponent").reference("placedOn")
+                val StaticComponent = problem.findClass("StaticComponent")
+                val Car = problem.findClass("Car")
+                val Pedestrian = problem.findClass("Pedestrian")
+                val Road = problem.findClass("Road")
+                val lanes = problem.findClass("Road").reference("lanes")
+                val LaneSegment = problem.findClass("LaneSegment")
+                val adjacentLanes = problem.findClass("LaneSegment").reference("adjacentLanes")
+                val sameDirLanes = problem.findClass("LaneSegment").reference("sameDirLanes")
+                
+                val c1 = problem.node("c1")
+                val c2 = problem.node("c2")
+                val p1 = problem.node("p1")
+                val r1 = problem.node("r1")
+                val l1 = problem.node("l1")
+                val l2 = problem.node("l2")
+                val l3 = problem.node("l3")
+                
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(DynamicComponent)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(placedOn)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(StaticComponent)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(Car)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(Pedestrian)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(Road)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(lanes)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(LaneSegment)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(adjacentLanes)))
+                assertTrue(model.getDataRepresentations().contains(relationMap.get(sameDirLanes)))
+                
+                assertTrue(model.get(relationMap.get(Car), Tuple.of(nodeMap.get(c1))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(Car), Tuple.of(nodeMap.get(c2))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(Pedestrian), Tuple.of(nodeMap.get(p1))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(Road), Tuple.of(nodeMap.get(r1))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(LaneSegment), Tuple.of(nodeMap.get(l1))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(LaneSegment), Tuple.of(nodeMap.get(l2))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(LaneSegment), Tuple.of(nodeMap.get(l3))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(placedOn), Tuple.of(nodeMap.get(c1),nodeMap.get(l1))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(placedOn), Tuple.of(nodeMap.get(c2),nodeMap.get(l2))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(placedOn), Tuple.of(nodeMap.get(p1),nodeMap.get(l3))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(lanes), Tuple.of(nodeMap.get(r1),nodeMap.get(l1))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(lanes), Tuple.of(nodeMap.get(r1),nodeMap.get(l2))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(lanes), Tuple.of(nodeMap.get(r1),nodeMap.get(l3))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(adjacentLanes), Tuple.of(nodeMap.get(l1),nodeMap.get(l2))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(adjacentLanes), Tuple.of(nodeMap.get(l2),nodeMap.get(l1))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(sameDirLanes), Tuple.of(nodeMap.get(l1),nodeMap.get(l3))).equals(TruthValue.TRUE))
+                assertTrue(model.get(relationMap.get(sameDirLanes), Tuple.of(nodeMap.get(l3),nodeMap.get(l1))).equals(TruthValue.TRUE))
+        }
+}
diff --git a/subprojects/language-web/.editorconfig b/subprojects/language-web/.editorconfig
new file mode 100644
index 00000000..1b78e967
--- /dev/null
+++ b/subprojects/language-web/.editorconfig
@@ -0,0 +1,5 @@
+[src/main/css/xtext/**.css]
+indent_style = tab
+
+[src/main/js/xtext/**.js]
+indent_style = tab
diff --git a/subprojects/language-web/.eslintrc.js b/subprojects/language-web/.eslintrc.js
new file mode 100644
index 00000000..b27feb0e
--- /dev/null
+++ b/subprojects/language-web/.eslintrc.js
@@ -0,0 +1,40 @@
+// Loosely based on
+// https://github.com/iamturns/create-exposed-app/blob/f14e435b8ce179c89cce3eea89e56202153a53da/.eslintrc.js
+module.exports = {
+  plugins: [
+    '@typescript-eslint',
+  ],
+  extends: [
+    'airbnb',
+    'airbnb-typescript',
+    'airbnb/hooks',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:@typescript-eslint/recommended-requiring-type-checking',
+  ],
+  parserOptions: {
+    project: './tsconfig.json',
+  },
+  rules: {
+    // https://basarat.gitbooks.io/typescript/docs/tips/defaultIsBad.html
+    'import/prefer-default-export': 'off',
+    'import/no-default-export': 'error',
+    // propTypes are for runtime validation, but we rely on TypeScript for build-time validation:
+    // https://github.com/yannickcr/eslint-plugin-react/issues/2275#issuecomment-492003857
+    'react/prop-types': 'off',
+    // Make sure switches are exhaustive: https://stackoverflow.com/a/60166264
+    'default-case': 'off',
+    '@typescript-eslint/switch-exhaustiveness-check': 'error',
+    // https://github.com/airbnb/javascript/pull/2501
+    'react/function-component-definition': ['error', {
+      namedComponents: 'function-expression',
+      namedComponents: 'function-declaration',
+    }],
+  },
+  env: {
+    browser: true,
+  },
+  ignorePatterns: [
+    '*.js',
+    'build/**/*',
+  ],
+};
diff --git a/subprojects/language-web/.stylelintrc.js b/subprojects/language-web/.stylelintrc.js
new file mode 100644
index 00000000..7adf8f26
--- /dev/null
+++ b/subprojects/language-web/.stylelintrc.js
@@ -0,0 +1,15 @@
+module.exports = {
+  extends: 'stylelint-config-recommended-scss',
+  // Simplified for only :export to TypeScript based on
+  // https://github.com/pascalduez/stylelint-config-css-modules/blob/d792a6ac7d2bce8239edccbc5a72e0616f22d696/index.js
+  rules: {
+    'selector-pseudo-class-no-unknown': [
+      true,
+      {
+        ignorePseudoClasses: [
+          'export',
+        ],
+      },
+    ],
+  },
+};
diff --git a/subprojects/language-web/build.gradle b/subprojects/language-web/build.gradle
new file mode 100644
index 00000000..a549288a
--- /dev/null
+++ b/subprojects/language-web/build.gradle
@@ -0,0 +1,147 @@
+plugins {
+        id 'refinery-frontend-workspace'
+        id 'refinery-java-application'
+        id 'refinery-xtext-conventions'
+}
+
+import org.siouan.frontendgradleplugin.infrastructure.gradle.RunYarn
+
+dependencies {
+        implementation project(':refinery-language')
+        implementation project(':refinery-language-ide')
+        implementation libs.xtend.lib
+        implementation libs.xtext.web
+        implementation libs.jetty.server
+        implementation libs.jetty.servlet
+        implementation libs.jetty.websocket.server
+        implementation libs.slf4j.simple
+        implementation libs.slf4j.log4j
+        testImplementation testFixtures(project(':refinery-language'))
+        testImplementation libs.jetty.websocket.client
+}
+
+def generateXtextLanguage = project(':refinery-language').tasks.named('generateXtextLanguage')
+
+for (taskName in ['compileJava', 'processResources']) {
+        tasks.named(taskName) {
+                dependsOn generateXtextLanguage
+        }
+}
+
+def webpackOutputDir = "${buildDir}/webpack"
+def productionResources = "${webpackOutputDir}/production"
+def serverMainClass = 'tools.refinery.language.web.ServerLauncher'
+
+frontend {
+        assembleScript = 'assemble:webpack'
+}
+
+def installFrontend = tasks.named('installFrontend')
+
+def generateLezerGrammar = tasks.register('generateLezerGrammar', RunYarn) {
+        dependsOn installFrontend
+        inputs.file('src/main/js/language/problem.grammar')
+        inputs.files('package.json', 'yarn.lock')
+        outputs.file "${buildDir}/generated/sources/lezer/problem.ts"
+        outputs.file "${buildDir}/generated/sources/lezer/problem.terms.ts"
+        script = 'run assemble:lezer'
+}
+
+def assembleFrontend = tasks.named('assembleFrontend')
+assembleFrontend.configure {
+        dependsOn generateLezerGrammar
+        inputs.dir 'src/main/css'
+        inputs.dir 'src/main/html'
+        inputs.dir 'src/main/js'
+        inputs.file "${buildDir}/generated/sources/lezer/problem.ts"
+        inputs.file "${buildDir}/generated/sources/lezer/problem.terms.ts"
+        inputs.files('package.json', 'yarn.lock', 'webpack.config.js')
+        outputs.dir productionResources
+}
+
+def eslint = tasks.register('eslint', RunYarn) {
+        dependsOn installFrontend
+        inputs.dir 'src/main/js'
+        inputs.files('.eslintrc.js', 'tsconfig.json')
+        if (project.hasProperty('ci')) {
+                outputs.file "${buildDir}/eslint.json"
+                script = 'run check:eslint:ci'
+        } else {
+                script = 'run check:eslint'
+        }
+        group = 'verification'
+        description = 'Check for TypeScript errors.'
+}
+
+def stylelint = tasks.register('stylelint', RunYarn) {
+        dependsOn installFrontend
+        inputs.dir 'src/main/css'
+        inputs.file '.stylelintrc.js'
+        if (project.hasProperty('ci')) {
+                outputs.file "${buildDir}/stylelint.json"
+                script = 'run check:stylelint:ci'
+        } else {
+                script = 'run check:stylelint'
+        }
+        group = 'verification'
+        description = 'Check for Sass errors.'
+}
+
+tasks.named('check') {
+        dependsOn(eslint, stylelint)
+}
+
+mainClassName = serverMainClass
+
+tasks.named('jar') {
+        dependsOn assembleFrontend
+        from(productionResources) {
+                into 'webapp'
+        }
+}
+
+tasks.named('shadowJar') {
+        dependsOn assembleFrontend
+        from(project.convention.getPlugin(JavaPluginConvention).sourceSets.main.output)
+        configurations = [project.configurations.runtimeClasspath]
+        exclude('META-INF/INDEX.LIST', 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA','schema/*',
+                '.options', '.api_description', '*.profile', 'about.*', 'about_*.html', 'about_files/*',
+                'plugin.xml', 'systembundle.properties', 'profile.list', 'META-INF/resources/xtext/**')
+        append('plugin.properties')
+        from(productionResources) {
+                into 'webapp'
+        }
+}
+
+def jettyRun = tasks.register('jettyRun', JavaExec) {
+        dependsOn assembleFrontend
+        dependsOn sourceSets.main.runtimeClasspath
+        classpath = sourceSets.main.runtimeClasspath.filter{it.exists()}
+        mainClass = serverMainClass
+        standardInput = System.in
+        environment BASE_RESOURCE: productionResources
+        group = 'run'
+        description = 'Start a Jetty web server serving the Xtex API and assets.'
+}
+
+tasks.register('webpackServe', RunYarn) {
+        dependsOn installFrontend
+        dependsOn generateLezerGrammar
+        outputs.dir "${webpackOutputDir}/development"
+        script = 'run serve'
+        group = 'run'
+        description = 'Start a Webpack dev server with hot module replacement.'
+}
+
+sonarqube.properties {
+        properties['sonar.sources'] += [
+                'src/main/css',
+                'src/main/html',
+                'src/main/js',
+        ]
+        property 'sonar.nodejs.executable', "${frontend.nodeInstallDirectory.get()}/bin/node"
+        property 'sonar.eslint.reportPaths', "${buildDir}/eslint.json"
+        property 'sonar.css.stylelint.reportPaths', "${buildDir}/stylelint.json"
+        // SonarJS does not pick up typescript files with `exactOptionalPropertyTypes`
+        property 'sonar.typescript.tsconfigPath', 'tsconfig.sonar.json'
+}
diff --git a/subprojects/language-web/package.json b/subprojects/language-web/package.json
new file mode 100644
index 00000000..5fa977d9
--- /dev/null
+++ b/subprojects/language-web/package.json
@@ -0,0 +1,103 @@
+{
+  "name": "@refinery/language-web",
+  "version": "0.0.0",
+  "description": "Web frontend for VIATRA-Generator",
+  "main": "index.js",
+  "scripts": {
+    "assemble:lezer": "lezer-generator src/main/js/language/problem.grammar -o build/generated/sources/lezer/problem.ts",
+    "assemble:webpack": "webpack --node-env production",
+    "serve": "webpack serve --node-env development --hot",
+    "check": "yarn run check:eslint && yarn run check:stylelint",
+    "check:eslint": "eslint .",
+    "check:eslint:ci": "eslint -f json -o build/eslint.json .",
+    "check:stylelint": "stylelint src/main/css/**/*.scss",
+    "check:stylelint:ci": "stylelint -f json src/main/css/**/*.scss > build/stylelint.json"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/graphs4value/refinery.git"
+  },
+  "author": "VIATRA-Generator authors",
+  "license": "EPL-2.0",
+  "bugs": {
+    "url": "https://github.com/graphs4value/issues"
+  },
+  "homepage": "https://refinery.tools",
+  "devDependencies": {
+    "@babel/core": "^7.16.0",
+    "@babel/plugin-transform-runtime": "^7.16.4",
+    "@babel/preset-env": "^7.16.4",
+    "@babel/preset-react": "^7.16.0",
+    "@babel/preset-typescript": "^7.16.0",
+    "@lezer/generator": "^0.15.2",
+    "@principalstudio/html-webpack-inject-preload": "^1.2.7",
+    "@types/react": "^17.0.37",
+    "@types/react-dom": "^17.0.11",
+    "@typescript-eslint/eslint-plugin": "^5.6.0",
+    "@typescript-eslint/parser": "^5.6.0",
+    "babel-loader": "^8.2.3",
+    "css-loader": "^6.5.1",
+    "eslint": "^8.4.1",
+    "eslint-config-airbnb": "^19.0.2",
+    "eslint-config-airbnb-typescript": "^16.1.0",
+    "eslint-import-resolver-node": "^0.3.6",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-jsx-a11y": "^6.5.1",
+    "eslint-plugin-react": "^7.27.1",
+    "eslint-plugin-react-hooks": "^4.3.0",
+    "html-webpack-plugin": "^5.5.0",
+    "image-webpack-loader": "^8.0.1",
+    "magic-comments-loader": "^1.4.1",
+    "mini-css-extract-plugin": "^2.4.5",
+    "postcss": "^8.4.4",
+    "postcss-scss": "^4.0.2",
+    "sass": "^1.45.0",
+    "sass-loader": "^12.4.0",
+    "style-loader": "^3.3.1",
+    "stylelint": "^14.1.0",
+    "stylelint-config-recommended-scss": "^5.0.2",
+    "stylelint-scss": "^4.0.1",
+    "typescript": "~4.5.3",
+    "webpack": "^5.65.0",
+    "webpack-cli": "^4.9.1",
+    "webpack-dev-server": "^4.6.0",
+    "webpack-subresource-integrity": "^5.0.0"
+  },
+  "dependencies": {
+    "@babel/runtime": "^7.16.3",
+    "@codemirror/autocomplete": "^0.19.9",
+    "@codemirror/closebrackets": "^0.19.0",
+    "@codemirror/commands": "^0.19.6",
+    "@codemirror/comment": "^0.19.0",
+    "@codemirror/fold": "^0.19.2",
+    "@codemirror/gutter": "^0.19.9",
+    "@codemirror/highlight": "^0.19.6",
+    "@codemirror/history": "^0.19.0",
+    "@codemirror/language": "^0.19.7",
+    "@codemirror/lint": "^0.19.3",
+    "@codemirror/matchbrackets": "^0.19.3",
+    "@codemirror/rangeset": "^0.19.2",
+    "@codemirror/rectangular-selection": "^0.19.1",
+    "@codemirror/search": "^0.19.4",
+    "@codemirror/state": "^0.19.6",
+    "@codemirror/view": "^0.19.29",
+    "@emotion/react": "^11.7.0",
+    "@emotion/styled": "^11.6.0",
+    "@fontsource/jetbrains-mono": "^4.5.0",
+    "@fontsource/roboto": "^4.5.1",
+    "@lezer/common": "^0.15.10",
+    "@lezer/lr": "^0.15.5",
+    "@mui/icons-material": "5.2.1",
+    "@mui/material": "5.2.3",
+    "ansi-styles": "^6.1.0",
+    "escape-string-regexp": "^5.0.0",
+    "loglevel": "^1.8.0",
+    "loglevel-plugin-prefix": "^0.8.4",
+    "mobx": "^6.3.8",
+    "mobx-react-lite": "^3.2.2",
+    "nanoid": "^3.1.30",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "zod": "^3.11.6"
+  }
+}
diff --git a/subprojects/language-web/src/main/css/index.scss b/subprojects/language-web/src/main/css/index.scss
new file mode 100644
index 00000000..ad876aaf
--- /dev/null
+++ b/subprojects/language-web/src/main/css/index.scss
@@ -0,0 +1,16 @@
+@use '@fontsource/roboto/scss/mixins' as Roboto;
+@use '@fontsource/jetbrains-mono/scss/mixins' as JetbrainsMono;
+
+$fontWeights: 300, 400, 500, 700;
+@each $weight in $fontWeights {
+  @include Roboto.fontFace($fontName: 'Roboto', $weight: $weight);
+  @include Roboto.fontFace($fontName: 'Roboto', $weight: $weight, $style: italic);
+}
+
+$monoFontWeights: 400, 700;
+@each $weight in $monoFontWeights {
+  @include JetbrainsMono.fontFace($fontName: 'JetBrains Mono', $weight: $weight);
+  @include JetbrainsMono.fontFace($fontName: 'JetBrains Mono', $weight: $weight, $style: italic);
+}
+@include JetbrainsMono.fontFaceVariable($fontName: 'JetBrains MonoVariable');
+@include JetbrainsMono.fontFaceVariable($fontName: 'JetBrains MonoVariable', $style: italic);
diff --git a/subprojects/language-web/src/main/css/themeVariables.module.scss b/subprojects/language-web/src/main/css/themeVariables.module.scss
new file mode 100644
index 00000000..85af4219
--- /dev/null
+++ b/subprojects/language-web/src/main/css/themeVariables.module.scss
@@ -0,0 +1,9 @@
+@import './themes';
+
+:export {
+  @each $themeName, $theme in $themes {
+    @each $variable, $value in $theme {
+      #{$themeName}--#{$variable}: $value,
+    }
+  }
+}
diff --git a/subprojects/language-web/src/main/css/themes.scss b/subprojects/language-web/src/main/css/themes.scss
new file mode 100644
index 00000000..a30f1de3
--- /dev/null
+++ b/subprojects/language-web/src/main/css/themes.scss
@@ -0,0 +1,38 @@
+$themes: (
+  'dark': (
+    'foreground': #abb2bf,
+    'foregroundHighlight': #eeffff,
+    'background': #212121,
+    'primary': #56b6c2,
+    'secondary': #ff5370,
+    'keyword': #56b6c2,
+    'predicate': #d6e9ff,
+    'variable': #c8ae9d,
+    'uniqueNode': #d6e9ff,
+    'number': #6e88a6,
+    'delimiter': #707787,
+    'comment': #5c6370,
+    'cursor': #56b6c2,
+    'selection': #3e4452,
+    'currentLine': rgba(0, 0, 0, 0.2),
+    'lineNumber': #5c6370,
+  ),
+  'light': (
+    'foreground': #abb2bf,
+    'background': #282c34,
+    'paper': #21252b,
+    'primary': #56b6c2,
+    'secondary': #ff5370,
+    'keyword': #56b6c2,
+    'predicate': #d6e9ff,
+    'variable': #c8ae9d,
+    'uniqueNode': #d6e9ff,
+    'number': #6e88a6,
+    'delimiter': #56606d,
+    'comment': #55606d,
+    'cursor': #f3efe7,
+    'selection': #3e4452,
+    'currentLine': #2c323c,
+    'lineNumber': #5c6370,
+  ),
+);
diff --git a/subprojects/language-web/src/main/html/index.html b/subprojects/language-web/src/main/html/index.html
new file mode 100644
index 00000000..f404aa8a
--- /dev/null
+++ b/subprojects/language-web/src/main/html/index.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en-US">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Refinery</title>
+  </head>
+  <body>
+    <noscript>
+      <p>
+        This application requires JavaScript to run.
+      </p>
+    </noscript>
+    <div id="app"></div>
+  </body>
+</html>
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/CacheControlFilter.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/CacheControlFilter.java
new file mode 100644
index 00000000..b13ae95d
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/CacheControlFilter.java
@@ -0,0 +1,52 @@
+package tools.refinery.language.web;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.util.regex.Pattern;
+
+import org.eclipse.jetty.http.HttpHeader;
+
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+public class CacheControlFilter implements Filter {
+        private static final Pattern CACHE_URI_PATTERN = Pattern.compile(".*\\.(css|gif|js|map|png|svg|woff2)");
+
+        private static final Duration EXPIRY = Duration.ofDays(365);
+
+        private static final String CACHE_CONTROL_CACHE_VALUE = "public, max-age: " + EXPIRY.toSeconds() + ", immutable";
+
+        private static final String CACHE_CONTROL_NO_CACHE_VALUE = "no-cache, no-store, max-age: 0, must-revalidate";
+
+        @Override
+        public void init(FilterConfig filterConfig) throws ServletException {
+                // Nothing to initialize.
+        }
+
+        @Override
+        public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+                        throws IOException, ServletException {
+                if (request instanceof HttpServletRequest httpRequest && response instanceof HttpServletResponse httpResponse) {
+                        if (CACHE_URI_PATTERN.matcher(httpRequest.getRequestURI()).matches()) {
+                                httpResponse.setHeader(HttpHeader.CACHE_CONTROL.asString(), CACHE_CONTROL_CACHE_VALUE);
+                                httpResponse.setDateHeader(HttpHeader.EXPIRES.asString(),
+                                                System.currentTimeMillis() + EXPIRY.toMillis());
+                        } else {
+                                httpResponse.setHeader(HttpHeader.CACHE_CONTROL.asString(), CACHE_CONTROL_NO_CACHE_VALUE);
+                                httpResponse.setDateHeader(HttpHeader.EXPIRES.asString(), 0);
+                        }
+                }
+                chain.doFilter(request, response);
+        }
+
+        @Override
+        public void destroy() {
+                // Nothing to dispose.
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/ProblemWebModule.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/ProblemWebModule.java
new file mode 100644
index 00000000..ec55036f
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/ProblemWebModule.java
@@ -0,0 +1,35 @@
+/*
+ * generated by Xtext 2.25.0
+ */
+package tools.refinery.language.web;
+
+import org.eclipse.xtext.web.server.XtextServiceDispatcher;
+import org.eclipse.xtext.web.server.model.IWebDocumentProvider;
+import org.eclipse.xtext.web.server.model.XtextWebDocumentAccess;
+import org.eclipse.xtext.web.server.occurrences.OccurrencesService;
+
+import tools.refinery.language.web.occurrences.ProblemOccurrencesService;
+import tools.refinery.language.web.xtext.server.push.PushServiceDispatcher;
+import tools.refinery.language.web.xtext.server.push.PushWebDocumentAccess;
+import tools.refinery.language.web.xtext.server.push.PushWebDocumentProvider;
+
+/**
+ * Use this class to register additional components to be used within the web application.
+ */
+public class ProblemWebModule extends AbstractProblemWebModule {
+        public Class<? extends IWebDocumentProvider> bindIWebDocumentProvider() {
+                return PushWebDocumentProvider.class;
+        }
+        
+        public Class<? extends XtextWebDocumentAccess> bindXtextWebDocumentAccess() {
+                return PushWebDocumentAccess.class;
+        }
+        
+        public Class<? extends XtextServiceDispatcher> bindXtextServiceDispatcher() {
+                return PushServiceDispatcher.class;
+        }
+        
+        public Class<? extends OccurrencesService> bindOccurrencesService() {
+                return ProblemOccurrencesService.class;
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/ProblemWebSetup.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/ProblemWebSetup.java
new file mode 100644
index 00000000..4738bc80
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/ProblemWebSetup.java
@@ -0,0 +1,25 @@
+/*
+ * generated by Xtext 2.25.0
+ */
+package tools.refinery.language.web;
+
+import org.eclipse.xtext.util.Modules2;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+import tools.refinery.language.ProblemRuntimeModule;
+import tools.refinery.language.ProblemStandaloneSetup;
+import tools.refinery.language.ide.ProblemIdeModule;
+
+/**
+ * Initialization support for running Xtext languages in web applications.
+ */
+public class ProblemWebSetup extends ProblemStandaloneSetup {
+        
+        @Override
+        public Injector createInjector() {
+                return Guice.createInjector(Modules2.mixin(new ProblemRuntimeModule(), new ProblemIdeModule(), new ProblemWebModule()));
+        }
+        
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/ProblemWebSocketServlet.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/ProblemWebSocketServlet.java
new file mode 100644
index 00000000..df67b521
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/ProblemWebSocketServlet.java
@@ -0,0 +1,29 @@
+package tools.refinery.language.web;
+
+import org.eclipse.xtext.util.DisposableRegistry;
+
+import jakarta.servlet.ServletException;
+import tools.refinery.language.web.xtext.servlet.XtextWebSocketServlet;
+
+public class ProblemWebSocketServlet extends XtextWebSocketServlet {
+
+        private static final long serialVersionUID = -7040955470384797008L;
+
+        private transient DisposableRegistry disposableRegistry;
+
+        @Override
+        public void init() throws ServletException {
+                super.init();
+                var injector = new ProblemWebSetup().createInjectorAndDoEMFRegistration();
+                this.disposableRegistry = injector.getInstance(DisposableRegistry.class);
+        }
+
+        @Override
+        public void destroy() {
+                if (disposableRegistry != null) {
+                        disposableRegistry.dispose();
+                        disposableRegistry = null;
+                }
+                super.destroy();
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/ServerLauncher.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/ServerLauncher.java
new file mode 100644
index 00000000..ffd903d0
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/ServerLauncher.java
@@ -0,0 +1,192 @@
+/*
+ * generated by Xtext 2.25.0
+ */
+package tools.refinery.language.web;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.EnumSet;
+import java.util.Optional;
+import java.util.Set;
+
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.session.SessionHandler;
+import org.eclipse.jetty.servlet.DefaultServlet;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.util.resource.Resource;
+import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.SessionTrackingMode;
+import tools.refinery.language.web.xtext.servlet.XtextWebSocketServlet;
+
+public class ServerLauncher {
+        public static final String DEFAULT_LISTEN_ADDRESS = "localhost";
+
+        public static final int DEFAULT_LISTEN_PORT = 1312;
+
+        public static final int DEFAULT_PUBLIC_PORT = 443;
+
+        public static final int HTTP_DEFAULT_PORT = 80;
+
+        public static final int HTTPS_DEFAULT_PORT = 443;
+        
+        public static final String ALLOWED_ORIGINS_SEPARATOR = ";";
+
+        private static final Logger LOG = LoggerFactory.getLogger(ServerLauncher.class);
+
+        private final Server server;
+
+        public ServerLauncher(InetSocketAddress bindAddress, Resource baseResource, Optional<String[]> allowedOrigins) {
+                server = new Server(bindAddress);
+                var handler = new ServletContextHandler();
+                addSessionHandler(handler);
+                addProblemServlet(handler, allowedOrigins);
+                if (baseResource != null) {
+                        handler.setBaseResource(baseResource);
+                        handler.setWelcomeFiles(new String[] { "index.html" });
+                        addDefaultServlet(handler);
+                }
+                handler.addFilter(CacheControlFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));
+                server.setHandler(handler);
+        }
+
+        private void addSessionHandler(ServletContextHandler handler) {
+                var sessionHandler = new SessionHandler();
+                sessionHandler.setSessionTrackingModes(Set.of(SessionTrackingMode.COOKIE));
+                handler.setSessionHandler(sessionHandler);
+        }
+
+        private void addProblemServlet(ServletContextHandler handler, Optional<String[]> allowedOrigins) {
+                var problemServletHolder = new ServletHolder(ProblemWebSocketServlet.class);
+                if (allowedOrigins.isEmpty()) {
+                        LOG.warn("All WebSocket origins are allowed! This setting should not be used in production!");
+                } else {
+                        var allowedOriginsString = String.join(XtextWebSocketServlet.ALLOWED_ORIGINS_SEPARATOR,
+                                        allowedOrigins.get());
+                        problemServletHolder.setInitParameter(XtextWebSocketServlet.ALLOWED_ORIGINS_INIT_PARAM,
+                                        allowedOriginsString);
+                }
+                handler.addServlet(problemServletHolder, "/xtext-service");
+                JettyWebSocketServletContainerInitializer.configure(handler, null);
+        }
+
+        private void addDefaultServlet(ServletContextHandler handler) {
+                var defaultServletHolder = new ServletHolder(DefaultServlet.class);
+                var isWindows = System.getProperty("os.name").toLowerCase().contains("win");
+                // Avoid file locking on Windows: https://stackoverflow.com/a/4985717
+                // See also the related Jetty ticket:
+                // https://github.com/eclipse/jetty.project/issues/2925
+                defaultServletHolder.setInitParameter("useFileMappedBuffer", isWindows ? "false" : "true");
+                handler.addServlet(defaultServletHolder, "/");
+        }
+
+        public void start() throws Exception {
+                server.start();
+                LOG.info("Server started on {}", server.getURI());
+                server.join();
+        }
+
+        public static void main(String[] args) {
+                try {
+                        var bindAddress = getBindAddress();
+                        var baseResource = getBaseResource();
+                        var allowedOrigins = getAllowedOrigins();
+                        var serverLauncher = new ServerLauncher(bindAddress, baseResource, allowedOrigins);
+                        serverLauncher.start();
+                } catch (Exception exception) {
+                        LOG.error("Fatal server error", exception);
+                        System.exit(1);
+                }
+        }
+
+        private static String getListenAddress() {
+                var listenAddress = System.getenv("LISTEN_ADDRESS");
+                if (listenAddress == null) {
+                        return DEFAULT_LISTEN_ADDRESS;
+                }
+                return listenAddress;
+        }
+
+        private static int getListenPort() {
+                var portStr = System.getenv("LISTEN_PORT");
+                if (portStr != null) {
+                        return Integer.parseInt(portStr);
+                }
+                return DEFAULT_LISTEN_PORT;
+        }
+
+        private static InetSocketAddress getBindAddress() {
+                var listenAddress = getListenAddress();
+                var listenPort = getListenPort();
+                return new InetSocketAddress(listenAddress, listenPort);
+        }
+
+        private static Resource getBaseResource() throws IOException, URISyntaxException {
+                var baseResourceOverride = System.getenv("BASE_RESOURCE");
+                if (baseResourceOverride != null) {
+                        // If a user override is provided, use it.
+                        return Resource.newResource(baseResourceOverride);
+                }
+                var indexUrlInJar = ServerLauncher.class.getResource("/webapp/index.html");
+                if (indexUrlInJar != null) {
+                        // If the app is packaged in the jar, serve it.
+                        var webRootUri = URI.create(indexUrlInJar.toURI().toASCIIString().replaceFirst("/index.html$", "/"));
+                        return Resource.newResource(webRootUri);
+                }
+                // Look for unpacked production artifacts (convenience for running from IDE).
+                var unpackedResourcePathComponents = new String[] { System.getProperty("user.dir"), "build", "webpack",
+                                "production" };
+                var unpackedResourceDir = new File(String.join(File.separator, unpackedResourcePathComponents));
+                if (unpackedResourceDir.isDirectory()) {
+                        return Resource.newResource(unpackedResourceDir);
+                }
+                // Fall back to just serving a 404.
+                return null;
+        }
+
+        private static String getPublicHost() {
+                var publicHost = System.getenv("PUBLIC_HOST");
+                if (publicHost != null) {
+                        return publicHost.toLowerCase();
+                }
+                return null;
+        }
+
+        private static int getPublicPort() {
+                var portStr = System.getenv("PUBLIC_PORT");
+                if (portStr != null) {
+                        return Integer.parseInt(portStr);
+                }
+                return DEFAULT_LISTEN_PORT;
+        }
+
+        private static Optional<String[]> getAllowedOrigins() {
+                var allowedOrigins = System.getenv("ALLOWED_ORIGINS");
+                if (allowedOrigins != null) {
+                        return Optional.of(allowedOrigins.split(ALLOWED_ORIGINS_SEPARATOR));
+                }
+                return getAllowedOriginsFromPublicHostAndPort();
+        }
+
+        private static Optional<String[]> getAllowedOriginsFromPublicHostAndPort() {
+                var publicHost = getPublicHost();
+                if (publicHost == null) {
+                        return Optional.empty();
+                }
+                int publicPort = getPublicPort();
+                var scheme = publicPort == HTTPS_DEFAULT_PORT ? "https" : "http";
+                var urlWithPort = String.format("%s://%s:%d", scheme, publicHost, publicPort);
+                if (publicPort == HTTPS_DEFAULT_PORT || publicPort == HTTP_DEFAULT_PORT) {
+                        var urlWithoutPort = String.format("%s://%s", scheme, publicHost);
+                        return Optional.of(new String[] { urlWithPort, urlWithoutPort });
+                }
+                return Optional.of(new String[] { urlWithPort });
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/occurrences/ProblemOccurrencesService.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/occurrences/ProblemOccurrencesService.java
new file mode 100644
index 00000000..d32bbb54
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/occurrences/ProblemOccurrencesService.java
@@ -0,0 +1,16 @@
+package tools.refinery.language.web.occurrences;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.web.server.occurrences.OccurrencesService;
+
+import com.google.inject.Singleton;
+
+import tools.refinery.language.model.problem.NamedElement;
+
+@Singleton
+public class ProblemOccurrencesService extends OccurrencesService {
+        @Override
+        protected boolean filter(EObject element) {
+                return super.filter(element) && element instanceof NamedElement;
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/PongResult.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/PongResult.java
new file mode 100644
index 00000000..fe510f51
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/PongResult.java
@@ -0,0 +1,44 @@
+package tools.refinery.language.web.xtext.server;
+
+import java.util.Objects;
+
+import org.eclipse.xtext.web.server.IServiceResult;
+
+public class PongResult implements IServiceResult {
+        private String pong;
+
+        public PongResult(String pong) {
+                super();
+                this.pong = pong;
+        }
+
+        public String getPong() {
+                return pong;
+        }
+
+        public void setPong(String pong) {
+                this.pong = pong;
+        }
+
+        @Override
+        public int hashCode() {
+                return Objects.hash(pong);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+                if (this == obj)
+                        return true;
+                if (obj == null)
+                        return false;
+                if (getClass() != obj.getClass())
+                        return false;
+                PongResult other = (PongResult) obj;
+                return Objects.equals(pong, other.pong);
+        }
+
+        @Override
+        public String toString() {
+                return "PongResult [pong=" + pong + "]";
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/ResponseHandler.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/ResponseHandler.java
new file mode 100644
index 00000000..2a85afe3
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/ResponseHandler.java
@@ -0,0 +1,8 @@
+package tools.refinery.language.web.xtext.server;
+
+import tools.refinery.language.web.xtext.server.message.XtextWebResponse;
+
+@FunctionalInterface
+public interface ResponseHandler {
+        void onResponse(XtextWebResponse response) throws ResponseHandlerException;
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/ResponseHandlerException.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/ResponseHandlerException.java
new file mode 100644
index 00000000..34fcb546
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/ResponseHandlerException.java
@@ -0,0 +1,14 @@
+package tools.refinery.language.web.xtext.server;
+
+public class ResponseHandlerException extends Exception {
+
+        private static final long serialVersionUID = 3589866922420268164L;
+
+        public ResponseHandlerException(String message, Throwable cause) {
+                super(message, cause);
+        }
+
+        public ResponseHandlerException(String message) {
+                super(message);
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/SubscribingServiceContext.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/SubscribingServiceContext.java
new file mode 100644
index 00000000..78e00a9e
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/SubscribingServiceContext.java
@@ -0,0 +1,26 @@
+package tools.refinery.language.web.xtext.server;
+
+import java.util.Set;
+
+import org.eclipse.xtext.web.server.IServiceContext;
+import org.eclipse.xtext.web.server.ISession;
+
+import tools.refinery.language.web.xtext.server.push.PrecomputationListener;
+
+public record SubscribingServiceContext(IServiceContext delegate, PrecomputationListener subscriber)
+                implements IServiceContext {
+        @Override
+        public Set<String> getParameterKeys() {
+                return delegate.getParameterKeys();
+        }
+
+        @Override
+        public String getParameter(String key) {
+                return delegate.getParameter(key);
+        }
+
+        @Override
+        public ISession getSession() {
+                return delegate.getSession();
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/TransactionExecutor.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/TransactionExecutor.java
new file mode 100644
index 00000000..0b417b06
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/TransactionExecutor.java
@@ -0,0 +1,180 @@
+package tools.refinery.language.web.xtext.server;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.xtext.resource.IResourceServiceProvider;
+import org.eclipse.xtext.util.IDisposable;
+import org.eclipse.xtext.web.server.IServiceContext;
+import org.eclipse.xtext.web.server.IServiceResult;
+import org.eclipse.xtext.web.server.ISession;
+import org.eclipse.xtext.web.server.InvalidRequestException;
+import org.eclipse.xtext.web.server.InvalidRequestException.UnknownLanguageException;
+import org.eclipse.xtext.web.server.XtextServiceDispatcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Strings;
+import com.google.inject.Injector;
+
+import tools.refinery.language.web.xtext.server.message.XtextWebErrorKind;
+import tools.refinery.language.web.xtext.server.message.XtextWebErrorResponse;
+import tools.refinery.language.web.xtext.server.message.XtextWebOkResponse;
+import tools.refinery.language.web.xtext.server.message.XtextWebPushMessage;
+import tools.refinery.language.web.xtext.server.message.XtextWebRequest;
+import tools.refinery.language.web.xtext.server.push.PrecomputationListener;
+import tools.refinery.language.web.xtext.server.push.PushWebDocument;
+import tools.refinery.language.web.xtext.servlet.SimpleServiceContext;
+
+public class TransactionExecutor implements IDisposable, PrecomputationListener {
+        private static final Logger LOG = LoggerFactory.getLogger(TransactionExecutor.class);
+
+        private final ISession session;
+
+        private final IResourceServiceProvider.Registry resourceServiceProviderRegistry;
+
+        private final Map<String, WeakReference<PushWebDocument>> subscriptions = new HashMap<>();
+
+        private ResponseHandler responseHandler;
+
+        private Object callPendingLock = new Object();
+
+        private boolean callPending;
+
+        private List<XtextWebPushMessage> pendingPushMessages = new ArrayList<>();
+
+        public TransactionExecutor(ISession session, IResourceServiceProvider.Registry resourceServiceProviderRegistry) {
+                this.session = session;
+                this.resourceServiceProviderRegistry = resourceServiceProviderRegistry;
+        }
+
+        public void setResponseHandler(ResponseHandler responseHandler) {
+                this.responseHandler = responseHandler;
+        }
+
+        public void handleRequest(XtextWebRequest request) throws ResponseHandlerException {
+                var serviceContext = new SimpleServiceContext(session, request.getRequestData());
+                var ping = serviceContext.getParameter("ping");
+                if (ping != null) {
+                        responseHandler.onResponse(new XtextWebOkResponse(request, new PongResult(ping)));
+                        return;
+                }
+                synchronized (callPendingLock) {
+                        if (callPending) {
+                                LOG.error("Reentrant request detected");
+                        }
+                        if (!pendingPushMessages.isEmpty()) {
+                                LOG.error("{} push messages got stuck without a pending request", pendingPushMessages.size());
+                        }
+                        callPending = true;
+                }
+                try {
+                        var injector = getInjector(serviceContext);
+                        var serviceDispatcher = injector.getInstance(XtextServiceDispatcher.class);
+                        var service = serviceDispatcher.getService(new SubscribingServiceContext(serviceContext, this));
+                        var serviceResult = service.getService().apply();
+                        responseHandler.onResponse(new XtextWebOkResponse(request, serviceResult));
+                } catch (InvalidRequestException e) {
+                        responseHandler.onResponse(new XtextWebErrorResponse(request, XtextWebErrorKind.REQUEST_ERROR, e));
+                } catch (RuntimeException e) {
+                        responseHandler.onResponse(new XtextWebErrorResponse(request, XtextWebErrorKind.SERVER_ERROR, e));
+                } finally {
+                        synchronized (callPendingLock) {
+                                for (var message : pendingPushMessages) {
+                                        try {
+                                                responseHandler.onResponse(message);
+                                        } catch (ResponseHandlerException | RuntimeException e) {
+                                                LOG.error("Error while flushing push message", e);
+                                        }
+                                }
+                                pendingPushMessages.clear();
+                                callPending = false;
+                        }
+                }
+        }
+
+        @Override
+        public void onPrecomputedServiceResult(String resourceId, String stateId, String serviceName,
+                        IServiceResult serviceResult) throws ResponseHandlerException {
+                var message = new XtextWebPushMessage(resourceId, stateId, serviceName, serviceResult);
+                synchronized (callPendingLock) {
+                        // If we're currently responding to a call we must delay any push messages until
+                        // the reply is sent, because push messages relating to the new state id must be
+                        // sent after the response with the new state id so that the client knows about
+                        // the new state when it receives the push message.
+                        if (callPending) {
+                                pendingPushMessages.add(message);
+                        } else {
+                                responseHandler.onResponse(message);
+                        }
+                }
+        }
+
+        @Override
+        public void onSubscribeToPrecomputationEvents(String resourceId, PushWebDocument document) {
+                PushWebDocument previousDocument = null;
+                var previousSubscription = subscriptions.get(resourceId);
+                if (previousSubscription != null) {
+                        previousDocument = previousSubscription.get();
+                }
+                if (previousDocument == document) {
+                        return;
+                }
+                if (previousDocument != null) {
+                        previousDocument.removePrecomputationListener(this);
+                }
+                subscriptions.put(resourceId, new WeakReference<>(document));
+        }
+
+        /**
+         * Get the injector to satisfy the request in the {@code serviceContext}.
+         * 
+         * Based on {@link org.eclipse.xtext.web.servlet.XtextServlet#getInjector}.
+         * 
+         * @param serviceContext the Xtext service context of the request
+         * @return the injector for the Xtext language in the request
+         * @throws UnknownLanguageException if the Xtext language cannot be determined
+         */
+        protected Injector getInjector(IServiceContext context) {
+                IResourceServiceProvider resourceServiceProvider = null;
+                var resourceName = context.getParameter("resource");
+                if (resourceName == null) {
+                        resourceName = "";
+                }
+                var emfURI = URI.createURI(resourceName);
+                var contentType = context.getParameter("contentType");
+                if (Strings.isNullOrEmpty(contentType)) {
+                        resourceServiceProvider = resourceServiceProviderRegistry.getResourceServiceProvider(emfURI);
+                        if (resourceServiceProvider == null) {
+                                if (emfURI.toString().isEmpty()) {
+                                        throw new UnknownLanguageException(
+                                                        "Unable to identify the Xtext language: missing parameter 'resource' or 'contentType'.");
+                                } else {
+                                        throw new UnknownLanguageException(
+                                                        "Unable to identify the Xtext language for resource " + emfURI + ".");
+                                }
+                        }
+                } else {
+                        resourceServiceProvider = resourceServiceProviderRegistry.getResourceServiceProvider(emfURI, contentType);
+                        if (resourceServiceProvider == null) {
+                                throw new UnknownLanguageException(
+                                                "Unable to identify the Xtext language for contentType " + contentType + ".");
+                        }
+                }
+                return resourceServiceProvider.get(Injector.class);
+        }
+
+        @Override
+        public void dispose() {
+                for (var subscription : subscriptions.values()) {
+                        var document = subscription.get();
+                        if (document != null) {
+                                document.removePrecomputationListener(this);
+                        }
+                }
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebErrorKind.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebErrorKind.java
new file mode 100644
index 00000000..f74bae74
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebErrorKind.java
@@ -0,0 +1,11 @@
+package tools.refinery.language.web.xtext.server.message;
+
+import com.google.gson.annotations.SerializedName;
+
+public enum XtextWebErrorKind {
+        @SerializedName("request")
+        REQUEST_ERROR,
+
+        @SerializedName("server")
+        SERVER_ERROR,
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebErrorResponse.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebErrorResponse.java
new file mode 100644
index 00000000..01d78c31
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebErrorResponse.java
@@ -0,0 +1,79 @@
+package tools.refinery.language.web.xtext.server.message;
+
+import java.util.Objects;
+
+import com.google.gson.annotations.SerializedName;
+
+public final class XtextWebErrorResponse implements XtextWebResponse {
+        private String id;
+
+        @SerializedName("error")
+        private XtextWebErrorKind errorKind;
+
+        @SerializedName("message")
+        private String errorMessage;
+
+        public XtextWebErrorResponse(String id, XtextWebErrorKind errorKind, String errorMessage) {
+                super();
+                this.id = id;
+                this.errorKind = errorKind;
+                this.errorMessage = errorMessage;
+        }
+
+        public XtextWebErrorResponse(XtextWebRequest request, XtextWebErrorKind errorKind,
+                        String errorMessage) {
+                this(request.getId(), errorKind, errorMessage);
+        }
+
+        public XtextWebErrorResponse(XtextWebRequest request, XtextWebErrorKind errorKind, Throwable t) {
+                this(request, errorKind, t.getMessage());
+        }
+
+        public String getId() {
+                return id;
+        }
+
+        public void setId(String id) {
+                this.id = id;
+        }
+
+        public XtextWebErrorKind getErrorKind() {
+                return errorKind;
+        }
+
+        public void setErrorKind(XtextWebErrorKind errorKind) {
+                this.errorKind = errorKind;
+        }
+
+        public String getErrorMessage() {
+                return errorMessage;
+        }
+
+        public void setErrorMessage(String errorMessage) {
+                this.errorMessage = errorMessage;
+        }
+
+        @Override
+        public int hashCode() {
+                return Objects.hash(errorKind, errorMessage, id);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+                if (this == obj)
+                        return true;
+                if (obj == null)
+                        return false;
+                if (getClass() != obj.getClass())
+                        return false;
+                XtextWebErrorResponse other = (XtextWebErrorResponse) obj;
+                return errorKind == other.errorKind && Objects.equals(errorMessage, other.errorMessage)
+                                && Objects.equals(id, other.id);
+        }
+
+        @Override
+        public String toString() {
+                return "XtextWebSocketErrorResponse [id=" + id + ", errorKind=" + errorKind + ", errorMessage=" + errorMessage
+                                + "]";
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebOkResponse.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebOkResponse.java
new file mode 100644
index 00000000..8af27247
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebOkResponse.java
@@ -0,0 +1,72 @@
+package tools.refinery.language.web.xtext.server.message;
+
+import java.util.Objects;
+
+import org.eclipse.xtext.web.server.IServiceResult;
+import org.eclipse.xtext.web.server.IUnwrappableServiceResult;
+
+import com.google.gson.annotations.SerializedName;
+
+public final class XtextWebOkResponse implements XtextWebResponse {
+        private String id;
+
+        @SerializedName("response")
+        private Object responseData;
+
+        public XtextWebOkResponse(String id, Object responseData) {
+                super();
+                this.id = id;
+                this.responseData = responseData;
+        }
+
+        public XtextWebOkResponse(XtextWebRequest request, IServiceResult result) {
+                this(request.getId(), maybeUnwrap(result));
+        }
+
+        public String getId() {
+                return id;
+        }
+
+        public void setId(String id) {
+                this.id = id;
+        }
+
+        public Object getResponseData() {
+                return responseData;
+        }
+
+        public void setResponseData(Object responseData) {
+                this.responseData = responseData;
+        }
+
+        @Override
+        public int hashCode() {
+                return Objects.hash(id, responseData);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+                if (this == obj)
+                        return true;
+                if (obj == null)
+                        return false;
+                if (getClass() != obj.getClass())
+                        return false;
+                XtextWebOkResponse other = (XtextWebOkResponse) obj;
+                return Objects.equals(id, other.id) && Objects.equals(responseData, other.responseData);
+        }
+
+        @Override
+        public String toString() {
+                return "XtextWebSocketOkResponse [id=" + id + ", responseData=" + responseData + "]";
+        }
+
+        private static Object maybeUnwrap(IServiceResult result) {
+                if (result instanceof IUnwrappableServiceResult unwrappableServiceResult
+                                && unwrappableServiceResult.getContent() != null) {
+                        return unwrappableServiceResult.getContent();
+                } else {
+                        return result;
+                }
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebPushMessage.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebPushMessage.java
new file mode 100644
index 00000000..c9432e1c
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebPushMessage.java
@@ -0,0 +1,81 @@
+package tools.refinery.language.web.xtext.server.message;
+
+import java.util.Objects;
+
+import com.google.gson.annotations.SerializedName;
+
+public final class XtextWebPushMessage implements XtextWebResponse {    
+        @SerializedName("resource")
+        private String resourceId;
+        
+        private String stateId;
+        
+        private String service;
+        
+        @SerializedName("push")
+        private Object pushData;
+
+        public XtextWebPushMessage(String resourceId, String stateId, String service, Object pushData) {
+                super();
+                this.resourceId = resourceId;
+                this.stateId = stateId;
+                this.service = service;
+                this.pushData = pushData;
+        }
+
+        public String getResourceId() {
+                return resourceId;
+        }
+
+        public void setResourceId(String resourceId) {
+                this.resourceId = resourceId;
+        }
+
+        public String getStateId() {
+                return stateId;
+        }
+
+        public void setStateId(String stateId) {
+                this.stateId = stateId;
+        }
+
+        public String getService() {
+                return service;
+        }
+
+        public void setService(String service) {
+                this.service = service;
+        }
+
+        public Object getPushData() {
+                return pushData;
+        }
+
+        public void setPushData(Object pushData) {
+                this.pushData = pushData;
+        }
+
+        @Override
+        public int hashCode() {
+                return Objects.hash(pushData, resourceId, service, stateId);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+                if (this == obj)
+                        return true;
+                if (obj == null)
+                        return false;
+                if (getClass() != obj.getClass())
+                        return false;
+                XtextWebPushMessage other = (XtextWebPushMessage) obj;
+                return Objects.equals(pushData, other.pushData) && Objects.equals(resourceId, other.resourceId)
+                                && Objects.equals(service, other.service) && Objects.equals(stateId, other.stateId);
+        }
+
+        @Override
+        public String toString() {
+                return "XtextWebPushMessage [resourceId=" + resourceId + ", stateId=" + stateId + ", service=" + service
+                                + ", pushData=" + pushData + "]";
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebRequest.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebRequest.java
new file mode 100644
index 00000000..959749f8
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebRequest.java
@@ -0,0 +1,57 @@
+package tools.refinery.language.web.xtext.server.message;
+
+import java.util.Map;
+import java.util.Objects;
+
+import com.google.gson.annotations.SerializedName;
+
+public class XtextWebRequest {
+        private String id;
+
+        @SerializedName("request")
+        private Map<String, String> requestData;
+
+        public XtextWebRequest(String id, Map<String, String> requestData) {
+                super();
+                this.id = id;
+                this.requestData = requestData;
+        }
+
+        public String getId() {
+                return id;
+        }
+
+        public void setId(String id) {
+                this.id = id;
+        }
+
+        public Map<String, String> getRequestData() {
+                return requestData;
+        }
+
+        public void setRequestData(Map<String, String> requestData) {
+                this.requestData = requestData;
+        }
+
+        @Override
+        public int hashCode() {
+                return Objects.hash(id, requestData);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+                if (this == obj)
+                        return true;
+                if (obj == null)
+                        return false;
+                if (getClass() != obj.getClass())
+                        return false;
+                XtextWebRequest other = (XtextWebRequest) obj;
+                return Objects.equals(id, other.id) && Objects.equals(requestData, other.requestData);
+        }
+
+        @Override
+        public String toString() {
+                return "XtextWebSocketRequest [id=" + id + ", requestData=" + requestData + "]";
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebResponse.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebResponse.java
new file mode 100644
index 00000000..3bd13047
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebResponse.java
@@ -0,0 +1,4 @@
+package tools.refinery.language.web.xtext.server.message;
+
+public sealed interface XtextWebResponse permits XtextWebOkResponse,XtextWebErrorResponse,XtextWebPushMessage {
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PrecomputationListener.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PrecomputationListener.java
new file mode 100644
index 00000000..79a284db
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PrecomputationListener.java
@@ -0,0 +1,15 @@
+package tools.refinery.language.web.xtext.server.push;
+
+import org.eclipse.xtext.web.server.IServiceResult;
+
+import tools.refinery.language.web.xtext.server.ResponseHandlerException;
+
+@FunctionalInterface
+public interface PrecomputationListener {
+        void onPrecomputedServiceResult(String resourceId, String stateId, String serviceName, IServiceResult serviceResult)
+                        throws ResponseHandlerException;
+
+        default void onSubscribeToPrecomputationEvents(String resourceId, PushWebDocument document) {
+                // Nothing to handle by default.
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushServiceDispatcher.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushServiceDispatcher.java
new file mode 100644
index 00000000..c7b8108d
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushServiceDispatcher.java
@@ -0,0 +1,23 @@
+package tools.refinery.language.web.xtext.server.push;
+
+import org.eclipse.xtext.web.server.IServiceContext;
+import org.eclipse.xtext.web.server.XtextServiceDispatcher;
+import org.eclipse.xtext.web.server.model.XtextWebDocument;
+
+import com.google.inject.Singleton;
+
+import tools.refinery.language.web.xtext.server.SubscribingServiceContext;
+
+@Singleton
+public class PushServiceDispatcher extends XtextServiceDispatcher {
+
+        @Override
+        protected XtextWebDocument getFullTextDocument(String fullText, String resourceId, IServiceContext context) {
+                var document = super.getFullTextDocument(fullText, resourceId, context);
+                if (document instanceof PushWebDocument pushWebDocument
+                                && context instanceof SubscribingServiceContext subscribingContext) {
+                        pushWebDocument.addPrecomputationListener(subscribingContext.subscriber());
+                }
+                return document;
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocument.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocument.java
new file mode 100644
index 00000000..906b9e30
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocument.java
@@ -0,0 +1,89 @@
+package tools.refinery.language.web.xtext.server.push;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.xtext.util.CancelIndicator;
+import org.eclipse.xtext.web.server.IServiceResult;
+import org.eclipse.xtext.web.server.model.AbstractCachedService;
+import org.eclipse.xtext.web.server.model.DocumentSynchronizer;
+import org.eclipse.xtext.web.server.model.XtextWebDocument;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.ImmutableList;
+
+import tools.refinery.language.web.xtext.server.ResponseHandlerException;
+
+public class PushWebDocument extends XtextWebDocument {
+        private static final Logger LOG = LoggerFactory.getLogger(PushWebDocument.class);
+
+        private final List<PrecomputationListener> precomputationListeners = new ArrayList<>();
+
+        private final Map<Class<?>, IServiceResult> precomputedServices = new HashMap<>();
+
+        public PushWebDocument(String resourceId, DocumentSynchronizer synchronizer) {
+                super(resourceId, synchronizer);
+                if (resourceId == null) {
+                        throw new IllegalArgumentException("resourceId must not be null");
+                }
+        }
+
+        public boolean addPrecomputationListener(PrecomputationListener listener) {
+                synchronized (precomputationListeners) {
+                        if (precomputationListeners.contains(listener)) {
+                                return false;
+                        }
+                        precomputationListeners.add(listener);
+                        listener.onSubscribeToPrecomputationEvents(getResourceId(), this);
+                        return true;
+                }
+        }
+
+        public boolean removePrecomputationListener(PrecomputationListener listener) {
+                synchronized (precomputationListeners) {
+                        return precomputationListeners.remove(listener);
+                }
+        }
+
+        public <T extends IServiceResult> void precomputeServiceResult(AbstractCachedService<T> service, String serviceName,
+                        CancelIndicator cancelIndicator, boolean logCacheMiss) {
+                var result = getCachedServiceResult(service, cancelIndicator, logCacheMiss);
+                if (result == null) {
+                        LOG.error("{} service returned null result", serviceName);
+                        return;
+                }
+                var serviceClass = service.getClass();
+                var previousResult = precomputedServices.get(serviceClass);
+                if (previousResult != null && previousResult.equals(result)) {
+                        return;
+                }
+                precomputedServices.put(serviceClass, result);
+                notifyPrecomputationListeners(serviceName, result);
+        }
+
+        private <T extends IServiceResult> void notifyPrecomputationListeners(String serviceName, T result) {
+                var resourceId = getResourceId();
+                var stateId = getStateId();
+                List<PrecomputationListener> copyOfListeners;
+                synchronized (precomputationListeners) {
+                        copyOfListeners = ImmutableList.copyOf(precomputationListeners);
+                }
+                var toRemove = new ArrayList<PrecomputationListener>();
+                for (var listener : copyOfListeners) {
+                        try {
+                                listener.onPrecomputedServiceResult(resourceId, stateId, serviceName, result);
+                        } catch (ResponseHandlerException e) {
+                                LOG.error("Delivering precomputation push message failed", e);
+                                toRemove.add(listener);
+                        }
+                }
+                if (!toRemove.isEmpty()) {
+                        synchronized (precomputationListeners) {
+                                precomputationListeners.removeAll(toRemove);
+                        }
+                }
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocumentAccess.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocumentAccess.java
new file mode 100644
index 00000000..b3666a86
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocumentAccess.java
@@ -0,0 +1,68 @@
+package tools.refinery.language.web.xtext.server.push;
+
+import org.eclipse.xtext.service.OperationCanceledManager;
+import org.eclipse.xtext.util.CancelIndicator;
+import org.eclipse.xtext.util.concurrent.CancelableUnitOfWork;
+import org.eclipse.xtext.web.server.IServiceResult;
+import org.eclipse.xtext.web.server.model.AbstractCachedService;
+import org.eclipse.xtext.web.server.model.IXtextWebDocument;
+import org.eclipse.xtext.web.server.model.PrecomputedServiceRegistry;
+import org.eclipse.xtext.web.server.model.XtextWebDocument;
+import org.eclipse.xtext.web.server.model.XtextWebDocumentAccess;
+import org.eclipse.xtext.web.server.syntaxcoloring.HighlightingService;
+import org.eclipse.xtext.web.server.validation.ValidationService;
+
+import com.google.inject.Inject;
+
+public class PushWebDocumentAccess extends XtextWebDocumentAccess {
+
+        @Inject
+        private PrecomputedServiceRegistry preComputedServiceRegistry;
+
+        @Inject
+        private OperationCanceledManager operationCanceledManager;
+
+        private PushWebDocument pushDocument;
+
+        @Override
+        protected void init(XtextWebDocument document, String requiredStateId, boolean skipAsyncWork) {
+                super.init(document, requiredStateId, skipAsyncWork);
+                if (document instanceof PushWebDocument newPushDocument) {
+                        pushDocument = newPushDocument;
+                }
+        }
+
+        @Override
+        protected void performPrecomputation(CancelIndicator cancelIndicator) {
+                if (pushDocument == null) {
+                        super.performPrecomputation(cancelIndicator);
+                        return;
+                }
+                for (AbstractCachedService<? extends IServiceResult> service : preComputedServiceRegistry
+                                .getPrecomputedServices()) {
+                        operationCanceledManager.checkCanceled(cancelIndicator);
+                        precomputeServiceResult(service, false);
+                }
+        }
+        
+        protected <T extends IServiceResult> void precomputeServiceResult(AbstractCachedService<T> service, boolean logCacheMiss) {
+                var serviceName = getPrecomputedServiceName(service);
+                readOnly(new CancelableUnitOfWork<Void, IXtextWebDocument>() {
+                        @Override
+                        public java.lang.Void exec(IXtextWebDocument d, CancelIndicator cancelIndicator) throws Exception {
+                                pushDocument.precomputeServiceResult(service, serviceName, cancelIndicator, logCacheMiss);
+                                return null;
+                        }
+                });
+        }
+        
+        protected String getPrecomputedServiceName(AbstractCachedService<? extends IServiceResult> service) {
+                if (service instanceof ValidationService) {
+                        return "validate";
+                }
+                if (service instanceof HighlightingService) {
+                        return "highlight";
+                }
+                throw new IllegalArgumentException("Unknown precomputed service: " + service);
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocumentProvider.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocumentProvider.java
new file mode 100644
index 00000000..fc45f74a
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocumentProvider.java
@@ -0,0 +1,33 @@
+package tools.refinery.language.web.xtext.server.push;
+
+import org.eclipse.xtext.web.server.IServiceContext;
+import org.eclipse.xtext.web.server.model.DocumentSynchronizer;
+import org.eclipse.xtext.web.server.model.IWebDocumentProvider;
+import org.eclipse.xtext.web.server.model.XtextWebDocument;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
+
+/**
+ * Based on
+ * {@link org.eclipse.xtext.web.server.model.IWebDocumentProvider.DefaultImpl}.
+ * 
+ * @author Kristóf Marussy
+ */
+@Singleton
+public class PushWebDocumentProvider implements IWebDocumentProvider {
+        @Inject
+        private Provider<DocumentSynchronizer> synchronizerProvider;
+
+        @Override
+        public XtextWebDocument get(String resourceId, IServiceContext serviceContext) {
+                if (resourceId == null) {
+                        return new XtextWebDocument(resourceId, synchronizerProvider.get());
+                } else {
+                        // We only need to send push messages if a resourceId is specified.
+                        return new PushWebDocument(resourceId,
+                                        serviceContext.getSession().get(DocumentSynchronizer.class, () -> this.synchronizerProvider.get()));
+                }
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/SimpleServiceContext.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/SimpleServiceContext.java
new file mode 100644
index 00000000..43e37160
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/SimpleServiceContext.java
@@ -0,0 +1,26 @@
+package tools.refinery.language.web.xtext.servlet;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.xtext.web.server.IServiceContext;
+import org.eclipse.xtext.web.server.ISession;
+
+import com.google.common.collect.ImmutableSet;
+
+public record SimpleServiceContext(ISession session, Map<String, String> parameters) implements IServiceContext {
+        @Override
+        public Set<String> getParameterKeys() {
+                return ImmutableSet.copyOf(parameters.keySet());
+        }
+
+        @Override
+        public String getParameter(String key) {
+                return parameters.get(key);
+        }
+
+        @Override
+        public ISession getSession() {
+                return session;
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/SimpleSession.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/SimpleSession.java
new file mode 100644
index 00000000..09c055a2
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/SimpleSession.java
@@ -0,0 +1,35 @@
+package tools.refinery.language.web.xtext.servlet;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.xtext.web.server.ISession;
+import org.eclipse.xtext.xbase.lib.Functions.Function0;
+
+public class SimpleSession implements ISession {
+        private Map<Object, Object> map = new HashMap<>();
+
+        @Override
+        public <T> T get(Object key) {
+                @SuppressWarnings("unchecked")
+                var value = (T) map.get(key);
+                return value;
+        }
+
+        @Override
+        public <T> T get(Object key, Function0<? extends T> factory) {
+                @SuppressWarnings("unchecked")
+                var value = (T) map.computeIfAbsent(key, absentKey -> factory.apply());
+                return value;
+        }
+
+        @Override
+        public void put(Object key, Object value) {
+                map.put(key, value);
+        }
+
+        @Override
+        public void remove(Object key) {
+                map.remove(key);
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextStatusCode.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextStatusCode.java
new file mode 100644
index 00000000..0cd229e8
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextStatusCode.java
@@ -0,0 +1,9 @@
+package tools.refinery.language.web.xtext.servlet;
+
+public final class XtextStatusCode {
+        public static final int INVALID_JSON = 4007;
+
+        private XtextStatusCode() {
+                throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextWebSocket.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextWebSocket.java
new file mode 100644
index 00000000..fd41f213
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextWebSocket.java
@@ -0,0 +1,133 @@
+package tools.refinery.language.web.xtext.servlet;
+
+import java.io.IOException;
+import java.io.Reader;
+
+import org.eclipse.jetty.websocket.api.Session;
+import org.eclipse.jetty.websocket.api.StatusCode;
+import org.eclipse.jetty.websocket.api.WriteCallback;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketError;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
+import org.eclipse.jetty.websocket.api.annotations.WebSocket;
+import org.eclipse.xtext.resource.IResourceServiceProvider;
+import org.eclipse.xtext.web.server.ISession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonIOException;
+import com.google.gson.JsonParseException;
+
+import tools.refinery.language.web.xtext.server.ResponseHandler;
+import tools.refinery.language.web.xtext.server.ResponseHandlerException;
+import tools.refinery.language.web.xtext.server.TransactionExecutor;
+import tools.refinery.language.web.xtext.server.message.XtextWebRequest;
+import tools.refinery.language.web.xtext.server.message.XtextWebResponse;
+
+@WebSocket
+public class XtextWebSocket implements WriteCallback, ResponseHandler {
+        private static final Logger LOG = LoggerFactory.getLogger(XtextWebSocket.class);
+
+        private final Gson gson = new Gson();
+
+        private final TransactionExecutor executor;
+
+        private Session webSocketSession;
+
+        public XtextWebSocket(TransactionExecutor executor) {
+                this.executor = executor;
+                executor.setResponseHandler(this);
+        }
+
+        public XtextWebSocket(ISession session, IResourceServiceProvider.Registry resourceServiceProviderRegistry) {
+                this(new TransactionExecutor(session, resourceServiceProviderRegistry));
+        }
+
+        @OnWebSocketConnect
+        public void onConnect(Session webSocketSession) {
+                if (this.webSocketSession != null) {
+                        LOG.error("Websocket session onConnect when already connected");
+                        return;
+                }
+                LOG.debug("New websocket connection from {}", webSocketSession.getRemoteAddress());
+                this.webSocketSession = webSocketSession;
+        }
+
+        @OnWebSocketClose
+        public void onClose(int statusCode, String reason) {
+                executor.dispose();
+                if (webSocketSession == null) {
+                        return;
+                }
+                if (statusCode == StatusCode.NORMAL || statusCode == StatusCode.SHUTDOWN) {
+                        LOG.debug("{} closed connection normally: {}", webSocketSession.getRemoteAddress(), reason);
+                } else {
+                        LOG.warn("{} closed connection with status code {}: {}", webSocketSession.getRemoteAddress(), statusCode,
+                                        reason);
+                }
+                webSocketSession = null;
+        }
+
+        @OnWebSocketError
+        public void onError(Throwable error) {
+                if (webSocketSession == null) {
+                        return;
+                }
+                LOG.error("Internal websocket error in connection from" + webSocketSession.getRemoteAddress(), error);
+        }
+
+        @OnWebSocketMessage
+        public void onMessage(Reader reader) {
+                if (webSocketSession == null) {
+                        LOG.error("Trying to receive message when websocket is disconnected");
+                        return;
+                }
+                XtextWebRequest request;
+                try {
+                        request = gson.fromJson(reader, XtextWebRequest.class);
+                } catch (JsonIOException e) {
+                        LOG.error("Cannot read from websocket from" + webSocketSession.getRemoteAddress(), e);
+                        if (webSocketSession.isOpen()) {
+                                webSocketSession.close(StatusCode.SERVER_ERROR, "Cannot read payload");
+                        }
+                        return;
+                } catch (JsonParseException e) {
+                        LOG.warn("Malformed websocket request from" + webSocketSession.getRemoteAddress(), e);
+                        webSocketSession.close(XtextStatusCode.INVALID_JSON, "Invalid JSON payload");
+                        return;
+                }
+                try {
+                        executor.handleRequest(request);
+                } catch (ResponseHandlerException e) {
+                        LOG.warn("Cannot write websocket response", e);
+                        if (webSocketSession.isOpen()) {
+                                webSocketSession.close(StatusCode.SERVER_ERROR, "Cannot write response");
+                        }
+                }
+        }
+
+        @Override
+        public void onResponse(XtextWebResponse response) throws ResponseHandlerException {
+                if (webSocketSession == null) {
+                        throw new ResponseHandlerException("Trying to send message when websocket is disconnected");
+                }
+                var responseString = gson.toJson(response);
+                try {
+                        webSocketSession.getRemote().sendPartialString(responseString, true, this);
+                } catch (IOException e) {
+                        throw new ResponseHandlerException(
+                                        "Cannot initiaite async write to websocket " + webSocketSession.getRemoteAddress(), e);
+                }
+        }
+
+        @Override
+        public void writeFailed(Throwable x) {
+                if (webSocketSession == null) {
+                        LOG.error("Cannot complete async write to disconnected websocket", x);
+                        return;
+                }
+                LOG.warn("Cannot complete async write to websocket " + webSocketSession.getRemoteAddress(), x);
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextWebSocketServlet.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextWebSocketServlet.java
new file mode 100644
index 00000000..942ca380
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextWebSocketServlet.java
@@ -0,0 +1,83 @@
+package tools.refinery.language.web.xtext.servlet;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.util.Set;
+
+import org.eclipse.jetty.websocket.server.JettyServerUpgradeRequest;
+import org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse;
+import org.eclipse.jetty.websocket.server.JettyWebSocketCreator;
+import org.eclipse.jetty.websocket.server.JettyWebSocketServlet;
+import org.eclipse.jetty.websocket.server.JettyWebSocketServletFactory;
+import org.eclipse.xtext.resource.IResourceServiceProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+
+public abstract class XtextWebSocketServlet extends JettyWebSocketServlet implements JettyWebSocketCreator {
+
+        private static final long serialVersionUID = -3772740838165122685L;
+
+        public static final String ALLOWED_ORIGINS_SEPARATOR = ";";
+
+        public static final String ALLOWED_ORIGINS_INIT_PARAM = "tools.refinery.language.web.xtext.XtextWebSocketServlet.allowedOrigin";
+
+        public static final String XTEXT_SUBPROTOCOL_V1 = "tools.refinery.language.web.xtext.v1";
+
+        /**
+         * Maximum message size should be large enough to upload a full model file.
+         */
+        private static final long MAX_FRAME_SIZE = 4L * 1024L * 1024L;
+
+        private static final Duration IDLE_TIMEOUT = Duration.ofSeconds(30);
+
+        private transient Logger log = LoggerFactory.getLogger(getClass());
+
+        private transient Set<String> allowedOrigins = null;
+
+        @Override
+        public void init(ServletConfig config) throws ServletException {
+                var allowedOriginsStr = config.getInitParameter(ALLOWED_ORIGINS_INIT_PARAM);
+                if (allowedOriginsStr == null) {
+                        log.warn("All WebSocket origins are allowed! This setting should not be used in production!");
+                } else {
+                        allowedOrigins = Set.of(allowedOriginsStr.split(ALLOWED_ORIGINS_SEPARATOR));
+                        log.info("Allowed origins: {}", allowedOrigins);
+                }
+                super.init(config);
+        }
+
+        @Override
+        protected void configure(JettyWebSocketServletFactory factory) {
+                factory.setMaxFrameSize(MAX_FRAME_SIZE);
+                factory.setIdleTimeout(IDLE_TIMEOUT);
+                factory.addMapping("/", this);
+        }
+
+        @Override
+        public Object createWebSocket(JettyServerUpgradeRequest req, JettyServerUpgradeResponse resp) {
+                if (allowedOrigins != null) {
+                        var origin = req.getOrigin();
+                        if (origin == null || !allowedOrigins.contains(origin.toLowerCase())) {
+                                log.error("Connection from {} from forbidden origin {}", req.getRemoteSocketAddress(), origin);
+                                try {
+                                        resp.sendForbidden("Origin not allowed");
+                                } catch (IOException e) {
+                                        log.error("Cannot send forbidden origin error", e);
+                                }
+                                return null;
+                        }
+                }
+                if (req.getSubProtocols().contains(XTEXT_SUBPROTOCOL_V1)) {
+                        resp.setAcceptedSubProtocol(XTEXT_SUBPROTOCOL_V1);
+                } else {
+                        log.error("None of the subprotocols {} offered by {} are supported", req.getSubProtocols(),
+                                        req.getRemoteSocketAddress());
+                        resp.setAcceptedSubProtocol(null);
+                }
+                var session = new SimpleSession();
+                return new XtextWebSocket(session, IResourceServiceProvider.Registry.INSTANCE);
+        }
+}
diff --git a/subprojects/language-web/src/main/js/App.tsx b/subprojects/language-web/src/main/js/App.tsx
new file mode 100644
index 00000000..54f92f9a
--- /dev/null
+++ b/subprojects/language-web/src/main/js/App.tsx
@@ -0,0 +1,60 @@
+import AppBar from '@mui/material/AppBar';
+import Box from '@mui/material/Box';
+import IconButton from '@mui/material/IconButton';
+import Toolbar from '@mui/material/Toolbar';
+import Typography from '@mui/material/Typography';
+import MenuIcon from '@mui/icons-material/Menu';
+import React from 'react';
+
+import { EditorArea } from './editor/EditorArea';
+import { EditorButtons } from './editor/EditorButtons';
+import { GenerateButton } from './editor/GenerateButton';
+
+export function App(): JSX.Element {
+  return (
+    <Box
+      display="flex"
+      flexDirection="column"
+      sx={{ height: '100vh' }}
+    >
+      <AppBar
+        position="static"
+        color="inherit"
+      >
+        <Toolbar>
+          <IconButton
+            edge="start"
+            sx={{ mr: 2 }}
+            color="inherit"
+            aria-label="menu"
+          >
+            <MenuIcon />
+          </IconButton>
+          <Typography
+            variant="h6"
+            component="h1"
+            flexGrow={1}
+          >
+            Refinery
+          </Typography>
+        </Toolbar>
+      </AppBar>
+      <Box
+        display="flex"
+        justifyContent="space-between"
+        alignItems="center"
+        p={1}
+      >
+        <EditorButtons />
+        <GenerateButton />
+      </Box>
+      <Box
+        flexGrow={1}
+        flexShrink={1}
+        sx={{ overflow: 'auto' }}
+      >
+        <EditorArea />
+      </Box>
+    </Box>
+  );
+}
diff --git a/subprojects/language-web/src/main/js/RootStore.tsx b/subprojects/language-web/src/main/js/RootStore.tsx
new file mode 100644
index 00000000..baf0b61e
--- /dev/null
+++ b/subprojects/language-web/src/main/js/RootStore.tsx
@@ -0,0 +1,39 @@
+import React, { createContext, useContext } from 'react';
+
+import { EditorStore } from './editor/EditorStore';
+import { ThemeStore } from './theme/ThemeStore';
+
+export class RootStore {
+  editorStore;
+
+  themeStore;
+
+  constructor(initialValue: string) {
+    this.themeStore = new ThemeStore();
+    this.editorStore = new EditorStore(initialValue, this.themeStore);
+  }
+}
+
+const StoreContext = createContext<RootStore | undefined>(undefined);
+
+export interface RootStoreProviderProps {
+  children: JSX.Element;
+
+  rootStore: RootStore;
+}
+
+export function RootStoreProvider({ children, rootStore }: RootStoreProviderProps): JSX.Element {
+  return (
+    <StoreContext.Provider value={rootStore}>
+      {children}
+    </StoreContext.Provider>
+  );
+}
+
+export const useRootStore = (): RootStore => {
+  const rootStore = useContext(StoreContext);
+  if (!rootStore) {
+    throw new Error('useRootStore must be used within RootStoreProvider');
+  }
+  return rootStore;
+};
diff --git a/subprojects/language-web/src/main/js/editor/EditorArea.tsx b/subprojects/language-web/src/main/js/editor/EditorArea.tsx
new file mode 100644
index 00000000..dba20f6e
--- /dev/null
+++ b/subprojects/language-web/src/main/js/editor/EditorArea.tsx
@@ -0,0 +1,152 @@
+import { Command, EditorView } from '@codemirror/view';
+import { closeSearchPanel, openSearchPanel } from '@codemirror/search';
+import { closeLintPanel, openLintPanel } from '@codemirror/lint';
+import { observer } from 'mobx-react-lite';
+import React, {
+  useCallback,
+  useEffect,
+  useRef,
+  useState,
+} from 'react';
+
+import { EditorParent } from './EditorParent';
+import { useRootStore } from '../RootStore';
+import { getLogger } from '../utils/logger';
+
+const log = getLogger('editor.EditorArea');
+
+function usePanel(
+  panelId: string,
+  stateToSet: boolean,
+  editorView: EditorView | null,
+  openCommand: Command,
+  closeCommand: Command,
+  closeCallback: () => void,
+) {
+  const [cachedViewState, setCachedViewState] = useState<boolean>(false);
+  useEffect(() => {
+    if (editorView === null || cachedViewState === stateToSet) {
+      return;
+    }
+    if (stateToSet) {
+      openCommand(editorView);
+      const buttonQuery = `.cm-${panelId}.cm-panel button[name="close"]`;
+      const closeButton = editorView.dom.querySelector(buttonQuery);
+      if (closeButton) {
+        log.debug('Addig close button callback to', panelId, 'panel');
+        // We must remove the event listener added by CodeMirror from the button
+        // that dispatches a transaction without going through `EditorStorre`.
+        // Cloning a DOM node removes event listeners,
+        // see https://stackoverflow.com/a/9251864
+        const closeButtonWithoutListeners = closeButton.cloneNode(true);
+        closeButtonWithoutListeners.addEventListener('click', (event) => {
+          closeCallback();
+          event.preventDefault();
+        });
+        closeButton.replaceWith(closeButtonWithoutListeners);
+      } else {
+        log.error('Opened', panelId, 'panel has no close button');
+      }
+    } else {
+      closeCommand(editorView);
+    }
+    setCachedViewState(stateToSet);
+  }, [
+    stateToSet,
+    editorView,
+    cachedViewState,
+    panelId,
+    openCommand,
+    closeCommand,
+    closeCallback,
+  ]);
+  return setCachedViewState;
+}
+
+function fixCodeMirrorAccessibility(editorView: EditorView) {
+  // Reported by Lighthouse 8.3.0.
+  const { contentDOM } = editorView;
+  contentDOM.removeAttribute('aria-expanded');
+  contentDOM.setAttribute('aria-label', 'Code editor');
+}
+
+export const EditorArea = observer(() => {
+  const { editorStore } = useRootStore();
+  const editorParentRef = useRef<HTMLDivElement | null>(null);
+  const [editorViewState, setEditorViewState] = useState<EditorView | null>(null);
+
+  const setSearchPanelOpen = usePanel(
+    'search',
+    editorStore.showSearchPanel,
+    editorViewState,
+    openSearchPanel,
+    closeSearchPanel,
+    useCallback(() => editorStore.setSearchPanelOpen(false), [editorStore]),
+  );
+
+  const setLintPanelOpen = usePanel(
+    'panel-lint',
+    editorStore.showLintPanel,
+    editorViewState,
+    openLintPanel,
+    closeLintPanel,
+    useCallback(() => editorStore.setLintPanelOpen(false), [editorStore]),
+  );
+
+  useEffect(() => {
+    if (editorParentRef.current === null) {
+      return () => {
+        // Nothing to clean up.
+      };
+    }
+
+    const editorView = new EditorView({
+      state: editorStore.state,
+      parent: editorParentRef.current,
+      dispatch: (transaction) => {
+        editorStore.onTransaction(transaction);
+        editorView.update([transaction]);
+        if (editorView.state !== editorStore.state) {
+          log.error(
+            'Failed to synchronize editor state - store state:',
+            editorStore.state,
+            'view state:',
+            editorView.state,
+          );
+        }
+      },
+    });
+    fixCodeMirrorAccessibility(editorView);
+    setEditorViewState(editorView);
+    setSearchPanelOpen(false);
+    setLintPanelOpen(false);
+    // `dispatch` is bound to the view instance,
+    // so it does not have to be called as a method.
+    // eslint-disable-next-line @typescript-eslint/unbound-method
+    editorStore.updateDispatcher(editorView.dispatch);
+    log.info('Editor created');
+
+    return () => {
+      editorStore.updateDispatcher(null);
+      editorView.destroy();
+      log.info('Editor destroyed');
+    };
+  }, [
+    editorParentRef,
+    editorStore,
+    setSearchPanelOpen,
+    setLintPanelOpen,
+  ]);
+
+  return (
+    <EditorParent
+      className="dark"
+      sx={{
+        '.cm-lineNumbers': editorStore.showLineNumbers ? {} : {
+          display: 'none !important',
+        },
+      }}
+      ref={editorParentRef}
+    />
+  );
+});
diff --git a/subprojects/language-web/src/main/js/editor/EditorButtons.tsx b/subprojects/language-web/src/main/js/editor/EditorButtons.tsx
new file mode 100644
index 00000000..150aa00d
--- /dev/null
+++ b/subprojects/language-web/src/main/js/editor/EditorButtons.tsx
@@ -0,0 +1,98 @@
+import type { Diagnostic } from '@codemirror/lint';
+import { observer } from 'mobx-react-lite';
+import IconButton from '@mui/material/IconButton';
+import Stack from '@mui/material/Stack';
+import ToggleButton from '@mui/material/ToggleButton';
+import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
+import CheckIcon from '@mui/icons-material/Check';
+import ErrorIcon from '@mui/icons-material/Error';
+import FormatListNumberedIcon from '@mui/icons-material/FormatListNumbered';
+import FormatPaint from '@mui/icons-material/FormatPaint';
+import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined';
+import RedoIcon from '@mui/icons-material/Redo';
+import SearchIcon from '@mui/icons-material/Search';
+import UndoIcon from '@mui/icons-material/Undo';
+import WarningIcon from '@mui/icons-material/Warning';
+import React from 'react';
+
+import { useRootStore } from '../RootStore';
+
+// Exhastive switch as proven by TypeScript.
+// eslint-disable-next-line consistent-return
+function getLintIcon(severity: Diagnostic['severity'] | null) {
+  switch (severity) {
+    case 'error':
+      return <ErrorIcon fontSize="small" />;
+    case 'warning':
+      return <WarningIcon fontSize="small" />;
+    case 'info':
+      return <InfoOutlinedIcon fontSize="small" />;
+    case null:
+      return <CheckIcon fontSize="small" />;
+  }
+}
+
+export const EditorButtons = observer(() => {
+  const { editorStore } = useRootStore();
+
+  return (
+    <Stack
+      direction="row"
+      spacing={1}
+    >
+      <Stack
+        direction="row"
+        alignItems="center"
+      >
+        <IconButton
+          disabled={!editorStore.canUndo}
+          onClick={() => editorStore.undo()}
+          aria-label="Undo"
+        >
+          <UndoIcon fontSize="small" />
+        </IconButton>
+        <IconButton
+          disabled={!editorStore.canRedo}
+          onClick={() => editorStore.redo()}
+          aria-label="Redo"
+        >
+          <RedoIcon fontSize="small" />
+        </IconButton>
+      </Stack>
+      <ToggleButtonGroup
+        size="small"
+      >
+        <ToggleButton
+          selected={editorStore.showLineNumbers}
+          onClick={() => editorStore.toggleLineNumbers()}
+          aria-label="Show line numbers"
+          value="show-line-numbers"
+        >
+          <FormatListNumberedIcon fontSize="small" />
+        </ToggleButton>
+        <ToggleButton
+          selected={editorStore.showSearchPanel}
+          onClick={() => editorStore.toggleSearchPanel()}
+          aria-label="Show find/replace"
+          value="show-search-panel"
+        >
+          <SearchIcon fontSize="small" />
+        </ToggleButton>
+        <ToggleButton
+          selected={editorStore.showLintPanel}
+          onClick={() => editorStore.toggleLintPanel()}
+          aria-label="Show diagnostics panel"
+          value="show-lint-panel"
+        >
+          {getLintIcon(editorStore.highestDiagnosticLevel)}
+        </ToggleButton>
+      </ToggleButtonGroup>
+      <IconButton
+        onClick={() => editorStore.formatText()}
+        aria-label="Automatic format"
+      >
+        <FormatPaint fontSize="small" />
+      </IconButton>
+    </Stack>
+  );
+});
diff --git a/subprojects/language-web/src/main/js/editor/EditorParent.ts b/subprojects/language-web/src/main/js/editor/EditorParent.ts
new file mode 100644
index 00000000..94ca24ea
--- /dev/null
+++ b/subprojects/language-web/src/main/js/editor/EditorParent.ts
@@ -0,0 +1,205 @@
+import { styled } from '@mui/material/styles';
+
+/**
+ * Returns a squiggly underline background image encoded as a CSS `url()` data URI with Base64.
+ *
+ * Based on
+ * https://github.com/codemirror/lint/blob/f524b4a53b0183bb343ac1e32b228d28030d17af/src/lint.ts#L501
+ *
+ * @param color the color of the underline
+ * @returns the CSS `url()`
+ */
+function underline(color: string) {
+  const svg = `<svg xmlns="http://www.w3.org/2000/svg" width="6" height="3">
+    <path d="m0 3 l2 -2 l1 0 l2 2 l1 0" stroke="${color}" fill="none" stroke-width=".7"/>
+  </svg>`;
+  const svgBase64 = window.btoa(svg);
+  return `url('data:image/svg+xml;base64,${svgBase64}')`;
+}
+
+export const EditorParent = styled('div')(({ theme }) => {
+  const codeMirrorLintStyle: Record<string, unknown> = {};
+  (['error', 'warning', 'info'] as const).forEach((severity) => {
+    const color = theme.palette[severity].main;
+    codeMirrorLintStyle[`.cm-diagnostic-${severity}`] = {
+      borderLeftColor: color,
+    };
+    codeMirrorLintStyle[`.cm-lintRange-${severity}`] = {
+      backgroundImage: underline(color),
+    };
+  });
+
+  return {
+    background: theme.palette.background.default,
+    '&, .cm-editor': {
+      height: '100%',
+    },
+    '.cm-content': {
+      padding: 0,
+    },
+    '.cm-scroller, .cm-tooltip-autocomplete, .cm-completionLabel, .cm-completionDetail': {
+      fontSize: 16,
+      fontFamily: '"JetBrains MonoVariable", "JetBrains Mono", monospace',
+      fontFeatureSettings: '"liga", "calt"',
+      fontWeight: 400,
+      letterSpacing: 0,
+      textRendering: 'optimizeLegibility',
+    },
+    '.cm-scroller': {
+      color: theme.palette.text.secondary,
+    },
+    '.cm-gutters': {
+      background: 'rgba(255, 255, 255, 0.1)',
+      color: theme.palette.text.disabled,
+      border: 'none',
+    },
+    '.cm-specialChar': {
+      color: theme.palette.secondary.main,
+    },
+    '.cm-activeLine': {
+      background: 'rgba(0, 0, 0, 0.3)',
+    },
+    '.cm-activeLineGutter': {
+      background: 'transparent',
+    },
+    '.cm-lineNumbers .cm-activeLineGutter': {
+      color: theme.palette.text.primary,
+    },
+    '.cm-cursor, .cm-cursor-primary': {
+      borderColor: theme.palette.primary.main,
+      background: theme.palette.common.black,
+    },
+    '.cm-selectionBackground': {
+      background: '#3e4453',
+    },
+    '.cm-focused': {
+      outline: 'none',
+      '.cm-selectionBackground': {
+        background: '#3e4453',
+      },
+    },
+    '.cm-panels-top': {
+      color: theme.palette.text.secondary,
+    },
+    '.cm-panel': {
+      '&, & button, & input': {
+        fontFamily: '"Roboto","Helvetica","Arial",sans-serif',
+      },
+      background: theme.palette.background.paper,
+      borderTop: `1px solid ${theme.palette.divider}`,
+      'button[name="close"]': {
+        background: 'transparent',
+        color: theme.palette.text.secondary,
+        cursor: 'pointer',
+      },
+    },
+    '.cm-panel.cm-panel-lint': {
+      'button[name="close"]': {
+        // Close button interferes with scrollbar, so we better hide it.
+        // The panel can still be closed from the toolbar.
+        display: 'none',
+      },
+      ul: {
+        li: {
+          borderBottom: `1px solid ${theme.palette.divider}`,
+          cursor: 'pointer',
+        },
+        '[aria-selected]': {
+          background: '#3e4453',
+          color: theme.palette.text.primary,
+        },
+        '&:focus [aria-selected]': {
+          background: theme.palette.primary.main,
+          color: theme.palette.primary.contrastText,
+        },
+      },
+    },
+    '.cm-foldPlaceholder': {
+      background: theme.palette.background.paper,
+      borderColor: theme.palette.text.disabled,
+      color: theme.palette.text.secondary,
+    },
+    '.cmt-comment': {
+      fontStyle: 'italic',
+      color: theme.palette.text.disabled,
+    },
+    '.cmt-number': {
+      color: '#6188a6',
+    },
+    '.cmt-string': {
+      color: theme.palette.secondary.dark,
+    },
+    '.cmt-keyword': {
+      color: theme.palette.primary.main,
+    },
+    '.cmt-typeName, .cmt-macroName, .cmt-atom': {
+      color: theme.palette.text.primary,
+    },
+    '.cmt-variableName': {
+      color: '#c8ae9d',
+    },
+    '.cmt-problem-node': {
+      '&, & .cmt-variableName': {
+        color: theme.palette.text.secondary,
+      },
+    },
+    '.cmt-problem-individual': {
+      '&, & .cmt-variableName': {
+        color: theme.palette.text.primary,
+      },
+    },
+    '.cmt-problem-abstract, .cmt-problem-new': {
+      fontStyle: 'italic',
+    },
+    '.cmt-problem-containment': {
+      fontWeight: 700,
+    },
+    '.cmt-problem-error': {
+      '&, & .cmt-typeName': {
+        color: theme.palette.error.main,
+      },
+    },
+    '.cmt-problem-builtin': {
+      '&, & .cmt-typeName, & .cmt-atom, & .cmt-variableName': {
+        color: theme.palette.primary.main,
+        fontWeight: 400,
+        fontStyle: 'normal',
+      },
+    },
+    '.cm-tooltip-autocomplete': {
+      background: theme.palette.background.paper,
+      boxShadow: `0px 2px 4px -1px rgb(0 0 0 / 20%),
+        0px 4px 5px 0px rgb(0 0 0 / 14%),
+        0px 1px 10px 0px rgb(0 0 0 / 12%)`,
+      '.cm-completionIcon': {
+        color: theme.palette.text.secondary,
+      },
+      '.cm-completionLabel': {
+        color: theme.palette.text.primary,
+      },
+      '.cm-completionDetail': {
+        color: theme.palette.text.secondary,
+        fontStyle: 'normal',
+      },
+      '[aria-selected]': {
+        background: `${theme.palette.primary.main} !important`,
+        '.cm-completionIcon, .cm-completionLabel, .cm-completionDetail': {
+          color: theme.palette.primary.contrastText,
+        },
+      },
+    },
+    '.cm-completionIcon': {
+      width: 16,
+      padding: 0,
+      marginRight: '0.5em',
+      textAlign: 'center',
+    },
+    ...codeMirrorLintStyle,
+    '.cm-problem-write': {
+      background: 'rgba(255, 255, 128, 0.3)',
+    },
+    '.cm-problem-read': {
+      background: 'rgba(255, 255, 255, 0.15)',
+    },
+  };
+});
diff --git a/subprojects/language-web/src/main/js/editor/EditorStore.ts b/subprojects/language-web/src/main/js/editor/EditorStore.ts
new file mode 100644
index 00000000..5760de28
--- /dev/null
+++ b/subprojects/language-web/src/main/js/editor/EditorStore.ts
@@ -0,0 +1,289 @@
+import { autocompletion, completionKeymap } from '@codemirror/autocomplete';
+import { closeBrackets, closeBracketsKeymap } from '@codemirror/closebrackets';
+import { defaultKeymap, indentWithTab } from '@codemirror/commands';
+import { commentKeymap } from '@codemirror/comment';
+import { foldGutter, foldKeymap } from '@codemirror/fold';
+import { highlightActiveLineGutter, lineNumbers } from '@codemirror/gutter';
+import { classHighlightStyle } from '@codemirror/highlight';
+import {
+  history,
+  historyKeymap,
+  redo,
+  redoDepth,
+  undo,
+  undoDepth,
+} from '@codemirror/history';
+import { indentOnInput } from '@codemirror/language';
+import {
+  Diagnostic,
+  lintKeymap,
+  setDiagnostics,
+} from '@codemirror/lint';
+import { bracketMatching } from '@codemirror/matchbrackets';
+import { rectangularSelection } from '@codemirror/rectangular-selection';
+import { searchConfig, searchKeymap } from '@codemirror/search';
+import {
+  EditorState,
+  StateCommand,
+  StateEffect,
+  Transaction,
+  TransactionSpec,
+} from '@codemirror/state';
+import {
+  drawSelection,
+  EditorView,
+  highlightActiveLine,
+  highlightSpecialChars,
+  keymap,
+} from '@codemirror/view';
+import {
+  makeAutoObservable,
+  observable,
+  reaction,
+} from 'mobx';
+
+import { findOccurrences, IOccurrence, setOccurrences } from './findOccurrences';
+import { problemLanguageSupport } from '../language/problemLanguageSupport';
+import {
+  IHighlightRange,
+  semanticHighlighting,
+  setSemanticHighlighting,
+} from './semanticHighlighting';
+import type { ThemeStore } from '../theme/ThemeStore';
+import { getLogger } from '../utils/logger';
+import { XtextClient } from '../xtext/XtextClient';
+
+const log = getLogger('editor.EditorStore');
+
+export class EditorStore {
+  private readonly themeStore;
+
+  state: EditorState;
+
+  private readonly client: XtextClient;
+
+  showLineNumbers = false;
+
+  showSearchPanel = false;
+
+  showLintPanel = false;
+
+  errorCount = 0;
+
+  warningCount = 0;
+
+  infoCount = 0;
+
+  private readonly defaultDispatcher = (tr: Transaction): void => {
+    this.onTransaction(tr);
+  };
+
+  private dispatcher = this.defaultDispatcher;
+
+  constructor(initialValue: string, themeStore: ThemeStore) {
+    this.themeStore = themeStore;
+    this.state = EditorState.create({
+      doc: initialValue,
+      extensions: [
+        autocompletion({
+          activateOnTyping: true,
+          override: [
+            (context) => this.client.contentAssist(context),
+          ],
+        }),
+        classHighlightStyle.extension,
+        closeBrackets(),
+        bracketMatching(),
+        drawSelection(),
+        EditorState.allowMultipleSelections.of(true),
+        EditorView.theme({}, {
+          dark: this.themeStore.darkMode,
+        }),
+        findOccurrences,
+        highlightActiveLine(),
+        highlightActiveLineGutter(),
+        highlightSpecialChars(),
+        history(),
+        indentOnInput(),
+        rectangularSelection(),
+        searchConfig({
+          top: true,
+          matchCase: true,
+        }),
+        semanticHighlighting,
+        // We add the gutters to `extensions` in the order we want them to appear.
+        lineNumbers(),
+        foldGutter(),
+        keymap.of([
+          { key: 'Mod-Shift-f', run: () => this.formatText() },
+          ...closeBracketsKeymap,
+          ...commentKeymap,
+          ...completionKeymap,
+          ...foldKeymap,
+          ...historyKeymap,
+          indentWithTab,
+          // Override keys in `lintKeymap` to go through the `EditorStore`.
+          { key: 'Mod-Shift-m', run: () => this.setLintPanelOpen(true) },
+          ...lintKeymap,
+          // Override keys in `searchKeymap` to go through the `EditorStore`.
+          { key: 'Mod-f', run: () => this.setSearchPanelOpen(true), scope: 'editor search-panel' },
+          { key: 'Escape', run: () => this.setSearchPanelOpen(false), scope: 'editor search-panel' },
+          ...searchKeymap,
+          ...defaultKeymap,
+        ]),
+        problemLanguageSupport(),
+      ],
+    });
+    this.client = new XtextClient(this);
+    reaction(
+      () => this.themeStore.darkMode,
+      (darkMode) => {
+        log.debug('Update editor dark mode', darkMode);
+        this.dispatch({
+          effects: [
+            StateEffect.appendConfig.of(EditorView.theme({}, {
+              dark: darkMode,
+            })),
+          ],
+        });
+      },
+    );
+    makeAutoObservable(this, {
+      state: observable.ref,
+    });
+  }
+
+  updateDispatcher(newDispatcher: ((tr: Transaction) => void) | null): void {
+    this.dispatcher = newDispatcher || this.defaultDispatcher;
+  }
+
+  onTransaction(tr: Transaction): void {
+    log.trace('Editor transaction', tr);
+    this.state = tr.state;
+    this.client.onTransaction(tr);
+  }
+
+  dispatch(...specs: readonly TransactionSpec[]): void {
+    this.dispatcher(this.state.update(...specs));
+  }
+
+  doStateCommand(command: StateCommand): boolean {
+    return command({
+      state: this.state,
+      dispatch: this.dispatcher,
+    });
+  }
+
+  updateDiagnostics(diagnostics: Diagnostic[]): void {
+    this.dispatch(setDiagnostics(this.state, diagnostics));
+    this.errorCount = 0;
+    this.warningCount = 0;
+    this.infoCount = 0;
+    diagnostics.forEach(({ severity }) => {
+      switch (severity) {
+        case 'error':
+          this.errorCount += 1;
+          break;
+        case 'warning':
+          this.warningCount += 1;
+          break;
+        case 'info':
+          this.infoCount += 1;
+          break;
+      }
+    });
+  }
+
+  get highestDiagnosticLevel(): Diagnostic['severity'] | null {
+    if (this.errorCount > 0) {
+      return 'error';
+    }
+    if (this.warningCount > 0) {
+      return 'warning';
+    }
+    if (this.infoCount > 0) {
+      return 'info';
+    }
+    return null;
+  }
+
+  updateSemanticHighlighting(ranges: IHighlightRange[]): void {
+    this.dispatch(setSemanticHighlighting(ranges));
+  }
+
+  updateOccurrences(write: IOccurrence[], read: IOccurrence[]): void {
+    this.dispatch(setOccurrences(write, read));
+  }
+
+  /**
+   * @returns `true` if there is history to undo
+   */
+  get canUndo(): boolean {
+    return undoDepth(this.state) > 0;
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  undo(): void {
+    log.debug('Undo', this.doStateCommand(undo));
+  }
+
+  /**
+   * @returns `true` if there is history to redo
+   */
+  get canRedo(): boolean {
+    return redoDepth(this.state) > 0;
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  redo(): void {
+    log.debug('Redo', this.doStateCommand(redo));
+  }
+
+  toggleLineNumbers(): void {
+    this.showLineNumbers = !this.showLineNumbers;
+    log.debug('Show line numbers', this.showLineNumbers);
+  }
+
+  /**
+   * Sets whether the CodeMirror search panel should be open.
+   *
+   * This method can be used as a CodeMirror command,
+   * because it returns `false` if it didn't execute,
+   * allowing other commands for the same keybind to run instead.
+   * This matches the behavior of the `openSearchPanel` and `closeSearchPanel`
+   * commands from `'@codemirror/search'`.
+   *
+   * @param newShosSearchPanel whether we should show the search panel
+   * @returns `true` if the state was changed, `false` otherwise
+   */
+  setSearchPanelOpen(newShowSearchPanel: boolean): boolean {
+    if (this.showSearchPanel === newShowSearchPanel) {
+      return false;
+    }
+    this.showSearchPanel = newShowSearchPanel;
+    log.debug('Show search panel', this.showSearchPanel);
+    return true;
+  }
+
+  toggleSearchPanel(): void {
+    this.setSearchPanelOpen(!this.showSearchPanel);
+  }
+
+  setLintPanelOpen(newShowLintPanel: boolean): boolean {
+    if (this.showLintPanel === newShowLintPanel) {
+      return false;
+    }
+    this.showLintPanel = newShowLintPanel;
+    log.debug('Show lint panel', this.showLintPanel);
+    return true;
+  }
+
+  toggleLintPanel(): void {
+    this.setLintPanelOpen(!this.showLintPanel);
+  }
+
+  formatText(): boolean {
+    this.client.formatText();
+    return true;
+  }
+}
diff --git a/subprojects/language-web/src/main/js/editor/GenerateButton.tsx b/subprojects/language-web/src/main/js/editor/GenerateButton.tsx
new file mode 100644
index 00000000..3834cec4
--- /dev/null
+++ b/subprojects/language-web/src/main/js/editor/GenerateButton.tsx
@@ -0,0 +1,44 @@
+import { observer } from 'mobx-react-lite';
+import Button from '@mui/material/Button';
+import PlayArrowIcon from '@mui/icons-material/PlayArrow';
+import React from 'react';
+
+import { useRootStore } from '../RootStore';
+
+const GENERATE_LABEL = 'Generate';
+
+export const GenerateButton = observer(() => {
+  const { editorStore } = useRootStore();
+  const { errorCount, warningCount } = editorStore;
+
+  const diagnostics: string[] = [];
+  if (errorCount > 0) {
+    diagnostics.push(`${errorCount} error${errorCount === 1 ? '' : 's'}`);
+  }
+  if (warningCount > 0) {
+    diagnostics.push(`${warningCount} warning${warningCount === 1 ? '' : 's'}`);
+  }
+  const summary = diagnostics.join(' and ');
+
+  if (errorCount > 0) {
+    return (
+      <Button
+        variant="outlined"
+        color="error"
+        onClick={() => editorStore.toggleLintPanel()}
+      >
+        {summary}
+      </Button>
+    );
+  }
+
+  return (
+    <Button
+      variant="outlined"
+      color={warningCount > 0 ? 'warning' : 'primary'}
+      startIcon={<PlayArrowIcon />}
+    >
+      {summary === '' ? GENERATE_LABEL : `${GENERATE_LABEL} (${summary})`}
+    </Button>
+  );
+});
diff --git a/subprojects/language-web/src/main/js/editor/decorationSetExtension.ts b/subprojects/language-web/src/main/js/editor/decorationSetExtension.ts
new file mode 100644
index 00000000..2d630c20
--- /dev/null
+++ b/subprojects/language-web/src/main/js/editor/decorationSetExtension.ts
@@ -0,0 +1,39 @@
+import { StateEffect, StateField, TransactionSpec } from '@codemirror/state';
+import { EditorView, Decoration, DecorationSet } from '@codemirror/view';
+
+export type TransactionSpecFactory = (decorations: DecorationSet) => TransactionSpec;
+
+export function decorationSetExtension(): [TransactionSpecFactory, StateField<DecorationSet>] {
+  const setEffect = StateEffect.define<DecorationSet>();
+  const field = StateField.define<DecorationSet>({
+    create() {
+      return Decoration.none;
+    },
+    update(currentDecorations, transaction) {
+      let newDecorations: DecorationSet | null = null;
+      transaction.effects.forEach((effect) => {
+        if (effect.is(setEffect)) {
+          newDecorations = effect.value;
+        }
+      });
+      if (newDecorations === null) {
+        if (transaction.docChanged) {
+          return currentDecorations.map(transaction.changes);
+        }
+        return currentDecorations;
+      }
+      return newDecorations;
+    },
+    provide: (f) => EditorView.decorations.from(f),
+  });
+
+  function transactionSpecFactory(decorations: DecorationSet) {
+    return {
+      effects: [
+        setEffect.of(decorations),
+      ],
+    };
+  }
+
+  return [transactionSpecFactory, field];
+}
diff --git a/subprojects/language-web/src/main/js/editor/findOccurrences.ts b/subprojects/language-web/src/main/js/editor/findOccurrences.ts
new file mode 100644
index 00000000..92102746
--- /dev/null
+++ b/subprojects/language-web/src/main/js/editor/findOccurrences.ts
@@ -0,0 +1,35 @@
+import { Range, RangeSet } from '@codemirror/rangeset';
+import type { TransactionSpec } from '@codemirror/state';
+import { Decoration } from '@codemirror/view';
+
+import { decorationSetExtension } from './decorationSetExtension';
+
+export interface IOccurrence {
+  from: number;
+
+  to: number;
+}
+
+const [setOccurrencesInteral, findOccurrences] = decorationSetExtension();
+
+const writeDecoration = Decoration.mark({
+  class: 'cm-problem-write',
+});
+
+const readDecoration = Decoration.mark({
+  class: 'cm-problem-read',
+});
+
+export function setOccurrences(write: IOccurrence[], read: IOccurrence[]): TransactionSpec {
+  const decorations: Range<Decoration>[] = [];
+  write.forEach(({ from, to }) => {
+    decorations.push(writeDecoration.range(from, to));
+  });
+  read.forEach(({ from, to }) => {
+    decorations.push(readDecoration.range(from, to));
+  });
+  const rangeSet = RangeSet.of(decorations, true);
+  return setOccurrencesInteral(rangeSet);
+}
+
+export { findOccurrences };
diff --git a/subprojects/language-web/src/main/js/editor/semanticHighlighting.ts b/subprojects/language-web/src/main/js/editor/semanticHighlighting.ts
new file mode 100644
index 00000000..2aed421b
--- /dev/null
+++ b/subprojects/language-web/src/main/js/editor/semanticHighlighting.ts
@@ -0,0 +1,24 @@
+import { RangeSet } from '@codemirror/rangeset';
+import type { TransactionSpec } from '@codemirror/state';
+import { Decoration } from '@codemirror/view';
+
+import { decorationSetExtension } from './decorationSetExtension';
+
+export interface IHighlightRange {
+  from: number;
+
+  to: number;
+
+  classes: string[];
+}
+
+const [setSemanticHighlightingInternal, semanticHighlighting] = decorationSetExtension();
+
+export function setSemanticHighlighting(ranges: IHighlightRange[]): TransactionSpec {
+  const rangeSet = RangeSet.of(ranges.map(({ from, to, classes }) => Decoration.mark({
+    class: classes.map((c) => `cmt-problem-${c}`).join(' '),
+  }).range(from, to)), true);
+  return setSemanticHighlightingInternal(rangeSet);
+}
+
+export { semanticHighlighting };
diff --git a/subprojects/language-web/src/main/js/global.d.ts b/subprojects/language-web/src/main/js/global.d.ts
new file mode 100644
index 00000000..0533a46e
--- /dev/null
+++ b/subprojects/language-web/src/main/js/global.d.ts
@@ -0,0 +1,11 @@
+declare const DEBUG: boolean;
+
+declare const PACKAGE_NAME: string;
+
+declare const PACKAGE_VERSION: string;
+
+declare module '*.module.scss' {
+  const cssVariables: { [key in string]?: string };
+  // eslint-disable-next-line import/no-default-export
+  export default cssVariables;
+}
diff --git a/subprojects/language-web/src/main/js/index.tsx b/subprojects/language-web/src/main/js/index.tsx
new file mode 100644
index 00000000..d368c9ba
--- /dev/null
+++ b/subprojects/language-web/src/main/js/index.tsx
@@ -0,0 +1,69 @@
+import React from 'react';
+import { render } from 'react-dom';
+import CssBaseline from '@mui/material/CssBaseline';
+
+import { App } from './App';
+import { RootStore, RootStoreProvider } from './RootStore';
+import { ThemeProvider } from './theme/ThemeProvider';
+
+import '../css/index.scss';
+
+const initialValue = `class Family {
+    contains Person[] members
+}
+
+class Person {
+    Person[] children opposite parent
+    Person[0..1] parent opposite children
+    int age
+    TaxStatus taxStatus
+}
+
+enum TaxStatus {
+    child, student, adult, retired
+}
+
+% A child cannot have any dependents.
+pred invalidTaxStatus(Person p) <->
+    taxStatus(p, child),
+    children(p, _q)
+  ; taxStatus(p, retired),
+    parent(p, q),
+    !taxStatus(q, retired).
+
+direct rule createChild(p):
+    children(p, newPerson) = unknown,
+    equals(newPerson, newPerson) = unknown
+ ~> new q,
+    children(p, q) = true,
+    taxStatus(q, child) = true.
+
+indiv family.
+Family(family).
+members(family, anne).
+members(family, bob).
+members(family, ciri).
+children(anne, ciri).
+?children(bob, ciri).
+default children(ciri, *): false.
+taxStatus(anne, adult).
+age(anne, 35).
+bobAge: 27.
+age(bob, bobAge).
+!age(ciri, bobAge).
+
+scope Family = 1, Person += 5..10.
+`;
+
+const rootStore = new RootStore(initialValue);
+
+const app = (
+  <RootStoreProvider rootStore={rootStore}>
+    <ThemeProvider>
+      <CssBaseline />
+      <App />
+    </ThemeProvider>
+  </RootStoreProvider>
+);
+
+render(app, document.getElementById('app'));
diff --git a/subprojects/language-web/src/main/js/language/folding.ts b/subprojects/language-web/src/main/js/language/folding.ts
new file mode 100644
index 00000000..5d51f796
--- /dev/null
+++ b/subprojects/language-web/src/main/js/language/folding.ts
@@ -0,0 +1,115 @@
+import { EditorState } from '@codemirror/state';
+import type { SyntaxNode } from '@lezer/common';
+
+export type FoldRange = { from: number, to: number };
+
+/**
+ * Folds a block comment between its delimiters.
+ *
+ * @param node the node to fold
+ * @returns the folding range or `null` is there is nothing to fold
+ */
+export function foldBlockComment(node: SyntaxNode): FoldRange {
+  return {
+    from: node.from + 2,
+    to: node.to - 2,
+  };
+}
+
+/**
+ * Folds a declaration after the first element if it appears on the opening line,
+ * otherwise folds after the opening keyword.
+ *
+ * @example
+ * First element on the opening line:
+ * ```
+ * scope Family = 1,
+ *       Person += 5..10.
+ * ```
+ * becomes
+ * ```
+ * scope Family = 1,[...].
+ * ```
+ *
+ * @example
+ * First element not on the opening line:
+ * ```
+ * scope Family
+ *       = 1,
+ *       Person += 5..10.
+ * ```
+ * becomes
+ * ```
+ * scope [...].
+ * ```
+ *
+ * @param node the node to fold
+ * @param state the editor state
+ * @returns the folding range or `null` is there is nothing to fold
+ */
+export function foldDeclaration(node: SyntaxNode, state: EditorState): FoldRange | null {
+  const { firstChild: open, lastChild: close } = node;
+  if (open === null || close === null) {
+    return null;
+  }
+  const { cursor } = open;
+  const lineEnd = state.doc.lineAt(open.from).to;
+  let foldFrom = open.to;
+  while (cursor.next() && cursor.from < lineEnd) {
+    if (cursor.type.name === ',') {
+      foldFrom = cursor.to;
+      break;
+    }
+  }
+  return {
+    from: foldFrom,
+    to: close.from,
+  };
+}
+
+/**
+ * Folds a node only if it has at least one sibling of the same type.
+ *
+ * The folding range will be the entire `node`.
+ *
+ * @param node the node to fold
+ * @returns the folding range or `null` is there is nothing to fold
+ */
+function foldWithSibling(node: SyntaxNode): FoldRange | null {
+  const { parent } = node;
+  if (parent === null) {
+    return null;
+  }
+  const { firstChild } = parent;
+  if (firstChild === null) {
+    return null;
+  }
+  const { cursor } = firstChild;
+  let nSiblings = 0;
+  while (cursor.nextSibling()) {
+    if (cursor.type === node.type) {
+      nSiblings += 1;
+    }
+    if (nSiblings >= 2) {
+      return {
+        from: node.from,
+        to: node.to,
+      };
+    }
+  }
+  return null;
+}
+
+export function foldWholeNode(node: SyntaxNode): FoldRange {
+  return {
+    from: node.from,
+    to: node.to,
+  };
+}
+
+export function foldConjunction(node: SyntaxNode): FoldRange | null {
+  if (node.parent?.type?.name === 'PredicateBody') {
+    return foldWithSibling(node);
+  }
+  return foldWholeNode(node);
+}
diff --git a/subprojects/language-web/src/main/js/language/indentation.ts b/subprojects/language-web/src/main/js/language/indentation.ts
new file mode 100644
index 00000000..6d36ed3b
--- /dev/null
+++ b/subprojects/language-web/src/main/js/language/indentation.ts
@@ -0,0 +1,87 @@
+import { TreeIndentContext } from '@codemirror/language';
+
+/**
+ * Finds the `from` of first non-skipped token, if any,
+ * after the opening keyword in the first line of the declaration.
+ *
+ * Based on
+ * https://github.com/codemirror/language/blob/cd7f7e66fa51ddbce96cf9396b1b6127d0ca4c94/src/indent.ts#L246
+ *
+ * @param context the indentation context
+ * @returns the alignment or `null` if there is no token after the opening keyword
+ */
+function findAlignmentAfterOpening(context: TreeIndentContext): number | null {
+  const {
+    node: tree,
+    simulatedBreak,
+  } = context;
+  const openingToken = tree.childAfter(tree.from);
+  if (openingToken === null) {
+    return null;
+  }
+  const openingLine = context.state.doc.lineAt(openingToken.from);
+  const lineEnd = simulatedBreak == null || simulatedBreak <= openingLine.from
+    ? openingLine.to
+    : Math.min(openingLine.to, simulatedBreak);
+  const { cursor } = openingToken;
+  while (cursor.next() && cursor.from < lineEnd) {
+    if (!cursor.type.isSkipped) {
+      return cursor.from;
+    }
+  }
+  return null;
+}
+
+/**
+ * Indents text after declarations by a single unit if it begins on a new line,
+ * otherwise it aligns with the text after the declaration.
+ *
+ * Based on
+ * https://github.com/codemirror/language/blob/cd7f7e66fa51ddbce96cf9396b1b6127d0ca4c94/src/indent.ts#L275
+ *
+ * @example
+ * Result with no hanging indent (indent unit = 2 spaces, units = 1):
+ * ```
+ * scope
+ *   Family = 1,
+ *   Person += 5..10.
+ * ```
+ *
+ * @example
+ * Result with hanging indent:
+ * ```
+ * scope Family = 1,
+ *       Person += 5..10.
+ * ```
+ *
+ * @param context the indentation context
+ * @param units the number of units to indent
+ * @returns the desired indentation level
+ */
+function indentDeclarationStrategy(context: TreeIndentContext, units: number): number {
+  const alignment = findAlignmentAfterOpening(context);
+  if (alignment !== null) {
+    return context.column(alignment);
+  }
+  return context.baseIndent + units * context.unit;
+}
+
+export function indentBlockComment(): number {
+  // Do not indent.
+  return -1;
+}
+
+export function indentDeclaration(context: TreeIndentContext): number {
+  return indentDeclarationStrategy(context, 1);
+}
+
+export function indentPredicateOrRule(context: TreeIndentContext): number {
+  const clauseIndent = indentDeclarationStrategy(context, 1);
+  if (/^\s+[;.]/.exec(context.textAfter) !== null) {
+    return clauseIndent - 2;
+  }
+  if (/^\s+(~>)/.exec(context.textAfter) !== null) {
+    return clauseIndent - 3;
+  }
+  return clauseIndent;
+}
diff --git a/subprojects/language-web/src/main/js/language/problem.grammar b/subprojects/language-web/src/main/js/language/problem.grammar
new file mode 100644
index 00000000..bccc2e31
--- /dev/null
+++ b/subprojects/language-web/src/main/js/language/problem.grammar
@@ -0,0 +1,149 @@
+@detectDelim
+
+@external prop implicitCompletion from '../../../../src/main/js/language/props.ts'
+
+@top Problem { statement* }
+
+statement {
+  ProblemDeclaration {
+    ckw<"problem"> QualifiedName "."
+  } |
+  ClassDefinition {
+    ckw<"abstract">? ckw<"class"> RelationName
+    (ckw<"extends"> sep<",", RelationName>)?
+    (ClassBody {  "{" ReferenceDeclaration* "}" } | ".")
+  } |
+  EnumDefinition {
+    ckw<"enum"> RelationName
+    (EnumBody { "{" sep<",", IndividualNodeName> "}" } | ".")
+  } |
+  PredicateDefinition {
+    (ckw<"error"> ckw<"pred">? | ckw<"direct">? ckw<"pred">)
+    RelationName ParameterList<Parameter>?
+    PredicateBody { ("<->" sep<OrOp, Conjunction>)?  "." }
+  } |
+  RuleDefinition {
+    ckw<"direct">? ckw<"rule">
+    RuleName ParameterList<Parameter>?
+    RuleBody { ":" sep<OrOp, Conjunction> "~>" sep<OrOp, Action> "." }
+  } |
+  Assertion {
+    kw<"default">? (NotOp | UnknownOp)? RelationName
+    ParameterList<AssertionArgument> (":" LogicValue)? "."
+  } |
+  NodeValueAssertion {
+    IndividualNodeName ":" Constant "."
+  } |
+  IndividualDeclaration {
+    ckw<"indiv"> sep<",", IndividualNodeName> "."
+  } |
+  ScopeDeclaration {
+    kw<"scope"> sep<",", ScopeElement> "."
+  }
+}
+
+ReferenceDeclaration {
+  (kw<"refers"> | kw<"contains">)?
+  RelationName
+  RelationName
+  ( "[" Multiplicity? "]" )?
+  (kw<"opposite"> RelationName)?
+  ";"?
+}
+
+Parameter { RelationName? VariableName }
+
+Conjunction { ("," | Literal)+ }
+
+OrOp { ";" }
+
+Literal { NotOp? Atom (("=" | ":") sep1<"|", LogicValue>)? }
+
+Atom { RelationName "+"? ParameterList<Argument> }
+
+Action { ("," | ActionLiteral)+ }
+
+ActionLiteral {
+   ckw<"new"> VariableName |
+   ckw<"delete"> VariableName |
+   Literal
+}
+
+Argument { VariableName | Constant }
+
+AssertionArgument { NodeName | StarArgument | Constant }
+
+Constant { Real | String }
+
+LogicValue {
+  ckw<"true"> | ckw<"false"> | ckw<"unknown"> | ckw<"error">
+}
+
+ScopeElement { RelationName ("=" | "+=") Multiplicity }
+
+Multiplicity { (IntMult "..")? (IntMult | StarMult)}
+
+RelationName { QualifiedName }
+
+RuleName { QualifiedName }
+
+IndividualNodeName { QualifiedName }
+
+VariableName { QualifiedName }
+
+NodeName { QualifiedName }
+
+QualifiedName[implicitCompletion=true] { identifier ("::" identifier)* }
+
+kw<term> { @specialize[@name={term},implicitCompletion=true]<identifier, term> }
+
+ckw<term> { @extend[@name={term},implicitCompletion=true]<identifier, term> }
+
+ParameterList<content> { "(" sep<",", content> ")" }
+
+sep<separator, content> { sep1<separator, content>? }
+
+sep1<separator, content> { content (separator content)* }
+
+@skip { LineComment | BlockComment | whitespace }
+
+@tokens {
+  whitespace { std.whitespace+ }
+
+  LineComment { ("//" | "%") ![\n]* }
+
+  BlockComment { "/*" blockCommentRest }
+
+  blockCommentRest { ![*] blockCommentRest | "*" blockCommentAfterStar }
+
+  blockCommentAfterStar { "/" | "*" blockCommentAfterStar | ![/*] blockCommentRest }
+
+  @precedence { BlockComment, LineComment }
+
+  identifier { $[A-Za-z_] $[a-zA-Z0-9_]* }
+
+  int { $[0-9]+ }
+
+  IntMult { int }
+
+  StarMult { "*" }
+
+  Real { "-"? (exponential | int ("." (int | exponential))?) }
+
+  exponential { int ("e" | "E") ("+" | "-")? int }
+
+  String {
+    "'" (![\\'\n] | "\\" ![\n] | "\\\n")+ "'" |
+    "\"" (![\\"\n] | "\\" (![\n] | "\n"))* "\""
+  }
+
+  NotOp { "!" }
+
+  UnknownOp { "?" }
+
+  StarArgument { "*" }
+
+  "{" "}" "(" ")" "[" "]" "." ".." "," ":" "<->" "~>"
+}
+
+@detectDelim
diff --git a/subprojects/language-web/src/main/js/language/problemLanguageSupport.ts b/subprojects/language-web/src/main/js/language/problemLanguageSupport.ts
new file mode 100644
index 00000000..6508a2c0
--- /dev/null
+++ b/subprojects/language-web/src/main/js/language/problemLanguageSupport.ts
@@ -0,0 +1,92 @@
+import { styleTags, tags as t } from '@codemirror/highlight';
+import {
+  foldInside,
+  foldNodeProp,
+  indentNodeProp,
+  indentUnit,
+  LanguageSupport,
+  LRLanguage,
+} from '@codemirror/language';
+import { LRParser } from '@lezer/lr';
+
+import { parser } from '../../../../build/generated/sources/lezer/problem';
+import {
+  foldBlockComment,
+  foldConjunction,
+  foldDeclaration,
+  foldWholeNode,
+} from './folding';
+import {
+  indentBlockComment,
+  indentDeclaration,
+  indentPredicateOrRule,
+} from './indentation';
+
+const parserWithMetadata = (parser as LRParser).configure({
+  props: [
+    styleTags({
+      LineComment: t.lineComment,
+      BlockComment: t.blockComment,
+      'problem class enum pred rule indiv scope': t.definitionKeyword,
+      'abstract extends refers contains opposite error direct default': t.modifier,
+      'true false unknown error': t.keyword,
+      'new delete': t.operatorKeyword,
+      NotOp: t.keyword,
+      UnknownOp: t.keyword,
+      OrOp: t.keyword,
+      StarArgument: t.keyword,
+      'IntMult StarMult Real': t.number,
+      StarMult: t.number,
+      String: t.string,
+      'RelationName/QualifiedName': t.typeName,
+      'RuleName/QualifiedName': t.macroName,
+      'IndividualNodeName/QualifiedName': t.atom,
+      'VariableName/QualifiedName': t.variableName,
+      '{ }': t.brace,
+      '( )': t.paren,
+      '[ ]': t.squareBracket,
+      '. .. , :': t.separator,
+      '<-> ~>': t.definitionOperator,
+    }),
+    indentNodeProp.add({
+      ProblemDeclaration: indentDeclaration,
+      UniqueDeclaration: indentDeclaration,
+      ScopeDeclaration: indentDeclaration,
+      PredicateBody: indentPredicateOrRule,
+      RuleBody: indentPredicateOrRule,
+      BlockComment: indentBlockComment,
+    }),
+    foldNodeProp.add({
+      ClassBody: foldInside,
+      EnumBody: foldInside,
+      ParameterList: foldInside,
+      PredicateBody: foldInside,
+      RuleBody: foldInside,
+      Conjunction: foldConjunction,
+      Action: foldWholeNode,
+      UniqueDeclaration: foldDeclaration,
+      ScopeDeclaration: foldDeclaration,
+      BlockComment: foldBlockComment,
+    }),
+  ],
+});
+
+const problemLanguage = LRLanguage.define({
+  parser: parserWithMetadata,
+  languageData: {
+    commentTokens: {
+      block: {
+        open: '/*',
+        close: '*/',
+      },
+      line: '%',
+    },
+    indentOnInput: /^\s*(?:\{|\}|\(|\)|;|\.|~>)$/,
+  },
+});
+
+export function problemLanguageSupport(): LanguageSupport {
+  return new LanguageSupport(problemLanguage, [
+    indentUnit.of('    '),
+  ]);
+}
diff --git a/subprojects/language-web/src/main/js/language/props.ts b/subprojects/language-web/src/main/js/language/props.ts
new file mode 100644
index 00000000..8e488bf5
--- /dev/null
+++ b/subprojects/language-web/src/main/js/language/props.ts
@@ -0,0 +1,7 @@
+import { NodeProp } from '@lezer/common';
+
+export const implicitCompletion = new NodeProp({
+  deserialize(s: string) {
+    return s === 'true';
+  },
+});
diff --git a/subprojects/language-web/src/main/js/theme/EditorTheme.ts b/subprojects/language-web/src/main/js/theme/EditorTheme.ts
new file mode 100644
index 00000000..1b0dd5de
--- /dev/null
+++ b/subprojects/language-web/src/main/js/theme/EditorTheme.ts
@@ -0,0 +1,47 @@
+import type { PaletteMode } from '@mui/material';
+
+import cssVariables from '../../css/themeVariables.module.scss';
+
+export enum EditorTheme {
+  Light,
+  Dark,
+}
+
+export class EditorThemeData {
+  className: string;
+
+  paletteMode: PaletteMode;
+
+  toggleDarkMode: EditorTheme;
+
+  foreground!: string;
+
+  foregroundHighlight!: string;
+
+  background!: string;
+
+  primary!: string;
+
+  secondary!: string;
+
+  constructor(className: string, paletteMode: PaletteMode, toggleDarkMode: EditorTheme) {
+    this.className = className;
+    this.paletteMode = paletteMode;
+    this.toggleDarkMode = toggleDarkMode;
+    Reflect.ownKeys(this).forEach((key) => {
+      if (!Reflect.get(this, key)) {
+        const cssKey = `${this.className}--${key.toString()}`;
+        if (cssKey in cssVariables) {
+          Reflect.set(this, key, cssVariables[cssKey]);
+        }
+      }
+    });
+  }
+}
+
+export const DEFAULT_THEME = EditorTheme.Dark;
+
+export const EDITOR_THEMES: { [key in EditorTheme]: EditorThemeData } = {
+  [EditorTheme.Light]: new EditorThemeData('light', 'light', EditorTheme.Dark),
+  [EditorTheme.Dark]: new EditorThemeData('dark', 'dark', EditorTheme.Light),
+};
diff --git a/subprojects/language-web/src/main/js/theme/ThemeProvider.tsx b/subprojects/language-web/src/main/js/theme/ThemeProvider.tsx
new file mode 100644
index 00000000..f5b50be1
--- /dev/null
+++ b/subprojects/language-web/src/main/js/theme/ThemeProvider.tsx
@@ -0,0 +1,15 @@
+import { observer } from 'mobx-react-lite';
+import { ThemeProvider as MaterialUiThemeProvider } from '@mui/material/styles';
+import React from 'react';
+
+import { useRootStore } from '../RootStore';
+
+export const ThemeProvider: React.FC = observer(({ children }) => {
+  const { themeStore } = useRootStore();
+
+  return (
+    <MaterialUiThemeProvider theme={themeStore.materialUiTheme}>
+      {children}
+    </MaterialUiThemeProvider>
+  );
+});
diff --git a/subprojects/language-web/src/main/js/theme/ThemeStore.ts b/subprojects/language-web/src/main/js/theme/ThemeStore.ts
new file mode 100644
index 00000000..ffaf6dde
--- /dev/null
+++ b/subprojects/language-web/src/main/js/theme/ThemeStore.ts
@@ -0,0 +1,64 @@
+import { makeAutoObservable } from 'mobx';
+import {
+  Theme,
+  createTheme,
+  responsiveFontSizes,
+} from '@mui/material/styles';
+
+import {
+  EditorTheme,
+  EditorThemeData,
+  DEFAULT_THEME,
+  EDITOR_THEMES,
+} from './EditorTheme';
+
+export class ThemeStore {
+  currentTheme: EditorTheme = DEFAULT_THEME;
+
+  constructor() {
+    makeAutoObservable(this);
+  }
+
+  toggleDarkMode(): void {
+    this.currentTheme = this.currentThemeData.toggleDarkMode;
+  }
+
+  private get currentThemeData(): EditorThemeData {
+    return EDITOR_THEMES[this.currentTheme];
+  }
+
+  get materialUiTheme(): Theme {
+    const themeData = this.currentThemeData;
+    const materialUiTheme = createTheme({
+      palette: {
+        mode: themeData.paletteMode,
+        background: {
+          default: themeData.background,
+          paper: themeData.background,
+        },
+        primary: {
+          main: themeData.primary,
+        },
+        secondary: {
+          main: themeData.secondary,
+        },
+        error: {
+          main: themeData.secondary,
+        },
+        text: {
+          primary: themeData.foregroundHighlight,
+          secondary: themeData.foreground,
+        },
+      },
+    });
+    return responsiveFontSizes(materialUiTheme);
+  }
+
+  get darkMode(): boolean {
+    return this.currentThemeData.paletteMode === 'dark';
+  }
+
+  get className(): string {
+    return this.currentThemeData.className;
+  }
+}
diff --git a/subprojects/language-web/src/main/js/utils/ConditionVariable.ts b/subprojects/language-web/src/main/js/utils/ConditionVariable.ts
new file mode 100644
index 00000000..0910dfa6
--- /dev/null
+++ b/subprojects/language-web/src/main/js/utils/ConditionVariable.ts
@@ -0,0 +1,64 @@
+import { getLogger } from './logger';
+import { PendingTask } from './PendingTask';
+
+const log = getLogger('utils.ConditionVariable');
+
+export type Condition = () => boolean;
+
+export class ConditionVariable {
+  condition: Condition;
+
+  defaultTimeout: number;
+
+  listeners: PendingTask<void>[] = [];
+
+  constructor(condition: Condition, defaultTimeout = 0) {
+    this.condition = condition;
+    this.defaultTimeout = defaultTimeout;
+  }
+
+  async waitFor(timeoutMs: number | null = null): Promise<void> {
+    if (this.condition()) {
+      return;
+    }
+    const timeoutOrDefault = timeoutMs || this.defaultTimeout;
+    let nowMs = Date.now();
+    const endMs = nowMs + timeoutOrDefault;
+    while (!this.condition() && nowMs < endMs) {
+      const remainingMs = endMs - nowMs;
+      const promise = new Promise<void>((resolve, reject) => {
+        if (this.condition()) {
+          resolve();
+          return;
+        }
+        const task = new PendingTask(resolve, reject, remainingMs);
+        this.listeners.push(task);
+      });
+      // We must keep waiting until the update has completed,
+      // so the tasks can't be started in parallel.
+      // eslint-disable-next-line no-await-in-loop
+      await promise;
+      nowMs = Date.now();
+    }
+    if (!this.condition()) {
+      log.error('Condition still does not hold after', timeoutOrDefault, 'ms');
+      throw new Error('Failed to wait for condition');
+    }
+  }
+
+  notifyAll(): void {
+    this.clearListenersWith((listener) => listener.resolve());
+  }
+
+  rejectAll(error: unknown): void {
+    this.clearListenersWith((listener) => listener.reject(error));
+  }
+
+  private clearListenersWith(callback: (listener: PendingTask<void>) => void) {
+    // Copy `listeners` so that we don't get into a race condition
+    // if one of the listeners adds another listener.
+    const { listeners } = this;
+    this.listeners = [];
+    listeners.forEach(callback);
+  }
+}
diff --git a/subprojects/language-web/src/main/js/utils/PendingTask.ts b/subprojects/language-web/src/main/js/utils/PendingTask.ts
new file mode 100644
index 00000000..51b79fb0
--- /dev/null
+++ b/subprojects/language-web/src/main/js/utils/PendingTask.ts
@@ -0,0 +1,60 @@
+import { getLogger } from './logger';
+
+const log = getLogger('utils.PendingTask');
+
+export class PendingTask<T> {
+  private readonly resolveCallback: (value: T) => void;
+
+  private readonly rejectCallback: (reason?: unknown) => void;
+
+  private resolved = false;
+
+  private timeout: number | null;
+
+  constructor(
+    resolveCallback: (value: T) => void,
+    rejectCallback: (reason?: unknown) => void,
+    timeoutMs?: number,
+    timeoutCallback?: () => void,
+  ) {
+    this.resolveCallback = resolveCallback;
+    this.rejectCallback = rejectCallback;
+    if (timeoutMs) {
+      this.timeout = setTimeout(() => {
+        if (!this.resolved) {
+          this.reject(new Error('Request timed out'));
+          if (timeoutCallback) {
+            timeoutCallback();
+          }
+        }
+      }, timeoutMs);
+    } else {
+      this.timeout = null;
+    }
+  }
+
+  resolve(value: T): void {
+    if (this.resolved) {
+      log.warn('Trying to resolve already resolved promise');
+      return;
+    }
+    this.markResolved();
+    this.resolveCallback(value);
+  }
+
+  reject(reason?: unknown): void {
+    if (this.resolved) {
+      log.warn('Trying to reject already resolved promise');
+      return;
+    }
+    this.markResolved();
+    this.rejectCallback(reason);
+  }
+
+  private markResolved() {
+    this.resolved = true;
+    if (this.timeout !== null) {
+      clearTimeout(this.timeout);
+    }
+  }
+}
diff --git a/subprojects/language-web/src/main/js/utils/Timer.ts b/subprojects/language-web/src/main/js/utils/Timer.ts
new file mode 100644
index 00000000..8f653070
--- /dev/null
+++ b/subprojects/language-web/src/main/js/utils/Timer.ts
@@ -0,0 +1,33 @@
+export class Timer {
+  readonly callback: () => void;
+
+  readonly defaultTimeout: number;
+
+  timeout: number | null = null;
+
+  constructor(callback: () => void, defaultTimeout = 0) {
+    this.callback = () => {
+      this.timeout = null;
+      callback();
+    };
+    this.defaultTimeout = defaultTimeout;
+  }
+
+  schedule(timeout: number | null = null): void {
+    if (this.timeout === null) {
+      this.timeout = setTimeout(this.callback, timeout || this.defaultTimeout);
+    }
+  }
+
+  reschedule(timeout: number | null = null): void {
+    this.cancel();
+    this.schedule(timeout);
+  }
+
+  cancel(): void {
+    if (this.timeout !== null) {
+      clearTimeout(this.timeout);
+      this.timeout = null;
+    }
+  }
+}
diff --git a/subprojects/language-web/src/main/js/utils/logger.ts b/subprojects/language-web/src/main/js/utils/logger.ts
new file mode 100644
index 00000000..306d122c
--- /dev/null
+++ b/subprojects/language-web/src/main/js/utils/logger.ts
@@ -0,0 +1,49 @@
+import styles, { CSPair } from 'ansi-styles';
+import log from 'loglevel';
+import * as prefix from 'loglevel-plugin-prefix';
+
+const colors: Partial<Record<string, CSPair>> = {
+  TRACE: styles.magenta,
+  DEBUG: styles.cyan,
+  INFO: styles.blue,
+  WARN: styles.yellow,
+  ERROR: styles.red,
+};
+
+prefix.reg(log);
+
+if (DEBUG) {
+  log.setLevel(log.levels.DEBUG);
+} else {
+  log.setLevel(log.levels.WARN);
+}
+
+if ('chrome' in window) {
+  // Only Chromium supports console ANSI escape sequences.
+  prefix.apply(log, {
+    format(level, name, timestamp) {
+      const formattedTimestamp = `${styles.gray.open}[${timestamp.toString()}]${styles.gray.close}`;
+      const levelColor = colors[level.toUpperCase()] || styles.red;
+      const formattedLevel = `${levelColor.open}${level}${levelColor.close}`;
+      const formattedName = `${styles.green.open}(${name || 'root'})${styles.green.close}`;
+      return `${formattedTimestamp} ${formattedLevel} ${formattedName}`;
+    },
+  });
+} else {
+  prefix.apply(log, {
+    template: '[%t] %l (%n)',
+  });
+}
+
+const appLogger = log.getLogger(PACKAGE_NAME);
+
+appLogger.info('Version:', PACKAGE_NAME, PACKAGE_VERSION);
+appLogger.info('Debug mode:', DEBUG);
+
+export function getLoggerFromRoot(name: string | symbol): log.Logger {
+  return log.getLogger(name);
+}
+
+export function getLogger(name: string | symbol): log.Logger {
+  return getLoggerFromRoot(`${PACKAGE_NAME}.${name.toString()}`);
+}
diff --git a/subprojects/language-web/src/main/js/xtext/ContentAssistService.ts b/subprojects/language-web/src/main/js/xtext/ContentAssistService.ts
new file mode 100644
index 00000000..8b872e06
--- /dev/null
+++ b/subprojects/language-web/src/main/js/xtext/ContentAssistService.ts
@@ -0,0 +1,219 @@
+import type {
+  Completion,
+  CompletionContext,
+  CompletionResult,
+} from '@codemirror/autocomplete';
+import { syntaxTree } from '@codemirror/language';
+import type { Transaction } from '@codemirror/state';
+import escapeStringRegexp from 'escape-string-regexp';
+
+import { implicitCompletion } from '../language/props';
+import type { UpdateService } from './UpdateService';
+import { getLogger } from '../utils/logger';
+import type { ContentAssistEntry } from './xtextServiceResults';
+
+const PROPOSALS_LIMIT = 1000;
+
+const IDENTIFIER_REGEXP_STR = '[a-zA-Z0-9_]*';
+
+const HIGH_PRIORITY_KEYWORDS = ['<->', '~>'];
+
+const log = getLogger('xtext.ContentAssistService');
+
+interface IFoundToken {
+  from: number;
+
+  to: number;
+
+  implicitCompletion: boolean;
+
+  text: string;
+}
+
+function findToken({ pos, state }: CompletionContext): IFoundToken | null {
+  const token = syntaxTree(state).resolveInner(pos, -1);
+  if (token === null) {
+    return null;
+  }
+  if (token.firstChild !== null) {
+    // We only autocomplete terminal nodes. If the current node is nonterminal,
+    // returning `null` makes us autocomplete with the empty prefix instead.
+    return null;
+  }
+  return {
+    from: token.from,
+    to: token.to,
+    implicitCompletion: token.type.prop(implicitCompletion) || false,
+    text: state.sliceDoc(token.from, token.to),
+  };
+}
+
+function shouldCompleteImplicitly(token: IFoundToken | null, context: CompletionContext): boolean {
+  return token !== null
+    && token.implicitCompletion
+    && context.pos - token.from >= 2;
+}
+
+function computeSpan(prefix: string, entryCount: number): RegExp {
+  const escapedPrefix = escapeStringRegexp(prefix);
+  if (entryCount < PROPOSALS_LIMIT) {
+    // Proposals with the current prefix fit the proposals limit.
+    // We can filter client side as long as the current prefix is preserved.
+    return new RegExp(`^${escapedPrefix}${IDENTIFIER_REGEXP_STR}$`);
+  }
+  // The current prefix overflows the proposals limits,
+  // so we have to fetch the completions again on the next keypress.
+  // Hopefully, it'll return a shorter list and we'll be able to filter client side.
+  return new RegExp(`^${escapedPrefix}$`);
+}
+
+function createCompletion(entry: ContentAssistEntry): Completion {
+  let boost: number;
+  switch (entry.kind) {
+    case 'KEYWORD':
+      // Some hard-to-type operators should be on top.
+      boost = HIGH_PRIORITY_KEYWORDS.includes(entry.proposal) ? 10 : -99;
+      break;
+    case 'TEXT':
+    case 'SNIPPET':
+      boost = -90;
+      break;
+    default: {
+      // Penalize qualified names (vs available unqualified names).
+      const extraSegments = entry.proposal.match(/::/g)?.length || 0;
+      boost = Math.max(-5 * extraSegments, -50);
+    }
+      break;
+  }
+  return {
+    label: entry.proposal,
+    detail: entry.description,
+    info: entry.documentation,
+    type: entry.kind?.toLowerCase(),
+    boost,
+  };
+}
+
+export class ContentAssistService {
+  private readonly updateService: UpdateService;
+
+  private lastCompletion: CompletionResult | null = null;
+
+  constructor(updateService: UpdateService) {
+    this.updateService = updateService;
+  }
+
+  onTransaction(transaction: Transaction): void {
+    if (this.shouldInvalidateCachedCompletion(transaction)) {
+      this.lastCompletion = null;
+    }
+  }
+
+  async contentAssist(context: CompletionContext): Promise<CompletionResult> {
+    const tokenBefore = findToken(context);
+    if (!context.explicit && !shouldCompleteImplicitly(tokenBefore, context)) {
+      return {
+        from: context.pos,
+        options: [],
+      };
+    }
+    let range: { from: number, to: number };
+    let prefix = '';
+    if (tokenBefore === null) {
+      range = {
+        from: context.pos,
+        to: context.pos,
+      };
+      prefix = '';
+    } else {
+      range = {
+        from: tokenBefore.from,
+        to: tokenBefore.to,
+      };
+      const prefixLength = context.pos - tokenBefore.from;
+      if (prefixLength > 0) {
+        prefix = tokenBefore.text.substring(0, context.pos - tokenBefore.from);
+      }
+    }
+    if (!context.explicit && this.shouldReturnCachedCompletion(tokenBefore)) {
+      log.trace('Returning cached completion result');
+      // Postcondition of `shouldReturnCachedCompletion`: `lastCompletion !== null`
+      return {
+        ...this.lastCompletion as CompletionResult,
+        ...range,
+      };
+    }
+    this.lastCompletion = null;
+    const entries = await this.updateService.fetchContentAssist({
+      resource: this.updateService.resourceName,
+      serviceType: 'assist',
+      caretOffset: context.pos,
+      proposalsLimit: PROPOSALS_LIMIT,
+    }, context);
+    if (context.aborted) {
+      return {
+        ...range,
+        options: [],
+      };
+    }
+    const options: Completion[] = [];
+    entries.forEach((entry) => {
+      if (prefix === entry.prefix) {
+        // Xtext will generate completions that do not complete the current token,
+        // e.g., `(` after trying to complete an indetifier,
+        // but we ignore those, since CodeMirror won't filter for them anyways.
+        options.push(createCompletion(entry));
+      }
+    });
+    log.debug('Fetched', options.length, 'completions from server');
+    this.lastCompletion = {
+      ...range,
+      options,
+      span: computeSpan(prefix, entries.length),
+    };
+    return this.lastCompletion;
+  }
+
+  private shouldReturnCachedCompletion(
+    token: { from: number, to: number, text: string } | null,
+  ): boolean {
+    if (token === null || this.lastCompletion === null) {
+      return false;
+    }
+    const { from, to, text } = token;
+    const { from: lastFrom, to: lastTo, span } = this.lastCompletion;
+    if (!lastTo) {
+      return true;
+    }
+    const [transformedFrom, transformedTo] = this.mapRangeInclusive(lastFrom, lastTo);
+    return from >= transformedFrom
+      && to <= transformedTo
+      && typeof span !== 'undefined'
+      && span.exec(text) !== null;
+  }
+
+  private shouldInvalidateCachedCompletion(transaction: Transaction): boolean {
+    if (!transaction.docChanged || this.lastCompletion === null) {
+      return false;
+    }
+    const { from: lastFrom, to: lastTo } = this.lastCompletion;
+    if (!lastTo) {
+      return true;
+    }
+    const [transformedFrom, transformedTo] = this.mapRangeInclusive(lastFrom, lastTo);
+    let invalidate = false;
+    transaction.changes.iterChangedRanges((fromA, toA) => {
+      if (fromA < transformedFrom || toA > transformedTo) {
+        invalidate = true;
+      }
+    });
+    return invalidate;
+  }
+
+  private mapRangeInclusive(lastFrom: number, lastTo: number): [number, number] {
+    const changes = this.updateService.computeChangesSinceLastUpdate();
+    const transformedFrom = changes.mapPos(lastFrom);
+    const transformedTo = changes.mapPos(lastTo, 1);
+    return [transformedFrom, transformedTo];
+  }
+}
diff --git a/subprojects/language-web/src/main/js/xtext/HighlightingService.ts b/subprojects/language-web/src/main/js/xtext/HighlightingService.ts
new file mode 100644
index 00000000..dfbb4a19
--- /dev/null
+++ b/subprojects/language-web/src/main/js/xtext/HighlightingService.ts
@@ -0,0 +1,37 @@
+import type { EditorStore } from '../editor/EditorStore';
+import type { IHighlightRange } from '../editor/semanticHighlighting';
+import type { UpdateService } from './UpdateService';
+import { highlightingResult } from './xtextServiceResults';
+
+export class HighlightingService {
+  private readonly store: EditorStore;
+
+  private readonly updateService: UpdateService;
+
+  constructor(store: EditorStore, updateService: UpdateService) {
+    this.store = store;
+    this.updateService = updateService;
+  }
+
+  onPush(push: unknown): void {
+    const { regions } = highlightingResult.parse(push);
+    const allChanges = this.updateService.computeChangesSinceLastUpdate();
+    const ranges: IHighlightRange[] = [];
+    regions.forEach(({ offset, length, styleClasses }) => {
+      if (styleClasses.length === 0) {
+        return;
+      }
+      const from = allChanges.mapPos(offset);
+      const to = allChanges.mapPos(offset + length);
+      if (to <= from) {
+        return;
+      }
+      ranges.push({
+        from,
+        to,
+        classes: styleClasses,
+      });
+    });
+    this.store.updateSemanticHighlighting(ranges);
+  }
+}
diff --git a/subprojects/language-web/src/main/js/xtext/OccurrencesService.ts b/subprojects/language-web/src/main/js/xtext/OccurrencesService.ts
new file mode 100644
index 00000000..bc865537
--- /dev/null
+++ b/subprojects/language-web/src/main/js/xtext/OccurrencesService.ts
@@ -0,0 +1,127 @@
+import { Transaction } from '@codemirror/state';
+
+import type { EditorStore } from '../editor/EditorStore';
+import type { IOccurrence } from '../editor/findOccurrences';
+import type { UpdateService } from './UpdateService';
+import { getLogger } from '../utils/logger';
+import { Timer } from '../utils/Timer';
+import { XtextWebSocketClient } from './XtextWebSocketClient';
+import {
+  isConflictResult,
+  occurrencesResult,
+  TextRegion,
+} from './xtextServiceResults';
+
+const FIND_OCCURRENCES_TIMEOUT_MS = 1000;
+
+// Must clear occurrences asynchronously from `onTransaction`,
+// because we must not emit a conflicting transaction when handling the pending transaction.
+const CLEAR_OCCURRENCES_TIMEOUT_MS = 10;
+
+const log = getLogger('xtext.OccurrencesService');
+
+function transformOccurrences(regions: TextRegion[]): IOccurrence[] {
+  const occurrences: IOccurrence[] = [];
+  regions.forEach(({ offset, length }) => {
+    if (length > 0) {
+      occurrences.push({
+        from: offset,
+        to: offset + length,
+      });
+    }
+  });
+  return occurrences;
+}
+
+export class OccurrencesService {
+  private readonly store: EditorStore;
+
+  private readonly webSocketClient: XtextWebSocketClient;
+
+  private readonly updateService: UpdateService;
+
+  private hasOccurrences = false;
+
+  private readonly findOccurrencesTimer = new Timer(() => {
+    this.handleFindOccurrences();
+  }, FIND_OCCURRENCES_TIMEOUT_MS);
+
+  private readonly clearOccurrencesTimer = new Timer(() => {
+    this.clearOccurrences();
+  }, CLEAR_OCCURRENCES_TIMEOUT_MS);
+
+  constructor(
+    store: EditorStore,
+    webSocketClient: XtextWebSocketClient,
+    updateService: UpdateService,
+  ) {
+    this.store = store;
+    this.webSocketClient = webSocketClient;
+    this.updateService = updateService;
+  }
+
+  onTransaction(transaction: Transaction): void {
+    if (transaction.docChanged) {
+      this.clearOccurrencesTimer.schedule();
+      this.findOccurrencesTimer.reschedule();
+    }
+    if (transaction.isUserEvent('select')) {
+      this.findOccurrencesTimer.reschedule();
+    }
+  }
+
+  private handleFindOccurrences() {
+    this.clearOccurrencesTimer.cancel();
+    this.updateOccurrences().catch((error) => {
+      log.error('Unexpected error while updating occurrences', error);
+      this.clearOccurrences();
+    });
+  }
+
+  private async updateOccurrences() {
+    await this.updateService.update();
+    const result = await this.webSocketClient.send({
+      resource: this.updateService.resourceName,
+      serviceType: 'occurrences',
+      expectedStateId: this.updateService.xtextStateId,
+      caretOffset: this.store.state.selection.main.head,
+    });
+    const allChanges = this.updateService.computeChangesSinceLastUpdate();
+    if (!allChanges.empty || isConflictResult(result, 'canceled')) {
+      // Stale occurrences result, the user already made some changes.
+      // We can safely ignore the occurrences and schedule a new find occurrences call.
+      this.clearOccurrences();
+      this.findOccurrencesTimer.schedule();
+      return;
+    }
+    const parsedOccurrencesResult = occurrencesResult.safeParse(result);
+    if (!parsedOccurrencesResult.success) {
+      log.error(
+        'Unexpected occurences result',
+        result,
+        'not an OccurrencesResult: ',
+        parsedOccurrencesResult.error,
+      );
+      this.clearOccurrences();
+      return;
+    }
+    const { stateId, writeRegions, readRegions } = parsedOccurrencesResult.data;
+    if (stateId !== this.updateService.xtextStateId) {
+      log.error('Unexpected state id, expected:', this.updateService.xtextStateId, 'got:', stateId);
+      this.clearOccurrences();
+      return;
+    }
+    const write = transformOccurrences(writeRegions);
+    const read = transformOccurrences(readRegions);
+    this.hasOccurrences = write.length > 0 || read.length > 0;
+    log.debug('Found', write.length, 'write and', read.length, 'read occurrences');
+    this.store.updateOccurrences(write, read);
+  }
+
+  private clearOccurrences() {
+    if (this.hasOccurrences) {
+      this.store.updateOccurrences([], []);
+      this.hasOccurrences = false;
+    }
+  }
+}
diff --git a/subprojects/language-web/src/main/js/xtext/UpdateService.ts b/subprojects/language-web/src/main/js/xtext/UpdateService.ts
new file mode 100644
index 00000000..e78944a9
--- /dev/null
+++ b/subprojects/language-web/src/main/js/xtext/UpdateService.ts
@@ -0,0 +1,363 @@
+import {
+  ChangeDesc,
+  ChangeSet,
+  ChangeSpec,
+  StateEffect,
+  Transaction,
+} from '@codemirror/state';
+import { nanoid } from 'nanoid';
+
+import type { EditorStore } from '../editor/EditorStore';
+import type { XtextWebSocketClient } from './XtextWebSocketClient';
+import { ConditionVariable } from '../utils/ConditionVariable';
+import { getLogger } from '../utils/logger';
+import { Timer } from '../utils/Timer';
+import {
+  ContentAssistEntry,
+  contentAssistResult,
+  documentStateResult,
+  formattingResult,
+  isConflictResult,
+} from './xtextServiceResults';
+
+const UPDATE_TIMEOUT_MS = 500;
+
+const WAIT_FOR_UPDATE_TIMEOUT_MS = 1000;
+
+const log = getLogger('xtext.UpdateService');
+
+const setDirtyChanges = StateEffect.define<ChangeSet>();
+
+export interface IAbortSignal {
+  aborted: boolean;
+}
+
+export class UpdateService {
+  resourceName: string;
+
+  xtextStateId: string | null = null;
+
+  private readonly store: EditorStore;
+
+  /**
+   * The changes being synchronized to the server if a full or delta text update is running,
+   * `null` otherwise.
+   */
+  private pendingUpdate: ChangeSet | null = null;
+
+  /**
+   * Local changes not yet sychronized to the server and not part of the running update, if any.
+   */
+  private dirtyChanges: ChangeSet;
+
+  private readonly webSocketClient: XtextWebSocketClient;
+
+  private readonly updatedCondition = new ConditionVariable(
+    () => this.pendingUpdate === null && this.xtextStateId !== null,
+    WAIT_FOR_UPDATE_TIMEOUT_MS,
+  );
+
+  private readonly idleUpdateTimer = new Timer(() => {
+    this.handleIdleUpdate();
+  }, UPDATE_TIMEOUT_MS);
+
+  constructor(store: EditorStore, webSocketClient: XtextWebSocketClient) {
+    this.resourceName = `${nanoid(7)}.problem`;
+    this.store = store;
+    this.dirtyChanges = this.newEmptyChangeSet();
+    this.webSocketClient = webSocketClient;
+  }
+
+  onReconnect(): void {
+    this.xtextStateId = null;
+    this.updateFullText().catch((error) => {
+      log.error('Unexpected error during initial update', error);
+    });
+  }
+
+  onTransaction(transaction: Transaction): void {
+    const setDirtyChangesEffect = transaction.effects.find(
+      (effect) => effect.is(setDirtyChanges),
+    ) as StateEffect<ChangeSet> | undefined;
+    if (setDirtyChangesEffect) {
+      const { value } = setDirtyChangesEffect;
+      if (this.pendingUpdate !== null) {
+        this.pendingUpdate = ChangeSet.empty(value.length);
+      }
+      this.dirtyChanges = value;
+      return;
+    }
+    if (transaction.docChanged) {
+      this.dirtyChanges = this.dirtyChanges.compose(transaction.changes);
+      this.idleUpdateTimer.reschedule();
+    }
+  }
+
+  /**
+   * Computes the summary of any changes happened since the last complete update.
+   *
+   * The result reflects any changes that happened since the `xtextStateId`
+   * version was uploaded to the server.
+   *
+   * @return the summary of changes since the last update
+   */
+  computeChangesSinceLastUpdate(): ChangeDesc {
+    return this.pendingUpdate?.composeDesc(this.dirtyChanges.desc) || this.dirtyChanges.desc;
+  }
+
+  private handleIdleUpdate() {
+    if (!this.webSocketClient.isOpen || this.dirtyChanges.empty) {
+      return;
+    }
+    if (this.pendingUpdate === null) {
+      this.update().catch((error) => {
+        log.error('Unexpected error during scheduled update', error);
+      });
+    }
+    this.idleUpdateTimer.reschedule();
+  }
+
+  private newEmptyChangeSet() {
+    return ChangeSet.of([], this.store.state.doc.length);
+  }
+
+  async updateFullText(): Promise<void> {
+    await this.withUpdate(() => this.doUpdateFullText());
+  }
+
+  private async doUpdateFullText(): Promise<[string, void]> {
+    const result = await this.webSocketClient.send({
+      resource: this.resourceName,
+      serviceType: 'update',
+      fullText: this.store.state.doc.sliceString(0),
+    });
+    const { stateId } = documentStateResult.parse(result);
+    return [stateId, undefined];
+  }
+
+  /**
+   * Makes sure that the document state on the server reflects recent
+   * local changes.
+   *
+   * Performs either an update with delta text or a full text update if needed.
+   * If there are not local dirty changes, the promise resolves immediately.
+   *
+   * @return a promise resolving when the update is completed
+   */
+  async update(): Promise<void> {
+    await this.prepareForDeltaUpdate();
+    const delta = this.computeDelta();
+    if (delta === null) {
+      return;
+    }
+    log.trace('Editor delta', delta);
+    await this.withUpdate(async () => {
+      const result = await this.webSocketClient.send({
+        resource: this.resourceName,
+        serviceType: 'update',
+        requiredStateId: this.xtextStateId,
+        ...delta,
+      });
+      const parsedDocumentStateResult = documentStateResult.safeParse(result);
+      if (parsedDocumentStateResult.success) {
+        return [parsedDocumentStateResult.data.stateId, undefined];
+      }
+      if (isConflictResult(result, 'invalidStateId')) {
+        return this.doFallbackToUpdateFullText();
+      }
+      throw parsedDocumentStateResult.error;
+    });
+  }
+
+  private doFallbackToUpdateFullText() {
+    if (this.pendingUpdate === null) {
+      throw new Error('Only a pending update can be extended');
+    }
+    log.warn('Delta update failed, performing full text update');
+    this.xtextStateId = null;
+    this.pendingUpdate = this.pendingUpdate.compose(this.dirtyChanges);
+    this.dirtyChanges = this.newEmptyChangeSet();
+    return this.doUpdateFullText();
+  }
+
+  async fetchContentAssist(
+    params: Record<string, unknown>,
+    signal: IAbortSignal,
+  ): Promise<ContentAssistEntry[]> {
+    await this.prepareForDeltaUpdate();
+    if (signal.aborted) {
+      return [];
+    }
+    const delta = this.computeDelta();
+    if (delta !== null) {
+      log.trace('Editor delta', delta);
+      const entries = await this.withUpdate(async () => {
+        const result = await this.webSocketClient.send({
+          ...params,
+          requiredStateId: this.xtextStateId,
+          ...delta,
+        });
+        const parsedContentAssistResult = contentAssistResult.safeParse(result);
+        if (parsedContentAssistResult.success) {
+          const { stateId, entries: resultEntries } = parsedContentAssistResult.data;
+          return [stateId, resultEntries];
+        }
+        if (isConflictResult(result, 'invalidStateId')) {
+          log.warn('Server state invalid during content assist');
+          const [newStateId] = await this.doFallbackToUpdateFullText();
+          // We must finish this state update transaction to prepare for any push events
+          // before querying for content assist, so we just return `null` and will query
+          // the content assist service later.
+          return [newStateId, null];
+        }
+        throw parsedContentAssistResult.error;
+      });
+      if (entries !== null) {
+        return entries;
+      }
+      if (signal.aborted) {
+        return [];
+      }
+    }
+    // Poscondition of `prepareForDeltaUpdate`: `xtextStateId !== null`
+    return this.doFetchContentAssist(params, this.xtextStateId as string);
+  }
+
+  private async doFetchContentAssist(params: Record<string, unknown>, expectedStateId: string) {
+    const result = await this.webSocketClient.send({
+      ...params,
+      requiredStateId: expectedStateId,
+    });
+    const { stateId, entries } = contentAssistResult.parse(result);
+    if (stateId !== expectedStateId) {
+      throw new Error(`Unexpected state id, expected: ${expectedStateId} got: ${stateId}`);
+    }
+    return entries;
+  }
+
+  async formatText(): Promise<void> {
+    await this.update();
+    let { from, to } = this.store.state.selection.main;
+    if (to <= from) {
+      from = 0;
+      to = this.store.state.doc.length;
+    }
+    log.debug('Formatting from', from, 'to', to);
+    await this.withUpdate(async () => {
+      const result = await this.webSocketClient.send({
+        resource: this.resourceName,
+        serviceType: 'format',
+        selectionStart: from,
+        selectionEnd: to,
+      });
+      const { stateId, formattedText } = formattingResult.parse(result);
+      this.applyBeforeDirtyChanges({
+        from,
+        to,
+        insert: formattedText,
+      });
+      return [stateId, null];
+    });
+  }
+
+  private computeDelta() {
+    if (this.dirtyChanges.empty) {
+      return null;
+    }
+    let minFromA = Number.MAX_SAFE_INTEGER;
+    let maxToA = 0;
+    let minFromB = Number.MAX_SAFE_INTEGER;
+    let maxToB = 0;
+    this.dirtyChanges.iterChangedRanges((fromA, toA, fromB, toB) => {
+      minFromA = Math.min(minFromA, fromA);
+      maxToA = Math.max(maxToA, toA);
+      minFromB = Math.min(minFromB, fromB);
+      maxToB = Math.max(maxToB, toB);
+    });
+    return {
+      deltaOffset: minFromA,
+      deltaReplaceLength: maxToA - minFromA,
+      deltaText: this.store.state.doc.sliceString(minFromB, maxToB),
+    };
+  }
+
+  private applyBeforeDirtyChanges(changeSpec: ChangeSpec) {
+    const pendingChanges = this.pendingUpdate?.compose(this.dirtyChanges) || this.dirtyChanges;
+    const revertChanges = pendingChanges.invert(this.store.state.doc);
+    const applyBefore = ChangeSet.of(changeSpec, revertChanges.newLength);
+    const redoChanges = pendingChanges.map(applyBefore.desc);
+    const changeSet = revertChanges.compose(applyBefore).compose(redoChanges);
+    this.store.dispatch({
+      changes: changeSet,
+      effects: [
+        setDirtyChanges.of(redoChanges),
+      ],
+    });
+  }
+
+  /**
+   * Executes an asynchronous callback that updates the state on the server.
+   *
+   * Ensures that updates happen sequentially and manages `pendingUpdate`
+   * and `dirtyChanges` to reflect changes being synchronized to the server
+   * and not yet synchronized to the server, respectively.
+   *
+   * Optionally, `callback` may return a second value that is retured by this function.
+   *
+   * Once the remote procedure call to update the server state finishes
+   * and returns the new `stateId`, `callback` must return _immediately_
+   * to ensure that the local `stateId` is updated likewise to be able to handle
+   * push messages referring to the new `stateId` from the server.
+   * If additional work is needed to compute the second value in some cases,
+   * use `T | null` instead of `T` as a return type and signal the need for additional
+   * computations by returning `null`. Thus additional computations can be performed
+   * outside of the critical section.
+   *
+   * @param callback the asynchronous callback that updates the server state
+   * @return a promise resolving to the second value returned by `callback`
+   */
+  private async withUpdate<T>(callback: () => Promise<[string, T]>): Promise<T> {
+    if (this.pendingUpdate !== null) {
+      throw new Error('Another update is pending, will not perform update');
+    }
+    this.pendingUpdate = this.dirtyChanges;
+    this.dirtyChanges = this.newEmptyChangeSet();
+    let newStateId: string | null = null;
+    try {
+      let result: T;
+      [newStateId, result] = await callback();
+      this.xtextStateId = newStateId;
+      this.pendingUpdate = null;
+      this.updatedCondition.notifyAll();
+      return result;
+    } catch (e) {
+      log.error('Error while update', e);
+      if (this.pendingUpdate === null) {
+        log.error('pendingUpdate was cleared during update');
+      } else {
+        this.dirtyChanges = this.pendingUpdate.compose(this.dirtyChanges);
+      }
+      this.pendingUpdate = null;
+      this.webSocketClient.forceReconnectOnError();
+      this.updatedCondition.rejectAll(e);
+      throw e;
+    }
+  }
+
+  /**
+   * Ensures that there is some state available on the server (`xtextStateId`)
+   * and that there is not pending update.
+   *
+   * After this function resolves, a delta text update is possible.
+   *
+   * @return a promise resolving when there is a valid state id but no pending update
+   */
+  private async prepareForDeltaUpdate() {
+    // If no update is pending, but the full text hasn't been uploaded to the server yet,
+    // we must start a full text upload.
+    if (this.pendingUpdate === null && this.xtextStateId === null) {
+      await this.updateFullText();
+    }
+    await this.updatedCondition.waitFor();
+  }
+}
diff --git a/subprojects/language-web/src/main/js/xtext/ValidationService.ts b/subprojects/language-web/src/main/js/xtext/ValidationService.ts
new file mode 100644
index 00000000..ff7d3700
--- /dev/null
+++ b/subprojects/language-web/src/main/js/xtext/ValidationService.ts
@@ -0,0 +1,39 @@
+import type { Diagnostic } from '@codemirror/lint';
+
+import type { EditorStore } from '../editor/EditorStore';
+import type { UpdateService } from './UpdateService';
+import { validationResult } from './xtextServiceResults';
+
+export class ValidationService {
+  private readonly store: EditorStore;
+
+  private readonly updateService: UpdateService;
+
+  constructor(store: EditorStore, updateService: UpdateService) {
+    this.store = store;
+    this.updateService = updateService;
+  }
+
+  onPush(push: unknown): void {
+    const { issues } = validationResult.parse(push);
+    const allChanges = this.updateService.computeChangesSinceLastUpdate();
+    const diagnostics: Diagnostic[] = [];
+    issues.forEach(({
+      offset,
+      length,
+      severity,
+      description,
+    }) => {
+      if (severity === 'ignore') {
+        return;
+      }
+      diagnostics.push({
+        from: allChanges.mapPos(offset),
+        to: allChanges.mapPos(offset + length),
+        severity,
+        message: description,
+      });
+    });
+    this.store.updateDiagnostics(diagnostics);
+  }
+}
diff --git a/subprojects/language-web/src/main/js/xtext/XtextClient.ts b/subprojects/language-web/src/main/js/xtext/XtextClient.ts
new file mode 100644
index 00000000..0898e725
--- /dev/null
+++ b/subprojects/language-web/src/main/js/xtext/XtextClient.ts
@@ -0,0 +1,86 @@
+import type {
+  CompletionContext,
+  CompletionResult,
+} from '@codemirror/autocomplete';
+import type { Transaction } from '@codemirror/state';
+
+import type { EditorStore } from '../editor/EditorStore';
+import { ContentAssistService } from './ContentAssistService';
+import { HighlightingService } from './HighlightingService';
+import { OccurrencesService } from './OccurrencesService';
+import { UpdateService } from './UpdateService';
+import { getLogger } from '../utils/logger';
+import { ValidationService } from './ValidationService';
+import { XtextWebSocketClient } from './XtextWebSocketClient';
+import { XtextWebPushService } from './xtextMessages';
+
+const log = getLogger('xtext.XtextClient');
+
+export class XtextClient {
+  private readonly webSocketClient: XtextWebSocketClient;
+
+  private readonly updateService: UpdateService;
+
+  private readonly contentAssistService: ContentAssistService;
+
+  private readonly highlightingService: HighlightingService;
+
+  private readonly validationService: ValidationService;
+
+  private readonly occurrencesService: OccurrencesService;
+
+  constructor(store: EditorStore) {
+    this.webSocketClient = new XtextWebSocketClient(
+      () => this.updateService.onReconnect(),
+      (resource, stateId, service, push) => this.onPush(resource, stateId, service, push),
+    );
+    this.updateService = new UpdateService(store, this.webSocketClient);
+    this.contentAssistService = new ContentAssistService(this.updateService);
+    this.highlightingService = new HighlightingService(store, this.updateService);
+    this.validationService = new ValidationService(store, this.updateService);
+    this.occurrencesService = new OccurrencesService(
+      store,
+      this.webSocketClient,
+      this.updateService,
+    );
+  }
+
+  onTransaction(transaction: Transaction): void {
+    // `ContentAssistService.prototype.onTransaction` needs the dirty change desc
+    // _before_ the current edit, so we call it before `updateService`.
+    this.contentAssistService.onTransaction(transaction);
+    this.updateService.onTransaction(transaction);
+    this.occurrencesService.onTransaction(transaction);
+  }
+
+  private onPush(resource: string, stateId: string, service: XtextWebPushService, push: unknown) {
+    const { resourceName, xtextStateId } = this.updateService;
+    if (resource !== resourceName) {
+      log.error('Unknown resource name: expected:', resourceName, 'got:', resource);
+      return;
+    }
+    if (stateId !== xtextStateId) {
+      log.error('Unexpected xtext state id: expected:', xtextStateId, 'got:', stateId);
+      // The current push message might be stale (referring to a previous state),
+      // so this is not neccessarily an error and there is no need to force-reconnect.
+      return;
+    }
+    switch (service) {
+      case 'highlight':
+        this.highlightingService.onPush(push);
+        return;
+      case 'validate':
+        this.validationService.onPush(push);
+    }
+  }
+
+  contentAssist(context: CompletionContext): Promise<CompletionResult> {
+    return this.contentAssistService.contentAssist(context);
+  }
+
+  formatText(): void {
+    this.updateService.formatText().catch((e) => {
+      log.error('Error while formatting text', e);
+    });
+  }
+}
diff --git a/subprojects/language-web/src/main/js/xtext/XtextWebSocketClient.ts b/subprojects/language-web/src/main/js/xtext/XtextWebSocketClient.ts
new file mode 100644
index 00000000..2ce20a54
--- /dev/null
+++ b/subprojects/language-web/src/main/js/xtext/XtextWebSocketClient.ts
@@ -0,0 +1,362 @@
+import { nanoid } from 'nanoid';
+
+import { getLogger } from '../utils/logger';
+import { PendingTask } from '../utils/PendingTask';
+import { Timer } from '../utils/Timer';
+import {
+  xtextWebErrorResponse,
+  XtextWebRequest,
+  xtextWebOkResponse,
+  xtextWebPushMessage,
+  XtextWebPushService,
+} from './xtextMessages';
+import { pongResult } from './xtextServiceResults';
+
+const XTEXT_SUBPROTOCOL_V1 = 'tools.refinery.language.web.xtext.v1';
+
+const WEBSOCKET_CLOSE_OK = 1000;
+
+const RECONNECT_DELAY_MS = [200, 1000, 5000, 30_000];
+
+const MAX_RECONNECT_DELAY_MS = RECONNECT_DELAY_MS[RECONNECT_DELAY_MS.length - 1];
+
+const BACKGROUND_IDLE_TIMEOUT_MS = 5 * 60 * 1000;
+
+const PING_TIMEOUT_MS = 10 * 1000;
+
+const REQUEST_TIMEOUT_MS = 1000;
+
+const log = getLogger('xtext.XtextWebSocketClient');
+
+export type ReconnectHandler = () => void;
+
+export type PushHandler = (
+  resourceId: string,
+  stateId: string,
+  service: XtextWebPushService,
+  data: unknown,
+) => void;
+
+enum State {
+  Initial,
+  Opening,
+  TabVisible,
+  TabHiddenIdle,
+  TabHiddenWaiting,
+  Error,
+  TimedOut,
+}
+
+export class XtextWebSocketClient {
+  private nextMessageId = 0;
+
+  private connection!: WebSocket;
+
+  private readonly pendingRequests = new Map<string, PendingTask<unknown>>();
+
+  private readonly onReconnect: ReconnectHandler;
+
+  private readonly onPush: PushHandler;
+
+  private state = State.Initial;
+
+  private reconnectTryCount = 0;
+
+  private readonly idleTimer = new Timer(() => {
+    this.handleIdleTimeout();
+  }, BACKGROUND_IDLE_TIMEOUT_MS);
+
+  private readonly pingTimer = new Timer(() => {
+    this.sendPing();
+  }, PING_TIMEOUT_MS);
+
+  private readonly reconnectTimer = new Timer(() => {
+    this.handleReconnect();
+  });
+
+  constructor(onReconnect: ReconnectHandler, onPush: PushHandler) {
+    this.onReconnect = onReconnect;
+    this.onPush = onPush;
+    document.addEventListener('visibilitychange', () => {
+      this.handleVisibilityChange();
+    });
+    this.reconnect();
+  }
+
+  private get isLogicallyClosed(): boolean {
+    return this.state === State.Error || this.state === State.TimedOut;
+  }
+
+  get isOpen(): boolean {
+    return this.state === State.TabVisible
+      || this.state === State.TabHiddenIdle
+      || this.state === State.TabHiddenWaiting;
+  }
+
+  private reconnect() {
+    if (this.isOpen || this.state === State.Opening) {
+      log.error('Trying to reconnect from', this.state);
+      return;
+    }
+    this.state = State.Opening;
+    const webSocketServer = window.origin.replace(/^http/, 'ws');
+    const webSocketUrl = `${webSocketServer}/xtext-service`;
+    this.connection = new WebSocket(webSocketUrl, XTEXT_SUBPROTOCOL_V1);
+    this.connection.addEventListener('open', () => {
+      if (this.connection.protocol !== XTEXT_SUBPROTOCOL_V1) {
+        log.error('Unknown subprotocol', this.connection.protocol, 'selected by server');
+        this.forceReconnectOnError();
+      }
+      if (document.visibilityState === 'hidden') {
+        this.handleTabHidden();
+      } else {
+        this.handleTabVisibleConnected();
+      }
+      log.info('Connected to websocket');
+      this.nextMessageId = 0;
+      this.reconnectTryCount = 0;
+      this.pingTimer.schedule();
+      this.onReconnect();
+    });
+    this.connection.addEventListener('error', (event) => {
+      log.error('Unexpected websocket error', event);
+      this.forceReconnectOnError();
+    });
+    this.connection.addEventListener('message', (event) => {
+      this.handleMessage(event.data);
+    });
+    this.connection.addEventListener('close', (event) => {
+      if (this.isLogicallyClosed && event.code === WEBSOCKET_CLOSE_OK
+        && this.pendingRequests.size === 0) {
+        log.info('Websocket closed');
+        return;
+      }
+      log.error('Websocket closed unexpectedly', event.code, event.reason);
+      this.forceReconnectOnError();
+    });
+  }
+
+  private handleVisibilityChange() {
+    if (document.visibilityState === 'hidden') {
+      if (this.state === State.TabVisible) {
+        this.handleTabHidden();
+      }
+      return;
+    }
+    this.idleTimer.cancel();
+    if (this.state === State.TabHiddenIdle || this.state === State.TabHiddenWaiting) {
+      this.handleTabVisibleConnected();
+      return;
+    }
+    if (this.state === State.TimedOut) {
+      this.reconnect();
+    }
+  }
+
+  private handleTabHidden() {
+    log.debug('Tab hidden while websocket is connected');
+    this.state = State.TabHiddenIdle;
+    this.idleTimer.schedule();
+  }
+
+  private handleTabVisibleConnected() {
+    log.debug('Tab visible while websocket is connected');
+    this.state = State.TabVisible;
+  }
+
+  private handleIdleTimeout() {
+    log.trace('Waiting for pending tasks before disconnect');
+    if (this.state === State.TabHiddenIdle) {
+      this.state = State.TabHiddenWaiting;
+      this.handleWaitingForDisconnect();
+    }
+  }
+
+  private handleWaitingForDisconnect() {
+    if (this.state !== State.TabHiddenWaiting) {
+      return;
+    }
+    const pending = this.pendingRequests.size;
+    if (pending === 0) {
+      log.info('Closing idle websocket');
+      this.state = State.TimedOut;
+      this.closeConnection(1000, 'idle timeout');
+      return;
+    }
+    log.info('Waiting for', pending, 'pending requests before closing websocket');
+  }
+
+  private sendPing() {
+    if (!this.isOpen) {
+      return;
+    }
+    const ping = nanoid();
+    log.trace('Ping', ping);
+    this.send({ ping }).then((result) => {
+      const parsedPongResult = pongResult.safeParse(result);
+      if (parsedPongResult.success && parsedPongResult.data.pong === ping) {
+        log.trace('Pong', ping);
+        this.pingTimer.schedule();
+      } else {
+        log.error('Invalid pong:', parsedPongResult, 'expected:', ping);
+        this.forceReconnectOnError();
+      }
+    }).catch((error) => {
+      log.error('Error while waiting for ping', error);
+      this.forceReconnectOnError();
+    });
+  }
+
+  send(request: unknown): Promise<unknown> {
+    if (!this.isOpen) {
+      throw new Error('Not open');
+    }
+    const messageId = this.nextMessageId.toString(16);
+    if (messageId in this.pendingRequests) {
+      log.error('Message id wraparound still pending', messageId);
+      this.rejectRequest(messageId, new Error('Message id wraparound'));
+    }
+    if (this.nextMessageId >= Number.MAX_SAFE_INTEGER) {
+      this.nextMessageId = 0;
+    } else {
+      this.nextMessageId += 1;
+    }
+    const message = JSON.stringify({
+      id: messageId,
+      request,
+    } as XtextWebRequest);
+    log.trace('Sending message', message);
+    return new Promise((resolve, reject) => {
+      const task = new PendingTask(resolve, reject, REQUEST_TIMEOUT_MS, () => {
+        this.removePendingRequest(messageId);
+      });
+      this.pendingRequests.set(messageId, task);
+      this.connection.send(message);
+    });
+  }
+
+  private handleMessage(messageStr: unknown) {
+    if (typeof messageStr !== 'string') {
+      log.error('Unexpected binary message', messageStr);
+      this.forceReconnectOnError();
+      return;
+    }
+    log.trace('Incoming websocket message', messageStr);
+    let message: unknown;
+    try {
+      message = JSON.parse(messageStr);
+    } catch (error) {
+      log.error('Json parse error', error);
+      this.forceReconnectOnError();
+      return;
+    }
+    const okResponse = xtextWebOkResponse.safeParse(message);
+    if (okResponse.success) {
+      const { id, response } = okResponse.data;
+      this.resolveRequest(id, response);
+      return;
+    }
+    const errorResponse = xtextWebErrorResponse.safeParse(message);
+    if (errorResponse.success) {
+      const { id, error, message: errorMessage } = errorResponse.data;
+      this.rejectRequest(id, new Error(`${error} error: ${errorMessage}`));
+      if (error === 'server') {
+        log.error('Reconnecting due to server error: ', errorMessage);
+        this.forceReconnectOnError();
+      }
+      return;
+    }
+    const pushMessage = xtextWebPushMessage.safeParse(message);
+    if (pushMessage.success) {
+      const {
+        resource,
+        stateId,
+        service,
+        push,
+      } = pushMessage.data;
+      this.onPush(resource, stateId, service, push);
+    } else {
+      log.error(
+        'Unexpected websocket message:',
+        message,
+        'not ok response because:',
+        okResponse.error,
+        'not error response because:',
+        errorResponse.error,
+        'not push message because:',
+        pushMessage.error,
+      );
+      this.forceReconnectOnError();
+    }
+  }
+
+  private resolveRequest(messageId: string, value: unknown) {
+    const pendingRequest = this.pendingRequests.get(messageId);
+    if (pendingRequest) {
+      pendingRequest.resolve(value);
+      this.removePendingRequest(messageId);
+      return;
+    }
+    log.error('Trying to resolve unknown request', messageId, 'with', value);
+  }
+
+  private rejectRequest(messageId: string, reason?: unknown) {
+    const pendingRequest = this.pendingRequests.get(messageId);
+    if (pendingRequest) {
+      pendingRequest.reject(reason);
+      this.removePendingRequest(messageId);
+      return;
+    }
+    log.error('Trying to reject unknown request', messageId, 'with', reason);
+  }
+
+  private removePendingRequest(messageId: string) {
+    this.pendingRequests.delete(messageId);
+    this.handleWaitingForDisconnect();
+  }
+
+  forceReconnectOnError(): void {
+    if (this.isLogicallyClosed) {
+      return;
+    }
+    this.abortPendingRequests();
+    this.closeConnection(1000, 'reconnecting due to error');
+    log.error('Reconnecting after delay due to error');
+    this.handleErrorState();
+  }
+
+  private abortPendingRequests() {
+    this.pendingRequests.forEach((request) => {
+      request.reject(new Error('Websocket disconnect'));
+    });
+    this.pendingRequests.clear();
+  }
+
+  private closeConnection(code: number, reason: string) {
+    this.pingTimer.cancel();
+    const { readyState } = this.connection;
+    if (readyState !== WebSocket.CLOSING && readyState !== WebSocket.CLOSED) {
+      this.connection.close(code, reason);
+    }
+  }
+
+  private handleErrorState() {
+    this.state = State.Error;
+    this.reconnectTryCount += 1;
+    const delay = RECONNECT_DELAY_MS[this.reconnectTryCount - 1] || MAX_RECONNECT_DELAY_MS;
+    log.info('Reconnecting in', delay, 'ms');
+    this.reconnectTimer.schedule(delay);
+  }
+
+  private handleReconnect() {
+    if (this.state !== State.Error) {
+      log.error('Unexpected reconnect in', this.state);
+      return;
+    }
+    if (document.visibilityState === 'hidden') {
+      this.state = State.TimedOut;
+    } else {
+      this.reconnect();
+    }
+  }
+}
diff --git a/subprojects/language-web/src/main/js/xtext/xtextMessages.ts b/subprojects/language-web/src/main/js/xtext/xtextMessages.ts
new file mode 100644
index 00000000..c4305fcf
--- /dev/null
+++ b/subprojects/language-web/src/main/js/xtext/xtextMessages.ts
@@ -0,0 +1,40 @@
+import { z } from 'zod';
+
+export const xtextWebRequest = z.object({
+  id: z.string().nonempty(),
+  request: z.unknown(),
+});
+
+export type XtextWebRequest = z.infer<typeof xtextWebRequest>;
+
+export const xtextWebOkResponse = z.object({
+  id: z.string().nonempty(),
+  response: z.unknown(),
+});
+
+export type XtextWebOkResponse = z.infer<typeof xtextWebOkResponse>;
+
+export const xtextWebErrorKind = z.enum(['request', 'server']);
+
+export type XtextWebErrorKind = z.infer<typeof xtextWebErrorKind>;
+
+export const xtextWebErrorResponse = z.object({
+  id: z.string().nonempty(),
+  error: xtextWebErrorKind,
+  message: z.string(),
+});
+
+export type XtextWebErrorResponse = z.infer<typeof xtextWebErrorResponse>;
+
+export const xtextWebPushService = z.enum(['highlight', 'validate']);
+
+export type XtextWebPushService = z.infer<typeof xtextWebPushService>;
+
+export const xtextWebPushMessage = z.object({
+  resource: z.string().nonempty(),
+  stateId: z.string().nonempty(),
+  service: xtextWebPushService,
+  push: z.unknown(),
+});
+
+export type XtextWebPushMessage = z.infer<typeof xtextWebPushMessage>;
diff --git a/subprojects/language-web/src/main/js/xtext/xtextServiceResults.ts b/subprojects/language-web/src/main/js/xtext/xtextServiceResults.ts
new file mode 100644
index 00000000..f79b059c
--- /dev/null
+++ b/subprojects/language-web/src/main/js/xtext/xtextServiceResults.ts
@@ -0,0 +1,112 @@
+import { z } from 'zod';
+
+export const pongResult = z.object({
+  pong: z.string().nonempty(),
+});
+
+export type PongResult = z.infer<typeof pongResult>;
+
+export const documentStateResult = z.object({
+  stateId: z.string().nonempty(),
+});
+
+export type DocumentStateResult = z.infer<typeof documentStateResult>;
+
+export const conflict = z.enum(['invalidStateId', 'canceled']);
+
+export type Conflict = z.infer<typeof conflict>;
+
+export const serviceConflictResult = z.object({
+  conflict,
+});
+
+export type ServiceConflictResult = z.infer<typeof serviceConflictResult>;
+
+export function isConflictResult(result: unknown, conflictType: Conflict): boolean {
+  const parsedConflictResult = serviceConflictResult.safeParse(result);
+  return parsedConflictResult.success && parsedConflictResult.data.conflict === conflictType;
+}
+
+export const severity = z.enum(['error', 'warning', 'info', 'ignore']);
+
+export type Severity = z.infer<typeof severity>;
+
+export const issue = z.object({
+  description: z.string().nonempty(),
+  severity,
+  line: z.number().int(),
+  column: z.number().int().nonnegative(),
+  offset: z.number().int().nonnegative(),
+  length: z.number().int().nonnegative(),
+});
+
+export type Issue = z.infer<typeof issue>;
+
+export const validationResult = z.object({
+  issues: issue.array(),
+});
+
+export type ValidationResult = z.infer<typeof validationResult>;
+
+export const replaceRegion = z.object({
+  offset: z.number().int().nonnegative(),
+  length: z.number().int().nonnegative(),
+  text: z.string(),
+});
+
+export type ReplaceRegion = z.infer<typeof replaceRegion>;
+
+export const textRegion = z.object({
+  offset: z.number().int().nonnegative(),
+  length: z.number().int().nonnegative(),
+});
+
+export type TextRegion = z.infer<typeof textRegion>;
+
+export const contentAssistEntry = z.object({
+  prefix: z.string(),
+  proposal: z.string().nonempty(),
+  label: z.string().optional(),
+  description: z.string().nonempty().optional(),
+  documentation: z.string().nonempty().optional(),
+  escapePosition: z.number().int().nonnegative().optional(),
+  textReplacements: replaceRegion.array(),
+  editPositions: textRegion.array(),
+  kind: z.string().nonempty(),
+});
+
+export type ContentAssistEntry = z.infer<typeof contentAssistEntry>;
+
+export const contentAssistResult = documentStateResult.extend({
+  entries: contentAssistEntry.array(),
+});
+
+export type ContentAssistResult = z.infer<typeof contentAssistResult>;
+
+export const highlightingRegion = z.object({
+  offset: z.number().int().nonnegative(),
+  length: z.number().int().nonnegative(),
+  styleClasses: z.string().nonempty().array(),
+});
+
+export type HighlightingRegion = z.infer<typeof highlightingRegion>;
+
+export const highlightingResult = z.object({
+  regions: highlightingRegion.array(),
+});
+
+export type HighlightingResult = z.infer<typeof highlightingResult>;
+
+export const occurrencesResult = documentStateResult.extend({
+  writeRegions: textRegion.array(),
+  readRegions: textRegion.array(),
+});
+
+export type OccurrencesResult = z.infer<typeof occurrencesResult>;
+
+export const formattingResult = documentStateResult.extend({
+  formattedText: z.string(),
+  replaceRegion: textRegion,
+});
+
+export type FormattingResult = z.infer<typeof formattingResult>;
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java
new file mode 100644
index 00000000..a26ce040
--- /dev/null
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java
@@ -0,0 +1,204 @@
+package tools.refinery.language.web;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.startsWith;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+
+import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.websocket.api.Session;
+import org.eclipse.jetty.websocket.api.StatusCode;
+import org.eclipse.jetty.websocket.api.annotations.WebSocket;
+import org.eclipse.jetty.websocket.api.exceptions.UpgradeException;
+import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
+import org.eclipse.jetty.websocket.client.WebSocketClient;
+import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
+import org.eclipse.xtext.testing.GlobalRegistries;
+import org.eclipse.xtext.testing.GlobalRegistries.GlobalStateMemento;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import tools.refinery.language.web.tests.WebSocketIntegrationTestClient;
+import tools.refinery.language.web.xtext.servlet.XtextStatusCode;
+import tools.refinery.language.web.xtext.servlet.XtextWebSocketServlet;
+
+class ProblemWebSocketServletIntegrationTest {
+        private static int SERVER_PORT = 28080;
+
+        private static String SERVLET_URI = "/xtext-service";
+
+        private GlobalStateMemento stateBeforeInjectorCreation;
+
+        private Server server;
+
+        private WebSocketClient client;
+
+        @BeforeEach
+        void beforeEach() throws Exception {
+                stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
+                client = new WebSocketClient();
+                client.start();
+        }
+
+        @AfterEach
+        void afterEach() throws Exception {
+                client.stop();
+                client = null;
+                if (server != null) {
+                        server.stop();
+                        server = null;
+                }
+                stateBeforeInjectorCreation.restoreGlobalState();
+                stateBeforeInjectorCreation = null;
+        }
+
+        @Test
+        void updateTest() {
+                startServer(null);
+                var clientSocket = new UpdateTestClient();
+                var session = connect(clientSocket, null, XtextWebSocketServlet.XTEXT_SUBPROTOCOL_V1);
+                assertThat(session.getUpgradeResponse().getAcceptedSubProtocol(),
+                                equalTo(XtextWebSocketServlet.XTEXT_SUBPROTOCOL_V1));
+                clientSocket.waitForTestResult();
+                assertThat(clientSocket.getCloseStatusCode(), equalTo(StatusCode.NORMAL));
+                var responses = clientSocket.getResponses();
+                assertThat(responses, hasSize(5));
+                assertThat(responses.get(0), equalTo("{\"id\":\"foo\",\"response\":{\"stateId\":\"-80000000\"}}"));
+                assertThat(responses.get(1), startsWith(
+                                "{\"resource\":\"test.problem\",\"stateId\":\"-80000000\",\"service\":\"highlight\",\"push\":{\"regions\":["));
+                assertThat(responses.get(2), equalTo(
+                                "{\"resource\":\"test.problem\",\"stateId\":\"-80000000\",\"service\":\"validate\",\"push\":{\"issues\":[]}}"));
+                assertThat(responses.get(3), equalTo("{\"id\":\"bar\",\"response\":{\"stateId\":\"-7fffffff\"}}"));
+                assertThat(responses.get(4), startsWith(
+                                "{\"resource\":\"test.problem\",\"stateId\":\"-7fffffff\",\"service\":\"highlight\",\"push\":{\"regions\":["));
+        }
+
+        @WebSocket
+        public static class UpdateTestClient extends WebSocketIntegrationTestClient {
+                @Override
+                protected void arrange(Session session, int responsesReceived) throws IOException {
+                        switch (responsesReceived) {
+                        case 0 -> session.getRemote().sendString(
+                                        "{\"id\":\"foo\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\",\"fullText\":\"class Person.\n\"}}");
+                        case 3 -> session.getRemote().sendString(
+                                        "{\"id\":\"bar\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\",\"requiredStateId\":\"-80000000\",\"deltaText\":\"indiv q.\nnode(q).\n\",\"deltaOffset\":\"0\",\"deltaReplaceLength\":\"0\"}}");
+                        case 5 -> session.close();
+                        }
+                }
+        }
+
+        @Test
+        void badSubProtocolTest() {
+                startServer(null);
+                var clientSocket = new CloseImmediatelyTestClient();
+                var session = connect(clientSocket, null, "<invalid sub-protocol>");
+                assertThat(session.getUpgradeResponse().getAcceptedSubProtocol(), equalTo(null));
+                clientSocket.waitForTestResult();
+                assertThat(clientSocket.getCloseStatusCode(), equalTo(StatusCode.NORMAL));
+        }
+
+        @WebSocket
+        public static class CloseImmediatelyTestClient extends WebSocketIntegrationTestClient {
+                @Override
+                protected void arrange(Session session, int responsesReceived) throws IOException {
+                        session.close();
+                }
+        }
+
+        @Test
+        void subProtocolNegotiationTest() {
+                startServer(null);
+                var clientSocket = new CloseImmediatelyTestClient();
+                var session = connect(clientSocket, null, "<invalid sub-protocol>", XtextWebSocketServlet.XTEXT_SUBPROTOCOL_V1);
+                assertThat(session.getUpgradeResponse().getAcceptedSubProtocol(),
+                                equalTo(XtextWebSocketServlet.XTEXT_SUBPROTOCOL_V1));
+                clientSocket.waitForTestResult();
+                assertThat(clientSocket.getCloseStatusCode(), equalTo(StatusCode.NORMAL));
+        }
+
+        @Test
+        void invalidJsonTest() {
+                startServer(null);
+                var clientSocket = new InvalidJsonTestClient();
+                connect(clientSocket, null, XtextWebSocketServlet.XTEXT_SUBPROTOCOL_V1);
+                clientSocket.waitForTestResult();
+                assertThat(clientSocket.getCloseStatusCode(), equalTo(XtextStatusCode.INVALID_JSON));
+        }
+
+        @WebSocket
+        public static class InvalidJsonTestClient extends WebSocketIntegrationTestClient {
+                @Override
+                protected void arrange(Session session, int responsesReceived) throws IOException {
+                        session.getRemote().sendString("<invalid json>");
+                }
+        }
+
+        @ParameterizedTest(name = "Origin: {0}")
+        @ValueSource(strings = { "https://refinery.example", "https://refinery.example:443", "HTTPS://REFINERY.EXAMPLE" })
+        void validOriginTest(String origin) {
+                startServer("https://refinery.example;https://refinery.example:443");
+                var clientSocket = new CloseImmediatelyTestClient();
+                connect(clientSocket, origin, XtextWebSocketServlet.XTEXT_SUBPROTOCOL_V1);
+                clientSocket.waitForTestResult();
+                assertThat(clientSocket.getCloseStatusCode(), equalTo(StatusCode.NORMAL));
+        }
+
+        @Test
+        void invalidOriginTest() {
+                startServer("https://refinery.example;https://refinery.example:443");
+                var clientSocket = new CloseImmediatelyTestClient();
+                var exception = assertThrows(CompletionException.class,
+                                () -> connect(clientSocket, "https://invalid.example", XtextWebSocketServlet.XTEXT_SUBPROTOCOL_V1));
+                var innerException = exception.getCause();
+                assertThat(innerException, instanceOf(UpgradeException.class));
+                assertThat(((UpgradeException) innerException).getResponseStatusCode(), equalTo(HttpStatus.FORBIDDEN_403));
+        }
+
+        private void startServer(String allowedOrigins) {
+                server = new Server(new InetSocketAddress(SERVER_PORT));
+                var handler = new ServletContextHandler();
+                var holder = new ServletHolder(ProblemWebSocketServlet.class);
+                if (allowedOrigins != null) {
+                        holder.setInitParameter(ProblemWebSocketServlet.ALLOWED_ORIGINS_INIT_PARAM, allowedOrigins);
+                }
+                handler.addServlet(holder, SERVLET_URI);
+                JettyWebSocketServletContainerInitializer.configure(handler, null);
+                server.setHandler(handler);
+                try {
+                        server.start();
+                } catch (Exception e) {
+                        throw new RuntimeException("Failed to start websocket server");
+                }
+        }
+
+        private Session connect(Object webSocketClient, String origin, String... subProtocols) {
+                var upgradeRequest = new ClientUpgradeRequest();
+                if (origin != null) {
+                        upgradeRequest.setHeader(HttpHeader.ORIGIN.name(), origin);
+                }
+                upgradeRequest.setSubProtocols(subProtocols);
+                CompletableFuture<Session> sessionFuture;
+                try {
+                        sessionFuture = client.connect(webSocketClient, URI.create("ws://localhost:" + SERVER_PORT + SERVLET_URI),
+                                        upgradeRequest);
+                } catch (IOException e) {
+                        throw new AssertionError("Unexpected exception while connection to websocket", e);
+                }
+                return sessionFuture.join();
+        }
+}
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java
new file mode 100644
index 00000000..b70d0ed5
--- /dev/null
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java
@@ -0,0 +1,42 @@
+package tools.refinery.language.web.tests;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+
+import org.eclipse.xtext.ide.ExecutorServiceProvider;
+
+import com.google.inject.Singleton;
+
+@Singleton
+public class AwaitTerminationExecutorServiceProvider extends ExecutorServiceProvider {
+        private List<RestartableCachedThreadPool> servicesToShutDown = new ArrayList<>();
+
+        @Override
+        protected ExecutorService createInstance(String key) {
+                var instance = new RestartableCachedThreadPool();
+                synchronized (servicesToShutDown) {
+                        servicesToShutDown.add(instance);
+                }
+                return instance;
+        }
+
+        public void waitForAllTasksToFinish() {
+                synchronized (servicesToShutDown) {
+                        for (var executorService : servicesToShutDown) {
+                                executorService.waitForAllTasksToFinish();
+                        }
+                }
+        }
+
+        @Override
+        public void dispose() {
+                super.dispose();
+                synchronized (servicesToShutDown) {
+                        for (var executorService : servicesToShutDown) {
+                                executorService.waitForTermination();
+                        }
+                        servicesToShutDown.clear();
+                }
+        }
+}
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/ProblemWebInjectorProvider.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/ProblemWebInjectorProvider.java
new file mode 100644
index 00000000..43c12faa
--- /dev/null
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/ProblemWebInjectorProvider.java
@@ -0,0 +1,47 @@
+package tools.refinery.language.web.tests;
+
+import org.eclipse.xtext.ide.ExecutorServiceProvider;
+import org.eclipse.xtext.util.DisposableRegistry;
+import org.eclipse.xtext.util.Modules2;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+import tools.refinery.language.ide.ProblemIdeModule;
+import tools.refinery.language.tests.ProblemInjectorProvider;
+import tools.refinery.language.web.ProblemWebModule;
+import tools.refinery.language.web.ProblemWebSetup;
+
+public class ProblemWebInjectorProvider extends ProblemInjectorProvider {
+
+        protected Injector internalCreateInjector() {
+                return new ProblemWebSetup() {
+                        @Override
+                        public Injector createInjector() {
+                                return Guice.createInjector(
+                                                Modules2.mixin(createRuntimeModule(), new ProblemIdeModule(), createWebModule()));
+                        }
+                }.createInjectorAndDoEMFRegistration();
+        }
+
+        protected ProblemWebModule createWebModule() {
+                // Await termination of the executor service to avoid race conditions between
+                // the tasks in the service and the {@link
+                // org.eclipse.xtext.testing.extensions.InjectionExtension}.
+                return new ProblemWebModule() {
+                        @SuppressWarnings("unused")
+                        public Class<? extends ExecutorServiceProvider> bindExecutorServiceProvider() {
+                                return AwaitTerminationExecutorServiceProvider.class;
+                        }
+                };
+        }
+
+        @Override
+        public void restoreRegistry() {
+                // Also make sure to dispose any IDisposable instances (that may depend on the
+                // global state) created by Xtext before restoring the global state.
+                var disposableRegistry = getInjector().getInstance(DisposableRegistry.class);
+                disposableRegistry.dispose();
+                super.restoreRegistry();
+        }
+}
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java
new file mode 100644
index 00000000..1468273d
--- /dev/null
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java
@@ -0,0 +1,109 @@
+package tools.refinery.language.web.tests;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RestartableCachedThreadPool implements ExecutorService {
+        private static final Logger LOG = LoggerFactory.getLogger(RestartableCachedThreadPool.class);
+        
+        private ExecutorService delegate;
+
+        public RestartableCachedThreadPool() {
+                delegate = createExecutorService();
+        }
+        
+        public void waitForAllTasksToFinish() {
+                delegate.shutdown();
+                waitForTermination();
+                delegate = createExecutorService();
+        }
+        
+        public void waitForTermination() {
+                try {
+                        delegate.awaitTermination(1, TimeUnit.SECONDS);
+                } catch (InterruptedException e) {
+                        LOG.warn("Interrupted while waiting for delegate executor to stop", e);
+                }
+        }
+        
+        protected ExecutorService createExecutorService() {
+                return Executors.newCachedThreadPool();
+        }
+        
+        @Override
+        public boolean awaitTermination(long arg0, TimeUnit arg1) throws InterruptedException {
+                return delegate.awaitTermination(arg0, arg1);
+        }
+
+        @Override
+        public void execute(Runnable arg0) {
+                delegate.execute(arg0);
+        }
+
+        @Override
+        public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> arg0, long arg1, TimeUnit arg2)
+                        throws InterruptedException {
+                return delegate.invokeAll(arg0, arg1, arg2);
+        }
+
+        @Override
+        public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> arg0) throws InterruptedException {
+                return delegate.invokeAll(arg0);
+        }
+
+        @Override
+        public <T> T invokeAny(Collection<? extends Callable<T>> arg0, long arg1, TimeUnit arg2)
+                        throws InterruptedException, ExecutionException, TimeoutException {
+                return delegate.invokeAny(arg0, arg1, arg2);
+        }
+
+        @Override
+        public <T> T invokeAny(Collection<? extends Callable<T>> arg0) throws InterruptedException, ExecutionException {
+                return delegate.invokeAny(arg0);
+        }
+
+        @Override
+        public boolean isShutdown() {
+                return delegate.isShutdown();
+        }
+
+        @Override
+        public boolean isTerminated() {
+                return delegate.isTerminated();
+        }
+
+        @Override
+        public void shutdown() {
+                delegate.shutdown();
+        }
+
+        @Override
+        public List<Runnable> shutdownNow() {
+                return delegate.shutdownNow();
+        }
+
+        @Override
+        public <T> Future<T> submit(Callable<T> arg0) {
+                return delegate.submit(arg0);
+        }
+
+        @Override
+        public <T> Future<T> submit(Runnable arg0, T arg1) {
+                return delegate.submit(arg0, arg1);
+        }
+
+        @Override
+        public Future<?> submit(Runnable arg0) {
+                return delegate.submit(arg0);
+        }
+}
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/WebSocketIntegrationTestClient.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/WebSocketIntegrationTestClient.java
new file mode 100644
index 00000000..49464d27
--- /dev/null
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/WebSocketIntegrationTestClient.java
@@ -0,0 +1,98 @@
+package tools.refinery.language.web.tests;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jetty.websocket.api.Session;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketError;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
+
+public abstract class WebSocketIntegrationTestClient {
+        private static long TIMEOUT_MILLIS = Duration.ofSeconds(1).toMillis();
+        
+        private boolean finished = false;
+
+        private Object lock = new Object();
+
+        private Throwable error;
+
+        private int closeStatusCode;
+
+        private List<String> responses = new ArrayList<>();
+        
+        public int getCloseStatusCode() {
+                return closeStatusCode;
+        }
+        
+        public List<String> getResponses() {
+                return responses;
+        }
+
+        @OnWebSocketConnect
+        public void onConnect(Session session) {
+                arrangeAndCatchErrors(session);
+        }
+        
+        private void arrangeAndCatchErrors(Session session) {
+                try {
+                        arrange(session, responses.size());
+                } catch (Exception e) {
+                        finishedWithError(e);
+                }
+        }
+        
+        protected abstract void arrange(Session session, int responsesReceived) throws IOException; 
+
+        @OnWebSocketClose
+        public void onClose(int statusCode, String reason) {
+                closeStatusCode = statusCode;
+                testFinished();
+        }
+
+        @OnWebSocketError
+        public void onError(Throwable error) {
+                finishedWithError(error);
+        }
+
+        @OnWebSocketMessage
+        public void onMessage(Session session, String message) {
+                responses.add(message);
+                arrangeAndCatchErrors(session);
+        }
+
+        private void finishedWithError(Throwable t) {
+                error = t;
+                testFinished();
+        }
+
+        private void testFinished() {
+                synchronized (lock) {
+                        finished = true;
+                        lock.notify();
+                }
+        }
+
+        public void waitForTestResult() {
+                synchronized (lock) {
+                        if (!finished) {
+                                try {
+                                        lock.wait(TIMEOUT_MILLIS);
+                                } catch (InterruptedException e) {
+                                        fail("Unexpected InterruptedException", e);
+                                }
+                        }
+                }
+                if (!finished) {
+                        fail("Test still not finished after timeout");
+                }
+                if (error != null) {
+                        fail("Unexpected exception in websocket thread", error);
+                }
+        }
+}
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java
new file mode 100644
index 00000000..5b8fedba
--- /dev/null
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java
@@ -0,0 +1,165 @@
+package tools.refinery.language.web.xtext.servlet;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasProperty;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.xtext.resource.IResourceServiceProvider;
+import org.eclipse.xtext.testing.InjectWith;
+import org.eclipse.xtext.testing.extensions.InjectionExtension;
+import org.eclipse.xtext.web.server.model.DocumentStateResult;
+import org.eclipse.xtext.web.server.syntaxcoloring.HighlightingResult;
+import org.eclipse.xtext.web.server.validation.ValidationResult;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.google.inject.Inject;
+
+import tools.refinery.language.web.tests.AwaitTerminationExecutorServiceProvider;
+import tools.refinery.language.web.tests.ProblemWebInjectorProvider;
+import tools.refinery.language.web.xtext.server.ResponseHandler;
+import tools.refinery.language.web.xtext.server.ResponseHandlerException;
+import tools.refinery.language.web.xtext.server.TransactionExecutor;
+import tools.refinery.language.web.xtext.server.message.XtextWebOkResponse;
+import tools.refinery.language.web.xtext.server.message.XtextWebRequest;
+import tools.refinery.language.web.xtext.server.message.XtextWebResponse;
+
+@ExtendWith(MockitoExtension.class)
+@ExtendWith(InjectionExtension.class)
+@InjectWith(ProblemWebInjectorProvider.class)
+class TransactionExecutorTest {
+        private static final String RESOURCE_NAME = "test.problem";
+
+        private static final String PROBLEM_CONTENT_TYPE = "application/x-tools.refinery.problem";
+
+        private static final String TEST_PROBLEM = """
+                        class Person {
+                                Person[0..*] friend opposite friend
+                        }
+
+                        friend(a, b).
+                        """;
+
+        private static final Map<String, String> UPDATE_FULL_TEXT_PARAMS = Map.of("resource", RESOURCE_NAME, "serviceType",
+                        "update", "fullText", TEST_PROBLEM);
+
+        @Inject
+        private IResourceServiceProvider.Registry resourceServiceProviderRegistry;
+
+        @Inject
+        private AwaitTerminationExecutorServiceProvider executorServices;
+
+        private TransactionExecutor transactionExecutor;
+
+        @BeforeEach
+        void beforeEach() {
+                transactionExecutor = new TransactionExecutor(new SimpleSession(), resourceServiceProviderRegistry);
+        }
+
+        @Test
+        void updateFullTextTest() throws ResponseHandlerException {
+                var captor = newCaptor();
+                var stateId = updateFullText(captor);
+                assertThatPrecomputedMessagesAreReceived(stateId, captor.getAllValues());
+        }
+
+        @Test
+        void updateDeltaTextHighlightAndValidationChange() throws ResponseHandlerException {
+                var stateId = updateFullText();
+                var responseHandler = sendRequestAndWaitForAllResponses(
+                                new XtextWebRequest("bar", Map.of("resource", RESOURCE_NAME, "serviceType", "update", "requiredStateId",
+                                                stateId, "deltaText", "individual q.\nnode(q).\n<invalid text>\n", "deltaOffset", "0", "deltaReplaceLength", "0")));
+
+                var captor = newCaptor();
+                verify(responseHandler, times(3)).onResponse(captor.capture());
+                var newStateId = getStateId("bar", captor.getAllValues().get(0));
+                assertThatPrecomputedMessagesAreReceived(newStateId, captor.getAllValues());
+        }
+
+        @Test
+        void updateDeltaTextHighlightChangeOnly() throws ResponseHandlerException {
+                var stateId = updateFullText();
+                var responseHandler = sendRequestAndWaitForAllResponses(
+                                new XtextWebRequest("bar", Map.of("resource", RESOURCE_NAME, "serviceType", "update", "requiredStateId",
+                                                stateId, "deltaText", "indiv q.\nnode(q).\n", "deltaOffset", "0", "deltaReplaceLength", "0")));
+
+                var captor = newCaptor();
+                verify(responseHandler, times(2)).onResponse(captor.capture());
+                var newStateId = getStateId("bar", captor.getAllValues().get(0));
+                assertHighlightingResponse(newStateId, captor.getAllValues().get(1));
+        }
+
+        @Test
+        void fullTextWithoutResourceTest() throws ResponseHandlerException {
+                var resourceServiceProvider = resourceServiceProviderRegistry
+                                .getResourceServiceProvider(URI.createFileURI(RESOURCE_NAME));
+                resourceServiceProviderRegistry.getContentTypeToFactoryMap().put(PROBLEM_CONTENT_TYPE, resourceServiceProvider);
+                var responseHandler = sendRequestAndWaitForAllResponses(new XtextWebRequest("foo",
+                                Map.of("contentType", PROBLEM_CONTENT_TYPE, "fullText", TEST_PROBLEM, "serviceType", "validate")));
+
+                var captor = newCaptor();
+                verify(responseHandler).onResponse(captor.capture());
+                var response = captor.getValue();
+                assertThat(response, hasProperty("id", equalTo("foo")));
+                assertThat(response, hasProperty("responseData", instanceOf(ValidationResult.class)));
+        }
+
+        private ArgumentCaptor<XtextWebResponse> newCaptor() {
+                return ArgumentCaptor.forClass(XtextWebResponse.class);
+        }
+
+        private String updateFullText() throws ResponseHandlerException {
+                return updateFullText(newCaptor());
+        }
+
+        private String updateFullText(ArgumentCaptor<XtextWebResponse> captor) throws ResponseHandlerException {
+                var responseHandler = sendRequestAndWaitForAllResponses(new XtextWebRequest("foo", UPDATE_FULL_TEXT_PARAMS));
+
+                verify(responseHandler, times(3)).onResponse(captor.capture());
+                return getStateId("foo", captor.getAllValues().get(0));
+        }
+
+        private ResponseHandler sendRequestAndWaitForAllResponses(XtextWebRequest request) throws ResponseHandlerException {
+                var responseHandler = mock(ResponseHandler.class);
+                transactionExecutor.setResponseHandler(responseHandler);
+                transactionExecutor.handleRequest(request);
+                executorServices.waitForAllTasksToFinish();
+                return responseHandler;
+        }
+
+        private String getStateId(String requestId, XtextWebResponse okResponse) {
+                assertThat(okResponse, hasProperty("id", equalTo(requestId)));
+                assertThat(okResponse, hasProperty("responseData", instanceOf(DocumentStateResult.class)));
+                return ((DocumentStateResult) ((XtextWebOkResponse) okResponse).getResponseData()).getStateId();
+        }
+
+        private void assertThatPrecomputedMessagesAreReceived(String stateId, List<XtextWebResponse> responses) {
+                assertHighlightingResponse(stateId, responses.get(1));
+                assertValidationResponse(stateId, responses.get(2));
+        }
+
+        private void assertHighlightingResponse(String stateId, XtextWebResponse highlightingResponse) {
+                assertThat(highlightingResponse, hasProperty("resourceId", equalTo(RESOURCE_NAME)));
+                assertThat(highlightingResponse, hasProperty("stateId", equalTo(stateId)));
+                assertThat(highlightingResponse, hasProperty("service", equalTo("highlight")));
+                assertThat(highlightingResponse, hasProperty("pushData", instanceOf(HighlightingResult.class)));
+        }
+
+        private void assertValidationResponse(String stateId, XtextWebResponse validationResponse) {
+                assertThat(validationResponse, hasProperty("resourceId", equalTo(RESOURCE_NAME)));
+                assertThat(validationResponse, hasProperty("stateId", equalTo(stateId)));
+                assertThat(validationResponse, hasProperty("service", equalTo("validate")));
+                assertThat(validationResponse, hasProperty("pushData", instanceOf(ValidationResult.class)));
+        }
+}
diff --git a/subprojects/language-web/tsconfig.json b/subprojects/language-web/tsconfig.json
new file mode 100644
index 00000000..cb5f6b13
--- /dev/null
+++ b/subprojects/language-web/tsconfig.json
@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "target": "es2020",
+    "module": "esnext",
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "jsx": "react",
+    "strict": true,
+    "noImplicitOverride": true,
+    "noImplicitReturns": true,
+    "exactOptionalPropertyTypes": false,
+    "noEmit": true,
+    "skipLibCheck": true
+  },
+  "include": ["./src/main/js/**/*"],
+  "exclude": ["./build/generated/sources/lezer/*"]
+}
diff --git a/subprojects/language-web/tsconfig.sonar.json b/subprojects/language-web/tsconfig.sonar.json
new file mode 100644
index 00000000..54eef68b
--- /dev/null
+++ b/subprojects/language-web/tsconfig.sonar.json
@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "target": "es2020",
+    "module": "esnext",
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "jsx": "react",
+    "strict": true,
+    "noImplicitOverride": true,
+    "noImplicitReturns": true,
+    "noEmit": true,
+    "skipLibCheck": true
+  },
+  "include": ["./src/main/js/**/*"],
+  "exclude": ["./src/main/js/xtext/**/*"]
+}
diff --git a/subprojects/language-web/webpack.config.js b/subprojects/language-web/webpack.config.js
new file mode 100644
index 00000000..801a705c
--- /dev/null
+++ b/subprojects/language-web/webpack.config.js
@@ -0,0 +1,232 @@
+const fs = require('fs');
+const path = require('path');
+
+const { DefinePlugin } = require('webpack');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const HtmlWebpackInjectPreload = require('@principalstudio/html-webpack-inject-preload');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const { SubresourceIntegrityPlugin } = require('webpack-subresource-integrity');
+
+const packageInfo = require('./package.json');
+
+const currentNodeEnv = process.env.NODE_ENV || 'development';
+const devMode = currentNodeEnv !== 'production';
+const outputPath = path.resolve(__dirname, 'build/webpack', currentNodeEnv);
+
+const portNumberOrElse = (envName, fallback) => {
+  const value = process.env[envName];
+  return value ? parseInt(value) : fallback;
+};
+const listenHost = process.env['LISTEN_HOST'] || 'localhost';
+const listenPort = portNumberOrElse('LISTEN_PORT', 1313);
+const apiHost = process.env['API_HOST'] || listenHost;
+const apiPort = portNumberOrElse('API_PORT', 1312);
+const publicHost = process.env['PUBLIC_HOST'] || listenHost;
+const publicPort = portNumberOrElse('PUBLIC_PORT', listenPort);
+
+const resolveSources = sources => path.resolve(__dirname, 'src', sources);
+const mainJsSources = resolveSources('main/js');
+const babelLoaderFilters = {
+  include: [mainJsSources],
+};
+const babelPresets = [
+  [
+    '@babel/preset-env',
+    {
+      targets: 'defaults',
+    },
+  ],
+  '@babel/preset-react',
+];
+const babelPlugins = [
+  '@babel/plugin-transform-runtime',
+]
+const magicCommentsLoader = {
+  loader: 'magic-comments-loader',
+  options: {
+    webpackChunkName: true,
+  }
+};
+
+module.exports = {
+  mode: devMode ? 'development' : 'production',
+  entry: './src/main/js',
+  output: {
+    path: outputPath,
+    publicPath: '/',
+    filename: devMode ? '[name].js' : '[name].[contenthash].js',
+    chunkFilename: devMode ? '[name].js' : '[name].[contenthash].js',
+    assetModuleFilename: devMode ? '[name].js' : '[name].[contenthash][ext]',
+    clean: true,
+    crossOriginLoading: 'anonymous',
+  },
+  module: {
+    rules: [
+      {
+        test: /\.jsx?$/i,
+        ...babelLoaderFilters,
+        use: [
+          {
+            loader: 'babel-loader',
+            options: {
+              presets: babelPresets,
+              plugins: [
+                [
+                  '@babel/plugin-proposal-class-properties',
+                  {
+                    loose: false,
+                  },
+                  ...babelPlugins,
+                ],
+              ],
+              assumptions: {
+                'setPublicClassFields': false,
+              },
+            },
+          },
+          magicCommentsLoader,
+        ],
+      },
+      {
+        test: /.tsx?$/i,
+        ...babelLoaderFilters,
+        use: [
+          {
+            loader: 'babel-loader',
+            options: {
+              presets: [
+                ...babelPresets,
+                [
+                  '@babel/preset-typescript',
+                  {
+                    isTSX: true,
+                    allExtensions: true,
+                    allowDeclareFields: true,
+                    onlyRemoveTypeImports: true,
+                    optimizeConstEnums: true,
+                  },
+                ]
+              ],
+              plugins: babelPlugins,
+            },
+          },
+          magicCommentsLoader,
+        ],
+      },
+      {
+        test: /\.scss$/i,
+        use: [
+          devMode ? 'style-loader' : MiniCssExtractPlugin.loader,
+          'css-loader',
+          {
+            loader: 'sass-loader',
+            options: {
+              implementation: require.resolve('sass'),
+            },
+          },
+        ],
+      },
+      {
+        test: /\.(gif|png|jpe?g|svg?)$/i,
+        use: [
+          {
+            loader: 'image-webpack-loader',
+            options: {
+              disable: true,
+            }
+          },
+        ],
+        type: 'asset',
+      },
+      {
+        test: /\.woff2?$/i,
+        type: 'asset/resource',
+      },
+    ],
+  },
+  resolve: {
+    modules: [
+      'node_modules',
+      mainJsSources,
+    ],
+    extensions: ['.js', '.jsx', '.ts', '.tsx'],
+  },
+  devtool: devMode ? 'inline-source-map' : 'source-map',
+  optimization: {
+    providedExports: !devMode,
+    sideEffects: devMode ? 'flag' : true,
+    splitChunks: {
+      chunks: 'all',
+      cacheGroups: {
+        defaultVendors: {
+          test: /[\\/]node_modules[\\/]/,
+          priority: -10,
+          reuseExistingChunk: true,
+          filename: devMode ? 'vendor.[id].js' : 'vendor.[contenthash].js',
+        },
+        default: {
+          minChunks: 2,
+          priority: -20,
+          reuseExistingChunk: true,
+        },
+      },
+    },
+  },
+  devServer: {
+    client: {
+      logging: 'info',
+      overlay: true,
+      progress: true,
+      webSocketURL: {
+        hostname: publicHost,
+        port: publicPort,
+        protocol: publicPort === 443 ? 'wss' : 'ws',
+      },
+    },
+    compress: true,
+    host: listenHost,
+    port: listenPort,
+    proxy: {
+      '/xtext-service': {
+        target: `${apiPort === 443 ? 'https' : 'http'}://${apiHost}:${apiPort}`,
+        ws: true,
+      },
+    },
+  },
+  plugins: [
+    new DefinePlugin({
+      'DEBUG': JSON.stringify(devMode),
+      'PACKAGE_NAME': JSON.stringify(packageInfo.name),
+      'PACKAGE_VERSION': JSON.stringify(packageInfo.version),
+    }),
+    new MiniCssExtractPlugin({
+      filename: '[name].[contenthash].css',
+      chunkFilename: '[name].[contenthash].css',
+    }),
+    new SubresourceIntegrityPlugin(),
+    new HtmlWebpackPlugin({
+      template: 'src/main/html/index.html',
+      minify: devMode ? false : {
+        collapseWhitespace: true,
+        removeComments: true,
+        removeOptionalTags: true,
+        removeRedundantAttributes: true,
+        removeScriptTypeAttributes: true,
+        removeStyleLinkTypeAttributes: true,
+        useShortDoctype: true,
+      },
+    }),
+    new HtmlWebpackInjectPreload({
+      files: [
+        {
+          match: /(roboto-latin-(400|500)-normal|jetbrains-mono-latin-variable).*\.woff2/,
+          attributes: {
+            as: 'font',
+            type: 'font/woff2',
+            crossorigin: 'anonymous',
+          },
+        },
+      ],
+    }),
+  ],
+};
diff --git a/subprojects/language/build.gradle b/subprojects/language/build.gradle
new file mode 100644
index 00000000..f7574ecc
--- /dev/null
+++ b/subprojects/language/build.gradle
@@ -0,0 +1,66 @@
+plugins {
+        id 'java-test-fixtures'
+        id 'refinery-java-library'
+        id 'refinery-mwe2'
+        id 'refinery-sonarqube'
+        id 'refinery-xtend'
+        id 'refinery-xtext-conventions'
+}
+
+dependencies {
+        api platform(libs.xtext.bom)
+        api libs.ecore
+        api libs.xtext.core
+        api libs.xtext.xbase
+        api project(':refinery-language-model')
+        testFixturesApi libs.xtext.testing
+        testFixturesApi testFixtures(project(':refinery-language-model'))
+        mwe2 libs.xtext.generator
+        mwe2 libs.xtext.generator.antlr
+}
+
+sourceSets {
+        testFixtures {
+                java.srcDirs += ['src/testFixtures/xtext-gen']
+                resources.srcDirs += ['src/testFixtures/xtext-gen']
+        }
+}
+
+tasks.named('jar') {
+        from(sourceSets.main.allSource) {
+                include '**/*.xtext'
+        }
+}
+
+def generateXtextLanguage = tasks.register('generateXtextLanguage', JavaExec) {
+        mainClass = 'org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher'
+        classpath = configurations.mwe2
+        inputs.file 'src/main/java/tools/refinery/language/GenerateProblem.mwe2'
+        inputs.file 'src/main/java/tools/refinery/language/Problem.xtext'
+        outputs.dir 'src/main/xtext-gen'
+        outputs.dir 'src/testFixtures/xtext-gen'
+        outputs.dir '../language-ide/src/main/xtext-gen'
+        outputs.dir '../language-web/src/main/xtext-gen'
+        args += 'src/main/java/tools/refinery/language/GenerateProblem.mwe2'
+        args += '-p'
+        args += "rootPath=/${projectDir}/.."
+}
+
+for (taskName in ['compileJava', 'processResources', 'generateXtext', 'generateEclipseSourceFolders']) {
+        tasks.named(taskName) {
+                dependsOn generateXtextLanguage
+        }
+}
+
+tasks.named('clean') {
+        delete 'src/main/xtext-gen'
+        delete 'src/testFixtures/xtext-gen'
+        delete '../language-ide/src/main/xtext-gen'
+        delete '../language-web/src/main/xtext-gen'
+}
+
+sonarqube.properties {
+        properties['sonar.exclusions'] += [
+                'src/testFixtures/xtext-gen/**',
+        ]
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2 b/subprojects/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2
new file mode 100644
index 00000000..21ff456e
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2
@@ -0,0 +1,68 @@
+module tools.refinery.language.GenerateProblem
+
+import org.eclipse.xtext.xtext.generator.*
+import org.eclipse.xtext.xtext.generator.model.project.*
+
+var rootPath = '..'
+
+Workflow {
+        component = XtextGenerator {
+                configuration = {
+                        project = StandardProjectConfig {
+                                baseName = 'language'
+                                rootPath = rootPath
+                                runtimeTest = {
+                                        enabled = true
+                                        srcGen = 'src/testFixtures/xtext-gen'
+                                }
+                                genericIde = {
+                                        name = 'language-ide'
+                                }
+                                web = {
+                                        enabled = true
+                                        name = 'language-web'
+                                }
+                                mavenLayout = true
+                        }
+                        code = {
+                                encoding = 'UTF-8'
+                                lineDelimiter = '\n'
+                                fileHeader = '/*\n * generated by Xtext \${version}\n */'
+                                preferXtendStubs = false
+                        }
+                }
+
+                language = StandardLanguage {
+                        name = 'tools.refinery.language.Problem'
+                        fileExtensions = 'problem'
+                        referencedResource = 'platform:/resource/tools.refinery.refinery-language-model/model/problem.genmodel'
+                        serializer = {
+                                generateStub = false
+                        }
+                        formatter = {
+                                generateStub = true
+                        }
+                        validator = {
+                                generateDeprecationValidation = true
+                        }
+                        generator = {
+                                generateStub = false
+                        }
+                        junitSupport = {
+                                generateStub = false
+                                skipXbaseTestingPackage = true
+                                junitVersion = '5'
+                        }
+                        webSupport = {
+                                // We only generate the {@code AbstractProblemWebModule},
+                                // because we write our own integration code for CodeMirror 6. 
+                                framework = 'codemirror'
+                                generateHtmlExample = false
+                                generateJettyLauncher = false
+                                generateJsHighlighting = false
+                                generateServlet = false
+                                generateWebXml = false
+                        }
+                }
+        }
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext b/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext
new file mode 100644
index 00000000..c94d40ab
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext
@@ -0,0 +1,205 @@
+grammar tools.refinery.language.Problem with org.eclipse.xtext.common.Terminals
+
+import "http://www.eclipse.org/emf/2002/Ecore" as ecore
+import "https://refinery.tools/emf/2021/Problem"
+
+Problem:
+        ("problem" name=Identifier ".")?
+        statements+=Statement*;
+
+Statement:
+        ClassDeclaration | EnumDeclaration | PredicateDefinition | RuleDefinition | Assertion | NodeValueAssertion |
+        ScopeDeclaration |
+        IndividualDeclaration;
+
+ClassDeclaration:
+        abstract?="abstract"? "class"
+        name=Identifier
+        ("extends" superTypes+=[Relation|QualifiedName] ("," superTypes+=[Relation|QualifiedName])*)?
+        ("{" (referenceDeclarations+=ReferenceDeclaration ";"?)* "}" | ".");
+
+EnumDeclaration:
+        "enum"
+        name=Identifier
+        ("{" (literals+=EnumLiteral ("," literals+=EnumLiteral)* ("," | ";")?)? "}" | ".");
+
+EnumLiteral returns Node:
+        name=Identifier;
+
+ReferenceDeclaration:
+        (containment?="contains" | "refers")?
+        referenceType=[Relation|QualifiedName]
+        ("[" multiplicity=Multiplicity "]")?
+        name=Identifier
+        ("opposite" opposite=[ReferenceDeclaration|QualifiedName])?;
+
+enum PredicateKind:
+        DIRECT="direct";
+
+PredicateDefinition:
+        (error?="error" "pred"? | kind=PredicateKind? "pred")
+        name=Identifier
+        "(" (parameters+=Parameter ("," parameters+=Parameter)*)? ")"
+        ("<->" bodies+=Conjunction (";" bodies+=Conjunction)*)?
+        ".";
+
+enum RuleKind:
+        DIRECT="direct";
+
+RuleDefinition:
+        kind=RuleKind "rule"
+        name=Identifier
+        "(" (parameters+=Parameter ("," parameters+=Parameter)*)? ")"
+        (":" bodies+=Conjunction (";" bodies+=Conjunction)*
+        "~>" action=Action)?
+        ".";
+
+Parameter:
+        parameterType=[Relation|QualifiedName]? name=Identifier;
+
+Conjunction:
+        literals+=Literal ("," literals+=Literal)*;
+
+Action:
+        actionLiterals+=ActionLiteral ("," actionLiterals+=ActionLiteral)*;
+
+Literal:
+        Atom | ValueLiteral | NegativeLiteral;
+
+ValueLiteral:
+        atom=Atom
+        (refinement?=":" | "=")
+        values+=LogicConstant ("|" values+=LogicConstant)*;
+
+NegativeLiteral:
+        "!" atom=Atom;
+
+ActionLiteral:
+        ValueActionLiteral | DeleteActionLiteral | NewActionLiteral;
+
+ValueActionLiteral:
+        atom=Atom
+        (refinement?=":" | "=")
+        value=LogicValue;
+
+DeleteActionLiteral:
+        "delete" variableOrNode=[VariableOrNode|QualifiedName];
+
+NewActionLiteral:
+        "new" variable=NewVariable;
+
+NewVariable:
+        name=Identifier;
+
+Atom:
+        relation=[Relation|QualifiedName]
+        transitiveClosure?="+"?
+        "(" (arguments+=Argument ("," arguments+=Argument)*)? ")";
+
+LogicConstant:
+        value=LogicValue;
+
+Argument:
+        VariableOrNodeArgument | ConstantArgument;
+
+VariableOrNodeArgument:
+        variableOrNode=[VariableOrNode|QualifiedName];
+
+ConstantArgument:
+        constant=Constant;
+
+Assertion:
+        default?="default"?
+        (value=ShortLogicValue?
+        relation=[Relation|QualifiedName]
+        "(" (arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)? ")"
+        | relation=[Relation|QualifiedName]
+        "(" (arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)? ")"
+        ":" value=LogicValue)
+        ".";
+
+AssertionArgument:
+        NodeAssertionArgument | WildcardAssertionArgument | ConstantAssertionArgument;
+
+NodeAssertionArgument:
+        node=[Node|QualifiedName];
+
+WildcardAssertionArgument:
+        {WildcardAssertionArgument} "*";
+
+ConstantAssertionArgument:
+        constant=Constant;
+
+enum LogicValue:
+        TRUE="true" | FALSE="false" | UNKNOWN="unknown" | ERROR="error";
+
+enum ShortLogicValue returns LogicValue:
+        FALSE="!" | UNKNOWN="?";
+
+NodeValueAssertion:
+        node=[Node|QualifiedName] ":" value=Constant ".";
+
+Constant:
+        RealConstant | IntConstant | StringConstant;
+
+IntConstant:
+        intValue=Integer;
+
+RealConstant:
+        realValue=Real;
+
+StringConstant:
+        stringValue=STRING;
+
+ScopeDeclaration:
+        "scope" typeScopes+=TypeScope ("," typeScopes+=TypeScope)* ".";
+
+TypeScope:
+        targetType=[ClassDeclaration|QualifiedName]
+        (increment?="+=" | "=")
+        multiplicity=DefiniteMultiplicity;
+
+Multiplicity:
+        UnboundedMultiplicity | DefiniteMultiplicity;
+
+DefiniteMultiplicity returns Multiplicity:
+        RangeMultiplicity | ExactMultiplicity;
+
+UnboundedMultiplicity:
+        {UnboundedMultiplicity};
+
+RangeMultiplicity:
+        lowerBound=INT ".." upperBound=UpperBound;
+
+ExactMultiplicity:
+        exactValue=INT;
+
+IndividualDeclaration:
+        "indiv" nodes+=EnumLiteral ("," nodes+=EnumLiteral)* ".";
+
+UpperBound returns ecore::EInt:
+        INT | "*";
+
+QualifiedName hidden():
+        Identifier ("::" Identifier)*;
+
+Identifier:
+        ID | "true" | "false" | "unknown" | "error" | "class" | "abstract" | "extends" | "enum" | "pred" |
+        "indiv" | "problem" | "new" | "delete" | "direct" | "rule";
+
+Integer returns ecore::EInt hidden():
+        "-"? INT;
+
+Real returns ecore::EDouble:
+        "-"? (EXPONENTIAL | INT "." (INT | EXPONENTIAL));
+
+@Override
+terminal ID:
+        ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*;
+
+terminal EXPONENTIAL:
+        INT ("e" | "E") ("+" | "-")? INT;
+
+@Override
+terminal SL_COMMENT:
+        ('%' | '//') !('\n' | '\r')* ('\r'? '\n')?;
diff --git a/subprojects/language/src/main/java/tools/refinery/language/ProblemRuntimeModule.java b/subprojects/language/src/main/java/tools/refinery/language/ProblemRuntimeModule.java
new file mode 100644
index 00000000..dd7731b4
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/ProblemRuntimeModule.java
@@ -0,0 +1,84 @@
+/*
+ * generated by Xtext 2.25.0
+ */
+package tools.refinery.language;
+
+import org.eclipse.xtext.conversion.IValueConverterService;
+import org.eclipse.xtext.naming.IQualifiedNameConverter;
+import org.eclipse.xtext.resource.DerivedStateAwareResource;
+import org.eclipse.xtext.resource.DerivedStateAwareResourceDescriptionManager;
+import org.eclipse.xtext.resource.IDefaultResourceDescriptionStrategy;
+import org.eclipse.xtext.resource.IDerivedStateComputer;
+import org.eclipse.xtext.resource.ILocationInFileProvider;
+import org.eclipse.xtext.resource.IResourceDescription;
+import org.eclipse.xtext.resource.XtextResource;
+import org.eclipse.xtext.scoping.IGlobalScopeProvider;
+import org.eclipse.xtext.scoping.IScopeProvider;
+import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider;
+import org.eclipse.xtext.validation.IResourceValidator;
+import org.eclipse.xtext.xbase.annotations.validation.DerivedStateAwareResourceValidator;
+
+import com.google.inject.Binder;
+import com.google.inject.name.Names;
+
+import tools.refinery.language.conversion.ProblemValueConverterService;
+import tools.refinery.language.naming.ProblemQualifiedNameConverter;
+import tools.refinery.language.resource.ProblemDerivedStateComputer;
+import tools.refinery.language.resource.ProblemLocationInFileProvider;
+import tools.refinery.language.resource.ProblemResourceDescriptionStrategy;
+import tools.refinery.language.scoping.ProblemGlobalScopeProvider;
+import tools.refinery.language.scoping.ProblemLocalScopeProvider;
+
+/**
+ * Use this class to register components to be used at runtime / without the
+ * Equinox extension registry.
+ */
+public class ProblemRuntimeModule extends AbstractProblemRuntimeModule {
+        public Class<? extends IQualifiedNameConverter> bindIQualifiedNameConverter() {
+                return ProblemQualifiedNameConverter.class;
+        }
+
+        public Class<? extends IDefaultResourceDescriptionStrategy> bindIDefaultResourceDescriptionStrategy() {
+                return ProblemResourceDescriptionStrategy.class;
+        }
+
+        @Override
+        public Class<? extends IValueConverterService> bindIValueConverterService() {
+                return ProblemValueConverterService.class;
+        }
+
+        @Override
+        public Class<? extends IGlobalScopeProvider> bindIGlobalScopeProvider() {
+                return ProblemGlobalScopeProvider.class;
+        }
+
+        @Override
+        public void configureIScopeProviderDelegate(Binder binder) {
+                binder.bind(IScopeProvider.class).annotatedWith(Names.named(AbstractDeclarativeScopeProvider.NAMED_DELEGATE))
+                                .to(ProblemLocalScopeProvider.class);
+        }
+
+        @Override
+        public Class<? extends XtextResource> bindXtextResource() {
+                return DerivedStateAwareResource.class;
+        }
+
+        // Method name follows Xtext convention.
+        @SuppressWarnings("squid:S100")
+        public Class<? extends IResourceDescription.Manager> bindIResourceDescription$Manager() {
+                return DerivedStateAwareResourceDescriptionManager.class;
+        }
+
+        public Class<? extends IResourceValidator> bindIResourceValidator() {
+                return DerivedStateAwareResourceValidator.class;
+        }
+
+        public Class<? extends IDerivedStateComputer> bindIDerivedStateComputer() {
+                return ProblemDerivedStateComputer.class;
+        }
+
+        @Override
+        public Class<? extends ILocationInFileProvider> bindILocationInFileProvider() {
+                return ProblemLocationInFileProvider.class;
+        }
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/ProblemStandaloneSetup.java b/subprojects/language/src/main/java/tools/refinery/language/ProblemStandaloneSetup.java
new file mode 100644
index 00000000..d753a119
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/ProblemStandaloneSetup.java
@@ -0,0 +1,44 @@
+/*
+ * generated by Xtext 2.25.0
+ */
+package tools.refinery.language;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.resource.IResourceFactory;
+import org.eclipse.xtext.resource.IResourceServiceProvider;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+import tools.refinery.language.model.ProblemEMFSetup;
+
+/**
+ * Initialization support for running Xtext languages without Equinox extension
+ * registry.
+ */
+public class ProblemStandaloneSetup extends ProblemStandaloneSetupGenerated {
+
+        public static void doSetup() {
+                new ProblemStandaloneSetup().createInjectorAndDoEMFRegistration();
+        }
+
+        @Override
+        public Injector createInjectorAndDoEMFRegistration() {
+                ProblemEMFSetup.doEMFRegistration();
+                var xmiInjector = createXmiInjector();
+                registerXmiInjector(xmiInjector);
+                return super.createInjectorAndDoEMFRegistration();
+        }
+        
+        protected Injector createXmiInjector() {
+                return Guice.createInjector(new ProblemXmiRuntimeModule());
+        }
+
+        protected void registerXmiInjector(Injector injector) {
+                IResourceFactory resourceFactory = injector.getInstance(IResourceFactory.class);
+                IResourceServiceProvider serviceProvider = injector.getInstance(IResourceServiceProvider.class);
+                
+                Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(ProblemEMFSetup.XMI_RESOURCE_EXTENSION, resourceFactory);
+                IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put(ProblemEMFSetup.XMI_RESOURCE_EXTENSION, serviceProvider);
+        }
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/ProblemXmiRuntimeModule.java b/subprojects/language/src/main/java/tools/refinery/language/ProblemXmiRuntimeModule.java
new file mode 100644
index 00000000..03a33bee
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/ProblemXmiRuntimeModule.java
@@ -0,0 +1,35 @@
+package tools.refinery.language;
+
+import org.eclipse.xtext.naming.IQualifiedNameConverter;
+import org.eclipse.xtext.resource.IDefaultResourceDescriptionStrategy;
+import org.eclipse.xtext.resource.IResourceFactory;
+import org.eclipse.xtext.resource.generic.AbstractGenericResourceRuntimeModule;
+
+import tools.refinery.language.model.ProblemEMFSetup;
+import tools.refinery.language.naming.ProblemQualifiedNameConverter;
+import tools.refinery.language.resource.ProblemResourceDescriptionStrategy;
+import tools.refinery.language.resource.ProblemXmiResourceFactory;
+
+public class ProblemXmiRuntimeModule extends AbstractGenericResourceRuntimeModule {
+        @Override
+        protected String getLanguageName() {
+                return "tools.refinery.language.ProblemXmi";
+        }
+
+        @Override
+        protected String getFileExtensions() {
+                return ProblemEMFSetup.XMI_RESOURCE_EXTENSION;
+        }
+        
+        public Class<? extends IResourceFactory> bindIResourceFactory() {
+                return ProblemXmiResourceFactory.class;
+        }
+        
+        public Class<? extends IQualifiedNameConverter> bindIQualifiedNameConverter() {
+                return ProblemQualifiedNameConverter.class;
+        }
+
+        public Class<? extends IDefaultResourceDescriptionStrategy> bindIDefaultResourceDescriptionStrategy() {
+                return ProblemResourceDescriptionStrategy.class;
+        }
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/conversion/ProblemValueConverterService.java b/subprojects/language/src/main/java/tools/refinery/language/conversion/ProblemValueConverterService.java
new file mode 100644
index 00000000..508688ed
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/conversion/ProblemValueConverterService.java
@@ -0,0 +1,19 @@
+package tools.refinery.language.conversion;
+
+import org.eclipse.xtext.common.services.DefaultTerminalConverters;
+import org.eclipse.xtext.conversion.IValueConverter;
+import org.eclipse.xtext.conversion.ValueConverter;
+
+import com.google.inject.Inject;
+
+public class ProblemValueConverterService extends DefaultTerminalConverters {
+        @Inject
+        private UpperBoundValueConverter upperBoundValueConverter;
+
+        @ValueConverter(rule = "UpperBound")
+        // Method name follows Xtext convention.
+        @SuppressWarnings("squid:S100")
+        public IValueConverter<Integer> UpperBound() {
+                return upperBoundValueConverter;
+        }
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/conversion/UpperBoundValueConverter.java b/subprojects/language/src/main/java/tools/refinery/language/conversion/UpperBoundValueConverter.java
new file mode 100644
index 00000000..be0d15ad
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/conversion/UpperBoundValueConverter.java
@@ -0,0 +1,35 @@
+package tools.refinery.language.conversion;
+
+import org.eclipse.xtext.conversion.ValueConverterException;
+import org.eclipse.xtext.conversion.impl.AbstractValueConverter;
+import org.eclipse.xtext.conversion.impl.INTValueConverter;
+import org.eclipse.xtext.nodemodel.INode;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
+@Singleton
+public class UpperBoundValueConverter extends AbstractValueConverter<Integer> {
+        public static final String INFINITY = "*";      
+        
+        @Inject
+        private INTValueConverter intValueConverter;
+        
+        @Override
+        public Integer toValue(String string, INode node) throws ValueConverterException {
+                if (INFINITY.equals(string)) {
+                        return -1;
+                } else {
+                        return intValueConverter.toValue(string, node);
+                }
+        }
+
+        @Override
+        public String toString(Integer value) throws ValueConverterException {
+                if (value < 0) {
+                        return INFINITY;
+                } else {
+                        return intValueConverter.toString(value);
+                }
+        }
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/formatting2/ProblemFormatter.java b/subprojects/language/src/main/java/tools/refinery/language/formatting2/ProblemFormatter.java
new file mode 100644
index 00000000..903347f7
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/formatting2/ProblemFormatter.java
@@ -0,0 +1,183 @@
+/*
+ * generated by Xtext 2.26.0.M2
+ */
+package tools.refinery.language.formatting2;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.formatting2.AbstractJavaFormatter;
+import org.eclipse.xtext.formatting2.IFormattableDocument;
+import org.eclipse.xtext.formatting2.IHiddenRegionFormatter;
+import org.eclipse.xtext.formatting2.regionaccess.ISemanticRegionsFinder;
+import org.eclipse.xtext.formatting2.regionaccess.ISequentialRegion;
+import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
+
+import tools.refinery.language.model.problem.Assertion;
+import tools.refinery.language.model.problem.Atom;
+import tools.refinery.language.model.problem.ClassDeclaration;
+import tools.refinery.language.model.problem.Conjunction;
+import tools.refinery.language.model.problem.IndividualDeclaration;
+import tools.refinery.language.model.problem.NegativeLiteral;
+import tools.refinery.language.model.problem.Parameter;
+import tools.refinery.language.model.problem.PredicateDefinition;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.ProblemPackage;
+
+public class ProblemFormatter extends AbstractJavaFormatter {
+
+        protected void format(Problem problem, IFormattableDocument doc) {
+                doc.prepend(problem, this::noSpace);
+                var region = regionFor(problem);
+                doc.append(region.keyword("problem"), this::oneSpace);
+                doc.prepend(region.keyword("."), this::noSpace);
+                appendNewLines(doc, region.keyword("."), this::twoNewLines);
+                for (var statement : problem.getStatements()) {
+                        doc.format(statement);
+                }
+        }
+
+        protected void format(Assertion assertion, IFormattableDocument doc) {
+                surroundNewLines(doc, assertion, this::singleNewLine);
+                var region = regionFor(assertion);
+                doc.append(region.feature(ProblemPackage.Literals.ASSERTION__DEFAULT), this::oneSpace);
+                doc.append(region.feature(ProblemPackage.Literals.ASSERTION__VALUE), this::noSpace);
+                doc.append(region.feature(ProblemPackage.Literals.ASSERTION__RELATION), this::noSpace);
+                formatParenthesizedList(region, doc);
+                doc.prepend(region.keyword(":"), this::noSpace);
+                doc.append(region.keyword(":"), this::oneSpace);
+                doc.prepend(region.keyword("."), this::noSpace);
+                for (var argument : assertion.getArguments()) {
+                        doc.format(argument);
+                }
+        }
+        
+        protected void format(ClassDeclaration classDeclaration, IFormattableDocument doc) {
+                surroundNewLines(doc, classDeclaration, this::twoNewLines);
+                var region = regionFor(classDeclaration);
+                doc.append(region.feature(ProblemPackage.Literals.CLASS_DECLARATION__ABSTRACT), this::oneSpace);
+                doc.append(region.keyword("class"), this::oneSpace);
+                doc.surround(region.keyword("extends"), this::oneSpace);
+                formatList(region, ",", doc);
+                doc.prepend(region.keyword("{"), this::oneSpace);
+                doc.append(region.keyword("{"), it -> it.setNewLines(1, 1, 2));
+                doc.prepend(region.keyword("}"), it -> it.setNewLines(1, 1, 2));
+                doc.prepend(region.keyword("."), this::noSpace);
+                for (var referenceDeclaration : classDeclaration.getReferenceDeclarations()) {
+                        doc.format(referenceDeclaration);
+                }
+        }
+
+        protected void format(PredicateDefinition predicateDefinition, IFormattableDocument doc) {
+                surroundNewLines(doc, predicateDefinition, this::twoNewLines);
+                var region = regionFor(predicateDefinition);
+                doc.append(region.feature(ProblemPackage.Literals.PREDICATE_DEFINITION__KIND), this::oneSpace);
+                doc.append(region.keyword("pred"), this::oneSpace);
+                doc.append(region.feature(ProblemPackage.Literals.NAMED_ELEMENT__NAME), this::noSpace);
+                formatParenthesizedList(region, doc);
+                doc.surround(region.keyword("<->"), this::oneSpace);
+                formatList(region, ";", doc);
+                doc.prepend(region.keyword("."), this::noSpace);
+                for (var parameter : predicateDefinition.getParameters()) {
+                        doc.format(parameter);
+                }
+                for (var body : predicateDefinition.getBodies()) {
+                        doc.format(body);
+                }
+        }
+
+        protected void format(Parameter parameter, IFormattableDocument doc) {
+                doc.append(regionFor(parameter).feature(ProblemPackage.Literals.PARAMETER__PARAMETER_TYPE), this::oneSpace);
+        }
+
+        protected void format(Conjunction conjunction, IFormattableDocument doc) {
+                var region = regionFor(conjunction);
+                formatList(region, ",", doc);
+                for (var literal : conjunction.getLiterals()) {
+                        doc.format(literal);
+                }
+        }
+
+        protected void format(NegativeLiteral literal, IFormattableDocument doc) {
+                var region = regionFor(literal);
+                doc.append(region.keyword("!"), this::noSpace);
+                doc.format(literal.getAtom());
+        }
+
+        protected void format(Atom atom, IFormattableDocument doc) {
+                var region = regionFor(atom);
+                doc.append(region.feature(ProblemPackage.Literals.ATOM__RELATION), this::noSpace);
+                doc.append(region.feature(ProblemPackage.Literals.ATOM__TRANSITIVE_CLOSURE), this::noSpace);
+                formatParenthesizedList(region, doc);
+                for (var argument : atom.getArguments()) {
+                        doc.format(argument);
+                }
+        }
+
+        protected void format(IndividualDeclaration individualDeclaration, IFormattableDocument doc) {
+                surroundNewLines(doc, individualDeclaration, this::singleNewLine);
+                var region = regionFor(individualDeclaration);
+                doc.append(region.keyword("indiv"), this::oneSpace);
+                formatList(region, ",", doc);
+                doc.prepend(region.keyword("."), this::noSpace);
+        }
+
+        protected void formatParenthesizedList(ISemanticRegionsFinder region, IFormattableDocument doc) {
+                doc.append(region.keyword("("), this::noSpace);
+                doc.prepend(region.keyword(")"), this::noSpace);
+                formatList(region, ",", doc);
+        }
+
+        protected void formatList(ISemanticRegionsFinder region, String separator, IFormattableDocument doc) {
+                for (var comma : region.keywords(separator)) {
+                        doc.prepend(comma, this::noSpace);
+                        doc.append(comma, this::oneSpace);
+                }
+        }
+
+        protected void singleNewLine(IHiddenRegionFormatter it) {
+                it.setNewLines(1, 1, 2);
+        }
+
+        protected void twoNewLines(IHiddenRegionFormatter it) {
+                it.highPriority();
+                it.setNewLines(2);
+        }
+
+        protected void surroundNewLines(IFormattableDocument doc, EObject eObject,
+                        Procedure1<? super IHiddenRegionFormatter> init) {
+                var region = doc.getRequest().getTextRegionAccess().regionForEObject(eObject);
+                preprendNewLines(doc, region, init);
+                appendNewLines(doc, region, init);
+        }
+
+        protected void preprendNewLines(IFormattableDocument doc, ISequentialRegion region,
+                        Procedure1<? super IHiddenRegionFormatter> init) {
+                if (region == null) {
+                        return;
+                }
+                var previousHiddenRegion = region.getPreviousHiddenRegion();
+                if (previousHiddenRegion == null) {
+                        return;
+                }
+                if (previousHiddenRegion.getPreviousSequentialRegion() == null) {
+                        doc.set(previousHiddenRegion, it -> it.setNewLines(0));
+                } else {
+                        doc.set(previousHiddenRegion, init);
+                }
+        }
+
+        protected void appendNewLines(IFormattableDocument doc, ISequentialRegion region,
+                        Procedure1<? super IHiddenRegionFormatter> init) {
+                if (region == null) {
+                        return;
+                }
+                var nextHiddenRegion = region.getNextHiddenRegion();
+                if (nextHiddenRegion == null) {
+                        return;
+                }
+                if (nextHiddenRegion.getNextSequentialRegion() == null) {
+                        doc.set(nextHiddenRegion, it -> it.setNewLines(1));
+                } else {
+                        doc.set(nextHiddenRegion, init);
+                }
+        }
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/naming/NamingUtil.java b/subprojects/language/src/main/java/tools/refinery/language/naming/NamingUtil.java
new file mode 100644
index 00000000..e959be74
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/naming/NamingUtil.java
@@ -0,0 +1,25 @@
+package tools.refinery.language.naming;
+
+import java.util.regex.Pattern;
+
+public final class NamingUtil {
+        private static final String SINGLETON_VARIABLE_PREFIX = "_";
+        
+        private static final Pattern ID_REGEX = Pattern.compile("[_a-zA-Z][_0-9a-zA-Z]*");
+
+        private NamingUtil() {
+                throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
+        }
+        
+        public static boolean isNullOrEmpty(String name) {
+                return name == null || name.isEmpty();
+        }
+
+        public static boolean isSingletonVariableName(String name) {
+                return name != null && name.startsWith(SINGLETON_VARIABLE_PREFIX);
+        }
+        
+        public static boolean isValidId(String name) {
+                return name != null && ID_REGEX.matcher(name).matches();
+        }
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/naming/ProblemQualifiedNameConverter.java b/subprojects/language/src/main/java/tools/refinery/language/naming/ProblemQualifiedNameConverter.java
new file mode 100644
index 00000000..5453906f
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/naming/ProblemQualifiedNameConverter.java
@@ -0,0 +1,15 @@
+package tools.refinery.language.naming;
+
+import org.eclipse.xtext.naming.IQualifiedNameConverter;
+
+import com.google.inject.Singleton;
+
+@Singleton
+public class ProblemQualifiedNameConverter extends IQualifiedNameConverter.DefaultImpl {
+        public static final String DELIMITER = "::";
+        
+        @Override
+        public String getDelimiter() {
+                return DELIMITER;
+        }
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/resource/DerivedVariableComputer.java b/subprojects/language/src/main/java/tools/refinery/language/resource/DerivedVariableComputer.java
new file mode 100644
index 00000000..bb1226c4
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/resource/DerivedVariableComputer.java
@@ -0,0 +1,194 @@
+package tools.refinery.language.resource;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.xtext.linking.impl.LinkingHelper;
+import org.eclipse.xtext.naming.IQualifiedNameConverter;
+import org.eclipse.xtext.nodemodel.INode;
+import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
+import org.eclipse.xtext.scoping.IScope;
+import org.eclipse.xtext.scoping.IScopeProvider;
+import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import com.google.inject.name.Named;
+
+import tools.refinery.language.model.problem.Argument;
+import tools.refinery.language.model.problem.Atom;
+import tools.refinery.language.model.problem.Conjunction;
+import tools.refinery.language.model.problem.ExistentialQuantifier;
+import tools.refinery.language.model.problem.ImplicitVariable;
+import tools.refinery.language.model.problem.Literal;
+import tools.refinery.language.model.problem.NegativeLiteral;
+import tools.refinery.language.model.problem.Parameter;
+import tools.refinery.language.model.problem.ParametricDefinition;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.ProblemFactory;
+import tools.refinery.language.model.problem.ProblemPackage;
+import tools.refinery.language.model.problem.Statement;
+import tools.refinery.language.model.problem.ValueLiteral;
+import tools.refinery.language.model.problem.VariableOrNodeArgument;
+import tools.refinery.language.naming.NamingUtil;
+
+@Singleton
+public class DerivedVariableComputer {
+        @Inject
+        private LinkingHelper linkingHelper;
+
+        @Inject
+        private IQualifiedNameConverter qualifiedNameConverter;
+
+        @Inject
+        @Named(AbstractDeclarativeScopeProvider.NAMED_DELEGATE)
+        private IScopeProvider scopeProvider;
+
+        public void installDerivedVariables(Problem problem, Set<String> nodeNames) {
+                for (Statement statement : problem.getStatements()) {
+                        if (statement instanceof ParametricDefinition definition) {
+                                installDerivedParametricDefinitionState(definition, nodeNames);
+                        }
+                }
+        }
+
+        protected void installDerivedParametricDefinitionState(ParametricDefinition definition, Set<String> nodeNames) {
+                Set<String> knownVariables = new HashSet<>();
+                knownVariables.addAll(nodeNames);
+                for (Parameter parameter : definition.getParameters()) {
+                        String name = parameter.getName();
+                        if (name != null) {
+                                knownVariables.add(name);
+                        }
+                }
+                for (Conjunction body : definition.getBodies()) {
+                        installDeriveConjunctionState(body, knownVariables);
+                }
+        }
+
+        protected void installDeriveConjunctionState(Conjunction conjunction, Set<String> knownVariables) {
+                Set<String> newVariables = new HashSet<>();
+                for (Literal literal : conjunction.getLiterals()) {
+                        if (literal instanceof Atom atom) {
+                                createSigletonVariablesAndCollectVariables(atom, knownVariables, newVariables);
+                        } else
+                        if (literal instanceof ValueLiteral valueLiteral) {
+                                createSigletonVariablesAndCollectVariables(valueLiteral.getAtom(), knownVariables, newVariables);
+                        }
+                }
+                createVariables(conjunction, newVariables);
+                newVariables.addAll(knownVariables);
+                for (Literal literal : conjunction.getLiterals()) {
+                        if (literal instanceof NegativeLiteral negativeLiteral) {
+                                installDeriveNegativeLiteralState(negativeLiteral, newVariables);
+                        }
+                }
+        }
+
+        protected void installDeriveNegativeLiteralState(NegativeLiteral negativeLiteral, Set<String> knownVariables) {
+                Set<String> newVariables = new HashSet<>();
+                createSigletonVariablesAndCollectVariables(negativeLiteral.getAtom(), knownVariables, newVariables);
+                createVariables(negativeLiteral, newVariables);
+        }
+
+        protected void createSigletonVariablesAndCollectVariables(Atom atom, Set<String> knownVariables,
+                        Set<String> newVariables) {
+                for (Argument argument : atom.getArguments()) {
+                        if (argument instanceof VariableOrNodeArgument variableOrNodeArgument) {
+                                IScope scope = scopeProvider.getScope(variableOrNodeArgument,
+                                                ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE);
+                                List<INode> nodes = NodeModelUtils.findNodesForFeature(variableOrNodeArgument,
+                                                ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE);
+                                for (INode node : nodes) {
+                                        var variableName = linkingHelper.getCrossRefNodeAsString(node, true);
+                                        var created = tryCreateVariableForArgument(variableOrNodeArgument, variableName, scope,
+                                                        knownVariables, newVariables);
+                                        if (created) {
+                                                break;
+                                        }
+                                }
+                        }
+                }
+        }
+
+        protected boolean tryCreateVariableForArgument(VariableOrNodeArgument variableOrNodeArgument, String variableName,
+                        IScope scope, Set<String> knownVariables, Set<String> newVariables) {
+                if (!NamingUtil.isValidId(variableName)) {
+                        return false;
+                }
+                var qualifiedName = qualifiedNameConverter.toQualifiedName(variableName);
+                if (scope.getSingleElement(qualifiedName) != null) {
+                        return false;
+                }
+                if (NamingUtil.isSingletonVariableName(variableName)) {
+                        createSingletonVariable(variableOrNodeArgument, variableName);
+                        return true;
+                }
+                if (!knownVariables.contains(variableName)) {
+                        newVariables.add(variableName);
+                        return true;
+                }
+                return false;
+        }
+
+        protected void createVariables(ExistentialQuantifier quantifier, Set<String> newVariables) {
+                for (String variableName : newVariables) {
+                        createVariable(quantifier, variableName);
+                }
+        }
+
+        protected void createVariable(ExistentialQuantifier quantifier, String variableName) {
+                if (NamingUtil.isValidId(variableName)) {
+                        ImplicitVariable variable = createNamedVariable(variableName);
+                        quantifier.getImplicitVariables().add(variable);
+                }
+        }
+
+        protected void createSingletonVariable(VariableOrNodeArgument argument, String variableName) {
+                if (NamingUtil.isValidId(variableName)) {
+                        ImplicitVariable variable = createNamedVariable(variableName);
+                        argument.setSingletonVariable(variable);
+                }
+        }
+
+        protected ImplicitVariable createNamedVariable(String variableName) {
+                var variable = ProblemFactory.eINSTANCE.createImplicitVariable();
+                variable.setName(variableName);
+                return variable;
+        }
+
+        public void discardDerivedVariables(Problem problem) {
+                for (Statement statement : problem.getStatements()) {
+                        if (statement instanceof ParametricDefinition parametricDefinition) {
+                                discardParametricDefinitionState(parametricDefinition);
+                        }
+                }
+        }
+
+        protected void discardParametricDefinitionState(ParametricDefinition definition) {
+                for (Conjunction body : definition.getBodies()) {
+                        body.getImplicitVariables().clear();
+                        for (Literal literal : body.getLiterals()) {
+                                if (literal instanceof Atom atom) {
+                                        discardDerivedAtomState(atom);
+                                }
+                                if (literal instanceof NegativeLiteral negativeLiteral) {
+                                        negativeLiteral.getImplicitVariables().clear();
+                                        discardDerivedAtomState(negativeLiteral.getAtom());
+                                }
+                        }
+                }
+        }
+
+        protected void discardDerivedAtomState(Atom atom) {
+                if (atom == null) {
+                        return;
+                }
+                for (Argument argument : atom.getArguments()) {
+                        if (argument instanceof VariableOrNodeArgument variableOrNodeArgument) {
+                                variableOrNodeArgument.setSingletonVariable(null);
+                        }
+                }
+        }
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/resource/NodeNameCollector.java b/subprojects/language/src/main/java/tools/refinery/language/resource/NodeNameCollector.java
new file mode 100644
index 00000000..99bf9b64
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/resource/NodeNameCollector.java
@@ -0,0 +1,88 @@
+package tools.refinery.language.resource;
+
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.xtext.linking.impl.LinkingHelper;
+import org.eclipse.xtext.naming.IQualifiedNameConverter;
+import org.eclipse.xtext.nodemodel.INode;
+import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
+import org.eclipse.xtext.scoping.IScope;
+import org.eclipse.xtext.scoping.IScopeProvider;
+import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+
+import tools.refinery.language.model.problem.Assertion;
+import tools.refinery.language.model.problem.AssertionArgument;
+import tools.refinery.language.model.problem.NodeAssertionArgument;
+import tools.refinery.language.model.problem.NodeValueAssertion;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.ProblemPackage;
+import tools.refinery.language.model.problem.Statement;
+import tools.refinery.language.naming.NamingUtil;
+
+public class NodeNameCollector {
+        @Inject
+        private LinkingHelper linkingHelper;
+
+        @Inject
+        private IQualifiedNameConverter qualifiedNameConverter;
+
+        @Inject
+        @Named(AbstractDeclarativeScopeProvider.NAMED_DELEGATE)
+        private IScopeProvider scopeProvider;
+
+        private final ImmutableSet.Builder<String> nodeNames = ImmutableSet.builder();
+
+        private IScope nodeScope;
+
+        public Set<String> getNodeNames() {
+                return nodeNames.build();
+        }
+
+        public void collectNodeNames(Problem problem) {
+                nodeScope = scopeProvider.getScope(problem, ProblemPackage.Literals.NODE_ASSERTION_ARGUMENT__NODE);
+                for (Statement statement : problem.getStatements()) {
+                        collectStatementNodeNames(statement);
+                }
+        }
+
+        protected void collectStatementNodeNames(Statement statement) {
+                if (statement instanceof Assertion assertion) {
+                        collectAssertionNodeNames(assertion);
+                } else if (statement instanceof NodeValueAssertion nodeValueAssertion) {
+                        collectNodeValueAssertionNodeNames(nodeValueAssertion);
+                }
+        }
+
+        protected void collectAssertionNodeNames(Assertion assertion) {
+                for (AssertionArgument argument : assertion.getArguments()) {
+                        if (argument instanceof NodeAssertionArgument) {
+                                collectNodeNames(argument, ProblemPackage.Literals.NODE_ASSERTION_ARGUMENT__NODE);
+                        }
+                }
+        }
+
+        protected void collectNodeValueAssertionNodeNames(NodeValueAssertion nodeValueAssertion) {
+                collectNodeNames(nodeValueAssertion, ProblemPackage.Literals.NODE_VALUE_ASSERTION__NODE);
+        }
+
+        private void collectNodeNames(EObject eObject, EStructuralFeature feature) {
+                List<INode> nodes = NodeModelUtils.findNodesForFeature(eObject, feature);
+                for (INode node : nodes) {
+                        var nodeName = linkingHelper.getCrossRefNodeAsString(node, true);
+                        if (!NamingUtil.isValidId(nodeName)) {
+                                continue;
+                        }
+                        var qualifiedName = qualifiedNameConverter.toQualifiedName(nodeName);
+                        if (nodeScope.getSingleElement(qualifiedName) == null) {
+                                nodeNames.add(nodeName);
+                        }
+                }
+        }
+}
\ No newline at end of file
diff --git a/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemDerivedStateComputer.java b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemDerivedStateComputer.java
new file mode 100644
index 00000000..275feca3
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemDerivedStateComputer.java
@@ -0,0 +1,163 @@
+package tools.refinery.language.resource;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.xtext.Constants;
+import org.eclipse.xtext.resource.DerivedStateAwareResource;
+import org.eclipse.xtext.resource.IDerivedStateComputer;
+import org.eclipse.xtext.resource.XtextResource;
+import org.eclipse.xtext.scoping.IScopeProvider;
+import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
+import com.google.inject.name.Named;
+
+import tools.refinery.language.model.problem.ClassDeclaration;
+import tools.refinery.language.model.problem.Node;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.ProblemFactory;
+import tools.refinery.language.model.problem.Statement;
+
+@Singleton
+public class ProblemDerivedStateComputer implements IDerivedStateComputer {
+        public static final String NEW_NODE = "new";
+
+        @Inject
+        @Named(Constants.LANGUAGE_NAME)
+        private String languageName;
+
+        @Inject
+        @Named(AbstractDeclarativeScopeProvider.NAMED_DELEGATE)
+        private IScopeProvider scopeProvider;
+
+        @Inject
+        private Provider<NodeNameCollector> nodeNameCollectorProvider;
+
+        @Inject
+        private DerivedVariableComputer derivedVariableComputer;
+
+        @Override
+        public void installDerivedState(DerivedStateAwareResource resource, boolean preLinkingPhase) {
+                var problem = getProblem(resource);
+                if (problem != null) {
+                        var adapter = getOrInstallAdapter(resource);
+                        installDerivedProblemState(problem, adapter, preLinkingPhase);
+                }
+        }
+
+        protected Problem getProblem(Resource resource) {
+                List<EObject> contents = resource.getContents();
+                if (contents.isEmpty()) {
+                        return null;
+                }
+                EObject object = contents.get(0);
+                if (object instanceof Problem problem) {
+                        return problem;
+                }
+                return null;
+        }
+
+        protected void installDerivedProblemState(Problem problem, Adapter adapter, boolean preLinkingPhase) {
+                installNewNodes(problem, adapter);
+                if (preLinkingPhase) {
+                        return;
+                }
+                Set<String> nodeNames = installDerivedNodes(problem);
+                derivedVariableComputer.installDerivedVariables(problem, nodeNames);
+        }
+
+        protected void installNewNodes(Problem problem, Adapter adapter) {
+                for (Statement statement : problem.getStatements()) {
+                        if (statement instanceof ClassDeclaration declaration && !declaration.isAbstract()
+                                        && declaration.getNewNode() == null) {
+                                var newNode = adapter.createNodeIfAbsent(declaration, key -> createNode(NEW_NODE));
+                                declaration.setNewNode(newNode);
+                        }
+                }
+        }
+
+        protected Set<String> installDerivedNodes(Problem problem) {
+                var collector = nodeNameCollectorProvider.get();
+                collector.collectNodeNames(problem);
+                Set<String> nodeNames = collector.getNodeNames();
+                List<Node> grapNodes = problem.getNodes();
+                for (String nodeName : nodeNames) {
+                        var graphNode = createNode(nodeName);
+                        grapNodes.add(graphNode);
+                }
+                return nodeNames;
+        }
+
+        protected Node createNode(String name) {
+                var node = ProblemFactory.eINSTANCE.createNode();
+                node.setName(name);
+                return node;
+        }
+
+        @Override
+        public void discardDerivedState(DerivedStateAwareResource resource) {
+                var problem = getProblem(resource);
+                if (problem != null) {
+                        var adapter = getOrInstallAdapter(resource);
+                        discardDerivedProblemState(problem, adapter);
+                }
+        }
+
+        protected void discardDerivedProblemState(Problem problem, Adapter adapter) {
+                Set<ClassDeclaration> classDeclarations = new HashSet<>();
+                problem.getNodes().clear();
+                for (Statement statement : problem.getStatements()) {
+                        if (statement instanceof ClassDeclaration classDeclaration) {
+                                classDeclaration.setNewNode(null);
+                                classDeclarations.add(classDeclaration);
+                        }
+                }
+                adapter.retainAll(classDeclarations);
+                derivedVariableComputer.discardDerivedVariables(problem);
+        }
+
+        protected Adapter getOrInstallAdapter(Resource resource) {
+                if (!(resource instanceof XtextResource)) {
+                        return new Adapter();
+                }
+                String resourceLanguageName = ((XtextResource) resource).getLanguageName();
+                if (!languageName.equals(resourceLanguageName)) {
+                        return new Adapter();
+                }
+                var adapter = (Adapter) EcoreUtil.getAdapter(resource.eAdapters(), Adapter.class);
+                if (adapter == null) {
+                        adapter = new Adapter();
+                        resource.eAdapters().add(adapter);
+                }
+                return adapter;
+        }
+
+        protected static class Adapter extends AdapterImpl {
+                private Map<ClassDeclaration, Node> newNodes = new HashMap<>();
+
+                public Node createNodeIfAbsent(ClassDeclaration classDeclaration, Function<ClassDeclaration, Node> createNode) {
+                        return newNodes.computeIfAbsent(classDeclaration, createNode);
+                }
+
+                public void retainAll(Collection<ClassDeclaration> classDeclarations) {
+                        newNodes.keySet().retainAll(classDeclarations);
+                }
+
+                @Override
+                public boolean isAdapterForType(Object type) {
+                        return Adapter.class == type;
+                }
+        }
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemLocationInFileProvider.java b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemLocationInFileProvider.java
new file mode 100644
index 00000000..7aa75833
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemLocationInFileProvider.java
@@ -0,0 +1,33 @@
+package tools.refinery.language.resource;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.resource.DefaultLocationInFileProvider;
+import org.eclipse.xtext.util.ITextRegion;
+
+import tools.refinery.language.model.ProblemUtil;
+import tools.refinery.language.model.problem.ImplicitVariable;
+import tools.refinery.language.model.problem.Node;
+
+public class ProblemLocationInFileProvider extends DefaultLocationInFileProvider {
+        @Override
+        protected ITextRegion doGetTextRegion(EObject obj, RegionDescription query) {
+                if (obj instanceof Node node) {
+                        return getNodeTextRegion(node, query);
+                }
+                if (obj instanceof ImplicitVariable) {
+                        return ITextRegion.EMPTY_REGION;
+                }
+                return super.doGetTextRegion(obj, query);
+        }
+
+        protected ITextRegion getNodeTextRegion(Node node, RegionDescription query) {
+                if (ProblemUtil.isIndividualNode(node)) {
+                        return super.doGetTextRegion(node, query);
+                }
+                if (ProblemUtil.isNewNode(node)) {
+                        EObject container = node.eContainer();
+                        return doGetTextRegion(container, query);
+                }
+                return ITextRegion.EMPTY_REGION;
+        }
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java
new file mode 100644
index 00000000..f86ebd38
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java
@@ -0,0 +1,103 @@
+package tools.refinery.language.resource;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.EcoreUtil2;
+import org.eclipse.xtext.naming.IQualifiedNameConverter;
+import org.eclipse.xtext.naming.QualifiedName;
+import org.eclipse.xtext.resource.EObjectDescription;
+import org.eclipse.xtext.resource.IEObjectDescription;
+import org.eclipse.xtext.resource.impl.DefaultResourceDescriptionStrategy;
+import org.eclipse.xtext.util.IAcceptor;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
+import tools.refinery.language.model.ProblemUtil;
+import tools.refinery.language.model.problem.NamedElement;
+import tools.refinery.language.model.problem.Node;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.Variable;
+import tools.refinery.language.naming.NamingUtil;
+
+@Singleton
+public class ProblemResourceDescriptionStrategy extends DefaultResourceDescriptionStrategy {
+        @Inject
+        private IQualifiedNameConverter qualifiedNameConverter;
+
+        @Override
+        public boolean createEObjectDescriptions(EObject eObject, IAcceptor<IEObjectDescription> acceptor) {
+                if (!shouldExport(eObject)) {
+                        return false;
+                }
+                var qualifiedName = getNameAsQualifiedName(eObject);
+                if (qualifiedName == null) {
+                        return true;
+                }
+                var problem = EcoreUtil2.getContainerOfType(eObject, Problem.class);
+                var problemQualifiedName = getNameAsQualifiedName(problem);
+                boolean nameExported;
+                if (shouldExportSimpleName(eObject)) {
+                        acceptEObjectDescription(eObject, problemQualifiedName, qualifiedName, acceptor);
+                        nameExported = true;
+                } else {
+                        nameExported = false;
+                }
+                var parent = eObject.eContainer();
+                while (parent != null && parent != problem) {
+                        var parentQualifiedName = getNameAsQualifiedName(parent);
+                        if (parentQualifiedName == null) {
+                                parent = parent.eContainer();
+                                continue;
+                        }
+                        qualifiedName = parentQualifiedName.append(qualifiedName);
+                        if (shouldExportSimpleName(parent)) {
+                                acceptEObjectDescription(eObject, problemQualifiedName, qualifiedName, acceptor);
+                                nameExported = true;
+                        } else {
+                                nameExported = false;
+                        }
+                        parent = parent.eContainer();
+                }
+                if (!nameExported) {
+                        acceptEObjectDescription(eObject, problemQualifiedName, qualifiedName, acceptor);
+                }
+                return true;
+        }
+
+        protected QualifiedName getNameAsQualifiedName(EObject eObject) {
+                if (!(eObject instanceof NamedElement)) {
+                        return null;
+                }
+                var namedElement = (NamedElement) eObject;
+                var name = namedElement.getName();
+                if (NamingUtil.isNullOrEmpty(name)) {
+                        return null;
+                }
+                return qualifiedNameConverter.toQualifiedName(name);
+        }
+
+        protected boolean shouldExport(EObject eObject) {
+                if (eObject instanceof Variable) {
+                        // Variables are always private to the containing predicate definition.
+                        return false;
+                }
+                if (eObject instanceof Node node) {
+                        // Only enum literals and new nodes are visible across problem files.
+                        return ProblemUtil.isIndividualNode(node) || ProblemUtil.isNewNode(node);
+                }
+                return true;
+        }
+
+        protected boolean shouldExportSimpleName(EObject eObject) {
+                if (eObject instanceof Node node) {
+                        return !ProblemUtil.isNewNode(node);
+                }
+                return true;
+        }
+
+        private void acceptEObjectDescription(EObject eObject, QualifiedName prefix, QualifiedName qualifiedName,
+                        IAcceptor<IEObjectDescription> acceptor) {
+                var qualifiedNameWithPrefix = prefix == null ? qualifiedName : prefix.append(qualifiedName);
+                acceptor.accept(EObjectDescription.create(qualifiedNameWithPrefix, eObject));
+        }
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemXmiResourceFactory.java b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemXmiResourceFactory.java
new file mode 100644
index 00000000..68aa6016
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemXmiResourceFactory.java
@@ -0,0 +1,16 @@
+package tools.refinery.language.resource;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.resource.IResourceFactory;
+
+import tools.refinery.language.model.problem.util.ProblemResourceFactoryImpl;
+
+public class ProblemXmiResourceFactory implements IResourceFactory {
+        private Resource.Factory problemResourceFactory = new ProblemResourceFactoryImpl();
+        
+        @Override
+        public Resource createResource(URI uri) {
+                return problemResourceFactory.createResource(uri);
+        }
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/resource/ReferenceCounter.java b/subprojects/language/src/main/java/tools/refinery/language/resource/ReferenceCounter.java
new file mode 100644
index 00000000..7525dfc6
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/resource/ReferenceCounter.java
@@ -0,0 +1,51 @@
+package tools.refinery.language.resource;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.util.IResourceScopeCache;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
+import tools.refinery.language.model.problem.Problem;
+
+@Singleton
+public class ReferenceCounter {
+        @Inject
+        private IResourceScopeCache cache;
+
+        public int countReferences(Problem problem, EObject eObject) {
+                var count = getReferenceCounts(problem).get(eObject);
+                if (count == null) {
+                        return 0;
+                }
+                return count;
+        }
+
+        protected Map<EObject, Integer> getReferenceCounts(Problem problem) {
+                var resource = problem.eResource();
+                if (resource == null) {
+                        return doGetReferenceCounts(problem);
+                }
+                return cache.get(problem, resource, () -> doGetReferenceCounts(problem));
+        }
+
+        protected Map<EObject, Integer> doGetReferenceCounts(Problem problem) {
+                var map = new HashMap<EObject, Integer>();
+                countCrossReferences(problem, map);
+                var iterator = problem.eAllContents();
+                while (iterator.hasNext()) {
+                        var eObject = iterator.next();
+                        countCrossReferences(eObject, map);
+                }
+                return map;
+        }
+
+        protected void countCrossReferences(EObject eObject, Map<EObject, Integer> map) {
+                for (var referencedObject : eObject.eCrossReferences()) {
+                        map.compute(referencedObject, (key, currentValue) -> currentValue == null ? 1 : currentValue + 1);
+                }
+        }
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemGlobalScopeProvider.java b/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemGlobalScopeProvider.java
new file mode 100644
index 00000000..b582d16b
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemGlobalScopeProvider.java
@@ -0,0 +1,18 @@
+package tools.refinery.language.scoping;
+
+import java.util.LinkedHashSet;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider;
+
+import tools.refinery.language.model.ProblemUtil;
+
+public class ProblemGlobalScopeProvider extends ImportUriGlobalScopeProvider {
+        @Override
+        protected LinkedHashSet<URI> getImportedUris(Resource resource) {
+                LinkedHashSet<URI> importedUris = new LinkedHashSet<>();
+                importedUris.add(ProblemUtil.BUILTIN_LIBRARY_URI);
+                return importedUris;
+        }
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemLocalScopeProvider.java b/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemLocalScopeProvider.java
new file mode 100644
index 00000000..85797025
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemLocalScopeProvider.java
@@ -0,0 +1,42 @@
+package tools.refinery.language.scoping;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.naming.QualifiedName;
+import org.eclipse.xtext.resource.IResourceDescriptions;
+import org.eclipse.xtext.resource.IResourceDescriptionsProvider;
+import org.eclipse.xtext.resource.ISelectable;
+import org.eclipse.xtext.scoping.impl.ImportNormalizer;
+import org.eclipse.xtext.scoping.impl.ImportedNamespaceAwareLocalScopeProvider;
+
+import com.google.inject.Inject;
+
+import tools.refinery.language.model.ProblemUtil;
+
+public class ProblemLocalScopeProvider extends ImportedNamespaceAwareLocalScopeProvider {
+        private static final QualifiedName BUILTIN_LIBRARY_QUALIFIED_NAME = QualifiedName
+                        .create(ProblemUtil.BUILTIN_LIBRARY_NAME);
+
+        @Inject
+        private IResourceDescriptionsProvider resourceDescriptionsProvider;
+
+        @Override
+        protected List<ImportNormalizer> getImplicitImports(boolean ignoreCase) {
+                return List.of(doCreateImportNormalizer(BUILTIN_LIBRARY_QUALIFIED_NAME, true, ignoreCase));
+        }
+
+        @Override
+        protected List<ImportNormalizer> getImportedNamespaceResolvers(EObject context, boolean ignoreCase) {
+                return List.of();
+        }
+
+        @Override
+        protected ISelectable internalGetAllDescriptions(Resource resource) {
+                // Force the use of ProblemResourceDescriptionStrategy to include all QualifiedNames of objects.
+                IResourceDescriptions resourceDescriptions = resourceDescriptionsProvider
+                                .getResourceDescriptions(resource.getResourceSet());
+                return resourceDescriptions.getResourceDescription(resource.getURI());
+        }
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemScopeProvider.java b/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemScopeProvider.java
new file mode 100644
index 00000000..d31a5308
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemScopeProvider.java
@@ -0,0 +1,104 @@
+/*
+ * generated by Xtext 2.25.0
+ */
+package tools.refinery.language.scoping;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.xtext.EcoreUtil2;
+import org.eclipse.xtext.scoping.IScope;
+import org.eclipse.xtext.scoping.Scopes;
+
+import tools.refinery.language.model.ProblemUtil;
+import tools.refinery.language.model.problem.ClassDeclaration;
+import tools.refinery.language.model.problem.ExistentialQuantifier;
+import tools.refinery.language.model.problem.NewActionLiteral;
+import tools.refinery.language.model.problem.ParametricDefinition;
+import tools.refinery.language.model.problem.Action;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.ProblemPackage;
+import tools.refinery.language.model.problem.ReferenceDeclaration;
+import tools.refinery.language.model.problem.Variable;
+import tools.refinery.language.model.problem.VariableOrNodeArgument;
+
+/**
+ * This class contains custom scoping description.
+ * 
+ * See
+ * https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#scoping
+ * on how and when to use it.
+ */
+public class ProblemScopeProvider extends AbstractProblemScopeProvider {
+
+        @Override
+        public IScope getScope(EObject context, EReference reference) {
+                var scope = super.getScope(context, reference);
+                if (reference == ProblemPackage.Literals.NODE_ASSERTION_ARGUMENT__NODE
+                                || reference == ProblemPackage.Literals.NODE_VALUE_ASSERTION__NODE) {
+                        return getNodesScope(context, scope);
+                }
+                if (reference == ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE
+                                || reference == ProblemPackage.Literals.DELETE_ACTION_LITERAL__VARIABLE_OR_NODE) {
+                        return getVariableScope(context, scope);
+                }
+                if (reference == ProblemPackage.Literals.REFERENCE_DECLARATION__OPPOSITE) {
+                        return getOppositeScope(context, scope);
+                }
+                return scope;
+        }
+
+        protected IScope getNodesScope(EObject context, IScope delegateScope) {
+                var problem = EcoreUtil2.getContainerOfType(context, Problem.class);
+                if (problem == null) {
+                        return delegateScope;
+                }
+                return Scopes.scopeFor(problem.getNodes(), delegateScope);
+        }
+
+        protected IScope getVariableScope(EObject context, IScope delegateScope) {
+                List<Variable> variables = new ArrayList<>();
+                EObject currentContext = context;
+                if (context instanceof VariableOrNodeArgument argument) {
+                        Variable singletonVariable = argument.getSingletonVariable();
+                        if (singletonVariable != null) {
+                                variables.add(singletonVariable);
+                        }
+                }
+                while (currentContext != null && !(currentContext instanceof ParametricDefinition)) {
+                        if (currentContext instanceof ExistentialQuantifier quantifier) {
+                                variables.addAll(quantifier.getImplicitVariables());
+                        } else
+                        if(currentContext instanceof Action action) {
+                                for (var literal : action.getActionLiterals()) {
+                                        if(literal instanceof NewActionLiteral newActionLiteral && newActionLiteral.getVariable() != null) {
+                                                variables.add(newActionLiteral.getVariable());
+                                        }
+                                }
+                        }
+                        currentContext = currentContext.eContainer();
+                }
+                IScope parentScope = getNodesScope(context, delegateScope);
+                if (currentContext != null) {
+                        ParametricDefinition definition = (ParametricDefinition) currentContext;
+                        parentScope = Scopes.scopeFor(definition.getParameters(),parentScope);
+                }
+                return Scopes.scopeFor(variables,parentScope);
+        }
+
+        protected IScope getOppositeScope(EObject context, IScope delegateScope) {
+                var referenceDeclaration = EcoreUtil2.getContainerOfType(context, ReferenceDeclaration.class);
+                if (referenceDeclaration == null) {
+                        return delegateScope;
+                }
+                var relation = referenceDeclaration.getReferenceType();
+                if (!(relation instanceof ClassDeclaration)) {
+                        return delegateScope;
+                }
+                var classDeclaration = (ClassDeclaration) relation;
+                var referenceDeclarations = ProblemUtil.getAllReferenceDeclarations(classDeclaration);
+                return Scopes.scopeFor(referenceDeclarations, delegateScope);
+        }
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java b/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java
new file mode 100644
index 00000000..975fdca2
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java
@@ -0,0 +1,62 @@
+/*
+ * generated by Xtext 2.25.0
+ */
+package tools.refinery.language.validation;
+
+import org.eclipse.xtext.EcoreUtil2;
+import org.eclipse.xtext.validation.Check;
+
+import com.google.inject.Inject;
+
+import tools.refinery.language.model.ProblemUtil;
+import tools.refinery.language.model.problem.Node;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.ProblemPackage;
+import tools.refinery.language.model.problem.Variable;
+import tools.refinery.language.model.problem.VariableOrNodeArgument;
+import tools.refinery.language.resource.ReferenceCounter;
+
+/**
+ * This class contains custom validation rules.
+ *
+ * See
+ * https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#validation
+ */
+public class ProblemValidator extends AbstractProblemValidator {
+        private static final String ISSUE_PREFIX = "tools.refinery.language.validation.ProblemValidator.";
+
+        public static final String SINGLETON_VARIABLE_ISSUE = ISSUE_PREFIX + "SINGLETON_VARIABLE";
+
+        public static final String NON_INDIVIDUAL_NODE_ISSUE = ISSUE_PREFIX + "NON_INDIVIDUAL_NODE";
+
+        @Inject
+        private ReferenceCounter referenceCounter;
+
+        @Check
+        public void checkUniqueVariable(VariableOrNodeArgument argument) {
+                var variableOrNode = argument.getVariableOrNode();
+                if (variableOrNode instanceof Variable variable && ProblemUtil.isImplicitVariable(variable)
+                                && !ProblemUtil.isSingletonVariable(variable)) {
+                        var problem = EcoreUtil2.getContainerOfType(variable, Problem.class);
+                        if (problem != null && referenceCounter.countReferences(problem, variable) <= 1) {
+                                var name = variable.getName();
+                                var message = "Variable '%s' has only a single reference. Add another reference or mark is as a singleton variable: '_%s'"
+                                                .formatted(name, name);
+                                warning(message, argument, ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE,
+                                                INSIGNIFICANT_INDEX, SINGLETON_VARIABLE_ISSUE);
+                        }
+                }
+        }
+
+        @Check
+        public void checkNonUniqueNode(VariableOrNodeArgument argument) {
+                var variableOrNode = argument.getVariableOrNode();
+                if (variableOrNode instanceof Node node && !ProblemUtil.isIndividualNode(node)) {
+                        var name = node.getName();
+                        var message = "Only individual nodes can be referenced in predicates. Mark '%s' as individual with the declaration 'indiv %s.'"
+                                        .formatted(name, name);
+                        error(message, argument, ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE,
+                                        INSIGNIFICANT_INDEX, NON_INDIVIDUAL_NODE_ISSUE);
+                }
+        }
+}
diff --git a/subprojects/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.xtend b/subprojects/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.xtend
new file mode 100644
index 00000000..53d31a6c
--- /dev/null
+++ b/subprojects/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.xtend
@@ -0,0 +1,64 @@
+/*
+ * generated by Xtext 2.26.0.M1
+ */
+package tools.refinery.language.tests
+
+import com.google.inject.Inject
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.extensions.InjectionExtension
+import org.eclipse.xtext.testing.util.ParseHelper
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.^extension.ExtendWith
+import tools.refinery.language.model.problem.Problem
+import tools.refinery.language.model.tests.ProblemTestUtil
+
+import static org.hamcrest.MatcherAssert.assertThat
+import static org.hamcrest.Matchers.*
+
+@ExtendWith(InjectionExtension)
+@InjectWith(ProblemInjectorProvider)
+class ProblemParsingTest {
+        @Inject
+        ParseHelper<Problem> parseHelper
+
+        @Inject
+        extension ProblemTestUtil
+
+        @Test
+        def void exampleTest() {
+                val it = parseHelper.parse('''
+                        class Family {
+                                contains Person[] members
+                        }
+                        
+                        class Person {
+                                Person[0..*] children opposite parent
+                                Person[0..1] parent opposite children
+                                int age
+                                TaxStatus taxStatus
+                        }
+                        
+                        enum TaxStatus {
+                                child, student, adult, retired
+                        }
+                        
+                        % A child cannot have any dependents.
+                        error invalidTaxStatus(Person p) <->
+                                taxStatus(p, child), children(p, _q).
+                        
+                        indiv family.
+                        Family(family).
+                        members(family, anne): true.
+                        members(family, bob).
+                        members(family, ciri).
+                        children(anne, ciri).
+                        ?children(bob, ciri).
+                        taxStatus(anne, adult).
+                        age(anne, 35).
+                        bobAge: 27.
+                        age(bob, bobAge).
+                        !age(ciri, bobAge).
+                ''')
+                assertThat(errors, empty)
+        }
+}
diff --git a/subprojects/language/src/test/java/tools/refinery/language/tests/formatting2/ProblemFormatterTest.java b/subprojects/language/src/test/java/tools/refinery/language/tests/formatting2/ProblemFormatterTest.java
new file mode 100644
index 00000000..41ad2d31
--- /dev/null
+++ b/subprojects/language/src/test/java/tools/refinery/language/tests/formatting2/ProblemFormatterTest.java
@@ -0,0 +1,235 @@
+package tools.refinery.language.tests.formatting2;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.util.List;
+
+import org.eclipse.xtext.formatting2.FormatterRequest;
+import org.eclipse.xtext.formatting2.IFormatter2;
+import org.eclipse.xtext.formatting2.regionaccess.ITextRegionAccess;
+import org.eclipse.xtext.formatting2.regionaccess.ITextReplacement;
+import org.eclipse.xtext.formatting2.regionaccess.TextRegionAccessBuilder;
+import org.eclipse.xtext.resource.XtextResource;
+import org.eclipse.xtext.testing.InjectWith;
+import org.eclipse.xtext.testing.extensions.InjectionExtension;
+import org.eclipse.xtext.testing.util.ParseHelper;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.tests.ProblemInjectorProvider;
+
+@ExtendWith(InjectionExtension.class)
+@InjectWith(ProblemInjectorProvider.class)
+class ProblemFormatterTest {
+        @Inject
+        private ParseHelper<Problem> parseHelper;
+
+        @Inject
+        private Provider<FormatterRequest> formatterRequestProvider;
+
+        @Inject
+        private TextRegionAccessBuilder regionBuilder;
+
+        @Inject
+        private IFormatter2 formatter2;
+
+        @Test
+        void problemNameTest() {
+                testFormatter("  problem  problem  .  ", "problem problem.\n");
+        }
+
+        @Test
+        void assertionTest() {
+                testFormatter("  equals (  a  ,  b  ,  *  )  :  true  .  ", "equals(a, b, *): true.\n");
+        }
+
+        @Test
+        void defaultAssertionTest() {
+                testFormatter("  default  equals (  a  ,  b  ,  *  )  :  true  .  ", "default equals(a, b, *): true.\n");
+        }
+
+        @Test
+        void assertionShortTrueTest() {
+                testFormatter("  equals (  a  ,  b  ,  *  )  .  ", "equals(a, b, *).\n");
+        }
+
+        @Test
+        void defaultAssertionShortTrueTest() {
+                testFormatter("  default  equals (  a  ,  b  ,  *  )  .  ", "default equals(a, b, *).\n");
+        }
+
+        @Test
+        void assertionShortFalseTest() {
+                testFormatter("  !  equals (  a  ,  b  ,  *  )  .  ", "!equals(a, b, *).\n");
+        }
+
+        @Test
+        void defaultAssertionShortFalseTest() {
+                testFormatter("  default  !  equals (  a  ,  b  ,  *  )  .  ", "default !equals(a, b, *).\n");
+        }
+
+        @Test
+        void assertionShortUnknownTest() {
+                testFormatter("  ?  equals (  a  ,  b  ,  *  )  .  ", "?equals(a, b, *).\n");
+        }
+
+        @Test
+        void defaultAssertionShortUnknownTest() {
+                testFormatter("  default  ?  equals (  a  ,  b  ,  *  )  .  ", "default ?equals(a, b, *).\n");
+        }
+
+        @Test
+        void multipleAssertionsTest() {
+                testFormatter("  exists (  a  )  .  ?  equals  (  a  ,  a  ).", """
+                                exists(a).
+                                ?equals(a, a).
+                                """);
+        }
+
+        @Test
+        void multipleAssertionsNamedProblemTest() {
+                testFormatter("  problem  foo  .  exists (  a  )  .  ?  equals  (  a  ,  a  ).", """
+                                problem foo.
+
+                                exists(a).
+                                ?equals(a, a).
+                                """);
+        }
+
+        @Test
+        void classWithoutBodyTest() {
+                testFormatter("  class  Foo  .  ", "class Foo.\n");
+        }
+
+        @Test
+        void abstractClassWithoutBodyTest() {
+                testFormatter("  abstract  class  Foo  .  ", "abstract class Foo.\n");
+        }
+
+        @Test
+        void classExtendsWithoutBodyTest() {
+                testFormatter("  class  Foo.  class  Bar  .  class  Quux  extends  Foo  ,  Bar  .  ", """
+                                class Foo.
+
+                                class Bar.
+
+                                class Quux extends Foo, Bar.
+                                """);
+        }
+
+        @Test
+        void classWithEmptyBodyTest() {
+                testFormatter("  class  Foo  {  }  ", """
+                                class Foo {
+                                }
+                                """);
+        }
+
+        @Test
+        void classExtendsWithBodyTest() {
+                testFormatter("  class  Foo.  class  Bar  .  class  Quux  extends  Foo  ,  Bar  {  }  ", """
+                                class Foo.
+
+                                class Bar.
+
+                                class Quux extends Foo, Bar {
+                                }
+                                """);
+        }
+
+        @Test
+        void predicateWithoutBodyTest() {
+                testFormatter("  pred  foo  (  node  a  ,  b  )  .  ", "pred foo(node a, b).\n");
+        }
+
+        @Test
+        void predicateWithBodyTest() {
+                testFormatter(
+                                "  pred  foo  (  node  a  ,  b  )  <->  equal  (a  ,  _c  )  ,  !  equal  (  a  ,  b  )  ;  equal+(  a  ,  b  )  .  ",
+                                "pred foo(node a, b) <-> equal(a, _c), !equal(a, b); equal+(a, b).\n");
+        }
+
+        @Test
+        void predicatesWithoutBodyTest() {
+                testFormatter("  pred  foo  (  node  a  ,  b  )  .  pred  bar  (  node  c  )  .  ", """
+                                pred foo(node a, b).
+
+                                pred bar(node c).
+                                """);
+        }
+
+        @Test
+        void predicateCommentsTest() {
+                testFormatter("""
+                                  % Some foo
+                                pred  foo  (  node  a  ,  b  )  .
+                                  % Some bar
+                                pred  bar  (  node  c  )  .
+                                """, """
+                                % Some foo
+                                pred foo(node a, b).
+
+                                % Some bar
+                                pred bar(node c).
+                                """);
+        }
+
+        @Test
+        void individualDeclarationTest() {
+                testFormatter("  indiv  a  ,  b  .  ", "indiv a, b.\n");
+        }
+
+        @Test
+        void mixedDeclarationsTest() {
+                testFormatter("""
+                                problem test.
+                                pred foo(node a).
+                                class Foo.
+                                foo(n1, n2).
+                                indiv i1.
+                                !foo(i1, n1).
+                                pred bar(node a, node b).
+                                pred quux().
+                                default !bar(*, *).
+                                """, """
+                                problem test.
+
+                                pred foo(node a).
+
+                                class Foo.
+
+                                foo(n1, n2).
+                                indiv i1.
+                                !foo(i1, n1).
+
+                                pred bar(node a, node b).
+
+                                pred quux().
+
+                                default !bar(*, *).
+                                """);
+        }
+
+        private void testFormatter(String toFormat, String expected) {
+                Problem problem;
+                try {
+                        problem = parseHelper.parse(toFormat);
+                } catch (Exception e) {
+                        throw new RuntimeException("Failed to parse document", e);
+                }
+                var resource = (XtextResource) problem.eResource();
+                FormatterRequest request = formatterRequestProvider.get();
+                request.setAllowIdentityEdits(false);
+                request.setFormatUndefinedHiddenRegionsOnly(false);
+                ITextRegionAccess regionAccess = regionBuilder.forNodeModel(resource).create();
+                request.setTextRegionAccess(regionAccess);
+                List<ITextReplacement> replacements = formatter2.format(request);
+                var formattedString = regionAccess.getRewriter().renderToString(replacements);
+                assertThat(formattedString, equalTo(expected));
+        }
+}
diff --git a/subprojects/language/src/test/java/tools/refinery/language/tests/rules/DirectRuleParsingTest.xtend b/subprojects/language/src/test/java/tools/refinery/language/tests/rules/DirectRuleParsingTest.xtend
new file mode 100644
index 00000000..d60651a0
--- /dev/null
+++ b/subprojects/language/src/test/java/tools/refinery/language/tests/rules/DirectRuleParsingTest.xtend
@@ -0,0 +1,96 @@
+package tools.refinery.language.tests.rules
+
+import com.google.inject.Inject
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.extensions.InjectionExtension
+import org.eclipse.xtext.testing.util.ParseHelper
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.^extension.ExtendWith
+import tools.refinery.language.model.problem.Problem
+import tools.refinery.language.tests.ProblemInjectorProvider
+import tools.refinery.language.model.tests.ProblemTestUtil
+
+import static org.hamcrest.MatcherAssert.assertThat
+import static org.hamcrest.Matchers.*
+
+@ExtendWith(InjectionExtension)
+@InjectWith(ProblemInjectorProvider)
+class DirectRuleParsingTest {
+        @Inject
+        ParseHelper<Problem> parseHelper
+
+        @Inject
+        extension ProblemTestUtil
+        
+        @Test
+        def void relationValueRewriteTest() {
+                val it = parseHelper.parse('''
+                        pred Person(p).
+                        direct rule r(p1): Person(p1) = true ~> Person(p1) = false.
+                ''')
+                assertThat(errors, empty)
+        }
+        
+        @Test
+        def void relationValueMergeTest() {
+                val it = parseHelper.parse('''
+                        pred Person(p).
+                        direct rule r(p1): Person(p1): true ~> Person(p1): false.
+                ''')
+                assertThat(errors, empty)
+        }
+        
+        @Test
+        def void newNodeTest() {
+                val it = parseHelper.parse('''
+                        pred Person(p).
+                        direct rule r(p1): Person(p1) = true ~> new p2, Person(p2) = unknown.
+                ''')
+                assertThat(errors, empty)
+                assertThat(rule("r").param(0), equalTo(rule("r").conj(0).lit(0).valueAtom.arg(0).variable))
+                assertThat(rule("r").actionLit(0).newVar,
+                        equalTo(rule("r").actionLit(1).valueAtom.arg(0).variable)
+                )
+        }
+        
+        @Test
+        def void differentScopeTest() {
+                val it = parseHelper.parse('''
+                        pred Friend(a, b).
+                        direct rule r(p1): Friend(p1, p2) = false ~> new p2, Friend(p1, p2) = true.
+                ''')
+                assertThat(errors, empty)
+                assertThat(rule("r").conj(0).lit(0).valueAtom.arg(1).variable,
+                        not(equalTo(rule("r").actionLit(1).valueAtom.arg(1).variable)))
+        }
+        
+        @Test
+        def void parameterShadowingTest() {
+                val it = parseHelper.parse('''
+                        pred Friend(a, b).
+                        direct rule r(p1, p2): Friend(p1, p2) = false ~> new p2, Friend(p1, p2) = true.
+                ''')
+                assertThat(errors, empty)
+                assertThat(rule("r").param(1),
+                        not(equalTo(rule("r").actionLit(1).valueAtom.arg(1).variable)))
+        }
+        
+        @Test
+        def void deleteParameterNodeTest() {
+                val it = parseHelper.parse('''
+                        pred Person(p).
+                        direct rule r(p1): Person(p1): false ~> delete p1.
+                ''')
+                assertThat(errors, empty)
+        }
+        
+        @Test
+        def void deleteDifferentScopeNodeTest() {
+                val it = parseHelper.parse('''
+                        pred Friend(p).
+                        direct rule r(p1): Friend(p1, p2) = true ~> delete p2.
+                ''')
+                assertThat(errors, not(empty))
+        }
+        
+}
diff --git a/subprojects/language/src/test/java/tools/refinery/language/tests/scoping/NodeScopingTest.xtend b/subprojects/language/src/test/java/tools/refinery/language/tests/scoping/NodeScopingTest.xtend
new file mode 100644
index 00000000..3a046341
--- /dev/null
+++ b/subprojects/language/src/test/java/tools/refinery/language/tests/scoping/NodeScopingTest.xtend
@@ -0,0 +1,322 @@
+package tools.refinery.language.tests.scoping
+
+import com.google.inject.Inject
+import java.util.stream.Stream
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.extensions.InjectionExtension
+import org.eclipse.xtext.testing.util.ParseHelper
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.^extension.ExtendWith
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.Arguments
+import org.junit.jupiter.params.provider.MethodSource
+import org.junit.jupiter.params.provider.ValueSource
+import tools.refinery.language.model.problem.Problem
+import tools.refinery.language.model.tests.ProblemTestUtil
+import tools.refinery.language.tests.ProblemInjectorProvider
+
+import static org.hamcrest.MatcherAssert.assertThat
+import static org.hamcrest.Matchers.*
+
+@ExtendWith(InjectionExtension)
+@InjectWith(ProblemInjectorProvider)
+class NodeScopingTest {
+        @Inject
+        ParseHelper<Problem> parseHelper
+
+        @Inject
+        extension ProblemTestUtil
+
+        @ParameterizedTest
+        @ValueSource(strings=#["", "builtin::"])
+        def void builtInArgumentTypeTest(String prefix) {
+                val it = parseHelper.parse('''
+                        pred predicate(«prefix»node a, «prefix»data b, «prefix»int c).
+                ''')
+                assertThat(errors, empty)
+                assertThat(pred('predicate').param(0).parameterType, equalTo(builtin.findClass('node')))
+                assertThat(pred('predicate').param(1).parameterType, equalTo(builtin.findClass('data')))
+                assertThat(pred('predicate').param(2).parameterType, equalTo(builtin.findClass('int')))
+        }
+
+        @Test
+        def void implicitNodeInAssertionTest() {
+                val it = parseHelper.parse('''
+                        pred predicate(node x, node y) <-> node(x).
+                        predicate(a, a).
+                        ?predicate(a, b).
+                ''')
+                assertThat(errors, empty)
+                assertThat(nodeNames, hasItems('a', 'b'))
+                assertThat(assertion(0).arg(0).node, equalTo(node('a')))
+                assertThat(assertion(0).arg(1).node, equalTo(node('a')))
+                assertThat(assertion(1).arg(0).node, equalTo(node('a')))
+                assertThat(assertion(1).arg(1).node, equalTo(node('b')))
+        }
+
+        @Test
+        def void implicitNodeInNodeValueAssertionTest() {
+                val it = parseHelper.parse('''
+                        a: 16.
+                ''')
+                assertThat(errors, empty)
+                assertThat(nodeNames, hasItems('a'))
+                assertThat(nodeValueAssertion(0).node, equalTo(node('a')))
+        }
+
+        @Test
+        def void implicitNodeInPredicateTest() {
+                val it = parseHelper.parse('''
+                        pred predicate(node a) <-> node(b).
+                        predicate(b).
+                ''')
+                assertThat(errors, empty)
+                assertThat(nodeNames, hasItem("b"))
+                assertThat(pred("predicate").conj(0).lit(0).arg(0).node, equalTo(node("b")))
+                assertThat(assertion(0).arg(0).node, equalTo(node("b")))
+        }
+
+        @ParameterizedTest
+        @MethodSource("individualNodeReferenceSource")
+        def void individualNodeInAssertionTest(String qualifiedNamePrefix, boolean namedProblem) {
+                val it = parseHelper.parse('''
+                        «IF namedProblem»problem test.«ENDIF»
+                        indiv a, b.
+                        pred predicate(node x, node y) <-> node(x).
+                        predicate(«qualifiedNamePrefix»a, «qualifiedNamePrefix»a).
+                        ?predicate(«qualifiedNamePrefix»a, «qualifiedNamePrefix»b).
+                ''')
+                assertThat(errors, empty)
+                assertThat(nodeNames, empty)
+                assertThat(assertion(0).arg(0).node, equalTo(individualNode('a')))
+                assertThat(assertion(0).arg(1).node, equalTo(individualNode('a')))
+                assertThat(assertion(1).arg(0).node, equalTo(individualNode('a')))
+                assertThat(assertion(1).arg(1).node, equalTo(individualNode('b')))
+        }
+
+        @ParameterizedTest
+        @MethodSource("individualNodeReferenceSource")
+        def void individualNodeInNodeValueAssertionTest(String qualifiedNamePrefix, boolean namedProblem) {
+                val it = parseHelper.parse('''
+                        «IF namedProblem»problem test.«ENDIF»
+                        indiv a.
+                        «qualifiedNamePrefix»a: 16.
+                ''')
+                assertThat(errors, empty)
+                assertThat(nodeNames, empty)
+                assertThat(nodeValueAssertion(0).node, equalTo(individualNode('a')))
+        }
+
+        @ParameterizedTest
+        @MethodSource("individualNodeReferenceSource")
+        def void individualNodeInPredicateTest(String qualifiedNamePrefix, boolean namedProblem) {
+                val it = parseHelper.parse('''
+                        «IF namedProblem»problem test.«ENDIF»
+                        indiv b.
+                        pred predicate(node a) <-> node(«qualifiedNamePrefix»b).
+                ''')
+                assertThat(errors, empty)
+                assertThat(nodeNames, empty)
+                assertThat(pred("predicate").conj(0).lit(0).arg(0).node, equalTo(individualNode("b")))
+        }
+        
+        static def individualNodeReferenceSource() {
+                Stream.of(
+                        Arguments.of("", false),
+                        Arguments.of("", true),
+                        Arguments.of("test::", true)
+                )
+        }
+
+        @ParameterizedTest
+        @MethodSource("builtInNodeReferencesSource")
+        def void builtInNodeTest(String qualifiedName) {
+                val it = parseHelper.parse('''
+                        pred predicate(node x) <-> node(x).
+                        predicate(«qualifiedName»).
+                ''')
+                assertThat(errors, empty)
+                assertThat(nodes, empty)
+                assertThat(assertion(0).arg(0).node, equalTo(builtin.findClass('int').newNode))
+        }
+
+        @ParameterizedTest
+        @MethodSource("builtInNodeReferencesSource")
+        def void builtInNodeInNodeValueAssertionTest(String qualifiedName) {
+                val it = parseHelper.parse('''
+                        «qualifiedName»: 16.
+                ''')
+                assertThat(errors, empty)
+                assertThat(nodes, empty)
+                assertThat(nodeValueAssertion(0).node, equalTo(builtin.findClass('int').newNode))
+        }
+
+        @ParameterizedTest
+        @MethodSource("builtInNodeReferencesSource")
+        def void builtInNodeInPredicateTest(String qualifiedName) {
+                val it = parseHelper.parse('''
+                        pred predicate(node x) <-> node(«qualifiedName»).
+                ''')
+                assertThat(errors, empty)
+                assertThat(pred("predicate").conj(0).lit(0).arg(0).node, equalTo(builtin.findClass('int').newNode))
+        }
+
+        static def builtInNodeReferencesSource() {
+                Stream.of(
+                        Arguments.of("int::new"),
+                        Arguments.of("builtin::int::new")
+                )
+        }
+
+        @ParameterizedTest(name="{0}, namedProblem={1}")
+        @MethodSource("classNewNodeReferencesSource")
+        def void classNewNodeTest(String qualifiedName, boolean namedProblem) {
+                val it = parseHelper.parse('''
+                        «IF namedProblem»problem test.«ENDIF»
+                        class Foo.
+                        pred predicate(node x) <-> node(x).
+                        predicate(«qualifiedName»).
+                ''')
+                assertThat(errors, empty)
+                assertThat(nodes, empty)
+                assertThat(assertion(0).arg(0).node, equalTo(findClass('Foo').newNode))
+        }
+
+        @ParameterizedTest(name="{0}, namedProblem={1}")
+        @MethodSource("classNewNodeReferencesSource")
+        def void classNewNodeInNodeValueAssertionTest(String qualifiedName, boolean namedProblem) {
+                val it = parseHelper.parse('''
+                        «IF namedProblem»problem test.«ENDIF»
+                        class Foo.
+                        «qualifiedName»: 16.
+                ''')
+                assertThat(errors, empty)
+                assertThat(nodes, empty)
+                assertThat(nodeValueAssertion(0).node, equalTo(findClass('Foo').newNode))
+        }
+
+        @ParameterizedTest(name="{0}, namedProblem={1}")
+        @MethodSource("classNewNodeReferencesSource")
+        def void classNewNodeInPredicateTest(String qualifiedName, boolean namedProblem) {
+                val it = parseHelper.parse('''
+                        «IF namedProblem»problem test.«ENDIF»
+                        class Foo.
+                        pred predicate(node x) <-> node(«qualifiedName»).
+                ''')
+                assertThat(errors, empty)
+                assertThat(pred("predicate").conj(0).lit(0).arg(0).node, equalTo(findClass('Foo').newNode))
+        }
+
+        static def classNewNodeReferencesSource() {
+                Stream.of(
+                        Arguments.of("Foo::new", false),
+                        Arguments.of("Foo::new", true),
+                        Arguments.of("test::Foo::new", true)
+                )
+        }
+
+        @Test
+        def void newNodeIsNotSpecial() {
+                val it = parseHelper.parse('''
+                        class Foo.
+                        pred predicate(node x) <-> node(x).
+                        predicate(new).
+                ''')
+                assertThat(errors, empty)
+                assertThat(nodeNames, hasItem('new'))
+                assertThat(assertion(0).arg(0).node, not(equalTo(findClass('Foo').newNode)))
+        }
+
+        @ParameterizedTest(name="{0}, namedProblem={1}")
+        @MethodSource("enumLiteralReferencesSource")
+        def void enumLiteralTest(String qualifiedName, boolean namedProblem) {
+                val it = parseHelper.parse('''
+                        «IF namedProblem»problem test.«ENDIF»
+                        enum Foo { alpha, beta }
+                        pred predicate(Foo a) <-> node(a).
+                        predicate(«qualifiedName»).
+                ''')
+                assertThat(errors, empty)
+                assertThat(nodes, empty)
+                assertThat(assertion(0).arg(0).node, equalTo(findEnum("Foo").literal("alpha")))
+        }
+
+        @ParameterizedTest(name="{0}, namedProblem={1}")
+        @MethodSource("enumLiteralReferencesSource")
+        def void enumLiteralInNodeValueAssertionTest(String qualifiedName, boolean namedProblem) {
+                val it = parseHelper.parse('''
+                        «IF namedProblem»problem test.«ENDIF»
+                        enum Foo { alpha, beta }
+                        «qualifiedName»: 16.
+                ''')
+                assertThat(errors, empty)
+                assertThat(nodes, empty)
+                assertThat(nodeValueAssertion(0).node, equalTo(findEnum("Foo").literal("alpha")))
+        }
+
+        @ParameterizedTest(name="{0}, namedProblem={1}")
+        @MethodSource("enumLiteralReferencesSource")
+        def void enumLiteralInPredicateTest(String qualifiedName, boolean namedProblem) {
+                val it = parseHelper.parse('''
+                        «IF namedProblem»problem test.«ENDIF»
+                        enum Foo { alpha, beta }
+                        pred predicate(Foo a) <-> node(«qualifiedName»).
+                ''')
+                assertThat(errors, empty)
+                assertThat(nodes, empty)
+                assertThat(pred("predicate").conj(0).lit(0).arg(0).node, equalTo(findEnum("Foo").literal("alpha")))
+        }
+
+        static def enumLiteralReferencesSource() {
+                Stream.of(
+                        Arguments.of("alpha", false),
+                        Arguments.of("alpha", true),
+                        Arguments.of("Foo::alpha", false),
+                        Arguments.of("Foo::alpha", true),
+                        Arguments.of("test::alpha", true),
+                        Arguments.of("test::Foo::alpha", true)
+                )
+        }
+
+        @ParameterizedTest
+        @MethodSource("builtInEnumLiteralReferencesSource")
+        def void builtInEnumLiteralTest(String qualifiedName) {
+                val it = parseHelper.parse('''
+                        pred predicate(node a) <-> node(a).
+                        predicate(«qualifiedName»).
+                ''')
+                assertThat(errors, empty)
+                assertThat(nodes, empty)
+                assertThat(assertion(0).arg(0).node, equalTo(builtin.findEnum("bool").literal("true")))
+        }
+
+        @ParameterizedTest
+        @MethodSource("builtInEnumLiteralReferencesSource")
+        def void builtInEnumLiteralInNodeValueAssertionTest(String qualifiedName) {
+                val it = parseHelper.parse('''
+                        «qualifiedName»: 16.
+                ''')
+                assertThat(errors, empty)
+                assertThat(nodes, empty)
+                assertThat(nodeValueAssertion(0).node, equalTo(builtin.findEnum("bool").literal("true")))
+        }
+
+        @ParameterizedTest
+        @MethodSource("builtInEnumLiteralReferencesSource")
+        def void bultInEnumLiteralInPredicateTest(String qualifiedName) {
+                val it = parseHelper.parse('''
+                        pred predicate() <-> node(«qualifiedName»).
+                ''')
+                assertThat(errors, empty)
+                assertThat(pred("predicate").conj(0).lit(0).arg(0).node, equalTo(builtin.findEnum("bool").literal("true")))
+        }
+
+        static def builtInEnumLiteralReferencesSource() {
+                Stream.of(
+                        Arguments.of("true"),
+                        Arguments.of("bool::true"),
+                        Arguments.of("builtin::true"),
+                        Arguments.of("builtin::bool::true")
+                )
+        }
+}
diff --git a/subprojects/language/src/test/java/tools/refinery/language/tests/serializer/ProblemSerializerTest.java b/subprojects/language/src/test/java/tools/refinery/language/tests/serializer/ProblemSerializerTest.java
new file mode 100644
index 00000000..ba3aaeb7
--- /dev/null
+++ b/subprojects/language/src/test/java/tools/refinery/language/tests/serializer/ProblemSerializerTest.java
@@ -0,0 +1,229 @@
+package tools.refinery.language.tests.serializer;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.xtext.testing.InjectWith;
+import org.eclipse.xtext.testing.extensions.InjectionExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import com.google.inject.Inject;
+
+import tools.refinery.language.model.ProblemUtil;
+import tools.refinery.language.model.problem.Atom;
+import tools.refinery.language.model.problem.LogicValue;
+import tools.refinery.language.model.problem.Node;
+import tools.refinery.language.model.problem.PredicateDefinition;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.ProblemFactory;
+import tools.refinery.language.model.problem.Relation;
+import tools.refinery.language.model.problem.VariableOrNode;
+import tools.refinery.language.model.tests.ProblemTestUtil;
+import tools.refinery.language.tests.ProblemInjectorProvider;
+
+@ExtendWith(InjectionExtension.class)
+@InjectWith(ProblemInjectorProvider.class)
+class ProblemSerializerTest {
+        @Inject
+        private ResourceSet resourceSet;
+
+        @Inject
+        private ProblemTestUtil testUtil;
+
+        private Resource resource;
+
+        private Problem problem;
+
+        private Problem builtin;
+
+        @BeforeEach
+        void beforeEach() {
+                problem = ProblemFactory.eINSTANCE.createProblem();
+                resource = resourceSet.createResource(URI.createFileURI("test.problem"));
+                resource.getContents().add(problem);
+                builtin = ProblemUtil.getBuiltInLibrary(problem).get();
+        }
+
+        @ParameterizedTest
+        @MethodSource
+        void assertionTest(LogicValue value, String serializedAssertion) {
+                var pred = createPred();
+                var node = ProblemFactory.eINSTANCE.createNode();
+                node.setName("a");
+                var individualDeclaration = ProblemFactory.eINSTANCE.createIndividualDeclaration();
+                individualDeclaration.getNodes().add(node);
+                problem.getStatements().add(individualDeclaration);
+                createAssertion(pred, node, value);
+
+                assertSerializedResult("""
+                                pred foo(node p).
+
+                                indiv a.
+                                """ + serializedAssertion + "\n");
+        }
+
+        static Stream<Arguments> assertionTest() {
+                return Stream.of(Arguments.of(LogicValue.TRUE, "foo(a)."), Arguments.of(LogicValue.FALSE, "!foo(a)."),
+                                Arguments.of(LogicValue.UNKNOWN, "?foo(a)."), Arguments.of(LogicValue.ERROR, "foo(a): error."));
+        }
+
+        @Test
+        void implicitNodeTest() {
+                var pred = createPred();
+                var node = ProblemFactory.eINSTANCE.createNode();
+                node.setName("a");
+                problem.getNodes().add(node);
+                createAssertion(pred, node);
+
+                assertSerializedResult("""
+                                pred foo(node p).
+
+                                foo(a).
+                                """);
+        }
+
+        private PredicateDefinition createPred() {
+                var pred = ProblemFactory.eINSTANCE.createPredicateDefinition();
+                pred.setName("foo");
+                var parameter = ProblemFactory.eINSTANCE.createParameter();
+                var nodeType = testUtil.findClass(builtin, "node");
+                parameter.setParameterType(nodeType);
+                parameter.setName("p");
+                pred.getParameters().add(parameter);
+                problem.getStatements().add(pred);
+                return pred;
+        }
+
+        @Test
+        void newNodeTest() {
+                var classDeclaration = ProblemFactory.eINSTANCE.createClassDeclaration();
+                classDeclaration.setName("Foo");
+                var newNode = ProblemFactory.eINSTANCE.createNode();
+                newNode.setName("new");
+                classDeclaration.setNewNode(newNode);
+                problem.getStatements().add(classDeclaration);
+                createAssertion(classDeclaration, newNode);
+
+                assertSerializedResult("""
+                                class Foo.
+
+                                Foo(Foo::new).
+                                """);
+        }
+
+        private void createAssertion(Relation relation, Node node) {
+                createAssertion(relation, node, LogicValue.TRUE);
+        }
+
+        private void createAssertion(Relation relation, Node node, LogicValue value) {
+                var assertion = ProblemFactory.eINSTANCE.createAssertion();
+                assertion.setRelation(relation);
+                var argument = ProblemFactory.eINSTANCE.createNodeAssertionArgument();
+                argument.setNode(node);
+                assertion.getArguments().add(argument);
+                assertion.setValue(value);
+                problem.getStatements().add(assertion);
+        }
+
+        @Test
+        void implicitVariableTest() {
+                var pred = ProblemFactory.eINSTANCE.createPredicateDefinition();
+                pred.setName("foo");
+                var nodeType = testUtil.findClass(builtin, "node");
+                var parameter1 = ProblemFactory.eINSTANCE.createParameter();
+                parameter1.setParameterType(nodeType);
+                parameter1.setName("p1");
+                pred.getParameters().add(parameter1);
+                var parameter2 = ProblemFactory.eINSTANCE.createParameter();
+                parameter2.setParameterType(nodeType);
+                parameter2.setName("p2");
+                pred.getParameters().add(parameter2);
+                var conjunction = ProblemFactory.eINSTANCE.createConjunction();
+                var variable = ProblemFactory.eINSTANCE.createImplicitVariable();
+                variable.setName("q");
+                conjunction.getImplicitVariables().add(variable);
+                var equals = testUtil.reference(nodeType, "equals");
+                conjunction.getLiterals().add(createAtom(equals, parameter1, variable));
+                conjunction.getLiterals().add(createAtom(equals, variable, parameter2));
+                pred.getBodies().add(conjunction);
+                problem.getStatements().add(pred);
+
+                assertSerializedResult("""
+                                pred foo(node p1, node p2) <-> equals(p1, q), equals(q, p2).
+                                """);
+        }
+
+        private Atom createAtom(Relation relation, VariableOrNode variable1, VariableOrNode variable2) {
+                var atom = ProblemFactory.eINSTANCE.createAtom();
+                atom.setRelation(relation);
+                var arg1 = ProblemFactory.eINSTANCE.createVariableOrNodeArgument();
+                arg1.setVariableOrNode(variable1);
+                atom.getArguments().add(arg1);
+                var arg2 = ProblemFactory.eINSTANCE.createVariableOrNodeArgument();
+                arg2.setVariableOrNode(variable2);
+                atom.getArguments().add(arg2);
+                return atom;
+        }
+
+        @Test
+        void singletonVariableTest() {
+                var pred = ProblemFactory.eINSTANCE.createPredicateDefinition();
+                pred.setName("foo");
+                var nodeType = testUtil.findClass(builtin, "node");
+                var parameter = ProblemFactory.eINSTANCE.createParameter();
+                parameter.setParameterType(nodeType);
+                parameter.setName("p");
+                pred.getParameters().add(parameter);
+                var conjunction = ProblemFactory.eINSTANCE.createConjunction();
+                var atom = ProblemFactory.eINSTANCE.createAtom();
+                var equals = testUtil.reference(nodeType, "equals");
+                atom.setRelation(equals);
+                var arg1 = ProblemFactory.eINSTANCE.createVariableOrNodeArgument();
+                arg1.setVariableOrNode(parameter);
+                atom.getArguments().add(arg1);
+                var arg2 = ProblemFactory.eINSTANCE.createVariableOrNodeArgument();
+                var variable = ProblemFactory.eINSTANCE.createImplicitVariable();
+                variable.setName("_q");
+                arg2.setSingletonVariable(variable);
+                arg2.setVariableOrNode(variable);
+                atom.getArguments().add(arg2);
+                conjunction.getLiterals().add(atom);
+                pred.getBodies().add(conjunction);
+                problem.getStatements().add(pred);
+
+                assertSerializedResult("""
+                                pred foo(node p) <-> equals(p, _q).
+                                """);
+        }
+
+        private void assertSerializedResult(String expected) {
+                var outputStream = new ByteArrayOutputStream();
+                try {
+                        resource.save(outputStream, Map.of());
+                } catch (IOException e) {
+                        throw new AssertionError("Failed to serialize problem", e);
+                } finally {
+                        try {
+                                outputStream.close();
+                        } catch (IOException e) {
+                                // Nothing to handle in a test.
+                        }
+                }
+                var problemString = outputStream.toString();
+
+                assertThat(problemString, equalTo(expected));
+        }
+}
diff --git a/subprojects/store/build.gradle b/subprojects/store/build.gradle
new file mode 100644
index 00000000..8d091a81
--- /dev/null
+++ b/subprojects/store/build.gradle
@@ -0,0 +1,9 @@
+plugins {
+        id 'refinery-java-library'
+        id 'refinery-jmh'
+}
+
+dependencies {
+        implementation libs.ecore
+        implementation libs.viatra
+}
diff --git a/subprojects/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutBenchmark.java b/subprojects/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutBenchmark.java
new file mode 100644
index 00000000..cdf3d3c8
--- /dev/null
+++ b/subprojects/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutBenchmark.java
@@ -0,0 +1,77 @@
+package tools.refinery.store.map.benchmarks;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.concurrent.TimeUnit;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+@Fork(1)
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@Measurement(time = 1, timeUnit = TimeUnit.SECONDS)
+@Warmup(time = 1, timeUnit = TimeUnit.SECONDS)
+public class ImmutablePutBenchmark {
+        @Benchmark
+        public void immutablePutBenchmark(ImmutablePutExecutionPlan executionPlan, Blackhole blackhole) {
+                var sut = executionPlan.createSut();
+                for (int i = 0; i < executionPlan.nPut; i++) {
+                        sut.put(executionPlan.nextKey(), executionPlan.nextValue());
+                }
+                blackhole.consume(sut);
+        }
+
+        @Benchmark
+        public void immutablePutAndCommitBenchmark(ImmutablePutExecutionPlan executionPlan, Blackhole blackhole) {
+                var sut = executionPlan.createSut();
+                for (int i = 0; i < executionPlan.nPut; i++) {
+                        sut.put(executionPlan.nextKey(), executionPlan.nextValue());
+                        if (i % 10 == 0) {
+                                blackhole.consume(sut.commit());
+                        }
+                }
+                blackhole.consume(sut);
+        }
+
+        @Benchmark
+        public void baselinePutBenchmark(ImmutablePutExecutionPlan executionPlan, Blackhole blackhole) {
+                var sut = new HashMap<Integer, String>();
+                for (int i = 0; i < executionPlan.nPut; i++) {
+                        var key = executionPlan.nextKey();
+                        var value = executionPlan.nextValue();
+                        if (executionPlan.isDefault(value)) {
+                                sut.remove(key);
+                        } else {
+                                sut.put(key, value);
+                        }
+                }
+                blackhole.consume(sut);
+        }
+
+        @Benchmark
+        public void baselinePutAndCommitBenchmark(ImmutablePutExecutionPlan executionPlan, Blackhole blackhole) {
+                var sut = new HashMap<Integer, String>();
+                var store = new ArrayList<HashMap<Integer, String>>();
+                for (int i = 0; i < executionPlan.nPut; i++) {
+                        var key = executionPlan.nextKey();
+                        var value = executionPlan.nextValue();
+                        if (executionPlan.isDefault(value)) {
+                                sut.remove(key);
+                        } else {
+                                sut.put(key, value);
+                        }
+                        if (i % 10 == 0) {
+                                store.add(new HashMap<>(sut));
+                        }
+                }
+                blackhole.consume(sut);
+                blackhole.consume(store);
+        }
+}
diff --git a/subprojects/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutExecutionPlan.java b/subprojects/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutExecutionPlan.java
new file mode 100644
index 00000000..756d504e
--- /dev/null
+++ b/subprojects/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutExecutionPlan.java
@@ -0,0 +1,57 @@
+package tools.refinery.store.map.benchmarks;
+
+import java.util.Random;
+
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.VersionedMapStore;
+import tools.refinery.store.map.VersionedMapStoreImpl;
+import tools.refinery.store.map.internal.VersionedMapImpl;
+import tools.refinery.store.map.tests.utils.MapTestEnvironment;
+
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+
+@State(Scope.Benchmark)
+public class ImmutablePutExecutionPlan {
+
+        @Param({ "100", "10000" })
+        public int nPut;
+
+        @Param({ "32", "1000", "100000" })
+        public int nKeys;
+
+        @Param({ "2", "3" })
+        public int nValues;
+
+        private Random random;
+
+        private String[] values;
+
+        private ContinousHashProvider<Integer> hashProvider = MapTestEnvironment.prepareHashProvider(false);
+
+        @Setup(Level.Trial)
+        public void setUpTrial() {
+                random = new Random();
+                values = MapTestEnvironment.prepareValues(nValues);
+        }
+
+        public VersionedMapImpl<Integer, String> createSut() {
+                VersionedMapStore<Integer, String> store = new VersionedMapStoreImpl<Integer, String>(hashProvider, values[0]);
+                return (VersionedMapImpl<Integer, String>) store.createMap();
+        }
+
+        public Integer nextKey() {
+                return random.nextInt(nKeys);
+        }
+
+        public boolean isDefault(String value) {
+                return value == values[0];
+        }
+
+        public String nextValue() {
+                return values[random.nextInt(nValues)];
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/ContinousHashProvider.java b/subprojects/store/src/main/java/tools/refinery/store/map/ContinousHashProvider.java
new file mode 100644
index 00000000..75f1e2ab
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/ContinousHashProvider.java
@@ -0,0 +1,69 @@
+package tools.refinery.store.map;
+
+import tools.refinery.store.map.internal.Node;
+
+/**
+ * A class representing an equivalence relation for a type {@code K} with a
+ * continuous hash function.
+ * 
+ * @author Oszkar Semerath
+ *
+ * @param <K> Target java type.
+ */
+public interface ContinousHashProvider<K> {
+        public static final int EFFECTIVE_BITS = Node.EFFECTIVE_BITS;
+        public static final int EFFECTIVE_BIT_MASK = (1 << (EFFECTIVE_BITS)) - 1;
+
+        /**
+         * Maximal practical depth for differentiating keys. If two keys have the same
+         * hash code until that depth, the algorithm can stop.
+         */
+        public static final int MAX_PRACTICAL_DEPTH = 500;
+
+        /**
+         * Provides a hash code for a object {@code key} with a given {@code index}. It
+         * has the following contracts:
+         * <ul>
+         * <li>If {@link #equals}{@code (key1,key2)}, then
+         * {@code getHash(key1, index) == getHash(key2, index)} for all values of
+         * {@code index}.</li>
+         * <li>If {@code getHash(key1,index) == getHash(key2, index)} for all values of
+         * {@code index}, then {@link #equals}{@code (key1, key2)}</li>
+         * <li>In current implementation, we use only the least significant
+         * {@link #EFFECTIVE_BITS}
+         * </ul>
+         * Check {@link #equals} for further details.
+         * 
+         * @param key   The target data object.
+         * @param index The depth of the the hash code. Needs to be non-negative.
+         * @return A hash code.
+         */
+        public int getHash(K key, int index);
+
+        public default int getEffectiveHash(K key, int index) {
+                return getHash(key, index) & EFFECTIVE_BIT_MASK;
+        }
+
+        public default int compare(K key1, K key2) {
+                if (key1.equals(key2)) {
+                        return 0;
+                } else {
+                        for (int i = 0; i < ContinousHashProvider.MAX_PRACTICAL_DEPTH; i++) {
+                                int hash1 = getEffectiveHash(key1, i);
+                                int hash2 = getEffectiveHash(key2, i);
+                                for(int j = 0; j<Integer.SIZE/Node.BRANCHING_FACTOR_BITS; j++) {
+                                        final int factorMask = (1<<Node.BRANCHING_FACTOR_BITS)-1;
+                                        int hashFragment1 = (hash1>>>j*Node.BRANCHING_FACTOR_BITS) & factorMask;
+                                        int hashFragment2 = (hash2>>>j*Node.BRANCHING_FACTOR_BITS) & factorMask;
+                                        var result = Integer.compare(hashFragment1, hashFragment2);
+                                        if (result != 0) {
+                                                return result;
+                                        }
+                                }
+                        }
+                        throw new IllegalArgumentException("Two different keys (" + key1 + " and " + key2
+                                        + ") have the same hashcode over the practical depth limitation ("
+                                        + ContinousHashProvider.MAX_PRACTICAL_DEPTH + ")!");
+                }
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/Cursor.java b/subprojects/store/src/main/java/tools/refinery/store/map/Cursor.java
new file mode 100644
index 00000000..9c465ddc
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/Cursor.java
@@ -0,0 +1,14 @@
+package tools.refinery.store.map;
+
+import java.util.List;
+
+public interface Cursor<K,V> {
+        public K getKey();
+        public V getValue();
+        public boolean isTerminated();
+        public boolean move();
+        public boolean isDirty();
+        
+        @SuppressWarnings("squid:S1452")
+        public List<VersionedMap<?,?>> getDependingMaps();
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/CursorAsIterator.java b/subprojects/store/src/main/java/tools/refinery/store/map/CursorAsIterator.java
new file mode 100644
index 00000000..65ae6648
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/CursorAsIterator.java
@@ -0,0 +1,57 @@
+package tools.refinery.store.map;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.function.BiFunction;
+import java.util.function.BiPredicate;
+
+public class CursorAsIterator<K,V,D> implements Iterator<D> {
+        private final Cursor<K, V> internal;
+        private final BiFunction<K, V, D> entryTransformation;
+        private final BiPredicate<K,V> filtering;
+        
+        D lastValidElement;
+        
+        public CursorAsIterator(Cursor<K, V> internal, BiFunction<K, V, D> entryTransformation, BiPredicate<K,V> filtering) {
+                this.internal = internal;
+                this.entryTransformation = entryTransformation;
+                this.filtering = filtering;
+                
+                moveToNext();
+        }
+        public CursorAsIterator(Cursor<K, V> internal, BiFunction<K, V, D> entryTransformation) {
+                this.internal = internal;
+                this.entryTransformation = entryTransformation;
+                this.filtering = ((k,v)->true);
+                
+                moveToNext();
+        }
+        
+        private void moveToNext() {
+                internal.move();
+                while(!internal.isTerminated() && !filtering.test(internal.getKey(), internal.getValue())) {
+                        internal.move();
+                }
+                if(!internal.isTerminated()) {
+                        lastValidElement = entryTransformation.apply(internal.getKey(), internal.getValue());
+                }
+        }
+        
+        
+        @Override
+        public boolean hasNext() {
+                return !internal.isTerminated();
+        }
+        @Override
+        public D next() {
+                if(hasNext()) {
+                        D last = lastValidElement;
+                        moveToNext();
+                        return last;
+                } else {
+                        throw new NoSuchElementException();
+                }
+
+        }
+        
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/DiffCursor.java b/subprojects/store/src/main/java/tools/refinery/store/map/DiffCursor.java
new file mode 100644
index 00000000..701f3ec8
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/DiffCursor.java
@@ -0,0 +1,6 @@
+package tools.refinery.store.map;
+
+public interface DiffCursor<K, V> extends Cursor<K,V> {
+        public V getFromValue();
+        public V getToValue();
+}
\ No newline at end of file
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/MapAsIterable.java b/subprojects/store/src/main/java/tools/refinery/store/map/MapAsIterable.java
new file mode 100644
index 00000000..6b986732
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/MapAsIterable.java
@@ -0,0 +1,26 @@
+package tools.refinery.store.map;
+
+import java.util.Iterator;
+import java.util.function.BiFunction;
+import java.util.function.BiPredicate;
+
+public class MapAsIterable<K,V,D> implements Iterable<D> {
+        private final VersionedMap<K, V> internal;
+        private final BiFunction<K, V, D> entryTransformation;
+        private final BiPredicate<K,V> filtering;
+        
+        public MapAsIterable(VersionedMap<K, V> internal, BiFunction<K, V, D> entryTransformation, BiPredicate<K,V> filtering) {
+                this.internal = internal;
+                this.entryTransformation = entryTransformation;
+                this.filtering = filtering;
+        }
+        public MapAsIterable(VersionedMap<K, V> internal, BiFunction<K, V, D> entryTransformation) {
+                this.internal = internal;
+                this.entryTransformation = entryTransformation;
+                this.filtering = ((k,v)->true);
+        }
+        @Override
+        public Iterator<D> iterator() {
+                return new CursorAsIterator<>(internal.getAll(), entryTransformation, filtering);
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/Versioned.java b/subprojects/store/src/main/java/tools/refinery/store/map/Versioned.java
new file mode 100644
index 00000000..6a23e9d5
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/Versioned.java
@@ -0,0 +1,7 @@
+package tools.refinery.store.map;
+
+public interface Versioned {
+        public long commit();
+        //maybe revert()?
+        public void restore(long state);
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMap.java b/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMap.java
new file mode 100644
index 00000000..a8a64d08
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMap.java
@@ -0,0 +1,13 @@
+package tools.refinery.store.map;
+
+public interface VersionedMap<K,V> extends Versioned{
+        public V get(K key);
+        public Cursor<K,V> getAll();
+        
+        public V put(K key, V value);
+        public void putAll(Cursor<K,V> cursor);
+        
+        public long getSize();
+        
+        public DiffCursor<K,V> getDiffCursor(long state);
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStore.java b/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStore.java
new file mode 100644
index 00000000..a8d7fb1a
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStore.java
@@ -0,0 +1,14 @@
+package tools.refinery.store.map;
+
+import java.util.Set;
+
+public interface VersionedMapStore<K, V> {
+        
+        public VersionedMap<K, V> createMap();
+
+        public VersionedMap<K, V> createMap(long state);
+        
+        public Set<Long> getStates();
+
+        public DiffCursor<K,V> getDiffCursor(long fromState, long toState);
+}
\ No newline at end of file
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreConfiguration.java b/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreConfiguration.java
new file mode 100644
index 00000000..723e5ec4
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreConfiguration.java
@@ -0,0 +1,48 @@
+package tools.refinery.store.map;
+
+public class VersionedMapStoreConfiguration {
+        
+        public VersionedMapStoreConfiguration() {
+                
+        }
+        public VersionedMapStoreConfiguration(boolean immutableWhenCommiting, boolean sharedNodeCacheInStore,
+                        boolean sharedNodeCacheInStoreGroups) {
+                super();
+                this.immutableWhenCommiting = immutableWhenCommiting;
+                this.sharedNodeCacheInStore = sharedNodeCacheInStore;
+                this.sharedNodeCacheInStoreGroups = sharedNodeCacheInStoreGroups;
+        }
+
+        /**
+         * If true root is replaced with immutable node when committed. Frees up memory
+         * by releasing immutable nodes, but it may decrease performance by recreating
+         * immutable nodes upon changes (some evidence).
+         */
+        private boolean immutableWhenCommiting = true;
+        public boolean isImmutableWhenCommiting() {
+                return immutableWhenCommiting;
+        }
+
+        /**
+         * If true, all subnodes are cached within a {@link VersionedMapStore}. It
+         * decreases the memory requirements. It may increase performance by discovering
+         * existing immutable copy of a node (some evidence). Additional overhead may
+         * decrease performance (no example found). The option permits the efficient
+         * implementation of version deletion.
+         */
+        private boolean sharedNodeCacheInStore = true;
+        public boolean isSharedNodeCacheInStore() {
+                return sharedNodeCacheInStore;
+        }
+        
+        /**
+         * If true, all subnodes are cached within a group of
+         * {@link VersionedMapStoreImpl#createSharedVersionedMapStores(int, ContinousHashProvider, Object, VersionedMapStoreConfiguration)}.
+         * If {@link VersionedMapStoreConfiguration#sharedNodeCacheInStore} is
+         * <code>false</code>, then it has currently no impact.
+         */
+        private boolean sharedNodeCacheInStoreGroups = true;
+        public boolean isSharedNodeCacheInStoreGroups() {
+                return sharedNodeCacheInStoreGroups;
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreImpl.java b/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreImpl.java
new file mode 100644
index 00000000..a626a5e8
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreImpl.java
@@ -0,0 +1,135 @@
+package tools.refinery.store.map;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.store.map.internal.ImmutableNode;
+import tools.refinery.store.map.internal.MapDiffCursor;
+import tools.refinery.store.map.internal.Node;
+import tools.refinery.store.map.internal.VersionedMapImpl;
+
+public class VersionedMapStoreImpl<K, V> implements VersionedMapStore<K, V> {
+        // Configuration
+        private final boolean immutableWhenCommiting;
+
+        // Static data
+        protected final ContinousHashProvider<K> hashProvider;
+        protected final V defaultValue;
+
+        // Dynamic data
+        protected final Map<Long, ImmutableNode<K, V>> states = new HashMap<>();
+        protected final Map<Node<K, V>, ImmutableNode<K, V>> nodeCache;
+        protected long nextID = 0;
+
+        public VersionedMapStoreImpl(ContinousHashProvider<K> hashProvider, V defaultValue,
+                        VersionedMapStoreConfiguration config) {
+                this.immutableWhenCommiting = config.isImmutableWhenCommiting();
+                this.hashProvider = hashProvider;
+                this.defaultValue = defaultValue;
+                if (config.isSharedNodeCacheInStore()) {
+                        nodeCache = new HashMap<>();
+                } else {
+                        nodeCache = null;
+                }
+        }
+
+        private VersionedMapStoreImpl(ContinousHashProvider<K> hashProvider, V defaultValue,
+                        Map<Node<K, V>, ImmutableNode<K, V>> nodeCache, VersionedMapStoreConfiguration config) {
+                this.immutableWhenCommiting = config.isImmutableWhenCommiting();
+                this.hashProvider = hashProvider;
+                this.defaultValue = defaultValue;
+                this.nodeCache = nodeCache;
+        }
+
+        public VersionedMapStoreImpl(ContinousHashProvider<K> hashProvider, V defaultValue) {
+                this(hashProvider, defaultValue, new VersionedMapStoreConfiguration());
+        }
+
+        public static <K, V> List<VersionedMapStore<K, V>> createSharedVersionedMapStores(int amount,
+                        ContinousHashProvider<K> hashProvider, V defaultValue,
+                        VersionedMapStoreConfiguration config) {
+                List<VersionedMapStore<K, V>> result = new ArrayList<>(amount);
+                if (config.isSharedNodeCacheInStoreGroups()) {
+                        Map<Node<K, V>, ImmutableNode<K, V>> nodeCache;
+                        if (config.isSharedNodeCacheInStore()) {
+                                nodeCache = new HashMap<>();
+                        } else {
+                                nodeCache = null;
+                        }
+                        for (int i = 0; i < amount; i++) {
+                                result.add(new VersionedMapStoreImpl<>(hashProvider, defaultValue, nodeCache, config));
+                        }
+                } else {
+                        for (int i = 0; i < amount; i++) {
+                                result.add(new VersionedMapStoreImpl<>(hashProvider, defaultValue, config));
+                        }
+                }
+                return result;
+        }
+
+        public static <K, V> List<VersionedMapStore<K, V>> createSharedVersionedMapStores(int amount,
+                        ContinousHashProvider<K> hashProvider, V defaultValue) {
+                return createSharedVersionedMapStores(amount, hashProvider, defaultValue, new VersionedMapStoreConfiguration());
+        }
+        
+        @Override
+        public synchronized Set<Long> getStates() {
+                return new HashSet<>(states.keySet());
+        }
+
+        @Override
+        public VersionedMap<K, V> createMap() {
+                return new VersionedMapImpl<>(this, hashProvider, defaultValue);
+        }
+
+        @Override
+        public VersionedMap<K, V> createMap(long state) {
+                ImmutableNode<K, V> data = revert(state);
+                return new VersionedMapImpl<>(this, hashProvider, defaultValue, data);
+        }
+        
+
+        public synchronized ImmutableNode<K, V> revert(long state) {
+                if (states.containsKey(state)) {
+                        return states.get(state);
+                } else {
+                        ArrayList<Long> existingKeys = new ArrayList<>(states.keySet());
+                        Collections.sort(existingKeys);
+                        throw new IllegalArgumentException("Store does not contain state " + state + "! Avaliable states: "
+                                        + Arrays.toString(existingKeys.toArray()));
+                }
+        }
+
+        public synchronized long commit(Node<K, V> data, VersionedMapImpl<K, V> mapToUpdateRoot) {
+                ImmutableNode<K, V> immutable;
+                if (data != null) {
+                        immutable = data.toImmutable(this.nodeCache);
+                } else {
+                        immutable = null;
+                }
+
+                if (nextID == Long.MAX_VALUE)
+                        throw new IllegalStateException("Map store run out of Id-s");
+                long id = nextID++;
+                this.states.put(id, immutable);
+                if (this.immutableWhenCommiting) {
+                        mapToUpdateRoot.setRoot(immutable);
+                }
+                return id;
+        }
+
+        @Override
+        public DiffCursor<K, V> getDiffCursor(long fromState, long toState) {
+                VersionedMap<K, V> map1 = createMap(fromState);
+                VersionedMap<K, V> map2 = createMap(toState);
+                Cursor<K, V> cursor1 = map1.getAll();
+                Cursor<K, V> cursor2 = map2.getAll();
+                return new MapDiffCursor<>(this.hashProvider, this.defaultValue, cursor1, cursor2);
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/HashClash.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/HashClash.java
new file mode 100644
index 00000000..5402ed4a
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/HashClash.java
@@ -0,0 +1,18 @@
+package tools.refinery.store.map.internal;
+
+enum HashClash {
+        /**
+         * Not stuck.
+         */
+        NONE,
+        
+        /**
+         * Clashed, next we should return the key of cursor 1.
+         */
+        STUCK_CURSOR_1,
+        
+        /**
+         * Clashed, next we should return the key of cursor 2.
+         */
+        STUCK_CURSOR_2
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/ImmutableNode.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/ImmutableNode.java
new file mode 100644
index 00000000..f68734ab
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/ImmutableNode.java
@@ -0,0 +1,378 @@
+package tools.refinery.store.map.internal;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import tools.refinery.store.map.ContinousHashProvider;
+
+public class ImmutableNode<K, V> extends Node<K, V> {
+        /**
+         * Bitmap defining the stored key and values.
+         */
+        final int dataMap;
+        /**
+         * Bitmap defining the positions of further nodes.
+         */
+        final int nodeMap;
+        /**
+         * Stores Keys, Values, and subnodes. Structure: (K,V)*,NODE; NODES are stored
+         * backwards.
+         */
+        final Object[] content;
+
+        /**
+         * Hash code derived from immutable hash code
+         */
+        final int precalculatedHash;
+
+        private ImmutableNode(int dataMap, int nodeMap, Object[] content, int precalculatedHash) {
+                super();
+                this.dataMap = dataMap;
+                this.nodeMap = nodeMap;
+                this.content = content;
+                this.precalculatedHash = precalculatedHash;
+        }
+
+        /**
+         * Constructor that copies a mutable node to an immutable.
+         * 
+         * @param node  A mutable node.
+         * @param cache A cache of existing immutable nodes. It can be used to search
+         *              and place reference immutable nodes. It can be null, if no cache
+         *              available.
+         * @return an immutable version of the input node.
+         */
+        static <K, V> ImmutableNode<K, V> constructImmutable(MutableNode<K, V> node,
+                        Map<Node<K, V>, ImmutableNode<K, V>> cache) {
+                // 1. try to return from cache
+                if (cache != null) {
+                        ImmutableNode<K, V> cachedResult = cache.get(node);
+                        if (cachedResult != null) {
+                                // 1.1 Already cached, return from cache.
+                                return cachedResult;
+                        }
+                }
+
+                // 2. otherwise construct a new ImmutableNode
+                int size = 0;
+                for (int i = 0; i < node.content.length; i++) {
+                        if (node.content[i] != null) {
+                                size++;
+                        }
+                }
+
+                int datas = 0;
+                int nodes = 0;
+                int resultDataMap = 0;
+                int resultNodeMap = 0;
+                final Object[] resultContent = new Object[size];
+                int bitposition = 1;
+                for (int i = 0; i < FACTOR; i++) {
+                        Object key = node.content[i * 2];
+                        if (key != null) {
+                                resultDataMap |= bitposition;
+                                resultContent[datas * 2] = key;
+                                resultContent[datas * 2 + 1] = node.content[i * 2 + 1];
+                                datas++;
+                        } else {
+                                @SuppressWarnings("unchecked")
+                                var subnode = (Node<K, V>) node.content[i * 2 + 1];
+                                if (subnode != null) {
+                                        ImmutableNode<K, V> immutableSubnode = subnode.toImmutable(cache);
+                                        resultNodeMap |= bitposition;
+                                        resultContent[size - 1 - nodes] = immutableSubnode;
+                                        nodes++;
+                                }
+                        }
+                        bitposition <<= 1;
+                }
+                final int resultHash = node.hashCode();
+                var newImmutable = new ImmutableNode<K, V>(resultDataMap, resultNodeMap, resultContent, resultHash);
+
+                // 3. save new immutable.
+                if (cache != null) {
+                        cache.put(newImmutable, newImmutable);
+                }
+                return newImmutable;
+        }
+
+        private int index(int bitmap, int bitpos) {
+                return Integer.bitCount(bitmap & (bitpos - 1));
+        }
+
+        @Override
+        public V getValue(K key, ContinousHashProvider<? super K> hashProvider, V defaultValue, int hash, int depth) {
+                int selectedHashFragment = hashFragment(hash, shiftDepth(depth));
+                int bitposition = 1 << selectedHashFragment;
+                // If the key is stored as a data
+                if ((dataMap & bitposition) != 0) {
+                        int keyIndex = 2 * index(dataMap, bitposition);
+                        @SuppressWarnings("unchecked")
+                        K keyCandidate = (K) content[keyIndex];
+                        if (keyCandidate.equals(key)) {
+                                @SuppressWarnings("unchecked")
+                                V value = (V) content[keyIndex + 1];
+                                return value;
+                        } else {
+                                return defaultValue;
+                        }
+                }
+                // the key is stored as a node
+                else if ((nodeMap & bitposition) != 0) {
+                        int keyIndex = content.length - 1 - index(nodeMap, bitposition);
+                        @SuppressWarnings("unchecked")
+                        var subNode = (ImmutableNode<K, V>) content[keyIndex];
+                        int newDepth = depth + 1;
+                        int newHash = newHash(hashProvider, key, hash, newDepth);
+                        return subNode.getValue(key, hashProvider, defaultValue, newHash, newDepth);
+                }
+                // the key is not stored at all
+                else {
+                        return defaultValue;
+                }
+        }
+
+        @Override
+        public Node<K, V> putValue(K key, V value, OldValueBox<V> oldValue, ContinousHashProvider<? super K> hashProvider,
+                        V defaultValue, int hash, int depth) {
+                int selectedHashFragment = hashFragment(hash, shiftDepth(depth));
+                int bitposition = 1 << selectedHashFragment;
+                if ((dataMap & bitposition) != 0) {
+                        int keyIndex = 2 * index(dataMap, bitposition);
+                        @SuppressWarnings("unchecked")
+                        K keyCandidate = (K) content[keyIndex];
+                        if (keyCandidate.equals(key)) {
+                                if (value == defaultValue) {
+                                        // delete
+                                        MutableNode<K, V> mutable = this.toMutable();
+                                        return mutable.removeEntry(selectedHashFragment, oldValue);
+                                } else if (value == content[keyIndex + 1]) {
+                                        // dont change
+                                        oldValue.setOldValue(value);
+                                        return this;
+                                } else {
+                                        // update existing value
+                                        MutableNode<K, V> mutable = this.toMutable();
+                                        return mutable.updateValue(value, oldValue, selectedHashFragment);
+                                }
+                        } else {
+                                if (value == defaultValue) {
+                                        // dont change
+                                        oldValue.setOldValue(defaultValue);
+                                        return this;
+                                } else {
+                                        // add new key + value
+                                        MutableNode<K, V> mutable = this.toMutable();
+                                        return mutable.putValue(key, value, oldValue, hashProvider, defaultValue, hash, depth);
+                                }
+                        }
+                } else if ((nodeMap & bitposition) != 0) {
+                        int keyIndex = content.length - 1 - index(nodeMap, bitposition);
+                        @SuppressWarnings("unchecked")
+                        var subNode = (ImmutableNode<K, V>) content[keyIndex];
+                        int newDepth = depth + 1;
+                        int newHash = newHash(hashProvider, key, hash, newDepth);
+                        var newsubNode = subNode.putValue(key, value, oldValue, hashProvider, defaultValue, newHash, newDepth);
+
+                        if (subNode == newsubNode) {
+                                // nothing changed
+                                return this;
+                        } else {
+                                MutableNode<K, V> mutable = toMutable();
+                                return mutable.updateWithSubNode(selectedHashFragment, newsubNode, value.equals(defaultValue));
+                        }
+                } else {
+                        // add new key + value
+                        MutableNode<K, V> mutable = this.toMutable();
+                        return mutable.putValue(key, value, oldValue, hashProvider, defaultValue, hash, depth);
+                }
+        }
+
+        @Override
+        public long getSize() {
+                int result = Integer.bitCount(this.dataMap);
+                for (int subnodeIndex = 0; subnodeIndex < Integer.bitCount(this.nodeMap); subnodeIndex++) {
+                        @SuppressWarnings("unchecked")
+                        var subnode = (ImmutableNode<K, V>) this.content[this.content.length - 1 - subnodeIndex];
+                        result += subnode.getSize();
+                }
+                return result;
+        }
+
+        @Override
+        protected MutableNode<K, V> toMutable() {
+                return new MutableNode<>(this);
+        }
+
+        @Override
+        public ImmutableNode<K, V> toImmutable(Map<Node<K, V>, ImmutableNode<K, V>> cache) {
+                return this;
+        }
+
+        @Override
+        protected MutableNode<K, V> isMutable() {
+                return null;
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        boolean moveToNext(MapCursor<K, V> cursor) {
+                // 1. try to move to data
+                int datas = Integer.bitCount(this.dataMap);
+                if (cursor.dataIndex != MapCursor.INDEX_FINISH) {
+                        int newDataIndex = cursor.dataIndex + 1;
+                        if (newDataIndex < datas) {
+                                cursor.dataIndex = newDataIndex;
+                                cursor.key = (K) this.content[newDataIndex * 2];
+                                cursor.value = (V) this.content[newDataIndex * 2 + 1];
+                                return true;
+                        } else {
+                                cursor.dataIndex = MapCursor.INDEX_FINISH;
+                        }
+                }
+
+                // 2. look inside the subnodes
+                int nodes = Integer.bitCount(this.nodeMap);
+                int newNodeIndex = cursor.nodeIndexStack.peek() + 1;
+                if (newNodeIndex < nodes) {
+                        // 2.1 found next subnode, move down to the subnode
+                        Node<K, V> subnode = (Node<K, V>) this.content[this.content.length - 1 - newNodeIndex];
+                        cursor.dataIndex = MapCursor.INDEX_START;
+                        cursor.nodeIndexStack.pop();
+                        cursor.nodeIndexStack.push(newNodeIndex);
+                        cursor.nodeIndexStack.push(MapCursor.INDEX_START);
+                        cursor.nodeStack.push(subnode);
+                        return subnode.moveToNext(cursor);
+                } else {
+                        // 3. no subnode found, move up
+                        cursor.nodeStack.pop();
+                        cursor.nodeIndexStack.pop();
+                        if (!cursor.nodeStack.isEmpty()) {
+                                Node<K, V> supernode = cursor.nodeStack.peek();
+                                return supernode.moveToNext(cursor);
+                        } else {
+                                cursor.key = null;
+                                cursor.value = null;
+                                return false;
+                        }
+                }
+        }
+
+        @Override
+        public void prettyPrint(StringBuilder builder, int depth, int code) {
+                for (int i = 0; i < depth; i++) {
+                        builder.append("\t");
+                }
+                if (code >= 0) {
+                        builder.append(code);
+                        builder.append(":");
+                }
+                builder.append("Immutable(");
+                boolean hadContent = false;
+                int dataMask = 1;
+                for (int i = 0; i < FACTOR; i++) {
+                        if ((dataMask & dataMap) != 0) {
+                                if (hadContent) {
+                                        builder.append(",");
+                                }
+                                builder.append(i);
+                                builder.append(":[");
+                                builder.append(content[2 * index(dataMap, dataMask)].toString());
+                                builder.append("]->[");
+                                builder.append(content[2 * index(dataMap, dataMask) + 1].toString());
+                                builder.append("]");
+                                hadContent = true;
+                        }
+                        dataMask <<= 1;
+                }
+                builder.append(")");
+                int nodeMask = 1;
+                for (int i = 0; i < FACTOR; i++) {
+                        if ((nodeMask & nodeMap) != 0) {
+                                @SuppressWarnings("unchecked")
+                                Node<K, V> subNode = (Node<K, V>) content[content.length - 1 - index(nodeMap, nodeMask)];
+                                builder.append("\n");
+                                subNode.prettyPrint(builder, depth + 1, i);
+                        }
+                        nodeMask <<= 1;
+                }
+        }
+
+        @Override
+        public void checkIntegrity(ContinousHashProvider<? super K> hashProvider, V defaultValue, int depth) {
+                if (depth > 0) {
+                        boolean orphaned = Integer.bitCount(dataMap) == 1 && nodeMap == 0;
+                        if (orphaned) {
+                                throw new IllegalStateException("Orphaned node! " + dataMap + ": " + content[0]);
+                        }
+                }
+                // check the place of data
+
+                // check subnodes
+                for (int i = 0; i < Integer.bitCount(nodeMap); i++) {
+                        @SuppressWarnings("unchecked")
+                        var subnode = (Node<K, V>) this.content[this.content.length - 1 - i];
+                        if (!(subnode instanceof ImmutableNode<?, ?>)) {
+                                throw new IllegalStateException("Immutable node contains mutable subnodes!");
+                        } else {
+                                subnode.checkIntegrity(hashProvider, defaultValue, depth + 1);
+                        }
+                }
+        }
+
+        @Override
+        public int hashCode() {
+                return this.precalculatedHash;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+                if (this == obj)
+                        return true;
+                if (obj == null)
+                        return false;
+                if (obj instanceof ImmutableNode<?, ?> other) {
+                        return precalculatedHash == other.precalculatedHash && dataMap == other.dataMap && nodeMap == other.nodeMap
+                                        && Arrays.deepEquals(content, other.content);
+                } else if (obj instanceof MutableNode<?, ?> mutableObj) {
+                        return ImmutableNode.compareImmutableMutable(this, mutableObj);
+                } else {
+                        return false;
+                }
+        }
+
+        public static boolean compareImmutableMutable(ImmutableNode<?, ?> immutable, MutableNode<?, ?> mutable) {
+                int datas = 0;
+                int nodes = 0;
+                final int immutableLength = immutable.content.length;
+                for (int i = 0; i < FACTOR; i++) {
+                        Object key = mutable.content[i * 2];
+                        // For each key candidate
+                        if (key != null) {
+                                // Check whether a new Key-Value pair can fit into the immutable container
+                                if (datas * 2 + nodes + 2 <= immutableLength) {
+                                        if (!immutable.content[datas * 2].equals(key)
+                                                        || !immutable.content[datas * 2 + 1].equals(mutable.content[i * 2 + 1])) {
+                                                return false;
+                                        }
+                                } else
+                                        return false;
+                                datas++;
+                        } else {
+                                var mutableSubnode = (Node<?, ?>) mutable.content[i * 2 + 1];
+                                if (mutableSubnode != null) {
+                                        if (datas * 2 + nodes + 1 <= immutableLength) {
+                                                Object immutableSubnode = immutable.content[immutableLength - 1 - nodes];
+                                                if (!mutableSubnode.equals(immutableSubnode)) {
+                                                        return false;
+                                                }
+                                                nodes++;
+                                        } else {
+                                                return false;
+                                        }
+                                }
+                        }
+                }
+                return true;
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapCursor.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapCursor.java
new file mode 100644
index 00000000..b90f5b71
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapCursor.java
@@ -0,0 +1,131 @@
+package tools.refinery.store.map.internal;
+
+import java.util.ArrayDeque;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.List;
+
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.VersionedMap;
+
+public class MapCursor<K,V> implements Cursor<K,V> {
+        // Constants
+        static final int INDEX_START = -1;
+        static final int INDEX_FINISH = -2;
+        
+        // Tree stack
+        ArrayDeque<Node<K,V>> nodeStack;
+        ArrayDeque<Integer> nodeIndexStack;
+        int dataIndex;
+        
+        // Values
+        K key;
+        V value;
+        
+        // Hash code for checking concurrent modifications
+        final VersionedMap<K,V> map;
+        final int creationHash; 
+        
+        public MapCursor(Node<K, V> root, VersionedMap<K,V> map) {
+                // Initializing tree stack
+                super();
+                this.nodeStack = new ArrayDeque<>();
+                this.nodeIndexStack = new ArrayDeque<>();
+                if(root != null) {
+                        this.nodeStack.add(root);
+                        this.nodeIndexStack.push(INDEX_START);
+                }
+                
+                this.dataIndex = INDEX_START;
+                
+                // Initializing cache
+                this.key = null;
+                this.value = null;
+                
+                // Initializing state
+                this.map=map;
+                this.creationHash = map.hashCode();
+        }
+        
+        public K getKey() {
+                return key;
+        }
+        
+        public V getValue() {
+                return value;
+        }
+        
+        public boolean isTerminated() {
+                return this.nodeStack.isEmpty();
+        }
+        
+        public boolean move() {
+                if(isDirty()) {
+                        throw new ConcurrentModificationException();
+                }
+                if(!isTerminated()) {
+                        boolean result = this.nodeStack.peek().moveToNext(this);
+                        if(this.nodeIndexStack.size() != this.nodeStack.size()) {
+                                throw new IllegalArgumentException("Node stack is corrupted by illegal moves!");
+                        }
+                        return result;
+                }
+                return false;
+        }
+        public boolean skipCurrentNode() {
+                nodeStack.pop();
+                nodeIndexStack.pop();
+                dataIndex = INDEX_FINISH;
+                return move();
+        }
+        @Override
+        public boolean isDirty() {
+                return this.map.hashCode() != this.creationHash;
+        }
+        @Override
+        public List<VersionedMap<?, ?>> getDependingMaps() {
+                return List.of(this.map);
+        }
+        
+        public static <K,V> boolean sameSubnode(MapCursor<K,V> cursor1, MapCursor<K,V> cursor2) {
+                Node<K, V> nodeOfCursor1 = cursor1.nodeStack.peek();
+                Node<K, V> nodeOfCursor2 = cursor2.nodeStack.peek();
+                if(nodeOfCursor1 != null && nodeOfCursor2 != null) {
+                        return nodeOfCursor1.equals(nodeOfCursor2);
+                } else {
+                        return false;
+                }
+        }
+        
+        /**
+         * 
+         * @param <K>
+         * @param <V>
+         * @param cursor1
+         * @param cursor2
+         * @return Positive number if cursor 1 is behind, negative number if cursor 2 is behind, and 0 if they are at the same position.
+         */
+        public static <K,V> int compare(MapCursor<K,V> cursor1, MapCursor<K,V> cursor2) {
+                // two cursors are equally deep
+                Iterator<Integer> stack1 = cursor1.nodeIndexStack.descendingIterator();
+                Iterator<Integer> stack2 = cursor2.nodeIndexStack.descendingIterator();
+                if(stack1.hasNext()) {
+                        if(!stack2.hasNext()) {
+                                // stack 2 has no more element, thus stack 1 is deeper
+                                return 1;
+                        }
+                        int val1 = stack1.next();
+                        int val2 = stack2.next();
+                        if(val1 < val2) {
+                                return -1;
+                        } else if(val2 < val1) {
+                                return 1;
+                        }
+                }
+                if(stack2.hasNext()) {
+                        // stack 2 has more element, thus stack 2 is deeper
+                        return 1;
+                }
+                return Integer.compare(cursor1.dataIndex, cursor2.dataIndex);
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapDiffCursor.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapDiffCursor.java
new file mode 100644
index 00000000..42333635
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapDiffCursor.java
@@ -0,0 +1,221 @@
+package tools.refinery.store.map.internal;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.DiffCursor;
+import tools.refinery.store.map.VersionedMap;
+
+/**
+ * A cursor representing the difference between two states of a map.
+ * 
+ * @author Oszkar Semerath
+ *
+ */
+public class MapDiffCursor<K, V> implements DiffCursor<K, V>, Cursor<K, V> {
+        /**
+         * Default value representing missing elements.
+         */
+        private V defaultValue;
+        private MapCursor<K, V> cursor1;
+        private MapCursor<K, V> cursor2;
+        private ContinousHashProvider<? super K> hashProvider;
+
+        // Values
+        private K key;
+        private V fromValue;
+        private V toValue;
+
+        // State
+        /**
+         * Positive number if cursor 1 is behind, negative number if cursor 2 is behind,
+         * and 0 if they are at the same position.
+         */
+        private int cursorRelation;
+        private HashClash hashClash = HashClash.NONE;
+
+        public MapDiffCursor(ContinousHashProvider<? super K> hashProvider, V defaultValue, Cursor<K, V> cursor1,
+                        Cursor<K, V> cursor2) {
+                super();
+                this.hashProvider = hashProvider;
+                this.defaultValue = defaultValue;
+                this.cursor1 = (MapCursor<K, V>) cursor1;
+                this.cursor2 = (MapCursor<K, V>) cursor2;
+        }
+
+        @Override
+        public K getKey() {
+                return key;
+        }
+
+        @Override
+        public V getFromValue() {
+                return fromValue;
+        }
+
+        @Override
+        public V getToValue() {
+                return toValue;
+        }
+
+        @Override
+        public V getValue() {
+                return getToValue();
+        }
+
+        public boolean isTerminated() {
+                return cursor1.isTerminated() && cursor2.isTerminated();
+        }
+
+        @Override
+        public boolean isDirty() {
+                return this.cursor1.isDirty() || this.cursor2.isDirty();
+        }
+
+        @Override
+        public List<VersionedMap<?, ?>> getDependingMaps() {
+                return Stream.concat(cursor1.getDependingMaps().stream(), cursor2.getDependingMaps().stream()).toList();
+        }
+
+        protected void updateState() {
+                if (!isTerminated()) {
+                        this.cursorRelation = MapCursor.compare(cursor1, cursor2);
+                        if (cursorRelation > 0 || cursor2.isTerminated()) {
+                                this.key = cursor1.getKey();
+                                this.fromValue = cursor1.getValue();
+                                this.toValue = defaultValue;
+                        } else if (cursorRelation < 0 || cursor1.isTerminated()) {
+                                this.key = cursor2.getKey();
+                                this.fromValue = defaultValue;
+                                this.toValue = cursor1.getValue();
+                        } else {
+                                // cursor1 = cursor2
+                                if (cursor1.getKey().equals(cursor2.getKey())) {
+                                        this.key = cursor1.getKey();
+                                        this.fromValue = cursor1.getValue();
+                                        this.toValue = defaultValue;
+                                } else {
+                                        resolveHashClashWithFirstEntry();
+                                }
+                        }
+                }
+        }
+
+        protected void resolveHashClashWithFirstEntry() {
+                int compareResult = this.hashProvider.compare(cursor1.key, cursor2.key);
+                if (compareResult < 0) {
+                        this.hashClash = HashClash.STUCK_CURSOR_2;
+                        this.cursorRelation = 0;
+                        this.key = cursor1.key;
+                        this.fromValue = cursor1.value;
+                        this.toValue = defaultValue;
+                } else if (compareResult > 0) {
+                        this.hashClash = HashClash.STUCK_CURSOR_1;
+                        this.cursorRelation = 0;
+                        this.key = cursor2.key;
+                        this.fromValue = defaultValue;
+                        this.toValue = cursor2.value;
+                } else {
+                        throw new IllegalArgumentException("Inconsistent compare result for diffcursor");
+                }
+        }
+
+        protected boolean isInHashClash() {
+                return this.hashClash != HashClash.NONE;
+        }
+
+        protected void resolveHashClashWithSecondEntry() {
+                switch (this.hashClash) {
+                case STUCK_CURSOR_1:
+                        this.hashClash = HashClash.NONE;
+                        this.cursorRelation = 0;
+                        this.key = cursor1.key;
+                        this.fromValue = cursor1.value;
+                        this.toValue = defaultValue;
+                        break;
+                case STUCK_CURSOR_2:
+                        this.hashClash = HashClash.NONE;
+                        this.cursorRelation = 0;
+                        this.key = cursor2.key;
+                        this.fromValue = defaultValue;
+                        this.toValue = cursor2.value;
+                        break;
+                default:
+                        throw new IllegalArgumentException("Inconsistent compare result for diffcursor");
+                }
+        }
+
+        protected boolean sameValues() {
+                if (this.fromValue == null) {
+                        return this.toValue == null;
+                } else {
+                        return this.fromValue.equals(this.toValue);
+                }
+        }
+
+        protected boolean moveOne() {
+                if (isTerminated()) {
+                        return false;
+                }
+                if (this.cursorRelation > 0 || cursor2.isTerminated()) {
+                        return cursor1.move();
+                } else if (this.cursorRelation < 0 || cursor1.isTerminated()) {
+                        return cursor2.move();
+                } else {
+                        boolean moved1 = cursor1.move();
+                        boolean moved2 = cursor2.move();
+                        return moved1 && moved2;
+                }
+        }
+
+        private boolean skipNode() {
+                if (isTerminated()) {
+                        throw new IllegalStateException("DiffCursor tries to skip when terminated!");
+                }
+                boolean update1 = cursor1.skipCurrentNode();
+                boolean update2 = cursor2.skipCurrentNode();
+                updateState();
+                return update1 && update2;
+        }
+
+        protected boolean moveToConsistentState() {
+                if (!isTerminated()) {
+                        boolean changed;
+                        boolean lastResult = true;
+                        do {
+                                changed = false;
+                                if (MapCursor.sameSubnode(cursor1, cursor2)) {
+                                        lastResult = skipNode();
+                                        changed = true;
+                                }
+                                if (sameValues()) {
+                                        lastResult = moveOne();
+                                        changed = true;
+                                }
+                                updateState();
+                        } while (changed && !isTerminated());
+                        return lastResult;
+                } else {
+                        return false;
+                }
+        }
+
+        public boolean move() {
+                if (!isTerminated()) {
+                        if (isInHashClash()) {
+                                this.resolveHashClashWithSecondEntry();
+                                return true;
+                        } else {
+                                if (moveOne()) {
+                                        return moveToConsistentState();
+                                } else {
+                                        return false;
+                                }
+                        }
+
+                } else
+                        return false;
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/MutableNode.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/MutableNode.java
new file mode 100644
index 00000000..54853010
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/MutableNode.java
@@ -0,0 +1,454 @@
+package tools.refinery.store.map.internal;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import tools.refinery.store.map.ContinousHashProvider;
+
+public class MutableNode<K, V> extends Node<K, V> {
+        int cachedHash;
+        protected Object[] content;
+
+        protected MutableNode() {
+                this.content = new Object[2 * FACTOR];
+                updateHash();
+        }
+
+        public static <K, V> MutableNode<K, V> initialize(K key, V value, ContinousHashProvider<? super K> hashProvider,
+                        V defaultValue) {
+                if (value == defaultValue) {
+                        return null;
+                } else {
+                        int hash = hashProvider.getHash(key, 0);
+                        int fragment = hashFragment(hash, 0);
+                        MutableNode<K, V> res = new MutableNode<>();
+                        res.content[2 * fragment] = key;
+                        res.content[2 * fragment + 1] = value;
+                        res.updateHash();
+                        return res;
+                }
+        }
+
+        /**
+         * Constructs a {@link MutableNode} as a copy of an {@link ImmutableNode}
+         * 
+         * @param node
+         */
+        protected MutableNode(ImmutableNode<K, V> node) {
+                this.content = new Object[2 * FACTOR];
+                int dataUsed = 0;
+                int nodeUsed = 0;
+                for (int i = 0; i < FACTOR; i++) {
+                        int bitposition = 1 << i;
+                        if ((node.dataMap & bitposition) != 0) {
+                                content[2 * i] = node.content[dataUsed * 2];
+                                content[2 * i + 1] = node.content[dataUsed * 2 + 1];
+                                dataUsed++;
+                        } else if ((node.nodeMap & bitposition) != 0) {
+                                content[2 * i + 1] = node.content[node.content.length - 1 - nodeUsed];
+                                nodeUsed++;
+                        }
+                }
+                this.cachedHash = node.hashCode();
+        }
+
+        @Override
+        public V getValue(K key, ContinousHashProvider<? super K> hashProvider, V defaultValue, int hash, int depth) {
+                int selectedHashFragment = hashFragment(hash, shiftDepth(depth));
+                @SuppressWarnings("unchecked")
+                K keyCandidate = (K) this.content[2 * selectedHashFragment];
+                if (keyCandidate != null) {
+                        if (keyCandidate.equals(key)) {
+                                @SuppressWarnings("unchecked")
+                                V value = (V) this.content[2 * selectedHashFragment + 1];
+                                return value;
+                        } else {
+                                return defaultValue;
+                        }
+                } else {
+                        @SuppressWarnings("unchecked")
+                        var nodeCandidate = (Node<K, V>) content[2 * selectedHashFragment + 1];
+                        if (nodeCandidate != null) {
+                                int newDepth = depth + 1;
+                                int newHash = newHash(hashProvider, key, hash, newDepth);
+                                return nodeCandidate.getValue(key, hashProvider, defaultValue, newHash, newDepth);
+                        } else {
+                                return defaultValue;
+                        }
+                }
+        }
+
+        @Override
+        public Node<K, V> putValue(K key, V value, OldValueBox<V> oldValueBox, ContinousHashProvider<? super K> hashProvider,
+                        V defaultValue, int hash, int depth) {
+                int selectedHashFragment = hashFragment(hash, shiftDepth(depth));
+                @SuppressWarnings("unchecked")
+                K keyCandidate = (K) content[2 * selectedHashFragment];
+                if (keyCandidate != null) {
+                        // If has key
+                        if (keyCandidate.equals(key)) {
+                                // The key is equals to an existing key -> update entry
+                                if (value == defaultValue) {
+                                        return removeEntry(selectedHashFragment, oldValueBox);
+                                } else {
+                                        return updateValue(value, oldValueBox, selectedHashFragment);
+                                }
+                        } else {
+                                // The key is not equivalent to an existing key on the same hash bin
+                                // -> split entry if it is necessary
+                                if (value == defaultValue) {
+                                        // Value is default -> do not need to add new node
+                                        oldValueBox.setOldValue(defaultValue);
+                                        return this;
+                                } else {
+                                        // Value is not default -> Split entry data to a new node
+                                        oldValueBox.setOldValue(defaultValue);
+                                        return moveDownAndSplit(hashProvider, key, value, keyCandidate, hash, depth, selectedHashFragment);
+                                }
+                        }
+                } else {
+                        // If it does not have key, check for value
+                        @SuppressWarnings("unchecked")
+                        var nodeCandidate = (Node<K, V>) content[2 * selectedHashFragment + 1];
+                        if (nodeCandidate != null) {
+                                // If it has value, it is a subnode -> upate that
+                                var newNode = nodeCandidate.putValue(key, value, oldValueBox, hashProvider, defaultValue,
+                                                newHash(hashProvider, key, hash, depth + 1), depth + 1);
+                                return updateWithSubNode(selectedHashFragment, newNode, value.equals(defaultValue));
+                        } else {
+                                // If it does not have value, put it in the empty place
+                                if (value == defaultValue) {
+                                        // dont need to add new key-value pair
+                                        oldValueBox.setOldValue(defaultValue);
+                                        return this;
+                                } else {
+                                        return addEntry(key, value, oldValueBox, selectedHashFragment, defaultValue);
+                                }
+
+                        }
+                }
+        }
+
+        private Node<K, V> addEntry(K key, V value, OldValueBox<V> oldValueBox, int selectedHashFragment, V defaultValue) {
+                content[2 * selectedHashFragment] = key;
+                oldValueBox.setOldValue(defaultValue);
+                content[2 * selectedHashFragment + 1] = value;
+                updateHash();
+                return this;
+        }
+
+        /**
+         * Updates an entry in a selected hash-fragment to a non-default value.
+         * 
+         * @param value
+         * @param selectedHashFragment
+         * @return
+         */
+        @SuppressWarnings("unchecked")
+        Node<K, V> updateValue(V value, OldValueBox<V> oldValue, int selectedHashFragment) {
+                oldValue.setOldValue((V) content[2 * selectedHashFragment + 1]);
+                content[2 * selectedHashFragment + 1] = value;
+                updateHash();
+                return this;
+        }
+
+        /**
+         * 
+         * @param selectedHashFragment
+         * @param newNode
+         * @return
+         */
+        Node<K, V> updateWithSubNode(int selectedHashFragment, Node<K, V> newNode, boolean deletionHappened) {
+                if (deletionHappened) {
+                        if (newNode == null) {
+                                // Check whether this node become empty
+                                content[2 * selectedHashFragment + 1] = null; // i.e. the new node
+                                if (hasContent()) {
+                                        updateHash();
+                                        return this;
+                                } else {
+                                        return null;
+                                }
+                        } else {
+                                // check whether newNode is orphan
+                                MutableNode<K, V> immutableNewNode = newNode.isMutable();
+                                if (immutableNewNode != null) {
+                                        int orphaned = immutableNewNode.isOrphaned();
+                                        if (orphaned >= 0) {
+                                                // orphan subnode data is replaced with data
+                                                content[2 * selectedHashFragment] = immutableNewNode.content[orphaned * 2];
+                                                content[2 * selectedHashFragment + 1] = immutableNewNode.content[orphaned * 2 + 1];
+                                                updateHash();
+                                                return this;
+                                        }
+                                }
+                        }
+                }
+                // normal behaviour
+                content[2 * selectedHashFragment + 1] = newNode;
+                updateHash();
+                return this;
+
+        }
+
+        private boolean hasContent() {
+                for (Object element : this.content) {
+                        if (element != null)
+                                return true;
+                }
+                return false;
+        }
+
+        @Override
+        protected MutableNode<K, V> isMutable() {
+                return this;
+        }
+
+        protected int isOrphaned() {
+                int dataFound = -2;
+                for (int i = 0; i < FACTOR; i++) {
+                        if (content[i * 2] != null) {
+                                if (dataFound >= 0) {
+                                        return -1;
+                                } else {
+                                        dataFound = i;
+                                }
+                        } else if (content[i * 2 + 1] != null) {
+                                return -3;
+                        }
+                }
+                return dataFound;
+        }
+
+        @SuppressWarnings("unchecked")
+        private Node<K, V> moveDownAndSplit(ContinousHashProvider<? super K> hashProvider, K newKey, V newValue,
+                        K previousKey, int hashOfNewKey, int depth, int selectedHashFragmentOfCurrentDepth) {
+                V previousValue = (V) content[2 * selectedHashFragmentOfCurrentDepth + 1];
+
+                MutableNode<K, V> newSubNode = newNodeWithTwoEntries(hashProvider, previousKey, previousValue,
+                                hashProvider.getHash(previousKey, hashDepth(depth)), newKey, newValue, hashOfNewKey, depth + 1);
+
+                content[2 * selectedHashFragmentOfCurrentDepth] = null;
+                content[2 * selectedHashFragmentOfCurrentDepth + 1] = newSubNode;
+                updateHash();
+                return this;
+        }
+
+        // Pass everything as parameters for performance.
+        @SuppressWarnings("squid:S107")
+        private MutableNode<K, V> newNodeWithTwoEntries(ContinousHashProvider<? super K> hashProvider, K key1, V value1,
+                        int oldHash1, K key2, V value2, int oldHash2, int newdepth) {
+                int newHash1 = newHash(hashProvider, key1, oldHash1, newdepth);
+                int newHash2 = newHash(hashProvider, key2, oldHash2, newdepth);
+                int newFragment1 = hashFragment(newHash1, shiftDepth(newdepth));
+                int newFragment2 = hashFragment(newHash2, shiftDepth(newdepth));
+
+                MutableNode<K, V> subNode = new MutableNode<>();
+                if (newFragment1 != newFragment2) {
+                        subNode.content[newFragment1 * 2] = key1;
+                        subNode.content[newFragment1 * 2 + 1] = value1;
+
+                        subNode.content[newFragment2 * 2] = key2;
+                        subNode.content[newFragment2 * 2 + 1] = value2;
+                } else {
+                        MutableNode<K, V> subSubNode = newNodeWithTwoEntries(hashProvider, key1, value1, newHash1, key2, value2,
+                                        newHash2, newdepth + 1);
+                        subNode.content[newFragment1 * 2 + 1] = subSubNode;
+                }
+                subNode.updateHash();
+                return subNode;
+        }
+
+        @SuppressWarnings("unchecked")
+        Node<K, V> removeEntry(int selectedHashFragment, OldValueBox<V> oldValue) {
+                content[2 * selectedHashFragment] = null;
+                oldValue.setOldValue((V) content[2 * selectedHashFragment + 1]);
+                content[2 * selectedHashFragment + 1] = null;
+                if (hasContent()) {
+                        updateHash();
+                        return this;
+                } else {
+                        return null;
+                }
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public long getSize() {
+                int size = 0;
+                for (int i = 0; i < FACTOR; i++) {
+                        if (content[i * 2] != null) {
+                                size++;
+                        } else {
+                                Node<K, V> nodeCandidate = (Node<K, V>) content[i * 2 + 1];
+                                if (nodeCandidate != null) {
+                                        size += nodeCandidate.getSize();
+                                }
+                        }
+                }
+                return size;
+        }
+
+        @Override
+        protected MutableNode<K, V> toMutable() {
+                return this;
+        }
+
+        @Override
+        public ImmutableNode<K, V> toImmutable(Map<Node<K, V>, ImmutableNode<K, V>> cache) {
+                return ImmutableNode.constructImmutable(this, cache);
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        boolean moveToNext(MapCursor<K, V> cursor) {
+                // 1. try to move to data
+                if (cursor.dataIndex != MapCursor.INDEX_FINISH) {
+                        for (int index = cursor.dataIndex + 1; index < FACTOR; index++) {
+                                if (this.content[index * 2] != null) {
+                                        // 1.1 found next data
+                                        cursor.dataIndex = index;
+                                        cursor.key = (K) this.content[index * 2];
+                                        cursor.value = (V) this.content[index * 2 + 1];
+                                        return true;
+                                }
+                        }
+                        cursor.dataIndex = MapCursor.INDEX_FINISH;
+                }
+
+                // 2. look inside the subnodes
+                for (int index = cursor.nodeIndexStack.peek() + 1; index < FACTOR; index++) {
+                        if (this.content[index * 2] == null && this.content[index * 2 + 1] != null) {
+                                // 2.1 found next subnode, move down to the subnode
+                                Node<K, V> subnode = (Node<K, V>) this.content[index * 2 + 1];
+
+                                cursor.dataIndex = MapCursor.INDEX_START;
+                                cursor.nodeIndexStack.pop();
+                                cursor.nodeIndexStack.push(index);
+                                cursor.nodeIndexStack.push(MapCursor.INDEX_START);
+                                cursor.nodeStack.push(subnode);
+
+                                return subnode.moveToNext(cursor);
+                        }
+                }
+                // 3. no subnode found, move up
+                cursor.nodeStack.pop();
+                cursor.nodeIndexStack.pop();
+                if (!cursor.nodeStack.isEmpty()) {
+                        Node<K, V> supernode = cursor.nodeStack.peek();
+                        return supernode.moveToNext(cursor);
+                } else {
+                        cursor.key = null;
+                        cursor.value = null;
+                        return false;
+                }
+        }
+
+        @Override
+        public void prettyPrint(StringBuilder builder, int depth, int code) {
+                for (int i = 0; i < depth; i++) {
+                        builder.append("\t");
+                }
+                if (code >= 0) {
+                        builder.append(code);
+                        builder.append(":");
+                }
+                builder.append("Mutable(");
+                // print content
+                boolean hadContent = false;
+                for (int i = 0; i < FACTOR; i++) {
+                        if (content[2 * i] != null) {
+                                if (hadContent) {
+                                        builder.append(",");
+                                }
+                                builder.append(i);
+                                builder.append(":[");
+                                builder.append(content[2 * i].toString());
+                                builder.append("]->[");
+                                builder.append(content[2 * i + 1].toString());
+                                builder.append("]");
+                                hadContent = true;
+                        }
+                }
+                builder.append(")");
+                // print subnodes
+                for (int i = 0; i < FACTOR; i++) {
+                        if (content[2 * i] == null && content[2 * i + 1] != null) {
+                                @SuppressWarnings("unchecked")
+                                Node<K, V> subNode = (Node<K, V>) content[2 * i + 1];
+                                builder.append("\n");
+                                subNode.prettyPrint(builder, depth + 1, i);
+                        }
+                }
+        }
+
+        @Override
+        public void checkIntegrity(ContinousHashProvider<? super K> hashProvider, V defaultValue, int depth) {
+                // check for orphan nodes
+                if (depth > 0) {
+                        int orphaned = isOrphaned();
+                        if (orphaned >= 0) {
+                                throw new IllegalStateException("Orphaned node! " + orphaned + ": " + content[2 * orphaned]);
+                        }
+                }
+                // check the place of data
+                for (int i = 0; i < FACTOR; i++) {
+                        if (this.content[2 * i] != null) {
+                                @SuppressWarnings("unchecked")
+                                K key = (K) this.content[2 * i];
+                                @SuppressWarnings("unchecked")
+                                V value = (V) this.content[2 * i + 1];
+
+                                if (value == defaultValue) {
+                                        throw new IllegalStateException("Node contains default value!");
+                                }
+                                int hashCode = hashProvider.getHash(key, hashDepth(depth));
+                                int shiftDepth = shiftDepth(depth);
+                                int selectedHashFragment = hashFragment(hashCode, shiftDepth);
+                                if (i != selectedHashFragment) {
+                                        throw new IllegalStateException("Key " + key + " with hash code " + hashCode
+                                                        + " is in bad place! Fragment=" + selectedHashFragment + ", Place=" + i);
+                                }
+                        }
+                }
+                // check subnodes
+                for (int i = 0; i < FACTOR; i++) {
+                        if (this.content[2 * i + 1] != null && this.content[2 * i] == null) {
+                                @SuppressWarnings("unchecked")
+                                var subNode = (Node<K, V>) this.content[2 * i + 1];
+                                subNode.checkIntegrity(hashProvider, defaultValue, depth + 1);
+                        }
+                }
+                // check the hash
+                int oldHash = this.cachedHash;
+                updateHash();
+                int newHash = this.cachedHash;
+                if (oldHash != newHash) {
+                        throw new IllegalStateException("Hash code was not up to date! (old=" + oldHash + ",new=" + newHash + ")");
+                }
+        }
+
+        protected void updateHash() {
+                this.cachedHash = Arrays.hashCode(content);
+        }
+
+        @Override
+        public int hashCode() {
+                return this.cachedHash;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+                if (this == obj)
+                        return true;
+                if (obj == null)
+                        return false;
+                if (obj instanceof MutableNode<?, ?> mutableObj) {
+                        return Arrays.deepEquals(this.content, mutableObj.content);
+                } else if (obj instanceof ImmutableNode<?, ?> immutableObj) {
+                        return ImmutableNode.compareImmutableMutable(immutableObj, this);
+                } else {
+                        return false;
+                }
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/Node.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/Node.java
new file mode 100644
index 00000000..234a4ff3
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/Node.java
@@ -0,0 +1,85 @@
+package tools.refinery.store.map.internal;
+
+import java.util.Map;
+
+import tools.refinery.store.map.ContinousHashProvider;
+
+public abstract class Node<K,V>{
+        public static final int BRANCHING_FACTOR_BITS = 5;
+        public static final int FACTOR = 1<<BRANCHING_FACTOR_BITS;
+        protected static final int NUMBER_OF_FACTORS = Integer.SIZE / BRANCHING_FACTOR_BITS;
+        protected static final int FACTOR_MASK = FACTOR-1;
+        public static final int EFFECTIVE_BITS = BRANCHING_FACTOR_BITS * NUMBER_OF_FACTORS;
+        
+        /**
+         * Calculates the index for the continuous hash.
+         * @param depth The depth of the node in the tree.
+         * @return The index of the continuous hash.
+         */
+        protected static int hashDepth(int depth) {
+                return depth/NUMBER_OF_FACTORS;
+        }
+        
+        /**
+         * Calculates the which segment of a single hash should be used.
+         * @param depth The depth of the node in the tree. 
+         * @return The segment of a hash code.
+         */
+        protected static int shiftDepth(int depth) {
+                return depth%NUMBER_OF_FACTORS;
+        }
+        /**
+         * Selects a segments from a complete hash for a given depth.
+         * @param hash A complete hash.
+         * @param shiftDepth The index of the segment.
+         * @return The segment as an integer.
+         */
+        protected static int hashFragment(int hash, int shiftDepth) {
+                if(shiftDepth<0 || Node.NUMBER_OF_FACTORS<shiftDepth) throw new IllegalArgumentException("Invalid shift depth! valid intervall=[0;5], input="+shiftDepth);
+                return (hash >>> shiftDepth*BRANCHING_FACTOR_BITS) & FACTOR_MASK;
+        }
+        
+        /**
+         * Returns the hash code for a given depth. It may calculate new hash code, or reuse a hash code calculated for depth-1.
+         * @param key The key.
+         * @param hash Hash code for depth-1
+         * @param depth The depth.
+         * @return The new hash code.
+         */
+        protected int newHash(final ContinousHashProvider<? super K> hashProvider, K key, int hash, int depth) {
+                final int hashDepth = hashDepth(depth);
+                if(hashDepth>=ContinousHashProvider.MAX_PRACTICAL_DEPTH) {
+                        throw new IllegalArgumentException("Key "+key+" have the clashing hashcode over the practical depth limitation ("+ContinousHashProvider.MAX_PRACTICAL_DEPTH+")!");
+                }
+                return depth%NUMBER_OF_FACTORS == 0?
+                                hashProvider.getHash(key, hashDepth) :
+                                hash;
+        }
+        
+        
+        public abstract V getValue(K key, ContinousHashProvider<? super K> hashProvider, V defaultValue,  int hash, int depth);
+        public abstract Node<K,V> putValue(K key, V value, OldValueBox<V> old, ContinousHashProvider<? super K> hashProvider, V defaultValue, int hash, int depth);
+        public abstract long getSize();
+        
+        abstract MutableNode<K, V> toMutable();
+        public abstract ImmutableNode<K, V> toImmutable(
+                        Map<Node<K, V>,ImmutableNode<K, V>> cache);
+        protected abstract MutableNode<K, V> isMutable();
+        /**
+         * Moves a {@link MapCursor} to its next position.
+         * @param cursor the cursor
+         * @return Whether there was a next value to move on.
+         */
+        abstract boolean moveToNext(MapCursor<K,V> cursor);
+        
+        ///////// FOR printing
+        public abstract void prettyPrint(StringBuilder builder, int depth, int code);
+        @Override
+        public String toString() {
+                StringBuilder stringBuilder = new StringBuilder();
+                prettyPrint(stringBuilder, 0, -1);
+                return stringBuilder.toString();
+        }
+        public void checkIntegrity(ContinousHashProvider<? super K> hashProvider, V defaultValue, int depth) {}
+        
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/OldValueBox.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/OldValueBox.java
new file mode 100644
index 00000000..5534c703
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/OldValueBox.java
@@ -0,0 +1,19 @@
+package tools.refinery.store.map.internal;
+
+public class OldValueBox<V>{
+        V oldValue;
+        boolean isSet = false;
+
+        public V getOldValue() {
+                if(!isSet) throw new IllegalStateException();
+                isSet = false;
+                return oldValue;
+        }
+
+        public void setOldValue(V ouldValue) {
+                if(isSet) throw new IllegalStateException();
+                this.oldValue = ouldValue;
+                isSet = true;
+        }
+        
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/VersionedMapImpl.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/VersionedMapImpl.java
new file mode 100644
index 00000000..346fe596
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/VersionedMapImpl.java
@@ -0,0 +1,171 @@
+package tools.refinery.store.map.internal;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.DiffCursor;
+import tools.refinery.store.map.VersionedMap;
+import tools.refinery.store.map.VersionedMapStoreImpl;
+
+/**
+ * Not threadSafe in itself
+ * @author Oszkar Semerath
+ *
+ * @param <K>
+ * @param <V>
+ */
+public class VersionedMapImpl<K,V> implements VersionedMap<K,V>{
+        protected final VersionedMapStoreImpl<K,V> store;
+        
+        protected final ContinousHashProvider<K> hashProvider;
+        protected final V defaultValue;
+        protected Node<K,V> root;
+        
+        private OldValueBox<V> oldValueBox = new OldValueBox<>();
+        
+        public VersionedMapImpl(
+                        VersionedMapStoreImpl<K,V> store,
+                        ContinousHashProvider<K> hashProvider,
+                        V defaultValue)
+        {
+                this.store = store;
+                this.hashProvider = hashProvider;
+                this.defaultValue = defaultValue;
+                this.root = null;
+        }
+        public VersionedMapImpl(
+                        VersionedMapStoreImpl<K,V> store,
+                        ContinousHashProvider<K> hashProvider,
+                        V defaultValue, Node<K,V> data)
+        {
+                this.store = store;
+                this.hashProvider = hashProvider;
+                this.defaultValue = defaultValue;
+                this.root = data;
+        }
+                
+        public V getDefaultValue() {
+                return defaultValue;
+        }
+        public ContinousHashProvider<K> getHashProvider() {
+                return hashProvider;
+        }
+        @Override
+        public V put(K key, V value) {
+                if(root!=null) {
+                        root = root.putValue(key, value, oldValueBox, hashProvider, defaultValue, hashProvider.getHash(key, 0), 0);
+                        return oldValueBox.getOldValue();
+                } else {
+                        root = MutableNode.initialize(key, value, hashProvider, defaultValue);
+                        return defaultValue;
+                }
+        }
+        
+        @Override
+        public void putAll(Cursor<K, V> cursor) {
+                if(cursor.getDependingMaps().contains(this)) {
+                        List<K> keys = new LinkedList<>();
+                        List<V> values = new LinkedList<>();
+                        while(cursor.move()) {
+                                keys.add(cursor.getKey());
+                                values.add(cursor.getValue());
+                        }
+                        Iterator<K> keyIterator = keys.iterator();
+                        Iterator<V> valueIterator = values.iterator();
+                        while(keyIterator.hasNext()) {
+                                this.put(keyIterator.next(), valueIterator.next());
+                        }
+                } else {
+                        while(cursor.move()) {
+                                this.put(cursor.getKey(), cursor.getValue());
+                        }
+                }
+        }
+        
+        @Override
+        public V get(K key) {
+                if(root!=null) {
+                        return root.getValue(key, hashProvider, defaultValue, hashProvider.getHash(key, 0), 0);
+                } else {
+                        return defaultValue;
+                }
+        }
+        @Override
+        public long getSize() {
+                if(root == null) {
+                        return 0;
+                } else {
+                        return root.getSize();
+                }
+        }
+
+        @Override
+        public Cursor<K, V> getAll() {
+                return new MapCursor<>(this.root,this);
+        }
+        @Override
+        public DiffCursor<K, V> getDiffCursor(long toVersion) {
+                Cursor<K, V> fromCursor = this.getAll();
+                VersionedMap<K, V> toMap = this.store.createMap(toVersion);
+                Cursor<K, V> toCursor = toMap.getAll();
+                return new MapDiffCursor<>(this.hashProvider,this.defaultValue, fromCursor, toCursor);
+                
+        }
+        
+
+        @Override
+        public long commit() {
+                return this.store.commit(root,this);
+        }
+        public void setRoot(Node<K, V> root) {
+                this.root = root;
+        }
+
+        @Override
+        public void restore(long state) {
+                root = this.store.revert(state);
+        }
+        
+        @Override
+        public int hashCode() {
+                final int prime = 31;
+                int result = 1;
+                result = prime * result + ((root == null) ? 0 : root.hashCode());
+                return result;
+        }
+        
+        @Override
+        public boolean equals(Object obj) {
+                if (this == obj)
+                        return true;
+                if (obj == null)
+                        return false;
+                if (getClass() != obj.getClass())
+                        return false;
+                VersionedMapImpl<?,?> other = (VersionedMapImpl<?,?>) obj;
+                if (root == null) {
+                        if (other.root != null)
+                                return false;
+                } else if (!root.equals(other.root))
+                        return false;
+                return true;
+        }
+        public void prettyPrint() {
+                StringBuilder s = new StringBuilder();
+                if(this.root != null) {
+                        this.root.prettyPrint(s, 0, -1);
+                        System.out.println(s.toString());
+                } else {
+                        System.out.println("empty tree");
+                }
+        }
+        public void checkIntegrity() {
+                if(this.root != null) {
+                        this.root.checkIntegrity(hashProvider, defaultValue, 0);
+                }
+        }
+
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/Model.java b/subprojects/store/src/main/java/tools/refinery/store/model/Model.java
new file mode 100644
index 00000000..a42d711a
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/Model.java
@@ -0,0 +1,20 @@
+package tools.refinery.store.model;
+
+import java.util.Set;
+
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.Versioned;
+import tools.refinery.store.model.representation.DataRepresentation;
+
+public interface Model extends Versioned{
+        @SuppressWarnings("squid:S1452")
+        Set<DataRepresentation<?, ?>> getDataRepresentations();
+        
+        <K,V> V get(DataRepresentation<K,V> representation, K key);
+        <K,V> Cursor<K,V> getAll(DataRepresentation<K,V> representation);
+        <K,V> V put(DataRepresentation<K,V> representation, K key, V value);
+        <K,V> void putAll(DataRepresentation<K,V> representation, Cursor<K,V> cursor);
+        <K,V> long getSize(DataRepresentation<K,V> representation);
+        
+        ModelDiffCursor getDiffCursor(long to);
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/ModelCursor.java b/subprojects/store/src/main/java/tools/refinery/store/model/ModelCursor.java
new file mode 100644
index 00000000..a835cf69
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/ModelCursor.java
@@ -0,0 +1,25 @@
+package tools.refinery.store.model;
+
+import java.util.Map;
+
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.model.representation.DataRepresentation;
+
+public class ModelCursor {
+        final Map<DataRepresentation<?, ?>,Cursor<?,?>> cursors;
+
+        public ModelCursor(Map<DataRepresentation<?, ?>, Cursor<?, ?>> cursors) {
+                super();
+                this.cursors = cursors;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public <K,V> Cursor<K,V> getCursor(DataRepresentation<K, V> representation) {
+                Cursor<?, ?> cursor = cursors.get(representation);
+                if(cursor != null) {
+                        return (Cursor<K, V>) cursor;
+                } else {
+                        throw new IllegalArgumentException("ModelCursor does not contain cursor for representation "+representation);
+                }
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/ModelDiffCursor.java b/subprojects/store/src/main/java/tools/refinery/store/model/ModelDiffCursor.java
new file mode 100644
index 00000000..91990fa6
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/ModelDiffCursor.java
@@ -0,0 +1,26 @@
+package tools.refinery.store.model;
+
+import java.util.Map;
+
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.DiffCursor;
+import tools.refinery.store.model.representation.DataRepresentation;
+
+public class ModelDiffCursor {
+        final Map<DataRepresentation<?, ?>,DiffCursor<?,?>> diffcursors;
+
+        public ModelDiffCursor(Map<DataRepresentation<?, ?>, DiffCursor<?, ?>> diffcursors) {
+                super();
+                this.diffcursors = diffcursors;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public <K,V> DiffCursor<K,V> getCursor(DataRepresentation<K, V> representation) {
+                Cursor<?, ?> cursor = diffcursors.get(representation);
+                if(cursor != null) {
+                        return (DiffCursor<K, V>) cursor;
+                } else {
+                        throw new IllegalArgumentException("ModelCursor does not contain cursor for representation "+representation);
+                }
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/ModelStore.java b/subprojects/store/src/main/java/tools/refinery/store/model/ModelStore.java
new file mode 100644
index 00000000..682a0e78
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/ModelStore.java
@@ -0,0 +1,16 @@
+package tools.refinery.store.model;
+
+import java.util.Set;
+
+import tools.refinery.store.model.representation.DataRepresentation;
+
+public interface ModelStore {
+        @SuppressWarnings("squid:S1452")
+        Set<DataRepresentation<?, ?>> getDataRepresentations();
+        
+        Model createModel();
+        Model createModel(long state);
+        
+        Set<Long> getStates();
+        ModelDiffCursor getDiffCursor(long from, long to);
+}
\ No newline at end of file
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/ModelStoreImpl.java b/subprojects/store/src/main/java/tools/refinery/store/model/ModelStoreImpl.java
new file mode 100644
index 00000000..97406cbb
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/ModelStoreImpl.java
@@ -0,0 +1,122 @@
+package tools.refinery.store.model;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.DiffCursor;
+import tools.refinery.store.map.VersionedMap;
+import tools.refinery.store.map.VersionedMapStore;
+import tools.refinery.store.map.VersionedMapStoreImpl;
+import tools.refinery.store.model.internal.ModelImpl;
+import tools.refinery.store.model.internal.SimilarRelationEquivalenceClass;
+import tools.refinery.store.model.representation.AuxilaryData;
+import tools.refinery.store.model.representation.DataRepresentation;
+import tools.refinery.store.model.representation.Relation;
+
+import java.util.Set;
+
+public class ModelStoreImpl implements ModelStore {
+
+        private final Map<DataRepresentation<?, ?>, VersionedMapStore<?, ?>> stores;
+
+        public ModelStoreImpl(Set<DataRepresentation<?, ?>> dataRepresentations) {
+                stores = initStores(dataRepresentations);
+        }
+
+        private Map<DataRepresentation<?, ?>, VersionedMapStore<?, ?>> initStores(
+                        Set<DataRepresentation<?, ?>> dataRepresentations) {
+                Map<DataRepresentation<?, ?>, VersionedMapStore<?, ?>> result = new HashMap<>();
+
+                Map<SimilarRelationEquivalenceClass, List<Relation<?>>> symbolRepresentationsPerHashPerArity = new HashMap<>();
+
+                for (DataRepresentation<?, ?> dataRepresentation : dataRepresentations) {
+                        if (dataRepresentation instanceof Relation<?> symbolRepresentation) {
+                                addOrCreate(symbolRepresentationsPerHashPerArity,
+                                                new SimilarRelationEquivalenceClass(symbolRepresentation), symbolRepresentation);
+                        } else if (dataRepresentation instanceof AuxilaryData<?, ?>) {
+                                VersionedMapStoreImpl<?, ?> store = new VersionedMapStoreImpl<>(dataRepresentation.getHashProvider(),
+                                                dataRepresentation.getDefaultValue());
+                                result.put(dataRepresentation, store);
+                        } else {
+                                throw new UnsupportedOperationException(
+                                                "Model store does not have strategy to use " + dataRepresentation.getClass() + "!");
+                        }
+                }
+                for (List<Relation<?>> symbolGroup : symbolRepresentationsPerHashPerArity.values()) {
+                        initRepresentationGroup(result, symbolGroup);
+                }
+
+                return result;
+        }
+
+        private void initRepresentationGroup(Map<DataRepresentation<?, ?>, VersionedMapStore<?, ?>> result,
+                        List<Relation<?>> symbolGroup) {
+                final ContinousHashProvider<Tuple> hashProvider = symbolGroup.get(0).getHashProvider();
+                final Object defaultValue = symbolGroup.get(0).getDefaultValue();
+
+                List<VersionedMapStore<Tuple, Object>> maps = VersionedMapStoreImpl
+                                .createSharedVersionedMapStores(symbolGroup.size(), hashProvider, defaultValue);
+
+                for (int i = 0; i < symbolGroup.size(); i++) {
+                        result.put(symbolGroup.get(i), maps.get(i));
+                }
+        }
+
+        private static <K, V> void addOrCreate(Map<K, List<V>> map, K key, V value) {
+                List<V> list;
+                if (map.containsKey(key)) {
+                        list = map.get(key);
+                } else {
+                        list = new LinkedList<>();
+                        map.put(key, list);
+                }
+                list.add(value);
+        }
+
+        @Override
+        public Set<DataRepresentation<?, ?>> getDataRepresentations() {
+                return this.stores.keySet();
+        }
+
+        @Override
+        public ModelImpl createModel() {
+                Map<DataRepresentation<?, ?>, VersionedMap<?, ?>> maps = new HashMap<>();
+                for (Entry<DataRepresentation<?, ?>, VersionedMapStore<?, ?>> entry : this.stores.entrySet()) {
+                        maps.put(entry.getKey(), entry.getValue().createMap());
+                }
+                return new ModelImpl(this, maps);
+        }
+
+        @Override
+        public synchronized ModelImpl createModel(long state) {
+                Map<DataRepresentation<?, ?>, VersionedMap<?, ?>> maps = new HashMap<>();
+                for (Entry<DataRepresentation<?, ?>, VersionedMapStore<?, ?>> entry : this.stores.entrySet()) {
+                        maps.put(entry.getKey(), entry.getValue().createMap(state));
+                }
+                return new ModelImpl(this, maps);
+        }
+
+        @Override
+        public synchronized Set<Long> getStates() {
+                var iterator = stores.values().iterator();
+                if (iterator.hasNext()) {
+                        return Set.copyOf(iterator.next().getStates());
+                }
+                return Set.of(0l);
+        }
+
+        @Override
+        public synchronized ModelDiffCursor getDiffCursor(long from, long to) {
+                Map<DataRepresentation<?, ?>, DiffCursor<?, ?>> diffcursors = new HashMap<>();
+                for (Entry<DataRepresentation<?, ?>, VersionedMapStore<?, ?>> entry : stores.entrySet()) {
+                        DataRepresentation<?, ?> representation = entry.getKey();
+                        DiffCursor<?, ?> diffCursor = entry.getValue().getDiffCursor(from, to);
+                        diffcursors.put(representation, diffCursor);
+                }
+                return new ModelDiffCursor(diffcursors);
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/Tuple.java b/subprojects/store/src/main/java/tools/refinery/store/model/Tuple.java
new file mode 100644
index 00000000..0aae3727
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/Tuple.java
@@ -0,0 +1,148 @@
+package tools.refinery.store.model;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public abstract class Tuple {
+        private static final int CUSTOMTUPLESIZE = 2;
+        protected static final List<Tuple1> tuple1Cash = new ArrayList<>(1024);
+        
+        public abstract int getSize();
+        public abstract int get(int element);
+        public abstract int[] toArray();
+        
+        @Override
+        public String toString() {
+                StringBuilder b = new StringBuilder();
+                b.append("[");
+                for(int i = 0; i<getSize(); i++) {
+                        if(i!=0) {
+                                b.append(",");
+                        }
+                        b.append(get(i));
+                }
+                b.append("]");
+                return b.toString();
+        }
+        
+        public static Tuple1 of1(int value) {
+                if(value < tuple1Cash.size()) {
+                        return tuple1Cash.get(value);
+                } else {
+                        Tuple1 newlyCreated = null;
+                        while(value >= tuple1Cash.size()) {
+                                newlyCreated = new Tuple1(tuple1Cash.size());
+                                tuple1Cash.add(newlyCreated);
+                        }
+                        return newlyCreated;
+                }
+        }
+        
+        public static Tuple of(int... values) {
+                if(values.length == 0) {
+                        return new Tuple0();
+                } else if(values.length == 1) {
+                        return of1(values[0]);
+                } else if(values.length == 2) {
+                        return new Tuple2(values[0],values[1]);
+                } else return new TupleN(values);
+        }
+        
+        protected IllegalArgumentException doesNotContain(int element) {
+                return new IllegalArgumentException("Tuple does not contain element "+element);
+        }
+        
+        public static class Tuple0 extends Tuple{
+                protected Tuple0() { }
+                @Override public int getSize() { return 0; }
+                @Override public int get(int element) {
+                        throw doesNotContain(element);
+                }
+                @Override public int[] toArray() {return new int[]{};}
+                @Override public int hashCode() { return TupleHashProvider.singleton().getHash(this, 0); }
+                @Override
+                public boolean equals(Object obj) {
+                        if (this == obj)
+                                return true;
+                        if (obj == null)
+                                return false;
+                        if (getClass() != obj.getClass())
+                                return false;
+                        return true;
+                }
+        }
+        public static class Tuple1 extends Tuple{
+                final int value0;
+                protected Tuple1(int value0) { this.value0 = value0; }
+                @Override public int getSize() { return 1; }
+                @Override public int get(int element) {
+                        if(element == 0) return value0;
+                        throw doesNotContain(element);
+                }
+                @Override public int[] toArray() {return new int[]{ value0 };}
+                @Override public int hashCode() { return TupleHashProvider.singleton().getHash(this, 0); }
+                @Override
+                public boolean equals(Object obj) {
+                        if (this == obj)
+                                return true;
+                        if (obj == null)
+                                return false;
+                        if (getClass() != obj.getClass())
+                                return false;
+                        Tuple1 other = (Tuple1) obj;
+                        return value0 == other.value0;
+                }
+        }
+        public static class Tuple2 extends Tuple{
+                final int value0;
+                final int value1;
+                protected Tuple2(int value0, int value1) { this.value0 = value0; this.value1 = value1; }
+                @Override public int getSize() { return 2; }
+                @Override public int get(int element) {
+                        if(element == 0) return value0;
+                        else if(element == 1) return value1;
+                        throw doesNotContain(element);
+                }
+                @Override public int[] toArray() {return new int[]{ value0,value1 };}
+                @Override public int hashCode() { return TupleHashProvider.singleton().getHash(this, 0); }
+                @Override
+                public boolean equals(Object obj) {
+                        if (this == obj)
+                                return true;
+                        if (obj == null)
+                                return false;
+                        if (getClass() != obj.getClass())
+                                return false;
+                        Tuple2 other = (Tuple2) obj;
+                        return value0 == other.value0 && value1 == other.value1;
+                }
+        }
+        public static class TupleN extends Tuple{
+                final int[] values;
+                protected TupleN(int[] values) { 
+                        if(values.length<CUSTOMTUPLESIZE)
+                                throw new IllegalArgumentException();
+                        this.values = Arrays.copyOf(values, values.length);
+                }
+                @Override public int getSize() { return values.length; }
+                @Override public int get(int element) {
+                        if(0<=element && element < values.length) {
+                                return values[element];
+                        } else throw doesNotContain(element);
+                }
+                @Override public int[] toArray() { return values; }
+                @Override public int hashCode() { return TupleHashProvider.singleton().getHash(this, 0); }
+                @Override
+                public boolean equals(Object obj) {
+                        if (this == obj)
+                                return true;
+                        if (obj == null)
+                                return false;
+                        if (getClass() != obj.getClass())
+                                return false;
+                        TupleN other = (TupleN) obj;
+                        return Arrays.equals(values, other.values);
+                }
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProvider.java b/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProvider.java
new file mode 100644
index 00000000..7a01311a
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProvider.java
@@ -0,0 +1,65 @@
+package tools.refinery.store.model;
+
+import tools.refinery.store.map.ContinousHashProvider;
+
+public class TupleHashProvider implements ContinousHashProvider<Tuple> {
+        protected static TupleHashProvider instance;
+
+        public static TupleHashProvider singleton() {
+                if (instance == null) {
+                        instance = new TupleHashProvider();
+                }
+                return instance;
+        }
+
+        protected static final int[] primes = new int[] { 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101,
+                        103, 107, 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, 173, 179, 181, 191, 193, 197, 199, 211,
+                        223, 227, 229, 233, 239, 241, 251, 257, 263, 269, 271, 277, 281, 283, 293, 307, 311, 313, 317, 331, 337,
+                        347, 349, 353, 359, 367, 373, 379, 383, 389, 397, 401, 409, 419, 421, 431, 433, 439, 443, 449, 457, 461,
+                        463, 467, 479, 487, 491, 499, 503, 509, 521, 523, 541, 547, 557, 563, 569, 571, 577, 587, 593, 599, 601,
+                        607, 613, 617, 619, 631, 641, 643, 647, 653, 659, 661, 673, 677, 683, 691, 701, 709, 719, 727, 733, 739,
+                        743, 751, 757, 761, 769, 773, 787, 797, 809, 811, 821, 823, 827, 829, 839, 853, 857, 859, 863, 877, 881,
+                        883, 887, 907, 911, 919, 929, 937, 941, 947, 953, 967, 971, 977, 983, 991, 997, 1009, 1013, 1019, 1021,
+                        1031, 1033, 1039, 1049, 1051, 1061, 1063, 1069, 1087, 1091, 1093, 1097, 1103, 1109, 1117, 1123, 1129, 1151,
+                        1153, 1163, 1171, 1181, 1187, 1193, 1201, 1213, 1217, 1223, 1229, 1231, 1237, 1249, 1259, 1277, 1279, 1283,
+                        1289, 1291, 1297, 1301, 1303, 1307, 1319, 1321, 1327, 1361, 1367, 1373, 1381, 1399, 1409, 1423, 1427, 1429,
+                        1433, 1439, 1447, 1451, 1453, 1459, 1471, 1481, 1483, 1487, 1489, 1493, 1499, 1511, 1523, 1531, 1543, 1549,
+                        1553, 1559, 1567, 1571, 1579, 1583, 1597, 1601, 1607, 1609, 1613, 1619, 1621, 1627, 1637, 1657, 1663, 1667,
+                        1669, 1693, 1697, 1699, 1709, 1721, 1723, 1733, 1741, 1747, 1753, 1759, 1777, 1783, 1787, 1789, 1801, 1811,
+                        1823, 1831, 1847, 1861, 1867, 1871, 1873, 1877, 1879, 1889, 1901, 1907, 1913, 1931, 1933, 1949, 1951, 1973,
+                        1979, 1987, 1993, 1997, 1999, 2003, 2011, 2017, 2027, 2029, 2039, 2053, 2063, 2069, 2081, 2083, 2087, 2089,
+                        2099, 2111, 2113, 2129, 2131, 2137, 2141, 2143, 2153, 2161, 2179, 2203, 2207, 2213, 2221, 2237, 2239, 2243,
+                        2251, 2267, 2269, 2273, 2281, 2287, 2293, 2297, 2309, 2311, 2333, 2339, 2341, 2347, 2351, 2357, 2371, 2377,
+                        2381, 2383, 2389, 2393, 2399, 2411, 2417, 2423, 2437, 2441, 2447, 2459, 2467, 2473, 2477, 2503, 2521, 2531,
+                        2539, 2543, 2549, 2551, 2557, 2579, 2591, 2593, 2609, 2617, 2621, 2633, 2647, 2657, 2659, 2663, 2671, 2677,
+                        2683, 2687, 2689, 2693, 2699, 2707, 2711, 2713, 2719, 2729, 2731, 2741, 2749, 2753, 2767, 2777, 2789, 2791,
+                        2797, 2801, 2803, 2819, 3089, 3109, 3119, 3121, 3137, 3163, 3167, 3169, 3181, 3187, 3191, 3203, 3209, 3217,
+                        3221, 3229, 3251, 3253, 3257, 3259, 3271, 3299, 3301, 3307, 3313, 3319, 3323, 3329, 3331, 3343, 3347, 3359,
+                        3361, 3371, 3373, 3389, 3391, 3407, 3413, 3433, 3449, 3457, 3461, 3463, 3467, 3469, 3491, 3499, 3511, 3517,
+                        3527, 3529, 3533, 3539, 3541, 3547, 3557, 3559, 3571, 3581, 3583, 3593, 3607, 3613, 3617, 3623, 3631, 3637,
+                        3643, 3659, 3671, 3673, 3677, 3691, 3697, 3701, 3709, 3719, 3727, 3733, 3739, 3761, 3767, 3769, 3779, 3793,
+                        3797, 3803, 3821, 3823, 3833, 3847, 3851, 3853, 3863, 3877, 3881, 3889, 3907, 3911 };
+        
+        protected static final long LARGESTPRIME30BITS = 1073741789;
+
+        public TupleHashProvider() {
+                if (primes.length < MAX_PRACTICAL_DEPTH) {
+                        throw new UnsupportedOperationException(
+                                        "Not enough prime numbers to support the practical depth of continuous hash!");
+                }
+        }
+
+        @Override
+        public int getHash(Tuple key, int index) {
+                if (index >= primes.length) {
+                        throw new IllegalArgumentException("Not enough prime numbers to support index");
+                }
+                long accumulator = 0;
+                final int prime = primes[index];
+                for (int i = 0; i < key.getSize(); i++) {
+                        accumulator = (prime * accumulator + key.get(i)) % LARGESTPRIME30BITS;
+                }
+
+                return (int) accumulator;
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProviderBitMagic.java b/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProviderBitMagic.java
new file mode 100644
index 00000000..5b053229
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProviderBitMagic.java
@@ -0,0 +1,28 @@
+package tools.refinery.store.model;
+
+import tools.refinery.store.map.ContinousHashProvider;
+
+public class TupleHashProviderBitMagic implements ContinousHashProvider<Tuple> {
+
+        @Override
+        public int getHash(Tuple key, int index) {
+                if(key.getSize() == 1) {
+                        return key.get(0);
+                }
+                
+                int result = 0;
+                final int startBitIndex = index*30;
+                final int finalBitIndex = startBitIndex+30;
+                final int arity = key.getSize();
+                
+                for(int i = startBitIndex; i<=finalBitIndex; i++) {
+                        final int selectedKey = key.get(i%arity);
+                        final int selectedPosition = 1<<(i/arity);
+                        if((selectedKey&selectedPosition) != 0) {
+                                result |= 1<<(i%30);
+                        }
+                }
+                
+                return result;
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelImpl.java b/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelImpl.java
new file mode 100644
index 00000000..2a5f2925
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelImpl.java
@@ -0,0 +1,124 @@
+package tools.refinery.store.model.internal;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.DiffCursor;
+import tools.refinery.store.map.VersionedMap;
+import tools.refinery.store.map.internal.MapDiffCursor;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelDiffCursor;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.model.representation.DataRepresentation;
+
+public class ModelImpl implements Model {
+        private final ModelStore store;
+        private final Map<DataRepresentation<?, ?>, VersionedMap<?, ?>> maps;
+
+        public ModelImpl(ModelStore store, Map<DataRepresentation<?, ?>, VersionedMap<?, ?>> maps) {
+                this.store = store;
+                this.maps = maps;
+        }
+
+        @Override
+        public Set<DataRepresentation<?, ?>> getDataRepresentations() {
+                return maps.keySet();
+        }
+
+        @SuppressWarnings("unchecked")
+        private <K, V> VersionedMap<K, V> getMap(DataRepresentation<K, V> representation) {
+                if (maps.containsKey(representation)) {
+                        return (VersionedMap<K, V>) maps.get(representation);
+                } else {
+                        throw new IllegalArgumentException("Model does have representation " + representation);
+                }
+        }
+
+        private <K, V> VersionedMap<K, V> getMapValidateKey(DataRepresentation<K, V> representation, K key) {
+                if (representation.isValidKey(key)) {
+                        return getMap(representation);
+                } else {
+                        throw new IllegalArgumentException(
+                                        "Key is not valid for representation! (representation=" + representation + ", key=" + key + ");");
+                }
+        }
+
+        @Override
+        public <K, V> V get(DataRepresentation<K, V> representation, K key) {
+                return getMapValidateKey(representation, key).get(key);
+        }
+
+        @Override
+        public <K, V> Cursor<K, V> getAll(DataRepresentation<K, V> representation) {
+                return getMap(representation).getAll();
+        }
+
+        @Override
+        public <K, V> V put(DataRepresentation<K, V> representation, K key, V value) {
+                return getMapValidateKey(representation, key).put(key, value);
+        }
+
+        @Override
+        public <K, V> void putAll(DataRepresentation<K, V> representation, Cursor<K, V> cursor) {
+                getMap(representation).putAll(cursor);
+        }
+
+        @Override
+        public <K, V> long getSize(DataRepresentation<K, V> representation) {
+                return getMap(representation).getSize();
+        }
+
+        @Override
+        public ModelDiffCursor getDiffCursor(long to) {
+                Model toModel = store.createModel(to);
+                Map<DataRepresentation<?, ?>, DiffCursor<?, ?>> diffCursors = new HashMap<>();
+                for (DataRepresentation<?, ?> representation : this.maps.keySet()) {
+                        MapDiffCursor<?, ?> diffCursor = constructDiffCursor(toModel, representation);
+                        diffCursors.put(representation, diffCursor);
+                }
+                return new ModelDiffCursor(diffCursors);
+        }
+
+        private <K, V> MapDiffCursor<K, V> constructDiffCursor(Model toModel, DataRepresentation<K, V> representation) {
+                @SuppressWarnings("unchecked")
+                Cursor<K, V> fromCursor = (Cursor<K, V>) this.maps.get(representation).getAll();
+                Cursor<K, V> toCursor = toModel.getAll(representation);
+
+                ContinousHashProvider<K> hashProvider = representation.getHashProvider();
+                V defaultValue = representation.getDefaultValue();
+                return new MapDiffCursor<>(hashProvider, defaultValue, fromCursor, toCursor);
+        }
+
+        @Override
+        public long commit() {
+                long version = 0;
+                boolean versionSet = false;
+                for (VersionedMap<?, ?> map : maps.values()) {
+                        long newVersion = map.commit();
+                        if (versionSet) {
+                                if (version != newVersion) {
+                                        throw new IllegalStateException(
+                                                        "Maps in model have different versions! (" + version + " and" + newVersion + ")");
+                                }
+                        } else {
+                                version = newVersion;
+                                versionSet = true;
+                        }
+                }
+                return version;
+        }
+
+        @Override
+        public void restore(long state) {
+                if(store.getStates().contains(state)) {
+                        for (VersionedMap<?, ?> map : maps.values()) {
+                                map.restore(state);
+                        }
+                } else {
+                        throw new IllegalArgumentException("Map does not contain state "+state+"!");
+                }
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/internal/SimilarRelationEquivalenceClass.java b/subprojects/store/src/main/java/tools/refinery/store/model/internal/SimilarRelationEquivalenceClass.java
new file mode 100644
index 00000000..9d1b1dd0
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/internal/SimilarRelationEquivalenceClass.java
@@ -0,0 +1,33 @@
+package tools.refinery.store.model.internal;
+
+import java.util.Objects;
+
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.representation.Relation;
+
+public class SimilarRelationEquivalenceClass {
+        final ContinousHashProvider<Tuple> hashProvider;
+        final Object defaultValue;
+        final int arity;
+        public SimilarRelationEquivalenceClass(Relation<?> representation) {
+                this.hashProvider = representation.getHashProvider();
+                this.defaultValue = representation.getDefaultValue();
+                this.arity = representation.getArity();
+        }
+        @Override
+        public int hashCode() {
+                return Objects.hash(arity, defaultValue, hashProvider);
+        }
+        @Override
+        public boolean equals(Object obj) {
+                if (this == obj)
+                        return true;
+                if (!(obj instanceof SimilarRelationEquivalenceClass))
+                        return false;
+                SimilarRelationEquivalenceClass other = (SimilarRelationEquivalenceClass) obj;
+                return arity == other.arity && Objects.equals(defaultValue, other.defaultValue)
+                                && Objects.equals(hashProvider, other.hashProvider);
+        }
+        
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/representation/AuxilaryData.java b/subprojects/store/src/main/java/tools/refinery/store/model/representation/AuxilaryData.java
new file mode 100644
index 00000000..ddd8a5f2
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/representation/AuxilaryData.java
@@ -0,0 +1,22 @@
+package tools.refinery.store.model.representation;
+
+import tools.refinery.store.map.ContinousHashProvider;
+
+public class AuxilaryData<K,V> extends DataRepresentation<K, V> {
+        private final String name;
+
+        public AuxilaryData(String name, ContinousHashProvider<K> hashProvider, V defaultValue) {
+                super(hashProvider, defaultValue);
+                this.name = name;
+        }
+        
+        @Override
+        public String getName() {
+                return name;
+        }
+        
+        @Override
+        public boolean isValidKey(K key) {
+                return true;
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/representation/DataRepresentation.java b/subprojects/store/src/main/java/tools/refinery/store/model/representation/DataRepresentation.java
new file mode 100644
index 00000000..585e7b88
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/representation/DataRepresentation.java
@@ -0,0 +1,24 @@
+package tools.refinery.store.model.representation;
+
+import tools.refinery.store.map.ContinousHashProvider;
+
+public abstract class DataRepresentation<K, V> {
+        protected final ContinousHashProvider<K> hashProvider;
+        protected final V defaultValue;
+
+        protected DataRepresentation(ContinousHashProvider<K> hashProvider,     V defaultValue) {
+                this.hashProvider = hashProvider;
+                this.defaultValue = defaultValue;
+        }
+        
+        public abstract String getName();
+        
+        public ContinousHashProvider<K> getHashProvider() {
+                return hashProvider;
+        }
+        public abstract boolean isValidKey(K key);
+
+        public V getDefaultValue() {
+                return defaultValue;
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/representation/Relation.java b/subprojects/store/src/main/java/tools/refinery/store/model/representation/Relation.java
new file mode 100644
index 00000000..fc2a3185
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/representation/Relation.java
@@ -0,0 +1,31 @@
+package tools.refinery.store.model.representation;
+
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.TupleHashProvider;
+
+public class Relation<D> extends DataRepresentation<Tuple, D> {
+        private final String name;
+        private final int arity;
+
+        public Relation(String name, int arity, D defaultValue) {
+                super(TupleHashProvider.singleton(), defaultValue);
+                this.name = name;
+                this.arity = arity;
+        }
+
+        @Override
+        public String getName() {
+                return name;
+        }
+
+        public int getArity() {
+                return arity;
+        }
+
+        @Override
+        public boolean isValidKey(Tuple key) {
+                if(key == null) {
+                        return false;
+                } else return key.getSize() == getArity();
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/representation/TruthValue.java b/subprojects/store/src/main/java/tools/refinery/store/model/representation/TruthValue.java
new file mode 100644
index 00000000..610713f3
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/representation/TruthValue.java
@@ -0,0 +1,51 @@
+package tools.refinery.store.model.representation;
+
+public enum TruthValue {
+        TRUE("true"),
+
+        FALSE("false"),
+
+        UNKNOWN("unknown"),
+
+        ERROR("error");
+
+        private final String name;
+
+        private TruthValue(String name) {
+                this.name = name;
+        }
+
+        public String getName() {
+                return name;
+        }
+
+        public static TruthValue toTruthValue(boolean value) {
+                return value ? TRUE : FALSE;
+        }
+
+        public boolean isConsistent() {
+                return this != ERROR;
+        }
+
+        public boolean isComplete() {
+                return this != UNKNOWN;
+        }
+
+        public boolean must() {
+                return this == TRUE || this == ERROR;
+        }
+
+        public boolean may() {
+                return this == TRUE || this == UNKNOWN;
+        }
+
+        public TruthValue not() {
+                if (this == TRUE) {
+                        return FALSE;
+                } else if (this == FALSE) {
+                        return TRUE;
+                } else {
+                        return this;
+                }
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/QueriableModel.java b/subprojects/store/src/main/java/tools/refinery/store/query/QueriableModel.java
new file mode 100644
index 00000000..f669b3ed
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/QueriableModel.java
@@ -0,0 +1,30 @@
+package tools.refinery.store.query;
+
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.query.building.DNFPredicate;
+
+public interface QueriableModel extends Model{
+        Set<DNFPredicate> getPredicates();
+        
+        void flushChanges();
+
+        boolean hasResult(DNFPredicate predicate);
+
+        boolean hasResult(DNFPredicate predicate, Object[] parameters);
+
+        Optional<Object[]> oneResult(DNFPredicate predicate);
+
+        Optional<Object[]> oneResult(DNFPredicate predicate, Object[] parameters);
+
+        Stream<Object[]> allResults(DNFPredicate predicate);
+
+        Stream<Object[]> allResults(DNFPredicate predicate, Object[] parameters);
+
+        int countResults(DNFPredicate predicate);
+
+        int countResults(DNFPredicate predicate, Object[] parameters);
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/QueriableModelStore.java b/subprojects/store/src/main/java/tools/refinery/store/query/QueriableModelStore.java
new file mode 100644
index 00000000..3a5b51ff
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/QueriableModelStore.java
@@ -0,0 +1,23 @@
+package tools.refinery.store.query;
+
+import java.util.Set;
+
+import tools.refinery.store.model.ModelDiffCursor;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.model.representation.DataRepresentation;
+import tools.refinery.store.query.building.DNFPredicate;
+import tools.refinery.store.query.view.RelationView;
+
+public interface QueriableModelStore extends ModelStore{
+        @SuppressWarnings("squid:S1452")
+        Set<DataRepresentation<?, ?>> getDataRepresentations();
+        @SuppressWarnings("squid:S1452")
+        Set<RelationView<?>> getViews();
+        Set<DNFPredicate> getPredicates();
+        
+        QueriableModel createModel();
+        QueriableModel createModel(long state);
+        
+        Set<Long> getStates();
+        ModelDiffCursor getDiffCursor(long from, long to);
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/QueriableModelStoreImpl.java b/subprojects/store/src/main/java/tools/refinery/store/query/QueriableModelStoreImpl.java
new file mode 100644
index 00000000..653783dd
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/QueriableModelStoreImpl.java
@@ -0,0 +1,127 @@
+package tools.refinery.store.query;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.viatra.query.runtime.api.GenericQuerySpecification;
+
+import tools.refinery.store.model.ModelDiffCursor;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.model.ModelStoreImpl;
+import tools.refinery.store.model.representation.DataRepresentation;
+import tools.refinery.store.query.building.DNFAnd;
+import tools.refinery.store.query.building.DNFAtom;
+import tools.refinery.store.query.building.DNFPredicate;
+import tools.refinery.store.query.building.PredicateAtom;
+import tools.refinery.store.query.building.RelationAtom;
+import tools.refinery.store.query.internal.DNF2PQuery;
+import tools.refinery.store.query.internal.QueriableModelImpl;
+import tools.refinery.store.query.internal.RawPatternMatcher;
+import tools.refinery.store.query.internal.DNF2PQuery.SimplePQuery;
+import tools.refinery.store.query.view.RelationView;
+
+public class QueriableModelStoreImpl implements QueriableModelStore {
+        protected final ModelStore store;
+        protected final Set<RelationView<?>> relationViews;
+        protected final Map<DNFPredicate, GenericQuerySpecification<RawPatternMatcher>> predicates;
+
+        public QueriableModelStoreImpl(Set<DataRepresentation<?, ?>> dataRepresentations,
+                        Set<RelationView<?>> relationViews, Set<DNFPredicate> predicates) {
+                this.store = new ModelStoreImpl(dataRepresentations);
+                validateViews(dataRepresentations, relationViews);
+                this.relationViews = Collections.unmodifiableSet(relationViews);
+                validatePredicates(relationViews, predicates);
+                this.predicates = initPredicates(predicates);
+        }
+
+        private void validateViews(Set<DataRepresentation<?, ?>> dataRepresentations, Set<RelationView<?>> relationViews) {
+                for (RelationView<?> relationView : relationViews) {
+                        // TODO: make it work for non-relation representation?
+                        if (!dataRepresentations.contains(relationView.getRepresentation())) {
+                                throw new IllegalArgumentException(
+                                                DataRepresentation.class.getSimpleName() + " " + relationView.getStringID() + " added to "
+                                                                + QueriableModelStore.class.getSimpleName() + " without a referred representation.");
+                        }
+                }
+        }
+
+        private void validatePredicates(Set<RelationView<?>> relationViews, Set<DNFPredicate> predicates) {
+                for (DNFPredicate dnfPredicate : predicates) {
+                        for (DNFAnd clause : dnfPredicate.getClauses()) {
+                                for (DNFAtom atom : clause.getConstraints()) {
+                                        if (atom instanceof RelationAtom relationAtom) {
+                                                validateRelationAtom(relationViews, dnfPredicate, relationAtom);
+                                        } else if (atom instanceof PredicateAtom predicateAtom) {
+                                                validatePredicateAtom(predicates, dnfPredicate, predicateAtom);
+                                        }
+                                }
+                        }
+                }
+        }
+
+        private void validateRelationAtom(Set<RelationView<?>> relationViews, DNFPredicate dnfPredicate,
+                        RelationAtom relationAtom) {
+                if (!relationViews.contains(relationAtom.getView())) {
+                        throw new IllegalArgumentException(DNFPredicate.class.getSimpleName() + " "
+                                        + dnfPredicate.getUniqueName() + " contains reference to a view of "
+                                        + relationAtom.getView().getRepresentation().getName()
+                                        + " that is not in the model.");
+                }
+        }
+        private void validatePredicateAtom(Set<DNFPredicate> predicates, DNFPredicate dnfPredicate,
+                        PredicateAtom predicateAtom) {
+                if (!predicates.contains(predicateAtom.getReferred())) {
+                        throw new IllegalArgumentException(
+                                        DNFPredicate.class.getSimpleName() + " " + dnfPredicate.getUniqueName()
+                                                        + " contains reference to a predicate "
+                                                        + predicateAtom.getReferred().getName()
+                                                        + "that is not in the model.");
+                }
+        }
+
+        private Map<DNFPredicate, GenericQuerySpecification<RawPatternMatcher>> initPredicates(Set<DNFPredicate> predicates) {
+                Map<DNFPredicate, GenericQuerySpecification<RawPatternMatcher>> result = new HashMap<>();
+                Map<DNFPredicate, SimplePQuery> dnf2PQueryMap = new HashMap<>();
+                for (DNFPredicate dnfPredicate : predicates) {
+                        GenericQuerySpecification<RawPatternMatcher> query = DNF2PQuery.translate(dnfPredicate,dnf2PQueryMap).build();
+                        result.put(dnfPredicate, query);
+                }
+
+                return result;
+        }
+
+        @Override
+        public Set<DataRepresentation<?, ?>> getDataRepresentations() {
+                return store.getDataRepresentations();
+        }
+        @Override
+        public Set<RelationView<?>> getViews() {
+                return this.relationViews;
+        }
+        @Override
+        public Set<DNFPredicate> getPredicates() {
+                return predicates.keySet();
+        }
+
+        @Override
+        public QueriableModel createModel() {
+                return new QueriableModelImpl(this, this.store.createModel(), predicates);
+        }
+
+        @Override
+        public QueriableModel createModel(long state) {
+                return new QueriableModelImpl(this, this.store.createModel(state), predicates);
+        }
+
+        @Override
+        public synchronized Set<Long> getStates() {
+                return this.store.getStates();
+        }
+
+        @Override
+        public synchronized ModelDiffCursor getDiffCursor(long from, long to) {
+                return this.store.getDiffCursor(from, to);
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/building/DNFAnd.java b/subprojects/store/src/main/java/tools/refinery/store/query/building/DNFAnd.java
new file mode 100644
index 00000000..48dabce2
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/building/DNFAnd.java
@@ -0,0 +1,37 @@
+package tools.refinery.store.query.building;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class DNFAnd {
+        private Set<Variable> existentiallyQuantified;
+        private List<DNFAtom> constraints;
+        public DNFAnd(Set<Variable> quantifiedVariables, List<DNFAtom> constraints) {
+                super();
+                this.existentiallyQuantified = quantifiedVariables;
+                this.constraints = constraints;
+        }
+        public Set<Variable> getExistentiallyQuantified() {
+                return existentiallyQuantified;
+        }
+        public List<DNFAtom> getConstraints() {
+                return constraints;
+        }
+        void unifyVariables(Map<String,Variable> uniqueVariableMap) {
+                Map<String,Variable> uniqueVariableMapForClause = new HashMap<>(uniqueVariableMap);
+                for(DNFAtom atom : constraints) {
+                        atom.unifyVariables(uniqueVariableMapForClause);
+                }
+        }
+        void collectQuantifiedVariables(Set<Variable> parameters) {
+                Set<Variable> result = new HashSet<>();
+                for(DNFAtom constraint : constraints) {
+                        constraint.collectAllVariables(result);
+                }
+                result.removeAll(parameters);
+                existentiallyQuantified = result;
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/building/DNFAtom.java b/subprojects/store/src/main/java/tools/refinery/store/query/building/DNFAtom.java
new file mode 100644
index 00000000..b047d7c8
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/building/DNFAtom.java
@@ -0,0 +1,33 @@
+package tools.refinery.store.query.building;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+public interface DNFAtom {
+        void unifyVariables(Map<String,Variable> variables);
+        static Variable unifyVariables(Map<String,Variable> unifiedVariables, Variable variable) {
+                if(variable != null) {
+                        if(variable.isNamed() && unifiedVariables.containsKey(variable.getName())) {
+                                return unifiedVariables.get(variable.getName());
+                        }
+                        return variable;
+                } else {
+                        return null;
+                }
+        }
+        void collectAllVariables(Set<Variable> variables);
+        static void addToCollection(Set<Variable> variables, Variable variable) {
+                if(variable != null) {
+                        variables.add(variable);
+                }
+        }
+        static void addToCollection(Set<Variable> variables, Collection<Variable> variableCollection) {
+                Iterator<Variable> iterator = variableCollection.iterator();
+                while(iterator.hasNext()) {
+                        Variable variable = iterator.next();
+                        addToCollection(variables, variable);
+                }
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/building/DNFPredicate.java b/subprojects/store/src/main/java/tools/refinery/store/query/building/DNFPredicate.java
new file mode 100644
index 00000000..f0c9ac42
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/building/DNFPredicate.java
@@ -0,0 +1,72 @@
+package tools.refinery.store.query.building;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+public class DNFPredicate {
+        private final String name;
+        private final String uniqueName;
+        private final List<Variable> parameters;
+        private final List<DNFAnd> clauses;
+        
+        public DNFPredicate(String name, List<Variable> parameters, List<DNFAnd> clauses) {
+                this.name = name;
+                this.uniqueName = generateUniqueName(name,"predicate");
+                this.parameters = parameters;
+                this.clauses = clauses;
+                
+                postProcess();
+        }
+        
+        public static String generateUniqueName(String originalName, String defaultPrefix) {
+                UUID uuid = UUID.randomUUID();
+                String uniqueString = uuid.toString().replace('-', '_');
+                if(originalName == null) {
+                        return defaultPrefix+uniqueString;
+                } else {
+                        return originalName+uniqueString;
+                }
+        }
+        
+        public String getName() {
+                return name;
+        }
+        public String getUniqueName() {
+                return uniqueName;
+        }
+        public List<Variable> getVariables() {
+                return parameters;
+        }
+        public List<DNFAnd> getClauses() {
+                return clauses;
+        }
+        
+        public void unifyVariables() {
+                Map<String,Variable> uniqueVariableMap = new HashMap<>();
+                for(Variable parameter : this.parameters) {
+                        if(parameter.isNamed()) {
+                                String parameterName = parameter.getName();
+                                if(uniqueVariableMap.containsKey(parameterName)) {
+                                        throw new IllegalArgumentException("Multiple parameters has the name "+parameterName);
+                                } else {
+                                        uniqueVariableMap.put(parameterName, parameter);
+                                }
+                        }
+                }
+                for(DNFAnd clause : this.clauses) {
+                        clause.unifyVariables(uniqueVariableMap);
+                }
+        }
+        public void collectQuantifiedVariables() {
+                for(DNFAnd clause : this.clauses) {
+                        clause.collectQuantifiedVariables(new HashSet<>(parameters));
+                }
+        }
+        public void postProcess() {
+                unifyVariables();
+                collectQuantifiedVariables();
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/building/EquivalenceAtom.java b/subprojects/store/src/main/java/tools/refinery/store/query/building/EquivalenceAtom.java
new file mode 100644
index 00000000..fede2518
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/building/EquivalenceAtom.java
@@ -0,0 +1,44 @@
+package tools.refinery.store.query.building;
+
+import java.util.Map;
+import java.util.Set;
+
+public class EquivalenceAtom implements DNFAtom{
+        private boolean positive;
+        private Variable left;
+        private Variable right;
+        public EquivalenceAtom(boolean positive, Variable left, Variable right) {
+                this.positive = positive;
+                this.left = left;
+                this.right = right;
+        }
+        public boolean isPositive() {
+                return positive;
+        }
+        public void setPositive(boolean positive) {
+                this.positive = positive;
+        }
+        public Variable getLeft() {
+                return left;
+        }
+        public void setLeft(Variable left) {
+                this.left = left;
+        }
+        public Variable getRight() {
+                return right;
+        }
+        public void setRight(Variable right) {
+                this.right = right;
+        }
+        
+        @Override
+        public void unifyVariables(Map<String, Variable> variables) {
+                this.left = DNFAtom.unifyVariables(variables,left);
+                this.right = DNFAtom.unifyVariables(variables,right);
+        }
+        @Override
+        public void collectAllVariables(Set<Variable> variables) {
+                DNFAtom.addToCollection(variables, left);
+                DNFAtom.addToCollection(variables, right);
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/building/PredicateAtom.java b/subprojects/store/src/main/java/tools/refinery/store/query/building/PredicateAtom.java
new file mode 100644
index 00000000..42394922
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/building/PredicateAtom.java
@@ -0,0 +1,66 @@
+package tools.refinery.store.query.building;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class PredicateAtom implements DNFAtom {
+        private DNFPredicate referred;
+        private List<Variable> substitution;
+        private boolean positive;
+        private boolean transitive;
+
+        public PredicateAtom(boolean positive, boolean transitive, DNFPredicate referred, List<Variable> substitution) {
+                this.positive = positive;
+                this.referred = referred;
+                this.substitution = substitution;
+                this.transitive = transitive;
+        }
+
+        public DNFPredicate getReferred() {
+                return referred;
+        }
+
+        public void setReferred(DNFPredicate referred) {
+                this.referred = referred;
+        }
+
+        public List<Variable> getSubstitution() {
+                return substitution;
+        }
+
+        public void setSubstitution(List<Variable> substitution) {
+                this.substitution = substitution;
+        }
+
+        public boolean isPositive() {
+                return positive;
+        }
+
+        public void setPositive(boolean positive) {
+                this.positive = positive;
+        }
+
+        public boolean isTransitive() {
+                return transitive;
+        }
+
+        public void setTransitive(boolean transitive) {
+                this.transitive = transitive;
+        }
+
+        @Override
+        public void unifyVariables(Map<String, Variable> variables) {
+                for (int i = 0; i < this.substitution.size(); i++) {
+                        final Object term = this.substitution.get(i);
+                        if (term instanceof Variable variableReference) {
+                                this.substitution.set(i, DNFAtom.unifyVariables(variables, variableReference));
+                        }
+                }
+        }
+
+        @Override
+        public void collectAllVariables(Set<Variable> variables) {
+                DNFAtom.addToCollection(variables, substitution);
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/building/RelationAtom.java b/subprojects/store/src/main/java/tools/refinery/store/query/building/RelationAtom.java
new file mode 100644
index 00000000..1238f1d7
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/building/RelationAtom.java
@@ -0,0 +1,49 @@
+package tools.refinery.store.query.building;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.store.query.view.FilteredRelationView;
+import tools.refinery.store.query.view.RelationView;
+
+public class RelationAtom implements DNFAtom {
+        RelationView<?> view;
+        List<Variable> substitution;
+
+        public RelationAtom(RelationView<?> view, List<Variable> substitution) {
+                this.view = view;
+                this.substitution = substitution;
+        }
+
+        public RelationView<?> getView() {
+                return view;
+        }
+
+        public void setView(FilteredRelationView<?> view) {
+                this.view = view;
+        }
+
+        public List<Variable> getSubstitution() {
+                return substitution;
+        }
+
+        public void setSubstitution(List<Variable> substitution) {
+                this.substitution = substitution;
+        }
+
+        @Override
+        public void unifyVariables(Map<String, Variable> variables) {
+                for (int i = 0; i < this.substitution.size(); i++) {
+                        final Object term = this.substitution.get(i);
+                        if (term instanceof Variable variableReference) {
+                                this.substitution.set(i, DNFAtom.unifyVariables(variables, variableReference));
+                        }
+                }
+        }
+
+        @Override
+        public void collectAllVariables(Set<Variable> variables) {
+                DNFAtom.addToCollection(variables, substitution);
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/building/Variable.java b/subprojects/store/src/main/java/tools/refinery/store/query/building/Variable.java
new file mode 100644
index 00000000..9ea7ce83
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/building/Variable.java
@@ -0,0 +1,22 @@
+package tools.refinery.store.query.building;
+
+public class Variable {
+        private final String name;
+        private final String uniqueName;
+
+        public Variable(String name) {
+                super();
+                this.name = name;
+                this.uniqueName = DNFPredicate.generateUniqueName(name, "variable");
+                
+        }
+        public String getName() {
+                return name;
+        }
+        public String getUniqueName() {
+                return uniqueName;
+        }
+        public boolean isNamed() {
+                return name != null;
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/internal/DNF2PQuery.java b/subprojects/store/src/main/java/tools/refinery/store/query/internal/DNF2PQuery.java
new file mode 100644
index 00000000..bcc03fb4
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/internal/DNF2PQuery.java
@@ -0,0 +1,189 @@
+package tools.refinery.store.query.internal;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.InputMismatchException;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.viatra.query.runtime.api.GenericQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.scope.QueryScope;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.BinaryTransitiveClosure;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.BasePQuery;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+import tools.refinery.store.query.building.DNFAnd;
+import tools.refinery.store.query.building.DNFAtom;
+import tools.refinery.store.query.building.DNFPredicate;
+import tools.refinery.store.query.building.EquivalenceAtom;
+import tools.refinery.store.query.building.PredicateAtom;
+import tools.refinery.store.query.building.RelationAtom;
+import tools.refinery.store.query.building.Variable;
+
+public class DNF2PQuery {
+
+        public static SimplePQuery translate(DNFPredicate predicate, Map<DNFPredicate, SimplePQuery> dnf2PQueryMap) {
+                SimplePQuery query = dnf2PQueryMap.get(predicate);
+                if (query != null) {
+                        return query;
+                }
+                query = new DNF2PQuery().new SimplePQuery(predicate.getName());
+                Map<Variable, PParameter> parameters = new HashMap<>();
+
+                predicate.getVariables().forEach(variable -> parameters.put(variable, new PParameter(variable.getName())));
+                List<PParameter> parameterList = new ArrayList<>();
+                for(var param : predicate.getVariables()) {
+                        parameterList.add(parameters.get(param));
+                }
+                query.setParameter(parameterList);
+                for (DNFAnd clause : predicate.getClauses()) {
+                        PBody body = new PBody(query);
+                        List<ExportedParameter> symbolicParameters = new ArrayList<>();
+                        for(var param : predicate.getVariables()) {
+                                PVariable pVar = body.getOrCreateVariableByName(param.getName());
+                                symbolicParameters.add(new ExportedParameter(body, pVar, parameters.get(param)));
+                        }
+                        body.setSymbolicParameters(symbolicParameters);
+                        query.addBody(body);
+                        for (DNFAtom constraint : clause.getConstraints()) {
+                                translateDNFAtom(constraint, body, dnf2PQueryMap);
+                        }
+                }
+                dnf2PQueryMap.put(predicate, query);
+                return query;
+        }
+
+        private static void translateDNFAtom(DNFAtom constraint, PBody body, Map<DNFPredicate, SimplePQuery> dnf2PQueryMap) {
+                if (constraint instanceof EquivalenceAtom equivalence) {
+                        translateEquivalenceAtom(equivalence, body);
+                }
+                if (constraint instanceof RelationAtom relation) {
+                        translateRelationAtom(relation, body);
+                }
+                if (constraint instanceof PredicateAtom predicate) {
+                        translatePredicateAtom(predicate, body, dnf2PQueryMap);
+                }
+        }
+
+        private static void translateEquivalenceAtom(EquivalenceAtom equivalence, PBody body) {
+                PVariable varSource = body.getOrCreateVariableByName(equivalence.getLeft().getName());
+                PVariable varTarget = body.getOrCreateVariableByName(equivalence.getRight().getName());
+                if (equivalence.isPositive())
+                        new Equality(body, varSource, varTarget);
+                else
+                        new Inequality(body, varSource, varTarget);
+        }
+
+        private static void translateRelationAtom(RelationAtom relation, PBody body) {
+                if (relation.getSubstitution().size() != relation.getView().getArity()) {
+                        throw new IllegalArgumentException("Arity (" + relation.getView().getArity()
+                                        + ") does not match parameter numbers (" + relation.getSubstitution().size() + ")");
+                }
+                Object[] variables = new Object[relation.getSubstitution().size()];
+                for (int i = 0; i < relation.getSubstitution().size(); i++) {
+                        variables[i] = body.getOrCreateVariableByName(relation.getSubstitution().get(i).getName());
+                }
+                new TypeConstraint(body, Tuples.flatTupleOf(variables), relation.getView());
+        }
+
+        private static void translatePredicateAtom(PredicateAtom predicate, PBody body, Map<DNFPredicate, SimplePQuery> dnf2PQueryMap) {
+                Object[] variables = new Object[predicate.getSubstitution().size()];
+                for (int i = 0; i < predicate.getSubstitution().size(); i++) {
+                        variables[i] = body.getOrCreateVariableByName(predicate.getSubstitution().get(i).getName());
+                }
+                if (predicate.isPositive()) {
+                        if (predicate.isTransitive()) {
+                                if (predicate.getSubstitution().size() != 2) {
+                                        throw new IllegalArgumentException("Transitive Predicate Atoms must be binary.");
+                                }
+                                new BinaryTransitiveClosure(body, Tuples.flatTupleOf(variables),
+                                                DNF2PQuery.translate(predicate.getReferred(), dnf2PQueryMap));
+                        } else {
+                                new PositivePatternCall(body, Tuples.flatTupleOf(variables),
+                                                DNF2PQuery.translate(predicate.getReferred(), dnf2PQueryMap));
+                        }
+                } else {
+                        if (predicate.isTransitive()) {
+                                throw new InputMismatchException("Transitive Predicate Atoms cannot be negative.");
+                        } else {
+                                new NegativePatternCall(body, Tuples.flatTupleOf(variables),
+                                                DNF2PQuery.translate(predicate.getReferred(), dnf2PQueryMap));
+                        }
+                }
+        }
+
+        public class SimplePQuery extends BasePQuery {
+
+                private String fullyQualifiedName;
+                private List<PParameter> parameters;
+                private LinkedHashSet<PBody> bodies = new LinkedHashSet<>();
+
+                public SimplePQuery(String name) {
+                        super(PVisibility.PUBLIC);
+                        fullyQualifiedName = name;
+                }
+
+                @Override
+                public String getFullyQualifiedName() {
+                        return fullyQualifiedName;
+                }
+
+                public void setParameter(List<PParameter> parameters) {
+                        this.parameters = parameters;
+                }
+
+                @Override
+                public List<PParameter> getParameters() {
+                        return parameters;
+                }
+
+                public void addBody(PBody body) {
+                        bodies.add(body);
+                }
+
+                @Override
+                protected Set<PBody> doGetContainedBodies() {
+                        setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+                        return bodies;
+                }
+
+                public GenericQuerySpecification<RawPatternMatcher> build() {
+                        return new GenericQuerySpecification<RawPatternMatcher>(this) {
+
+                                @Override
+                                public Class<? extends QueryScope> getPreferredScopeClass() {
+                                        return RelationalScope.class;
+                                }
+
+                                @Override
+                                protected RawPatternMatcher instantiate(ViatraQueryEngine engine) {
+                                        RawPatternMatcher matcher = engine.getExistingMatcher(this);
+                                if (matcher == null) {
+                                    matcher = engine.getMatcher(this);
+                                }       
+                                return matcher;
+                                }
+
+                                @Override
+                                public RawPatternMatcher instantiate() {
+                                        return new RawPatternMatcher(this);
+                                }
+
+                        };
+                }
+        }
+}
\ No newline at end of file
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/internal/DummyBaseIndexer.java b/subprojects/store/src/main/java/tools/refinery/store/query/internal/DummyBaseIndexer.java
new file mode 100644
index 00000000..49637071
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/internal/DummyBaseIndexer.java
@@ -0,0 +1,59 @@
+package tools.refinery.store.query.internal;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.concurrent.Callable;
+
+import org.eclipse.viatra.query.runtime.api.scope.IBaseIndex;
+import org.eclipse.viatra.query.runtime.api.scope.IIndexingErrorListener;
+import org.eclipse.viatra.query.runtime.api.scope.IInstanceObserver;
+import org.eclipse.viatra.query.runtime.api.scope.ViatraBaseIndexChangeListener;
+
+/**
+ * copied from org.eclipse.viatra.query.runtime.tabular.TabularEngineContext;
+ */
+public class DummyBaseIndexer implements IBaseIndex{
+
+        @Override
+        public <V> V coalesceTraversals(Callable<V> callable) throws InvocationTargetException {
+                try {
+                        return callable.call();
+                } catch (Exception e) {
+                        throw new InvocationTargetException(e);
+                }
+        }
+
+        @Override
+        public void addBaseIndexChangeListener(ViatraBaseIndexChangeListener listener) {
+                // no notification support
+        }
+
+        @Override
+        public void removeBaseIndexChangeListener(ViatraBaseIndexChangeListener listener) {
+                // no notification support
+        }
+
+        @Override
+        public void resampleDerivedFeatures() {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean addIndexingErrorListener(IIndexingErrorListener listener) {
+                return true;
+        }
+
+        @Override
+        public boolean removeIndexingErrorListener(IIndexingErrorListener listener) {
+                return true;
+        }
+
+        @Override
+        public boolean addInstanceObserver(IInstanceObserver observer, Object observedObject) {
+                return true;
+        }
+
+        @Override
+        public boolean removeInstanceObserver(IInstanceObserver observer, Object observedObject) {
+                return true;
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/internal/ModelUpdateListener.java b/subprojects/store/src/main/java/tools/refinery/store/query/internal/ModelUpdateListener.java
new file mode 100644
index 00000000..aa80985f
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/internal/ModelUpdateListener.java
@@ -0,0 +1,103 @@
+package tools.refinery.store.query.internal;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener;
+import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple;
+
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.representation.Relation;
+import tools.refinery.store.query.view.RelationView;
+
+public class ModelUpdateListener {
+        /**
+         * Collections of Relations and their Views.
+         */
+        private final Map<Relation<?>, Set<RelationView<?>>> relation2View;
+        /**
+         * Collection of Views and their buffers.
+         */
+        private final Map<RelationView<?>, Set<ViewUpdateBuffer<?>>> view2Buffers;
+
+        public ModelUpdateListener(Set<RelationView<?>> relationViews) {
+                this.relation2View = new HashMap<>();
+                this.view2Buffers = new HashMap<>();
+
+                for (RelationView<?> relationView : relationViews) {
+                        registerView(relationView);
+                }
+        }
+
+        private void registerView(RelationView<?> view) {
+                Relation<?> relation = view.getRepresentation();
+
+                // 1. register views to relations, if necessary
+                var views = relation2View.computeIfAbsent(relation, x->new HashSet<>());
+                views.add(view);
+
+                // 2. register notifier map to views, if necessary
+                view2Buffers.computeIfAbsent(view, x->new HashSet<>());
+        }
+
+        boolean containsRelationalView(RelationView<?> relationalKey) {
+                return view2Buffers.containsKey(relationalKey);
+        }
+
+        <D> void addListener(RelationView<D> relationView, ITuple seed, IQueryRuntimeContextListener listener) {
+                if (view2Buffers.containsKey(relationView)) {
+                        ViewUpdateTranslator<D> updateListener = new ViewUpdateTranslator<>(relationView, seed, listener);
+                        ViewUpdateBuffer<D> updateBuffer = new ViewUpdateBuffer<>(updateListener);
+                        view2Buffers.get(relationView).add(updateBuffer);
+                } else
+                        throw new IllegalArgumentException();
+        }
+
+        void removeListener(RelationView<?> relationView, ITuple seed, IQueryRuntimeContextListener listener) {
+                if (view2Buffers.containsKey(relationView)) {
+                        Set<ViewUpdateBuffer<?>> buffers = this.view2Buffers.get(relationView);
+                        for(var buffer : buffers) {
+                                if(buffer.getUpdateListener().key == seed && buffer.getUpdateListener().listener == listener) {
+                                        // remove buffer and terminate immediately, or it will break iterator.
+                                        buffers.remove(buffer);
+                                        return;
+                                }
+                        }
+                } else
+                        throw new IllegalArgumentException();
+        }
+
+        public <D> void addUpdate(Relation<D> relation, Tuple key, D oldValue, D newValue) {
+                var views = this.relation2View.get(relation);
+                if (views != null) {
+                        for (var view : views) {
+                                var buffers = this.view2Buffers.get(view);
+                                for (var buffer : buffers) {
+                                        @SuppressWarnings("unchecked")
+                                        var typedBuffer = (ViewUpdateBuffer<D>) buffer;
+                                        typedBuffer.addChange(key, oldValue, newValue);
+                                }
+                        }
+                }
+        }
+
+        public boolean hasChange() {
+                for (var bufferCollection : this.view2Buffers.values()) {
+                        for (ViewUpdateBuffer<?> buffer : bufferCollection) {
+                                if (buffer.hasChange())
+                                        return true;
+                        }
+                }
+                return false;
+        }
+
+        public void flush() {
+                for (var bufferCollection : this.view2Buffers.values()) {
+                        for (ViewUpdateBuffer<?> buffer : bufferCollection) {
+                                buffer.flush();
+                        }
+                }
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/internal/PredicateResult.java b/subprojects/store/src/main/java/tools/refinery/store/query/internal/PredicateResult.java
new file mode 100644
index 00000000..65d23eb6
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/internal/PredicateResult.java
@@ -0,0 +1,24 @@
+package tools.refinery.store.query.internal;
+
+import java.util.Optional;
+import java.util.stream.Stream;
+
+public interface PredicateResult {
+
+        boolean hasResult();
+
+        boolean hasResult(Object[] parameters);
+
+        Optional<Object[]> oneResult();
+
+        Optional<Object[]> oneResult(Object[] parameters);
+
+        Stream<Object[]> allResults();
+
+        Stream<Object[]> allResults(Object[] parameters);
+
+        int countResults();
+
+        int countResults(Object[] parameters);
+
+}
\ No newline at end of file
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/internal/QueriableModelImpl.java b/subprojects/store/src/main/java/tools/refinery/store/query/internal/QueriableModelImpl.java
new file mode 100644
index 00000000..0f4d609f
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/internal/QueriableModelImpl.java
@@ -0,0 +1,212 @@
+package tools.refinery.store.query.internal;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import org.eclipse.viatra.query.runtime.api.AdvancedViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.GenericQueryGroup;
+import org.eclipse.viatra.query.runtime.api.GenericQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.IQueryGroup;
+
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.DiffCursor;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelDiffCursor;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.representation.DataRepresentation;
+import tools.refinery.store.model.representation.Relation;
+import tools.refinery.store.query.QueriableModel;
+import tools.refinery.store.query.QueriableModelStore;
+import tools.refinery.store.query.building.DNFPredicate;
+
+public class QueriableModelImpl implements QueriableModel {
+        protected final QueriableModelStore store;
+        protected final Model model;
+        protected final Map<DNFPredicate, GenericQuerySpecification<RawPatternMatcher>> predicates2PQuery;
+        
+        protected RelationalScope scope;
+        protected AdvancedViatraQueryEngine engine;
+        protected Map<DNFPredicate, RawPatternMatcher> predicate2Matcher;
+
+        public QueriableModelImpl(QueriableModelStore store, Model model,
+                        Map<DNFPredicate, GenericQuerySpecification<RawPatternMatcher>> predicates2PQuery) {
+                this.store = store;
+                this.model = model;
+                this.predicates2PQuery = predicates2PQuery;
+                initEngine();
+        }
+
+        private void initEngine() {
+                this.scope = new RelationalScope(this.model, this.store.getViews());
+                this.engine = AdvancedViatraQueryEngine.createUnmanagedEngine(this.scope);
+                this.predicate2Matcher = initMatchers(this.engine, this.predicates2PQuery);
+        }
+
+        private Map<DNFPredicate, RawPatternMatcher> initMatchers(AdvancedViatraQueryEngine engine,
+                        Map<DNFPredicate, GenericQuerySpecification<RawPatternMatcher>> predicates2pQuery) {
+                // 1. prepare group
+                IQueryGroup queryGroup = GenericQueryGroup.of(Set.copyOf(predicates2pQuery.values()));
+                engine.prepareGroup(queryGroup, null);
+
+                // 2. then get all matchers
+                Map<DNFPredicate, RawPatternMatcher> result = new HashMap<>();
+                for (var entry : predicates2pQuery.entrySet()) {
+                        var matcher = engine.getMatcher(entry.getValue());
+                        result.put(entry.getKey(), matcher);
+                }
+                return result;
+        }
+
+        @Override
+        public Set<DataRepresentation<?, ?>> getDataRepresentations() {
+                return model.getDataRepresentations();
+        }
+
+        @Override
+        public Set<DNFPredicate> getPredicates() {
+                return store.getPredicates();
+        }
+
+        @Override
+        public <K, V> V get(DataRepresentation<K, V> representation, K key) {
+                return model.get(representation, key);
+        }
+
+        @Override
+        public <K, V> Cursor<K, V> getAll(DataRepresentation<K, V> representation) {
+                return model.getAll(representation);
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public <K, V> V put(DataRepresentation<K, V> representation, K key, V value) {
+                V oldValue = this.model.put(representation, key, value);
+                if(representation instanceof Relation<?> relation) {
+                        this.scope.processUpdate((Relation<V>)relation, (Tuple)key, oldValue, value);
+                }
+                return oldValue;
+        }
+
+        @Override
+        public <K, V> void putAll(DataRepresentation<K, V> representation, Cursor<K, V> cursor) {
+                if(representation instanceof Relation<?>) {
+                        @SuppressWarnings("unchecked")
+                        Relation<V> relation = (Relation<V>) representation;
+                        while(cursor.move()) {
+                                Tuple key = (Tuple) cursor.getKey();
+                                V newValue = cursor.getValue();
+                                V oldValue = this.model.put(relation, key, newValue);
+                                this.scope.processUpdate(relation, key, oldValue, newValue);
+                        }
+                } else {
+                        this.model.putAll(representation, cursor);
+                }
+        }
+
+        @Override
+        public <K, V> long getSize(DataRepresentation<K, V> representation) {
+                return model.getSize(representation);
+        }
+
+        protected PredicateResult getPredicateResult(DNFPredicate predicate) {
+                var result = this.predicate2Matcher.get(predicate);
+                if (result == null) {
+                        throw new IllegalArgumentException("Model does not contain predicate " + predicate.getName() + "!");
+                } else
+                        return result;
+        }
+
+        protected void validateParameters(DNFPredicate predicate, Object[] parameters) {
+                int predicateArity = predicate.getVariables().size();
+                int parameterArity = parameters.length;
+                if (parameterArity != predicateArity) {
+                        throw new IllegalArgumentException("Predicate " + predicate.getName() + " with " + predicateArity
+                                        + " arity called with different number of parameters (" + parameterArity + ")!");
+                }
+        }
+
+        @Override
+        public boolean hasResult(DNFPredicate predicate) {
+                return getPredicateResult(predicate).hasResult();
+        }
+
+        @Override
+        public boolean hasResult(DNFPredicate predicate, Object[] parameters) {
+                validateParameters(predicate, parameters);
+                return getPredicateResult(predicate).hasResult(parameters);
+        }
+        
+        @Override
+        public Optional<Object[]> oneResult(DNFPredicate predicate){
+                return getPredicateResult(predicate).oneResult();
+        }
+
+        @Override
+        public Optional<Object[]> oneResult(DNFPredicate predicate, Object[] parameters){
+                validateParameters(predicate, parameters);
+                return getPredicateResult(predicate).oneResult(parameters);
+        }
+
+        @Override
+        public Stream<Object[]> allResults(DNFPredicate predicate){
+                return getPredicateResult(predicate).allResults();
+        }
+
+        @Override
+        public Stream<Object[]> allResults(DNFPredicate predicate, Object[] parameters){
+                validateParameters(predicate, parameters);
+                return getPredicateResult(predicate).allResults(parameters);
+        }
+
+        @Override
+        public int countResults(DNFPredicate predicate){
+                return getPredicateResult(predicate).countResults();
+        }
+
+        @Override
+        public int countResults(DNFPredicate predicate, Object[] parameters){
+                validateParameters(predicate, parameters);
+                return getPredicateResult(predicate).countResults(parameters);
+                
+        }
+        @Override
+        public void flushChanges() {
+                this.scope.flush();
+        }
+
+        @Override
+        public ModelDiffCursor getDiffCursor(long to) {
+                return model.getDiffCursor(to);
+        }
+
+        @Override
+        public long commit() {
+                return this.model.commit();
+        }
+
+        @Override
+        public void restore(long state) {
+                restoreWithDiffReplay(state);
+        }
+
+        public void restoreWithDiffReplay(long state) {
+                var modelDiffCursor = getDiffCursor(state);
+                for(DataRepresentation<?,?> dataRepresentation : this.getDataRepresentations()) {
+                        restoreRepresentationWithDiffReplay(modelDiffCursor, dataRepresentation);
+                }
+        }
+
+        private <K,V> void restoreRepresentationWithDiffReplay(ModelDiffCursor modelDiffCursor,
+                        DataRepresentation<K, V> dataRepresentation) {
+                DiffCursor<K,V> diffCursor = modelDiffCursor.getCursor(dataRepresentation);
+                this.putAll(dataRepresentation, diffCursor);
+        }
+        
+        public void restoreWithReinit(long state) {
+                model.restore(state);
+                this.initEngine();
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/internal/RawPatternMatcher.java b/subprojects/store/src/main/java/tools/refinery/store/query/internal/RawPatternMatcher.java
new file mode 100644
index 00000000..c6d6353c
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/internal/RawPatternMatcher.java
@@ -0,0 +1,57 @@
+package tools.refinery.store.query.internal;
+
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.eclipse.viatra.query.runtime.api.GenericPatternMatcher;
+import org.eclipse.viatra.query.runtime.api.GenericQuerySpecification;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.AbstractTuple;
+
+public class RawPatternMatcher extends GenericPatternMatcher implements PredicateResult{
+        
+        protected final Object[] empty;
+        
+        public RawPatternMatcher(GenericQuerySpecification<? extends GenericPatternMatcher> specification) {
+                super(specification);
+                this.empty = new Object[specification.getParameterNames().size()];
+        }
+        
+        @Override
+        public boolean hasResult() {
+                return hasResult(empty);
+        }
+        @Override
+        public boolean hasResult(Object[] parameters) {
+                return this.backend.hasMatch(parameters);
+        }
+        @Override
+        public Optional<Object[]> oneResult() {
+                return oneResult(empty);
+        }
+        @Override
+        public Optional<Object[]> oneResult(Object[] parameters) {
+                Optional<Tuple> tuple = this.backend.getOneArbitraryMatch(parameters);
+                if(tuple.isPresent()) {
+                        return Optional.of(tuple.get().getElements());
+                } else {
+                        return Optional.empty();
+                }
+        }
+        @Override
+        public Stream<Object[]> allResults() {
+                return allResults(empty);
+        }
+        @Override
+        public Stream<Object[]> allResults(Object[] parameters) {
+                return this.backend.getAllMatches(parameters).map(AbstractTuple::getElements);
+        }
+        @Override
+        public int countResults() {
+                return countResults(empty);
+        }
+        @Override
+        public int countResults(Object[] parameters) {
+                return backend.countMatches(parameters);
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/internal/RelationalEngineContext.java b/subprojects/store/src/main/java/tools/refinery/store/query/internal/RelationalEngineContext.java
new file mode 100644
index 00000000..dfbd8545
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/internal/RelationalEngineContext.java
@@ -0,0 +1,33 @@
+package tools.refinery.store.query.internal;
+
+import org.eclipse.viatra.query.runtime.api.scope.IBaseIndex;
+import org.eclipse.viatra.query.runtime.api.scope.IEngineContext;
+import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContext;
+
+import tools.refinery.store.model.Model;
+
+public class RelationalEngineContext implements IEngineContext{
+        private final IBaseIndex baseIndex = new DummyBaseIndexer();
+        private final RelationalRuntimeContext runtimeContext;
+        
+
+        public RelationalEngineContext(Model model, ModelUpdateListener updateListener) {
+                runtimeContext = new RelationalRuntimeContext(model, updateListener);
+        }
+
+        @Override
+        public IBaseIndex getBaseIndex() {
+                return this.baseIndex;
+        }
+
+        @Override
+        public void dispose() {
+                //lifecycle not controlled by engine
+        }
+
+        @Override
+        public IQueryRuntimeContext getQueryRuntimeContext() {
+                return runtimeContext;
+        }
+
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/internal/RelationalQueryMetaContext.java b/subprojects/store/src/main/java/tools/refinery/store/query/internal/RelationalQueryMetaContext.java
new file mode 100644
index 00000000..05fb0904
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/internal/RelationalQueryMetaContext.java
@@ -0,0 +1,58 @@
+package tools.refinery.store.query.internal;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.viatra.query.runtime.matchers.context.AbstractQueryMetaContext;
+import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
+import org.eclipse.viatra.query.runtime.matchers.context.InputKeyImplication;
+
+import tools.refinery.store.query.view.RelationView;
+
+/**
+ * The meta context information for String scopes.
+ */
+public final class RelationalQueryMetaContext extends AbstractQueryMetaContext {
+
+        @Override
+        public boolean isEnumerable(IInputKey key) {            
+        ensureValidKey(key);
+        return key.isEnumerable();
+        }
+
+        @Override
+        public boolean isStateless(IInputKey key) {
+        ensureValidKey(key);
+        return key instanceof RelationView<?>;
+        }
+
+        @Override
+        public Collection<InputKeyImplication> getImplications(IInputKey implyingKey) {
+        ensureValidKey(implyingKey);
+        return new HashSet<InputKeyImplication>();
+        }               
+
+        @Override
+    public Map<Set<Integer>, Set<Integer>> getFunctionalDependencies(IInputKey key) {
+        ensureValidKey(key);
+        if (key instanceof RelationView) {
+            return new HashMap<Set<Integer>, Set<Integer>>();
+        } else {
+            return Collections.emptyMap();
+        }
+    }
+
+    public void ensureValidKey(IInputKey key) {
+        if (! (key instanceof RelationView<?>))
+            illegalInputKey(key);
+    }
+
+    public void illegalInputKey(IInputKey key) {
+        throw new IllegalArgumentException("The input key " + key + " is not a valid input key.");
+    }
+        
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/internal/RelationalRuntimeContext.java b/subprojects/store/src/main/java/tools/refinery/store/query/internal/RelationalRuntimeContext.java
new file mode 100644
index 00000000..a186b5dd
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/internal/RelationalRuntimeContext.java
@@ -0,0 +1,178 @@
+package tools.refinery.store.query.internal;
+
+import static tools.refinery.store.util.CollectionsUtil.filter;
+import static tools.refinery.store.util.CollectionsUtil.map;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Iterator;
+import java.util.Optional;
+import java.util.concurrent.Callable;
+
+import org.eclipse.viatra.query.runtime.base.core.NavigationHelperImpl;
+import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
+import org.eclipse.viatra.query.runtime.matchers.context.IQueryMetaContext;
+import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContext;
+import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener;
+import org.eclipse.viatra.query.runtime.matchers.context.IndexingService;
+import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.TupleMask;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.matchers.util.Accuracy;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.query.view.RelationView;
+
+public class RelationalRuntimeContext implements IQueryRuntimeContext {
+        private final RelationalQueryMetaContext metaContext = new RelationalQueryMetaContext();
+        private final ModelUpdateListener modelUpdateListener;
+        private final Model model;
+        
+        public RelationalRuntimeContext(Model model, ModelUpdateListener relationUpdateListener) {
+                this.model = model;
+                this.modelUpdateListener = relationUpdateListener;
+        }
+        
+        @Override
+        public IQueryMetaContext getMetaContext() {
+                return metaContext;
+        }
+
+        /**
+         * TODO: check {@link NavigationHelperImpl#coalesceTraversals(Callable)}
+         */
+        @Override
+        public <V> V coalesceTraversals(Callable<V> callable) throws InvocationTargetException {
+        try {
+            return callable.call();
+        } catch (Exception e) {
+            throw new InvocationTargetException(e);
+        }
+        }
+
+        @Override
+        public boolean isCoalescing() {
+                return true;
+        }
+
+        @Override
+        public boolean isIndexed(IInputKey key, IndexingService service) {
+                if(key instanceof RelationView<?> relationalKey) {
+                        return this.modelUpdateListener.containsRelationalView(relationalKey);
+                } else {
+                        return false;
+                }
+        }
+
+        @Override
+        public void ensureIndexed(IInputKey key, IndexingService service) {
+                if(!isIndexed(key, service)) {
+                        throw new IllegalStateException("Engine tries to index a new key " +key);
+                }
+        }
+        @SuppressWarnings("squid:S1452")
+        RelationView<?> checkKey(IInputKey key) {
+                if(key instanceof RelationView) {
+                        RelationView<?> relationViewKey = (RelationView<?>) key;
+                        if(modelUpdateListener.containsRelationalView(relationViewKey)) {
+                                return relationViewKey;
+                        } else {
+                                throw new IllegalStateException("Query is asking for non-indexed key");
+                        }
+                } else {
+                        throw new IllegalStateException("Query is asking for non-relational key");
+                }
+        }
+        
+        @Override
+        public int countTuples(IInputKey key, TupleMask seedMask, ITuple seed) {
+                RelationView<?> relationalViewKey = checkKey(key);
+                Iterable<Object[]> allObjects = relationalViewKey.getAll(model);
+                Iterable<Object[]> filteredBySeed = filter(allObjects,objectArray -> isMatching(objectArray,seedMask,seed));
+                Iterator<Object[]> iterator = filteredBySeed.iterator();
+                int result = 0;
+                while(iterator.hasNext()) {
+                        iterator.next();
+                        result++;
+                }
+                return result;
+        }
+
+        @Override
+        public Optional<Long> estimateCardinality(IInputKey key, TupleMask groupMask, Accuracy requiredAccuracy) {
+                return Optional.empty();
+        }
+
+        @Override
+        public Iterable<Tuple> enumerateTuples(IInputKey key, TupleMask seedMask, ITuple seed) {
+                RelationView<?> relationalViewKey = checkKey(key);
+                Iterable<Object[]> allObjects = relationalViewKey.getAll(model);
+                Iterable<Object[]> filteredBySeed = filter(allObjects,objectArray -> isMatching(objectArray,seedMask,seed));
+                return map(filteredBySeed,Tuples::flatTupleOf);
+        }
+        
+        private boolean isMatching(Object[] tuple, TupleMask seedMask, ITuple seed) {
+                for(int i=0; i<seedMask.indices.length; i++) {
+                        final Object seedElement = seed.get(i);
+                        final Object tupleElement = tuple[seedMask.indices[i]];
+                        if(!tupleElement.equals(seedElement)) {
+                                return false;
+                        }
+                }
+                return true;
+        }
+
+        @Override
+        public Iterable<? extends Object> enumerateValues(IInputKey key, TupleMask seedMask, ITuple seed) {
+                return enumerateTuples(key, seedMask, seed);
+        }
+
+        @Override
+        public boolean containsTuple(IInputKey key, ITuple seed) {
+                RelationView<?> relationalViewKey = checkKey(key);
+                return relationalViewKey.get(model,seed.getElements());
+        }
+
+        @Override
+        public void addUpdateListener(IInputKey key, Tuple seed, IQueryRuntimeContextListener listener) {
+                RelationView<?> relationalKey = checkKey(key);
+                this.modelUpdateListener.addListener(relationalKey, seed, listener);
+                
+        }
+
+        @Override
+        public void removeUpdateListener(IInputKey key, Tuple seed, IQueryRuntimeContextListener listener) {
+                RelationView<?> relationalKey = checkKey(key);
+                this.modelUpdateListener.removeListener(relationalKey, seed, listener);
+        }
+
+        @Override
+        public Object wrapElement(Object externalElement) {
+                return externalElement;
+        }
+
+        @Override
+        public Object unwrapElement(Object internalElement) {
+                return internalElement;
+        }
+
+        @Override
+        public Tuple wrapTuple(Tuple externalElements) {
+                return externalElements;
+        }
+
+        @Override
+        public Tuple unwrapTuple(Tuple internalElements) {
+                return internalElements;
+        }
+
+        @Override
+        public void ensureWildcardIndexing(IndexingService service) {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void executeAfterTraversal(Runnable runnable) throws InvocationTargetException {
+                runnable.run();
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/internal/RelationalScope.java b/subprojects/store/src/main/java/tools/refinery/store/query/internal/RelationalScope.java
new file mode 100644
index 00000000..e8d45356
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/internal/RelationalScope.java
@@ -0,0 +1,43 @@
+package tools.refinery.store.query.internal;
+
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.scope.IEngineContext;
+import org.eclipse.viatra.query.runtime.api.scope.IIndexingErrorListener;
+import org.eclipse.viatra.query.runtime.api.scope.QueryScope;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.representation.Relation;
+import tools.refinery.store.query.view.RelationView;
+
+public class RelationalScope extends QueryScope{
+        private final Model model;
+        private final ModelUpdateListener updateListener;
+        
+        public RelationalScope(Model model, Set<RelationView<?>> relationViews) {
+                this.model = model;
+                this.updateListener = new ModelUpdateListener(relationViews);
+                //this.changeListener = new 
+        }
+        
+        public <D> void processUpdate(Relation<D> relation, Tuple key, D oldValue, D newValue) {
+                updateListener.addUpdate(relation, key, oldValue, newValue);
+        }
+        
+        public boolean hasChange() {
+                return updateListener.hasChange();
+        }
+
+        public void flush() {
+                updateListener.flush();
+        }
+        
+        @Override
+        protected IEngineContext createEngineContext(ViatraQueryEngine engine, IIndexingErrorListener errorListener,
+                        Logger logger) {
+                return new RelationalEngineContext(model, updateListener);
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/internal/ViewUpdate.java b/subprojects/store/src/main/java/tools/refinery/store/query/internal/ViewUpdate.java
new file mode 100644
index 00000000..7d1a4c05
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/internal/ViewUpdate.java
@@ -0,0 +1,34 @@
+package tools.refinery.store.query.internal;
+
+import java.util.Arrays;
+import java.util.Objects;
+
+record ViewUpdate (Object[] tuple, boolean isInsertion) {
+
+        @Override
+        public int hashCode() {
+                final int prime = 31;
+                int result = 1;
+                result = prime * result + Arrays.deepHashCode(tuple);
+                result = prime * result + Objects.hash(isInsertion);
+                return result;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+                if (this == obj)
+                        return true;
+                if (obj == null)
+                        return false;
+                if (getClass() != obj.getClass())
+                        return false;
+                ViewUpdate other = (ViewUpdate) obj;
+                return isInsertion == other.isInsertion && Arrays.deepEquals(tuple, other.tuple);
+        }
+
+        @Override
+        public String toString() {
+                return "ViewUpdate [" + Arrays.toString(tuple) + "insertion= "+this.isInsertion+"]";
+        }
+        
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/internal/ViewUpdateBuffer.java b/subprojects/store/src/main/java/tools/refinery/store/query/internal/ViewUpdateBuffer.java
new file mode 100644
index 00000000..6bc4c96a
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/internal/ViewUpdateBuffer.java
@@ -0,0 +1,46 @@
+package tools.refinery.store.query.internal;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import tools.refinery.store.model.Tuple;
+
+public class ViewUpdateBuffer<D> {
+        protected final ViewUpdateTranslator<D> updateListener;
+        protected final List<ViewUpdate> buffer = new ArrayList<>();
+        
+        public ViewUpdateBuffer(ViewUpdateTranslator<D> updateListener) {
+                this.updateListener = updateListener;
+        }
+        
+        public ViewUpdateTranslator<D> getUpdateListener() {
+                return updateListener;
+        }
+        
+        public boolean hasChange() {
+                return ! buffer.isEmpty();
+        }
+        
+        public void addChange(Tuple tuple, D oldValue, D newValue) {
+                if(oldValue != newValue) {
+                        Object[] oldTuple = updateListener.isMatching(tuple, oldValue);
+                        Object[] newTuple = updateListener.isMatching(tuple, newValue);
+                        if(!Arrays.equals(oldTuple, newTuple)) {
+                                if(oldTuple != null) {
+                                        buffer.add(new ViewUpdate(oldTuple, false));
+                                }
+                                if(newTuple != null) {
+                                        buffer.add(new ViewUpdate(newTuple, true));
+                                }
+                        }
+                }
+        }
+        
+        public void flush() {
+                for (ViewUpdate viewChange : buffer) {
+                        updateListener.processChange(viewChange);
+                }
+                buffer.clear();
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/internal/ViewUpdateTranslator.java b/subprojects/store/src/main/java/tools/refinery/store/query/internal/ViewUpdateTranslator.java
new file mode 100644
index 00000000..1c210c5f
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/internal/ViewUpdateTranslator.java
@@ -0,0 +1,57 @@
+package tools.refinery.store.query.internal;
+
+import java.util.Objects;
+
+import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener;
+import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.query.view.RelationView;
+
+public class ViewUpdateTranslator<D> {
+        final RelationView<D> key;
+        final ITuple filter;
+        final IQueryRuntimeContextListener listener;
+        
+        public ViewUpdateTranslator(RelationView<D> key, ITuple filter, IQueryRuntimeContextListener listener) {
+                super();
+                this.key = key;
+                this.filter = filter;
+                this.listener = listener;
+        }
+        
+        public void processChange(ViewUpdate change) {
+                listener.update(key, Tuples.flatTupleOf(change.tuple()), change.isInsertion());
+        }
+
+        public Object[] isMatching(Tuple tuple, D value){
+                return isMatching(key.getWrappedKey().transform(tuple, value), filter);
+        }
+        @SuppressWarnings("squid:S1168")
+        private Object[] isMatching(Object[] tuple, ITuple filter) {
+                for(int i = 0; i<filter.getSize(); i++) {
+                        final Object filterObject = filter.get(i);
+                        if(filterObject != null && !filterObject.equals(tuple[i])) {
+                                return null;
+                        }
+                }
+                return tuple;
+        }
+
+        @Override
+        public int hashCode() {
+                return Objects.hash(filter, key, listener);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+                if (this == obj)
+                        return true;
+                if (!(obj instanceof ViewUpdateTranslator))
+                        return false;
+                ViewUpdateTranslator<?> other = (ViewUpdateTranslator<?>) obj;
+                return Objects.equals(filter, other.filter) && Objects.equals(key, other.key)
+                                && Objects.equals(listener, other.listener);
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/view/FilteredRelationView.java b/subprojects/store/src/main/java/tools/refinery/store/query/view/FilteredRelationView.java
new file mode 100644
index 00000000..3531195a
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/view/FilteredRelationView.java
@@ -0,0 +1,48 @@
+package tools.refinery.store.query.view;
+
+import java.util.function.BiPredicate;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.Tuple.Tuple1;
+import tools.refinery.store.model.representation.Relation;
+
+public class FilteredRelationView<D> extends RelationView<D>{
+        private final BiPredicate<Tuple,D> predicate;
+
+        public FilteredRelationView(Relation<D> representation, BiPredicate<Tuple,D> predicate) {
+                super(representation);
+                this.predicate = predicate;
+        }
+        @Override
+        protected Object[] forwardMap(Tuple key, D value) {
+                return toTuple1Array(key);
+        }
+        @Override
+        public boolean get(Model model, Object[] tuple) {
+                int[] content = new int[tuple.length];
+                for(int i = 0; i<tuple.length; i++) {
+                        content[i] =((Tuple1)tuple[i]).get(0);
+                }
+                Tuple key = Tuple.of(content);
+                D value = model.get(representation, key);
+                return filter(key, value);
+        }
+        
+        public static Object[] toTuple1Array(Tuple t) {
+                Object[] result = new Object[t.getSize()];
+                for(int i = 0; i<t.getSize(); i++) {
+                        result[i] = Tuple.of(t.get(i));
+                }
+                return result;
+        }
+        
+        @Override
+        public int getArity() {
+                return this.representation.getArity();
+        }
+        @Override
+        protected boolean filter(Tuple key, D value) {
+                return this.predicate.test(key, value);
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/view/FunctionalRelationView.java b/subprojects/store/src/main/java/tools/refinery/store/query/view/FunctionalRelationView.java
new file mode 100644
index 00000000..db9ba4b8
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/view/FunctionalRelationView.java
@@ -0,0 +1,50 @@
+package tools.refinery.store.query.view;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.Tuple.Tuple1;
+import tools.refinery.store.model.representation.Relation;
+
+public class FunctionalRelationView<D> extends RelationView<D> {
+
+        public FunctionalRelationView(Relation<D> representation) {
+                super(representation);
+        }
+
+        @Override
+        protected boolean filter(Tuple key, D value) {
+                return true;
+        }
+
+        @Override
+        protected Object[] forwardMap(Tuple key, D value) {
+                return toTuple1ArrayPlusValue(key, value);
+        }
+
+        @Override
+        public boolean get(Model model, Object[] tuple) {
+                int[] content = new int[tuple.length-1];
+                for(int i = 0; i<tuple.length-1; i++) {
+                        content[i] =((Tuple1)tuple[i]).get(0);
+                }
+                Tuple key = Tuple.of(content);
+                @SuppressWarnings("unchecked")
+                D valueInTuple = (D) tuple[tuple.length-1];
+                D valueInMap = model.get(representation, key);
+                return valueInTuple.equals(valueInMap);
+        }
+        
+        public static <D> Object[] toTuple1ArrayPlusValue(Tuple t, D value) {
+                Object[] result = new Object[t.getSize()+1];
+                for(int i = 0; i<t.getSize(); i++) {
+                        result[i] = Tuple.of(t.get(i));
+                }
+                result[t.getSize()] = value;
+                return result;
+        }
+        
+        @Override
+        public int getArity() {
+                return this.representation.getArity()+1;
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/view/KeyOnlyRelationView.java b/subprojects/store/src/main/java/tools/refinery/store/query/view/KeyOnlyRelationView.java
new file mode 100644
index 00000000..6fa387a1
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/view/KeyOnlyRelationView.java
@@ -0,0 +1,16 @@
+package tools.refinery.store.query.view;
+
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.representation.Relation;
+
+public class KeyOnlyRelationView extends FilteredRelationView<Boolean>{
+
+        public KeyOnlyRelationView(Relation<Boolean> representation) {
+                super(representation, (k,v)->true);
+        }
+        @Override
+        protected boolean filter(Tuple key, Boolean value) {
+                return !value.equals(representation.getDefaultValue());
+        }
+        
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/view/RelationView.java b/subprojects/store/src/main/java/tools/refinery/store/query/view/RelationView.java
new file mode 100644
index 00000000..fd55eed4
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/view/RelationView.java
@@ -0,0 +1,85 @@
+package tools.refinery.store.query.view;
+
+import java.util.Objects;
+
+import org.eclipse.viatra.query.runtime.matchers.context.common.BaseInputKeyWrapper;
+
+import tools.refinery.store.map.CursorAsIterator;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.representation.Relation;
+
+/**
+ * Represents a view of a {@link Relation} that can be queried.
+ * 
+ * @author Oszkar Semerath
+ *
+ * @param <D>
+ */
+public abstract class RelationView<D> extends BaseInputKeyWrapper<RelationView<D>> {
+        protected final Relation<D> representation;
+
+        protected RelationView(Relation<D> representation) {
+                super(null);
+                this.wrappedKey = this;
+                this.representation = representation;
+        }
+
+        @Override
+        public String getPrettyPrintableName() {
+                return representation.getName();
+        }
+
+        @Override
+        public String getStringID() {
+                return representation.getName() + this.getClass().getName();
+        }
+
+        public Relation<D> getRepresentation() {
+                return representation;
+        }
+
+        @Override
+        public boolean isEnumerable() {
+                return true;
+        }
+
+        protected abstract boolean filter(Tuple key, D value);
+
+        protected abstract Object[] forwardMap(Tuple key, D value);
+
+        public abstract boolean get(Model model, Object[] tuple);
+        
+        @SuppressWarnings("squid:S1168")
+        public Object[] transform(Tuple tuple, D value) {
+                if (filter(tuple, value)) {
+                        return forwardMap(tuple, value);
+                } else
+                        return null;
+        }
+
+        public Iterable<Object[]> getAll(Model model) {
+                return (() -> new CursorAsIterator<>(model.getAll(representation), (k, v) -> forwardMap(k, v),
+                                (k, v) -> filter(k, v)));
+        }
+
+        @Override
+        public int hashCode() {
+                final int prime = 31;
+                int result = 1;
+                result = prime * result + Objects.hash(representation);
+                return result;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+                if (this == obj)
+                        return true;
+                if (!(obj instanceof RelationView))
+                        return false;
+                @SuppressWarnings("unchecked")
+                RelationView<D> other = ((RelationView<D>) obj);
+                return Objects.equals(representation, other.representation);
+        }
+
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/util/CollectionsUtil.java b/subprojects/store/src/main/java/tools/refinery/store/util/CollectionsUtil.java
new file mode 100644
index 00000000..841d0dfa
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/util/CollectionsUtil.java
@@ -0,0 +1,72 @@
+package tools.refinery.store.util;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+public final class CollectionsUtil {
+        private CollectionsUtil() {
+                throw new UnsupportedOperationException();
+        }
+        
+        public static <S,T> Iterator<T> map(Iterator<S> source, Function<S, T> transformation) {
+                return new Iterator<T>() {
+
+                        @Override
+                        public boolean hasNext() {
+                                return source.hasNext();
+                        }
+
+                        @Override
+                        public T next() {
+                                return transformation.apply(source.next());
+                        }
+                };
+        }
+        
+        public static <S,T> Iterable<T> map(Iterable<S> source, Function<S, T> transformation) {
+                return (()->map(source.iterator(),transformation));
+        }
+        
+        public static <T> Iterator<T> filter(Iterator<T> source, Predicate<T> condition) {
+                return new Iterator<T>() {
+                        T internalNext = move();
+                        boolean internalHasNext;
+                        
+                        private T move() {
+                                internalHasNext = source.hasNext();
+                                if(internalHasNext) {
+                                        internalNext = source.next();
+                                }
+                                while(internalHasNext && !condition.test(internalNext)) {
+                                        internalHasNext = source.hasNext();
+                                        if(internalHasNext) {
+                                                internalNext = source.next();
+                                        }
+                                }
+                                return internalNext;
+                        }
+
+                        @Override
+                        public boolean hasNext() {
+                                return internalHasNext;
+                        }
+
+                        @Override
+                        public T next() {
+                                if(!internalHasNext) {
+                                        throw new NoSuchElementException();
+                                } else {
+                                        T result = internalNext;
+                                        move();
+                                        return result;
+                                }
+                        }
+                };
+        }
+        
+        public static <T> Iterable<T> filter(Iterable<T> source, Predicate<T> condition) {
+                return (()->filter(source.iterator(),condition));
+        }
+}
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/MapUnitTests.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/MapUnitTests.java
new file mode 100644
index 00000000..f0d5d927
--- /dev/null
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/MapUnitTests.java
@@ -0,0 +1,22 @@
+package tools.refinery.store.map.tests;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import tools.refinery.store.map.VersionedMapStore;
+import tools.refinery.store.map.VersionedMapStoreImpl;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.TupleHashProvider;
+
+class MapUnitTests {
+        @Test
+        void defaultTest() {
+                VersionedMapStore<Tuple, Boolean> store = new VersionedMapStoreImpl<Tuple, Boolean>(TupleHashProvider.singleton(), false);
+                var map = store.createMap();
+                var out1 = map.put(Tuple.of(0), true);
+                assertEquals(false, out1);
+                var out2 = map.put(Tuple.of(1), true);
+                assertEquals(false, out2);
+        }
+}
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/CommitFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/CommitFuzzTest.java
new file mode 100644
index 00000000..1f9d022f
--- /dev/null
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/CommitFuzzTest.java
@@ -0,0 +1,96 @@
+package tools.refinery.store.map.tests.fuzz;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.Random;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.VersionedMapStore;
+import tools.refinery.store.map.VersionedMapStoreImpl;
+import tools.refinery.store.map.internal.VersionedMapImpl;
+import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils;
+import tools.refinery.store.map.tests.utils.MapTestEnvironment;
+
+class CommitFuzzTest {
+        private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency,
+                        boolean evilHash) {
+                String[] values = MapTestEnvironment.prepareValues(maxValue);
+                ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
+
+                VersionedMapStore<Integer, String> store = new VersionedMapStoreImpl<Integer, String>(chp, values[0]);
+                VersionedMapImpl<Integer, String> sut = (VersionedMapImpl<Integer, String>) store.createMap();
+                MapTestEnvironment<Integer, String> e = new MapTestEnvironment<Integer, String>(sut);
+
+                Random r = new Random(seed);
+
+                iterativeRandomPutsAndCommits(scenario, steps, maxKey, values, e, r, commitFrequency);
+        }
+
+        private void iterativeRandomPutsAndCommits(String scenario, int steps, int maxKey, String[] values,
+                        MapTestEnvironment<Integer, String> e, Random r, int commitFrequency) {
+                int stopAt = -1;
+                for (int i = 0; i < steps; i++) {
+                        int index = i + 1;
+                        int nextKey = r.nextInt(maxKey);
+                        String nextValue = values[r.nextInt(values.length)];
+                        if (index == stopAt) {
+                                System.out.println("issue!");
+                                System.out.println("State before:");
+                                e.printComparison();
+                                e.sut.prettyPrint();
+                                System.out.println("Next: put(" + nextKey + "," + nextValue + ")");
+                        }
+                        try {
+                                e.put(nextKey, nextValue);
+                                if (index == stopAt) {
+                                        e.sut.prettyPrint();
+                                }
+                                e.checkEquivalence(scenario + ":" + index);
+                        } catch (Exception exception) {
+                                exception.printStackTrace();
+                                fail(scenario + ":" + index + ": exception happened: " + exception);
+                        }
+                        MapTestEnvironment.printStatus(scenario, index, steps, null);
+                        if (index % commitFrequency == 0) {
+                                e.sut.commit();
+                        }
+                }
+        }
+
+        @ParameterizedTest(name = "Commit {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
+        @MethodSource
+        @Timeout(value = 10)
+        @Tag("fuzz")
+        void parametrizedFastFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed,
+                        boolean evilHash) {
+                runFuzzTest("CommitS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues,
+                                commitFrequency, evilHash);
+        }
+
+        static Stream<Arguments> parametrizedFastFuzz() {
+                return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 },
+                                new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 },
+                                new Object[] { false, true });
+        }
+
+        @ParameterizedTest(name = "Commit {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
+        @MethodSource
+        @Tag("fuzz")
+        @Tag("slow")
+        void parametrizedSlowFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed,
+                        boolean evilHash) {
+                runFuzzTest("CommitS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues,
+                                commitFrequency, evilHash);
+        }
+
+        static Stream<Arguments> parametrizedSlowFuzz() {
+                return FuzzTestUtils.changeStepCount(parametrizedFastFuzz(), 1);
+        }
+}
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/ContentEqualsFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/ContentEqualsFuzzTest.java
new file mode 100644
index 00000000..263cb2cd
--- /dev/null
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/ContentEqualsFuzzTest.java
@@ -0,0 +1,143 @@
+package tools.refinery.store.map.tests.fuzz;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.AbstractMap.SimpleEntry;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Random;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.VersionedMap;
+import tools.refinery.store.map.VersionedMapStore;
+import tools.refinery.store.map.VersionedMapStoreImpl;
+import tools.refinery.store.map.internal.VersionedMapImpl;
+import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils;
+import tools.refinery.store.map.tests.utils.MapTestEnvironment;
+
+class ContentEqualsFuzzTest {
+        private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency,
+                        boolean evilHash) {
+                String[] values = MapTestEnvironment.prepareValues(maxValue);
+                ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
+
+                Random r = new Random(seed);
+
+                iterativeRandomPutsAndCommitsThenCompare(scenario, chp, steps, maxKey, values, r, commitFrequency);
+        }
+
+        private void iterativeRandomPutsAndCommitsThenCompare(String scenario, ContinousHashProvider<Integer> chp, int steps, int maxKey, String[] values, Random r, int commitFrequency) {
+                
+                VersionedMapStore<Integer, String> store1 = new VersionedMapStoreImpl<Integer, String>(chp, values[0]);
+                VersionedMap<Integer, String> sut1 = store1.createMap();
+                
+                // Fill one map
+                for (int i = 0; i < steps; i++) {
+                        int index1 = i + 1;
+                        int nextKey = r.nextInt(maxKey);
+                        String nextValue = values[r.nextInt(values.length)];
+                        try {
+                                sut1.put(nextKey, nextValue);
+                        } catch (Exception exception) {
+                                exception.printStackTrace();
+                                fail(scenario + ":" + index1 + ": exception happened: " + exception);
+                        }
+                        MapTestEnvironment.printStatus(scenario, index1, steps, "Fill");
+                        if (index1 % commitFrequency == 0) {
+                                sut1.commit();
+                        }
+                }
+                
+                // Get the content of the first map
+                List<SimpleEntry<Integer, String>> content = new LinkedList<>();
+                Cursor<Integer, String> cursor = sut1.getAll();
+                while (cursor.move()) {
+                        content.add(new SimpleEntry<>(cursor.getKey(), cursor.getValue()));
+                }
+                
+                // Randomize the order of the content
+                Collections.shuffle(content, r);
+                
+                VersionedMapStore<Integer, String> store2 = new VersionedMapStoreImpl<Integer, String>(chp, values[0]);
+                VersionedMap<Integer, String> sut2 = store2.createMap();
+                int index2 = 1;
+                for (SimpleEntry<Integer, String> entry : content) {
+                        sut2.put(entry.getKey(), entry.getValue());
+                        if(index2++%commitFrequency == 0)
+                                sut2.commit();
+                }
+                
+                // Check the integrity of the maps
+                ((VersionedMapImpl<Integer,String>) sut1).checkIntegrity();
+                ((VersionedMapImpl<Integer,String>) sut2).checkIntegrity();
+                
+//              // Compare the two maps
+                // By size
+                assertEquals(sut1.getSize(), content.size());
+                assertEquals(sut2.getSize(), content.size());
+                
+                
+                
+                // By cursors
+                Cursor<Integer, String> cursor1 = sut1.getAll();
+                Cursor<Integer, String> cursor2 = sut2.getAll();
+                int index3 = 1;
+                boolean canMove = true;
+                do{
+                        boolean canMove1 = cursor1.move();
+                        boolean canMove2 = cursor2.move();
+                        assertEquals(canMove1, canMove2, scenario + ":" + index3 +" Cursors stopped at different times!");
+                        assertEquals(cursor1.getKey(), cursor2.getKey(), scenario + ":" + index3 +" Cursors have different keys!");
+                        assertEquals(cursor1.getValue(), cursor2.getValue(), scenario + ":" + index3 +" Cursors have different values!");
+                        
+                        canMove = canMove1;
+                        MapTestEnvironment.printStatus(scenario, index3++, content.size(), "Compare");
+                } while (canMove);
+                
+                // By hashcode
+                assertEquals(sut1.hashCode(), sut2.hashCode(), "Hash codes are not equal!");
+                
+                // By equals
+                assertEquals(sut1, sut2, "Maps are not equals");
+        }
+
+        @ParameterizedTest(name = "Compare {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
+        @MethodSource
+        @Timeout(value = 10)
+        @Tag("fuzz")
+        void parametrizedFastFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed,
+                        boolean evilHash) {
+                runFuzzTest("CompareS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues,
+                                commitFrequency, evilHash);
+        }
+
+        static Stream<Arguments> parametrizedFastFuzz() {
+                return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 },
+                                new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 },
+                                new Object[] { false, true });
+        }
+
+        @ParameterizedTest(name = "Compare {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
+        @MethodSource
+        @Tag("fuzz")
+        @Tag("slow")
+        void parametrizedSlowFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed,
+                        boolean evilHash) {
+                runFuzzTest("CompareS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues,
+                                commitFrequency, evilHash);
+        }
+
+        static Stream<Arguments> parametrizedSlowFuzz() {
+                return FuzzTestUtils.changeStepCount(parametrizedFastFuzz(), 1);
+        }
+}
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/DiffCursorFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/DiffCursorFuzzTest.java
new file mode 100644
index 00000000..e6334224
--- /dev/null
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/DiffCursorFuzzTest.java
@@ -0,0 +1,117 @@
+package tools.refinery.store.map.tests.fuzz;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.Random;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.DiffCursor;
+import tools.refinery.store.map.VersionedMapStore;
+import tools.refinery.store.map.VersionedMapStoreImpl;
+import tools.refinery.store.map.internal.VersionedMapImpl;
+import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils;
+import tools.refinery.store.map.tests.utils.MapTestEnvironment;
+
+class DiffCursorFuzzTest {
+        private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency,
+                        boolean evilHash) {
+                String[] values = MapTestEnvironment.prepareValues(maxValue);
+                ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
+
+                VersionedMapStore<Integer, String> store = new VersionedMapStoreImpl<Integer, String>(chp, values[0]);
+                iterativeRandomPutsAndCommitsThenDiffcursor(scenario, store, steps, maxKey, values, seed, commitFrequency);
+        }
+
+        private void iterativeRandomPutsAndCommitsThenDiffcursor(String scenario, VersionedMapStore<Integer, String> store,
+                        int steps, int maxKey, String[] values, int seed, int commitFrequency) {
+                // 1. build a map with versions
+                Random r = new Random(seed);
+                VersionedMapImpl<Integer, String> versioned = (VersionedMapImpl<Integer, String>) store.createMap();
+                int largestCommit = -1;
+
+                for (int i = 0; i < steps; i++) {
+                        int index = i + 1;
+                        int nextKey = r.nextInt(maxKey);
+                        String nextValue = values[r.nextInt(values.length)];
+                        try {
+                                versioned.put(nextKey, nextValue);
+                        } catch (Exception exception) {
+                                exception.printStackTrace();
+                                fail(scenario + ":" + index + ": exception happened: " + exception);
+                        }
+                        if (index % commitFrequency == 0) {
+                                long version = versioned.commit();
+                                largestCommit = (int) version;
+                        }
+                        if (index % 10000 == 0)
+                                System.out.println(scenario + ":" + index + "/" + steps + " building finished");
+                }
+                // 2. create a non-versioned map,
+                VersionedMapImpl<Integer, String> moving = (VersionedMapImpl<Integer, String>) store.createMap();
+                Random r2 = new Random(seed + 1);
+
+                final int diffTravelFrequency = commitFrequency * 2;
+                for (int i = 0; i < steps; i++) {
+                        int index = i + 1;
+                        if (index % diffTravelFrequency == 0) {
+                                // difftravel
+                                long travelToVersion = r2.nextInt(largestCommit + 1);
+                                DiffCursor<Integer, String> diffCursor = moving.getDiffCursor(travelToVersion);
+                                moving.putAll(diffCursor);
+
+                        } else {
+                                // random puts
+                                int nextKey = r2.nextInt(maxKey);
+                                String nextValue = values[r2.nextInt(values.length)];
+                                try {
+                                        moving.put(nextKey, nextValue);
+                                } catch (Exception exception) {
+                                        exception.printStackTrace();
+                                        fail(scenario + ":" + index + ": exception happened: " + exception);
+                                }
+                                if (index % commitFrequency == 0) {
+                                        versioned.commit();
+                                }
+                                if (index % 10000 == 0)
+                                        System.out.println(scenario + ":" + index + "/" + steps + " building finished");
+                        }
+                }
+
+        }
+
+        @ParameterizedTest(name = "Mutable-Immutable Compare {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
+        @MethodSource
+        @Timeout(value = 10)
+        @Tag("fuzz")
+        void parametrizedFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed,
+                        boolean evilHash) {
+                runFuzzTest("MutableImmutableCompareS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps,
+                                noKeys, noValues, commitFrequency, evilHash);
+        }
+
+        static Stream<Arguments> parametrizedFuzz() {
+                return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 },
+                                new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 },
+                                new Object[] { false, true });
+        }
+        @ParameterizedTest(name = "Mutable-Immutable Compare {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
+        @MethodSource
+        @Tag("fuzz")
+        @Tag("slow")
+        void parametrizedSlowFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed,
+                        boolean evilHash) {
+                runFuzzTest("MutableImmutableCompareS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues,
+                                commitFrequency, evilHash);
+        }
+
+        static Stream<Arguments> parametrizedSlowFuzz() {
+                return FuzzTestUtils.changeStepCount(parametrizedFuzz(), 1);
+        }
+}
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadFuzzTest.java
new file mode 100644
index 00000000..1ab431a8
--- /dev/null
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadFuzzTest.java
@@ -0,0 +1,97 @@
+package tools.refinery.store.map.tests.fuzz;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.VersionedMapStore;
+import tools.refinery.store.map.VersionedMapStoreImpl;
+import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils;
+import tools.refinery.store.map.tests.utils.MapTestEnvironment;
+
+class MultiThreadFuzzTest {
+        public static final int noThreads = 32;
+        
+        private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency,
+                        boolean evilHash) {
+                String[] values = MapTestEnvironment.prepareValues(maxValue);
+                ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
+
+                VersionedMapStore<Integer, String> store = new VersionedMapStoreImpl<Integer, String>(chp, values[0]);
+                
+                // initialize runnables
+                MultiThreadTestRunnable[] runnables = new MultiThreadTestRunnable[noThreads];
+                for(int i = 0; i<noThreads; i++) {
+                        runnables[i] = new MultiThreadTestRunnable(scenario+"-T"+(i+1), store, steps, maxKey, values, seed, commitFrequency);
+                }
+                
+                // initialize threads
+                Thread[] threads = new Thread[noThreads];
+                for(int i = 0; i<noThreads; i++) {
+                        threads[i] = new Thread(runnables[i]);
+                }
+                
+                // start threads;
+                for(int i = 0; i<noThreads; i++) {
+                        threads[i].start();
+                }
+                
+                // wait all the threads;
+                for(int i = 0; i<noThreads; i++) {
+                        try {
+                                threads[i].join();
+                        } catch (InterruptedException e) {
+                                fail("Thread "+i+" interrupted.");
+                        }
+                }
+                
+                // collect errors
+                List<Throwable> errors = new LinkedList<>();
+                for(int i = 0; i<noThreads; i++) {
+                        errors.addAll(runnables[i].getErrors());
+                }
+                
+                assertEquals(Collections.EMPTY_LIST, errors);
+        }
+
+        @ParameterizedTest(name = "Multithread {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
+        @MethodSource
+        @Timeout(value = 10)
+        @Tag("fuzz")
+        void parametrizedFastFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed,
+                        boolean evilHash) {
+                runFuzzTest("MultithreadS" + steps + "K" + noKeys + "V" + noValues + "CF" + commitFrequency + "s" + seed, seed, steps, noKeys, noValues,
+                                commitFrequency, evilHash);
+        }
+
+        static Stream<Arguments> parametrizedFastFuzz() {
+                return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 },
+                                new Object[] { 2, 3 }, new Object[] { 10, 100 }, new Object[] { 1, 2, 3 },
+                                new Object[] { false, true });
+        }
+
+        @ParameterizedTest(name = "Multithread {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
+        @MethodSource
+        @Tag("fuzz")
+        @Tag("slow")
+        void parametrizedSlowFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed,
+                        boolean evilHash) {
+                runFuzzTest("RestoreS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues,
+                                commitFrequency, evilHash);
+        }
+
+        static Stream<Arguments> parametrizedSlowFuzz() {
+                return FuzzTestUtils.changeStepCount(RestoreFuzzTest.parametrizedFastFuzz(), 1);
+        }
+}
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadTestRunnable.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadTestRunnable.java
new file mode 100644
index 00000000..f77f9ee5
--- /dev/null
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadTestRunnable.java
@@ -0,0 +1,101 @@
+package tools.refinery.store.map.tests.fuzz;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import tools.refinery.store.map.VersionedMapStore;
+import tools.refinery.store.map.internal.VersionedMapImpl;
+import tools.refinery.store.map.tests.utils.MapTestEnvironment;
+
+public class MultiThreadTestRunnable implements Runnable {
+        String scenario;
+        VersionedMapStore<Integer, String> store;
+        int steps;
+        int maxKey;
+        String[] values;
+        int seed;
+        int commitFrequency;
+        List<Throwable> errors = new LinkedList<>();
+        
+        public MultiThreadTestRunnable(String scenario, VersionedMapStore<Integer, String> store, int steps,
+                        int maxKey, String[] values, int seed, int commitFrequency) {
+                super();
+                this.scenario = scenario;
+                this.store = store;
+                this.steps = steps;
+                this.maxKey = maxKey;
+                this.values = values;
+                this.seed = seed;
+                this.commitFrequency = commitFrequency;
+        }
+
+        private void logAndThrowError(String message) {
+                AssertionError error = new AssertionError(message);
+                errors.add(error);
+        }
+        
+        public List<Throwable> getErrors() {
+                return errors;
+        }
+        
+        @Override
+        public void run() {
+                // 1. build a map with versions
+                Random r = new Random(seed);
+                VersionedMapImpl<Integer, String> versioned = (VersionedMapImpl<Integer, String>) store.createMap();
+                Map<Integer, Long> index2Version = new HashMap<>();
+
+                for (int i = 0; i < steps; i++) {
+                        int index = i + 1;
+                        int nextKey = r.nextInt(maxKey);
+                        String nextValue = values[r.nextInt(values.length)];
+                        try {
+                                versioned.put(nextKey, nextValue);
+                        } catch (Exception exception) {
+                                exception.printStackTrace();
+                                logAndThrowError(scenario + ":" + index + ": exception happened: " + exception);
+                        }
+                        if (index % commitFrequency == 0) {
+                                long version = versioned.commit();
+                                index2Version.put(i, version);
+                        }
+                        MapTestEnvironment.printStatus(scenario, index, steps, "building");
+                }
+                // 2. create a non-versioned 
+                VersionedMapImpl<Integer, String> reference = (VersionedMapImpl<Integer, String>) store.createMap();
+                r = new Random(seed);
+                Random r2 = new Random(seed+1);
+
+                for (int i = 0; i < steps; i++) {
+                        int index = i + 1;
+                        int nextKey = r.nextInt(maxKey);
+                        String nextValue = values[r.nextInt(values.length)];
+                        try {
+                                reference.put(nextKey, nextValue);
+                        } catch (Exception exception) {
+                                exception.printStackTrace();
+                                logAndThrowError(scenario + ":" + index + ": exception happened: " + exception);
+                        }
+                        // go back to an existing state and compare to the reference
+                        if (index % (commitFrequency) == 0) {
+                                versioned.restore(index2Version.get(i));
+                                MapTestEnvironment.compareTwoMaps(scenario + ":" + index, reference, versioned,errors);
+                                
+                                // go back to a random state (probably created by another thread)
+                                List<Long> states = new ArrayList<>(store.getStates());
+                                Collections.shuffle(states, r2);
+                                for(Long state : states.subList(0, Math.min(states.size(), 100))) {
+                                        versioned.restore(state);
+                                }
+                                versioned.restore(index2Version.get(i));
+                        }
+
+                        MapTestEnvironment.printStatus(scenario, index, steps, "comparison");
+                }
+        }
+}
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableFuzzTest.java
new file mode 100644
index 00000000..d40c49c4
--- /dev/null
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableFuzzTest.java
@@ -0,0 +1,92 @@
+package tools.refinery.store.map.tests.fuzz;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.Random;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.VersionedMapStore;
+import tools.refinery.store.map.VersionedMapStoreImpl;
+import tools.refinery.store.map.internal.VersionedMapImpl;
+import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils;
+import tools.refinery.store.map.tests.utils.MapTestEnvironment;
+
+class MutableFuzzTest {
+        private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, boolean evilHash) {
+                String[] values = MapTestEnvironment.prepareValues(maxValue);
+                ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
+
+                VersionedMapStore<Integer, String> store = new VersionedMapStoreImpl<Integer, String>(chp, values[0]);
+                VersionedMapImpl<Integer, String> sut = (VersionedMapImpl<Integer, String>) store.createMap();
+                MapTestEnvironment<Integer, String> e = new MapTestEnvironment<Integer, String>(sut);
+
+                Random r = new Random(seed);
+
+                iterativeRandomPuts(scenario, steps, maxKey, values, e, r);
+        }
+
+        private void iterativeRandomPuts(String scenario, int steps, int maxKey, String[] values,
+                        MapTestEnvironment<Integer, String> e, Random r) {
+                int stopAt = -1;
+                for (int i = 0; i < steps; i++) {
+                        int index = i + 1;
+                        int nextKey = r.nextInt(maxKey);
+                        String nextValue = values[r.nextInt(values.length)];
+                        if (index == stopAt) {
+                                System.out.println("issue!");
+                                System.out.println("State before:");
+                                e.printComparison();
+                                e.sut.prettyPrint();
+                                System.out.println("Next: put(" + nextKey + "," + nextValue + ")");
+                        }
+                        try {
+                                e.put(nextKey, nextValue);
+                                if (index == stopAt) {
+                                        e.sut.prettyPrint();
+                                }
+                                e.checkEquivalence(scenario + ":" + index);
+                        } catch (Exception exception) {
+                                exception.printStackTrace();
+                                fail(scenario + ":" + index + ": exception happened: " + exception);
+                        }
+                        MapTestEnvironment.printStatus(scenario, index, steps, null);
+                }
+        }
+
+        @ParameterizedTest(name = "Mutable {index}/{0} Steps={1} Keys={2} Values={3} seed={4} evil-hash={5}")
+        @MethodSource
+        @Timeout(value = 10)
+        @Tag("fuzz")
+        void parametrizedFuzz(int test, int steps, int noKeys, int noValues, int seed, boolean evilHash) {
+                runFuzzTest(
+                                "MutableS" + steps + "K" + noKeys + "V" + noValues + "s" + seed + "H" + (evilHash ? "Evil" : "Normal"),
+                                seed, steps, noKeys, noValues, evilHash);
+        }
+
+        static Stream<Arguments> parametrizedFuzz() {
+                return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT },
+                                new Object[] { 3, 32, 32 * 32, 32 * 32 * 32 * 32 }, new Object[] { 2, 3 }, new Object[] { 1, 2, 3 },
+                                new Object[] { false, true });
+        }
+        
+        @ParameterizedTest(name = "Mutable {index}/{0} Steps={1} Keys={2} Values={3} seed={4} evil-hash={5}")
+        @MethodSource
+        @Tag("fuzz")
+        @Tag("slow")
+        void parametrizedSlowFuzz(int test, int steps, int noKeys, int noValues, int seed, boolean evilHash) {
+                runFuzzTest(
+                                "MutableS" + steps + "K" + noKeys + "V" + noValues + "s" + seed + "H" + (evilHash ? "Evil" : "Normal"),
+                                seed, steps, noKeys, noValues, evilHash);
+        }
+
+        static Stream<Arguments> parametrizedSlowFuzz() {
+                return FuzzTestUtils.changeStepCount(parametrizedFuzz(), 1);
+        }
+}
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableImmutableCompareFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableImmutableCompareFuzzTest.java
new file mode 100644
index 00000000..410705a2
--- /dev/null
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableImmutableCompareFuzzTest.java
@@ -0,0 +1,89 @@
+package tools.refinery.store.map.tests.fuzz;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.Random;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.VersionedMapStore;
+import tools.refinery.store.map.VersionedMapStoreImpl;
+import tools.refinery.store.map.internal.VersionedMapImpl;
+import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils;
+import tools.refinery.store.map.tests.utils.MapTestEnvironment;
+
+class MutableImmutableCompareFuzzTest {
+        private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency,
+                        boolean evilHash) {
+                String[] values = MapTestEnvironment.prepareValues(maxValue);
+                ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
+
+                VersionedMapStore<Integer, String> store = new VersionedMapStoreImpl<Integer, String>(chp, values[0]);
+                VersionedMapImpl<Integer, String> immutable = (VersionedMapImpl<Integer, String>) store.createMap();
+                VersionedMapImpl<Integer, String> mutable = (VersionedMapImpl<Integer, String>) store.createMap();
+
+                Random r = new Random(seed);
+
+                iterativeRandomPutsAndCommitsAndCompare(scenario, immutable, mutable, steps, maxKey, values, r,
+                                commitFrequency);
+        }
+
+        private void iterativeRandomPutsAndCommitsAndCompare(String scenario, VersionedMapImpl<Integer, String> immutable,
+                        VersionedMapImpl<Integer, String> mutable, int steps, int maxKey, String[] values, Random r,
+                        int commitFrequency) {
+                for (int i = 0; i < steps; i++) {
+                        int index = i + 1;
+                        int nextKey = r.nextInt(maxKey);
+                        String nextValue = values[r.nextInt(values.length)];
+                        try {
+                                immutable.put(nextKey, nextValue);
+                                mutable.put(nextKey, nextValue);
+                        } catch (Exception exception) {
+                                exception.printStackTrace();
+                                fail(scenario + ":" + index + ": exception happened: " + exception);
+                        }
+                        if (index % commitFrequency == 0) {
+                                immutable.commit();
+                        }
+                        MapTestEnvironment.compareTwoMaps(scenario + ":" + index, immutable, mutable);
+
+                        MapTestEnvironment.printStatus(scenario, index, steps, null);
+                }
+        }
+
+        @ParameterizedTest(name = "Mutable-Immutable Compare {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
+        @MethodSource
+        @Timeout(value = 10)
+        @Tag("fuzz")
+        void parametrizedFastFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed,
+                        boolean evilHash) {
+                runFuzzTest("MutableImmutableCompareS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps,
+                                noKeys, noValues, commitFrequency, evilHash);
+        }
+
+        static Stream<Arguments> parametrizedFastFuzz() {
+                return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 },
+                                new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 },
+                                new Object[] { false, true });
+        }
+
+        @ParameterizedTest(name = "Mutable-Immutable Compare {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
+        @MethodSource
+        @Tag("fuzz")
+        @Tag("slow")
+        void parametrizedSlowFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed,
+                        boolean evilHash) {
+                runFuzzTest("MutableImmutableCompareS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps,
+                                noKeys, noValues, commitFrequency, evilHash);
+        }
+
+        static Stream<Arguments> parametrizedSlowFuzz() {
+                return FuzzTestUtils.changeStepCount(MutableImmutableCompareFuzzTest.parametrizedFastFuzz(), 1);
+        }
+}
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/RestoreFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/RestoreFuzzTest.java
new file mode 100644
index 00000000..2e29a03f
--- /dev/null
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/RestoreFuzzTest.java
@@ -0,0 +1,109 @@
+package tools.refinery.store.map.tests.fuzz;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.VersionedMapStore;
+import tools.refinery.store.map.VersionedMapStoreImpl;
+import tools.refinery.store.map.internal.VersionedMapImpl;
+import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils;
+import tools.refinery.store.map.tests.utils.MapTestEnvironment;
+
+class RestoreFuzzTest {
+        private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency,
+                        boolean evilHash) {
+                String[] values = MapTestEnvironment.prepareValues(maxValue);
+                ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
+
+                VersionedMapStore<Integer, String> store = new VersionedMapStoreImpl<Integer, String>(chp, values[0]);
+
+                iterativeRandomPutsAndCommitsThenRestore(scenario, store, steps, maxKey, values, seed, commitFrequency);
+        }
+
+        private void iterativeRandomPutsAndCommitsThenRestore(String scenario, VersionedMapStore<Integer, String> store,
+                        int steps, int maxKey, String[] values, int seed, int commitFrequency) {
+                // 1. build a map with versions
+                Random r = new Random(seed);
+                VersionedMapImpl<Integer, String> versioned = (VersionedMapImpl<Integer, String>) store.createMap();
+                Map<Integer, Long> index2Version = new HashMap<>();
+
+                for (int i = 0; i < steps; i++) {
+                        int index = i + 1;
+                        int nextKey = r.nextInt(maxKey);
+                        String nextValue = values[r.nextInt(values.length)];
+                        try {
+                                versioned.put(nextKey, nextValue);
+                        } catch (Exception exception) {
+                                exception.printStackTrace();
+                                fail(scenario + ":" + index + ": exception happened: " + exception);
+                        }
+                        if (index % commitFrequency == 0) {
+                                long version = versioned.commit();
+                                index2Version.put(i, version);
+                        }
+                        MapTestEnvironment.printStatus(scenario, index, steps, "building");
+                }
+                // 2. create a non-versioned and
+                VersionedMapImpl<Integer, String> reference = (VersionedMapImpl<Integer, String>) store.createMap();
+                r = new Random(seed);
+
+                for (int i = 0; i < steps; i++) {
+                        int index = i + 1;
+                        int nextKey = r.nextInt(maxKey);
+                        String nextValue = values[r.nextInt(values.length)];
+                        try {
+                                reference.put(nextKey, nextValue);
+                        } catch (Exception exception) {
+                                exception.printStackTrace();
+                                fail(scenario + ":" + index + ": exception happened: " + exception);
+                        }
+                        if (index % commitFrequency == 0) {
+                                versioned.restore(index2Version.get(i));
+                                MapTestEnvironment.compareTwoMaps(scenario + ":" + index, reference, versioned);
+                        }
+                        MapTestEnvironment.printStatus(scenario, index, steps, "comparison");
+                }
+
+        }
+
+        @ParameterizedTest(name = "Restore {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
+        @MethodSource
+        @Timeout(value = 10)
+        @Tag("smoke")
+        void parametrizedFastFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed,
+                        boolean evilHash) {
+                runFuzzTest("RestoreS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues,
+                                commitFrequency, evilHash);
+        }
+
+        static Stream<Arguments> parametrizedFastFuzz() {
+                return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 },
+                                new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 },
+                                new Object[] { false, true });
+        }
+
+        @ParameterizedTest(name = "Restore {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
+        @MethodSource
+        @Tag("smoke")
+        @Tag("slow")
+        void parametrizedSlowFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed,
+                        boolean evilHash) {
+                runFuzzTest("RestoreS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues,
+                                commitFrequency, evilHash);
+        }
+
+        static Stream<Arguments> parametrizedSlowFuzz() {
+                return FuzzTestUtils.changeStepCount(RestoreFuzzTest.parametrizedFastFuzz(), 1);
+        }
+}
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/SharedStoreFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/SharedStoreFuzzTest.java
new file mode 100644
index 00000000..914a0f63
--- /dev/null
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/SharedStoreFuzzTest.java
@@ -0,0 +1,113 @@
+package tools.refinery.store.map.tests.fuzz;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.VersionedMapStore;
+import tools.refinery.store.map.VersionedMapStoreImpl;
+import tools.refinery.store.map.internal.VersionedMapImpl;
+import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils;
+import tools.refinery.store.map.tests.utils.MapTestEnvironment;
+
+class SharedStoreFuzzTest {
+        private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency,
+                        boolean evilHash) {
+                String[] values = MapTestEnvironment.prepareValues(maxValue);
+                ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
+
+                List<VersionedMapStore<Integer, String>> stores = VersionedMapStoreImpl.createSharedVersionedMapStores(5, chp, values[0]);
+
+                iterativeRandomPutsAndCommitsThenRestore(scenario, stores, steps, maxKey, values, seed, commitFrequency);
+        }
+
+        private void iterativeRandomPutsAndCommitsThenRestore(String scenario, List<VersionedMapStore<Integer, String>> stores,
+                        int steps, int maxKey, String[] values, int seed, int commitFrequency) {
+                // 1. maps with versions
+                Random r = new Random(seed);
+                List<VersionedMapImpl<Integer, String>> versioneds = new LinkedList<>();
+                for(VersionedMapStore<Integer, String> store : stores) {
+                        versioneds.add((VersionedMapImpl<Integer, String>) store.createMap());
+                }
+                                
+                List<Map<Integer, Long>> index2Version = new LinkedList<>();
+                for(int i = 0; i<stores.size(); i++) {
+                        index2Version.add(new HashMap<>());
+                }
+
+                for (int i = 0; i < steps; i++) {
+                        int stepIndex = i + 1;
+                        for (int storeIndex = 0; storeIndex<versioneds.size(); storeIndex++) {
+                                int nextKey = r.nextInt(maxKey);
+                                String nextValue = values[r.nextInt(values.length)];
+                                versioneds.get(storeIndex).put(nextKey, nextValue);
+                                if (stepIndex % commitFrequency == 0) {
+                                        long version = versioneds.get(storeIndex).commit();
+                                        index2Version.get(storeIndex).put(i, version);
+                                }
+                                MapTestEnvironment.printStatus(scenario, stepIndex, steps, "building");
+                        }               
+                }
+                // 2. create a non-versioned and
+                List<VersionedMapImpl<Integer, String>> reference = new LinkedList<>();
+                for(VersionedMapStore<Integer, String> store : stores) {
+                        reference.add((VersionedMapImpl<Integer, String>) store.createMap());
+                }
+                r = new Random(seed);
+
+                for (int i = 0; i < steps; i++) {
+                        int index = i + 1;
+                        for (int storeIndex = 0; storeIndex<versioneds.size(); storeIndex++) {
+                                int nextKey = r.nextInt(maxKey);
+                                String nextValue = values[r.nextInt(values.length)];
+                                reference.get(storeIndex).put(nextKey, nextValue);
+                                if (index % commitFrequency == 0) {
+                                        versioneds.get(storeIndex).restore(index2Version.get(storeIndex).get(i));
+                                        MapTestEnvironment.compareTwoMaps(scenario + ":" + index, reference.get(storeIndex), versioneds.get(storeIndex));
+                                }
+                        }
+                        MapTestEnvironment.printStatus(scenario, index, steps, "comparison");   
+                }
+
+        }
+
+        @ParameterizedTest(name = "Shared Store {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
+        @MethodSource
+        @Timeout(value = 10)
+        @Tag("smoke")
+        void parametrizedFastFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed,
+                        boolean evilHash) {
+                runFuzzTest("SharedS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues,
+                                commitFrequency, evilHash);
+        }
+
+        static Stream<Arguments> parametrizedFastFuzz() {
+                return FuzzTestUtils.permutationWithSize(new Object[] { FuzzTestUtils.FAST_STEP_COUNT }, new Object[] { 3, 32, 32 * 32 },
+                                new Object[] { 2, 3 }, new Object[] { 1, 10, 100 }, new Object[] { 1, 2, 3 },
+                                new Object[] { false, true });
+        }
+
+        @ParameterizedTest(name = "Shared Store {index}/{0} Steps={1} Keys={2} Values={3} commit frequency={4} seed={5} evil-hash={6}")
+        @MethodSource
+        @Tag("smoke")
+        @Tag("slow")
+        void parametrizedSlowFuzz(int tests, int steps, int noKeys, int noValues, int commitFrequency, int seed,
+                        boolean evilHash) {
+                runFuzzTest("SharedS" + steps + "K" + noKeys + "V" + noValues + "s" + seed, seed, steps, noKeys, noValues,
+                                commitFrequency, evilHash);
+        }
+
+        static Stream<Arguments> parametrizedSlowFuzz() {
+                return FuzzTestUtils.changeStepCount(RestoreFuzzTest.parametrizedFastFuzz(), 1);
+        }
+}
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestUtils.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestUtils.java
new file mode 100644
index 00000000..e75d7f5a
--- /dev/null
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestUtils.java
@@ -0,0 +1,64 @@
+package tools.refinery.store.map.tests.fuzz.utils;
+
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.provider.Arguments;
+
+public final class FuzzTestUtils {
+        public static final int FAST_STEP_COUNT = 500;
+        public static final int SLOW_STEP_COUNT = 32 * 32 * 32 * 32;
+
+        private FuzzTestUtils() {
+                throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
+        }
+
+        public static Stream<Arguments> changeStepCount(Stream<Arguments> arguments, int parameterIndex) {
+                return arguments.map(x -> Arguments.of(updatedStepCount(x.get(), parameterIndex)));
+        }
+
+        public static Object[] updatedStepCount(Object[] arguments, int parameterIndex) {
+                Object[] copy = Arrays.copyOf(arguments, arguments.length);
+                copy[parameterIndex] = SLOW_STEP_COUNT;
+                return copy;
+        }
+
+        static List<List<Object>> permutationInternal(int from, Object[]... valueOption) {
+                if (valueOption.length == from) {
+                        return List.of(List.of());
+                } else {
+                        Object[] permuteThis = valueOption[from];
+                        List<List<Object>> otherCombination = permutationInternal(from + 1, valueOption);
+                        List<List<Object>> result = new LinkedList<>();
+                        for (Object permuteThisElement : permuteThis) {
+                                for (List<Object> otherCombinationList : otherCombination) {
+                                        List<Object> newResult = new LinkedList<>();
+                                        newResult.add(permuteThisElement);
+                                        newResult.addAll(otherCombinationList);
+                                        result.add(newResult);
+                                }
+                        }
+                        return result;
+                }
+        }
+
+        public static Stream<Arguments> permutation(Object[]... valueOption) {
+                List<List<Object>> permutations = permutationInternal(0, valueOption);
+                return permutations.stream().map(x -> Arguments.of(x.toArray()));
+        }
+
+        public static Stream<Arguments> permutationWithSize(Object[]... valueOption) {
+                int size = 1;
+                for (int i = 0; i < valueOption.length; i++) {
+                        size *= valueOption[i].length;
+                }
+                Object[][] newValueOption = new Object[valueOption.length + 1][];
+                newValueOption[0] = new Object[] { size };
+                for (int i = 1; i < newValueOption.length; i++) {
+                        newValueOption[i] = valueOption[i - 1];
+                }
+                return permutation(newValueOption);
+        }
+}
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestUtilsTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestUtilsTest.java
new file mode 100644
index 00000000..72f2a46c
--- /dev/null
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestUtilsTest.java
@@ -0,0 +1,33 @@
+package tools.refinery.store.map.tests.fuzz.utils;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+class FuzzTestUtilsTest {
+        @Test
+        void permutationInternalTest() {
+                List<List<Object>> res = FuzzTestUtils.permutationInternal(0, new Object[] { 1, 2, 3 },
+                                new Object[] { 'a', 'b', 'c' }, new Object[] { "alpha", "beta", "gamma", "delta" });
+                assertEquals(3 * 3 * 4, res.size());
+        }
+
+        @Test
+        void permutationTest1() {
+                var res = FuzzTestUtils.permutation(new Object[] { 1, 2, 3 }, new Object[] { 'a', 'b', 'c' },
+                                new Object[] { "alpha", "beta", "gamma", "delta" });
+                assertEquals(3 * 3 * 4, res.count());
+        }
+
+        @Test
+        void permutationTest2() {
+                var res = FuzzTestUtils.permutation(new Object[] { 1, 2, 3 }, new Object[] { 'a', 'b', 'c' },
+                                new Object[] { "alpha", "beta", "gamma", "delta" });
+                var arguments = res.findFirst().get().get();
+                assertEquals(1, arguments[0]);
+                assertEquals('a', arguments[1]);
+                assertEquals("alpha", arguments[2]);
+        }
+}
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/utils/MapTestEnvironment.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/utils/MapTestEnvironment.java
new file mode 100644
index 00000000..991b4f51
--- /dev/null
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/utils/MapTestEnvironment.java
@@ -0,0 +1,214 @@
+package tools.refinery.store.map.tests.utils;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.VersionedMap;
+import tools.refinery.store.map.internal.VersionedMapImpl;
+
+import java.util.TreeMap;
+
+public class MapTestEnvironment<K, V> {
+        public static String[] prepareValues(int maxValue) {
+                String[] values = new String[maxValue];
+                values[0] = "DEFAULT";
+                for (int i = 1; i < values.length; i++) {
+                        values[i] = "VAL" + i;
+                }
+                return values;
+        }
+
+        public static ContinousHashProvider<Integer> prepareHashProvider(final boolean evil) {
+                // Use maxPrime = 2147483629
+
+                ContinousHashProvider<Integer> chp = new ContinousHashProvider<Integer>() {
+
+                        @Override
+                        public int getHash(Integer key, int index) {
+                                if (evil && index < 15 && index < key / 3) {
+                                        return 7;
+                                }
+                                int result = 1;
+                                final int prime = 31;
+
+                                result = prime * result + key;
+                                result = prime * result + index;
+
+                                return result;
+                        }
+                };
+                return chp;
+        }
+
+        public static void printStatus(String scenario, int actual, int max, String stepName) {
+                if (actual % 10000 == 0) {
+                        String printStepName = stepName == null ? "" : stepName;
+                        System.out.format(scenario + ":%d/%d (%d%%) " + printStepName + "%n", actual, max, actual * 100 / max);
+                }
+
+        }
+        
+        public static <K, V> void compareTwoMaps(String title, VersionedMapImpl<K, V> map1,
+                        VersionedMapImpl<K, V> map2) {
+                compareTwoMaps(title, map1, map2, null);
+        }
+        public static <K, V> void compareTwoMaps(String title, VersionedMapImpl<K, V> map1,
+                        VersionedMapImpl<K, V> map2, List<Throwable> errors) {
+                // 1. Comparing cursors.
+                Cursor<K, V> cursor1 = map1.getAll();
+                Cursor<K, V> cursor2 = map2.getAll();
+                while (!cursor1.isTerminated()) {
+                        if (cursor2.isTerminated()) {
+                                fail("cursor 2 terminated before cursor1");
+                        }
+                        assertEqualsList(cursor1.getKey(), cursor2.getKey(),"Keys not equal", errors);
+                        assertEqualsList(cursor2.getValue(), cursor2.getValue(), "Values not equal", errors);
+                        cursor1.move();
+                        cursor2.move();
+                }
+                if (!cursor2.isTerminated())
+                        fail("cursor 1 terminated before cursor 2");
+
+                // 2.1. comparing hash codes
+                assertEqualsList(map1.hashCode(), map2.hashCode(), title + ": hash code check",errors);
+                assertEqualsList(map1, map2, title + ": 1.equals(2)",errors);
+                assertEqualsList(map2, map1, title + ": 2.equals(1)",errors);
+        }
+        private static void assertEqualsList(Object o1, Object o2, String message, List<Throwable> errors) {
+                if(errors == null) {
+                        assertEquals(o1, o2, message);
+                } else {
+                        if(o1 != null) {
+                                if(!(o1.equals(o2))) {
+                                        AssertionError error = new AssertionError((message != null ? message+" " : "") + "expected: " + o1 + " but was : " + o2);
+                                        errors.add(error);
+                                }
+                        }
+                }
+        }
+
+        public VersionedMapImpl<K, V> sut;
+        Map<K, V> oracle = new HashMap<K, V>();
+
+        public MapTestEnvironment(VersionedMapImpl<K, V> sut) {
+                this.sut = sut;
+        }
+
+        public void put(K key, V value) {
+                V oldSutValue = sut.put(key, value);
+                V oldOracleValue;
+                if (value != sut.getDefaultValue()) {
+                        oldOracleValue = oracle.put(key, value);
+                } else {
+                        oldOracleValue = oracle.remove(key);
+                }
+                if(oldSutValue == sut.getDefaultValue() && oldOracleValue != null) {
+                        fail("After put, SUT old value was default, but oracle old walue was " + oldOracleValue);
+                }
+                if(oldSutValue != sut.getDefaultValue()) {
+                        assertEquals(oldOracleValue, oldSutValue);
+                }
+        }
+
+        public void checkEquivalence(String title) {
+                // 0. Checking integrity
+                try {
+                        sut.checkIntegrity();
+                } catch (IllegalStateException e) {
+                        fail(title + ":  " + e.getMessage());
+                }
+
+                // 1. Checking: if Reference contains <key,value> pair, then SUT contains
+                // <key,value> pair.
+                // Tests get functions
+                for (Entry<K, V> entry : oracle.entrySet()) {
+                        V sutValue = sut.get(entry.getKey());
+                        V oracleValue = entry.getValue();
+                        if (sutValue != oracleValue) {
+                                printComparison();
+                                fail(title + ": Non-equivalent get(" + entry.getKey() + ") results: SUT=" + sutValue + ", Oracle="
+                                                + oracleValue + "!");
+                        }
+                }
+
+                // 2. Checking: if SUT contains <key,value> pair, then Reference contains
+                // <key,value> pair.
+                // Tests iterators
+                int elementsInSutEntrySet = 0;
+                Cursor<K, V> cursor = sut.getAll();
+                while (cursor.move()) {
+                        elementsInSutEntrySet++;
+                        K key = cursor.getKey();
+                        V sutValue = cursor.getValue();
+                        // System.out.println(key + " -> " + sutValue);
+                        V oracleValue = oracle.get(key);
+                        if (sutValue != oracleValue) {
+                                printComparison();
+                                fail(title + ": Non-equivalent entry in iterator: SUT=<" + key + "," + sutValue + ">, Oracle=<" + key
+                                                + "," + oracleValue + ">!");
+                        }
+
+                }
+
+                // 3. Checking sizes
+                // Counting of non-default value pairs.
+                int oracleSize = oracle.entrySet().size();
+                long sutSize = sut.getSize();
+                if (oracleSize != sutSize || oracleSize != elementsInSutEntrySet) {
+                        printComparison();
+                        fail(title + ": Non-eqivalent size() result: SUT.getSize()=" + sutSize + ", SUT.entryset.size="
+                                        + elementsInSutEntrySet + ", Oracle=" + oracleSize + "!");
+                }
+        }
+
+        public static <K,V> void checkOrder(String scenario, VersionedMap<K,V> versionedMap) {
+                K previous = null;
+                Cursor<K, V> cursor = versionedMap.getAll();
+                while(cursor.move()) {
+                        System.out.println(cursor.getKey() + " " + ((VersionedMapImpl<K, V>) versionedMap).getHashProvider().getHash(cursor.getKey(), 0));
+                        if(previous != null) {
+                                int comparisonResult = ((VersionedMapImpl<K, V>) versionedMap).getHashProvider().compare(previous, cursor.getKey());
+                                assertTrue(comparisonResult<0,scenario+" Cursor order is not incremental!");
+                        }
+                        previous = cursor.getKey();
+                }
+                System.out.println();
+        }
+
+        public void printComparison() {
+                System.out.println("SUT:");
+                printEntrySet(sut.getAll());
+                System.out.println("Oracle:");
+                printEntrySet(oracle.entrySet().iterator());
+        }
+
+        private void printEntrySet(Iterator<Entry<K, V>> iterator) {
+                TreeMap<K, V> treemap = new TreeMap<>();
+                while (iterator.hasNext()) {
+                        Entry<K, V> entry = iterator.next();
+                        treemap.put(entry.getKey(), entry.getValue());
+                }
+                for (Entry<K, V> e : treemap.entrySet()) {
+                        System.out.println("\t" + e.getKey() + " -> " + e.getValue());
+                }
+        }
+
+        private void printEntrySet(Cursor<K, V> cursor) {
+                TreeMap<K, V> treemap = new TreeMap<>();
+                while (cursor.move()) {
+                        treemap.put(cursor.getKey(), cursor.getValue());
+                }
+                for (Entry<K, V> e : treemap.entrySet()) {
+                        System.out.println("\t" + e.getKey() + " -> " + e.getValue());
+                }
+        }
+}
diff --git a/subprojects/store/src/test/java/tools/refinery/store/model/hashTests/HashEfficiencyTest.java b/subprojects/store/src/test/java/tools/refinery/store/model/hashTests/HashEfficiencyTest.java
new file mode 100644
index 00000000..7d070380
--- /dev/null
+++ b/subprojects/store/src/test/java/tools/refinery/store/model/hashTests/HashEfficiencyTest.java
@@ -0,0 +1,161 @@
+package tools.refinery.store.model.hashTests;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Random;
+
+import org.junit.jupiter.api.Test;
+
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.TupleHashProvider;
+import tools.refinery.store.model.TupleHashProviderBitMagic;
+
+class HashEfficiencyTest {
+
+        private static List<Tuple> permutations(int range, int arity) {
+                if(arity == 1) {
+                        List<Tuple> result = new ArrayList<>(range);
+                        for(int i=0; i<range; i++) {
+                                result.add(Tuple.of(i));
+                        }
+                        return result;
+                } else if(arity > 1) {
+                        List<Tuple> smallers = permutations(range, arity-1);
+                        List<Tuple> result = new ArrayList<>(range*smallers.size());
+                        for(Tuple smaller : smallers) {
+                                for(int i=0; i<range; i++) {
+                                        int[] larger = new int[arity];
+                                        for(int x = 0; x<smaller.getSize(); x++) {
+                                                larger[x] = smaller.get(x);
+                                        }
+                                        larger[arity-1] = i;
+                                        result.add(Tuple.of(larger));
+                                }
+                        }
+                        return result;
+                } else throw new IllegalArgumentException();
+        }
+        
+        private static int amountToRange(int arity, int n) {
+                int range = 1;
+                while(Math.pow(range,arity)<n+0.1) {
+                        range++;
+                }
+                return 1024;
+        }
+        
+        public static List<Tuple> nPermutations(int arity, int n) {
+                int range = amountToRange(arity, n);
+                List<Tuple> permutations = permutations(range, arity);
+                return permutations.subList(0, n);
+        }
+
+        public static List<Tuple> nRandoms(int arity, int n, int seed) {
+                int range = amountToRange(arity, n);
+                List<Tuple> permutations = new ArrayList<>(n);
+                Random r = new Random(seed);
+                for(int i = 0; i<n; i++) {
+                        int[] tuple = new int[arity];
+                        for(int j=0; j<arity; j++) {
+                                tuple[j] = r.nextInt(range);
+                        }
+                        permutations.add(Tuple.of(tuple));
+                }
+                return permutations;
+        }
+        
+        @Test
+        void permutationTest() {
+                List<Tuple> p = permutations(10, 2);
+                assertEquals(p.size(),10*10);
+        }
+//      private void printTuples(List<Tuple> p) {
+//              for(Tuple element : p) {
+//                      System.out.println(element);
+//              }
+//      }
+        @Test
+        void nPermutationTest() {
+                final int amount = 500;
+                List<Tuple> p = nPermutations(2, amount);
+                assertEquals(amount,p.size());
+        }
+        @Test
+        void nRandomTest() {
+                final int amount = 500;
+                List<Tuple> p = nRandoms(2, amount, 1);;
+                assertEquals(amount,p.size());
+        }
+        private static double calculateHashClashes(List<Tuple> tuples, ContinousHashProvider<Tuple> chp) {
+                int sumClashes = 0;
+                
+                for(int i = 0; i<tuples.size(); i++) {
+                        int height = 0;
+                        for(int j=0; j<tuples.size(); j++) {
+                                int clashes = calculateHashClash(chp, tuples.get(i), tuples.get(j));
+                                height = Math.max(height, clashes);
+                        }
+                        sumClashes += height;
+                }
+                return (sumClashes+0.0) / tuples.size();
+        }
+        private static int calculateHashClash(ContinousHashProvider<Tuple> chp, Tuple a, Tuple b) {
+                if(a.equals(b)) return 0;
+                final int bits = 5;
+                final int segments = Integer.SIZE/bits;
+                final int mask = (1<<bits)-1;
+                for(int i = 0;;i++) {
+                        int index = i/segments;
+                        int depth = i%segments;
+                        int aHash = (chp.getHash(a, index)>>(depth*5))&mask;
+                        int bHash = (chp.getHash(b, index)>>(depth*5))&mask;
+                        if(aHash != bHash) {
+                                return i+1;
+                        }
+                        if(i>400) {
+                                throw new IllegalStateException(a+" vs "+b);
+                        }
+                }
+        }
+        private static double caclulateOptimalHashClash(int size) {
+                return (Math.log(size)/Math.log(32));
+        }
+        public static void main(String[] args) {
+                List<String> hashNames = new LinkedList<>();
+                List<ContinousHashProvider<Tuple>> hashes = new LinkedList<>();
+                hashNames.add("PrimeGroup");
+                hashes.add(new TupleHashProvider());
+                hashNames.add("BitMagic");
+                hashes.add(new TupleHashProviderBitMagic());
+                
+                int[] arities = new int[] {2,3,4,5};
+                int[] sizes = new int[] {32*32,32*32*8};
+                
+                System.out.println("Size,Arity,DataSource,Hash,Chashes,Optimal,Badness");
+                for(int size : sizes) {
+                        double optimalClashes = caclulateOptimalHashClash(size);
+                        for(int arity : arities) {
+                                List<String> dataSourceNames = new LinkedList<>();
+                                List<List<Tuple>> dataSources = new LinkedList<>();
+                                
+//                              dataSourceNames.add("Permutation");
+//                              dataSources.add(nPermutations(arity, size));
+                                dataSourceNames.add("Random");
+                                dataSources.add(nRandoms(arity, size, 0));
+                                
+                                for(int dataSourceIndex = 0; dataSourceIndex<dataSourceNames.size(); dataSourceIndex++) {
+                                        for(int hashIndex = 0; hashIndex<hashNames.size(); hashIndex++) {
+                                                double clashes = calculateHashClashes(dataSources.get(dataSourceIndex),hashes.get(hashIndex));
+                                                System.out.println(
+                                                        size+","+arity+","+dataSourceNames.get(dataSourceIndex)+","+hashNames.get(hashIndex)+","+
+                                                        clashes+","+optimalClashes+","+(clashes+0.0)/optimalClashes);
+                                        }
+                                }
+                        }
+                }
+        }
+}
diff --git a/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java b/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java
new file mode 100644
index 00000000..9d90b1e1
--- /dev/null
+++ b/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java
@@ -0,0 +1,148 @@
+package tools.refinery.store.model.tests;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Set;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.model.ModelStoreImpl;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.representation.Relation;
+
+class ModelTest {
+
+        @Test
+        void modelConstructionTest() {
+                Relation<Boolean> person = new Relation<>("Person", 1, false);
+                Relation<Boolean> friend = new Relation<>("friend", 2, false);
+
+                ModelStore store = new ModelStoreImpl(Set.of(person, friend));
+                Model model = store.createModel();
+
+                assertTrue(store.getDataRepresentations().contains(person));
+                assertTrue(store.getDataRepresentations().contains(friend));
+                assertTrue(model.getDataRepresentations().contains(person));
+                assertTrue(model.getDataRepresentations().contains(friend));
+
+                Relation<Integer> other = new Relation<Integer>("other", 2, null);
+                assertFalse(model.getDataRepresentations().contains(other));
+        }
+
+        @Test
+        void modelBuildingTest() {
+                Relation<Boolean> person = new Relation<>("Person", 1, false);
+                Relation<Integer> age = new Relation<Integer>("age", 1, null);
+                Relation<Boolean> friend = new Relation<>("friend", 2, false);
+
+                ModelStore store = new ModelStoreImpl(Set.of(person, age, friend));
+                Model model = store.createModel();
+
+                model.put(person, Tuple.of(0), true);
+                model.put(person, Tuple.of(1), true);
+                model.put(age, Tuple.of(0), 3);
+                model.put(age, Tuple.of(1), 1);
+                model.put(friend, Tuple.of(0, 1), true);
+                model.put(friend, Tuple.of(1, 0), true);
+
+                assertTrue(model.get(person, Tuple.of(0)));
+                assertTrue(model.get(person, Tuple.of(1)));
+                assertFalse(model.get(person, Tuple.of(2)));
+
+                assertEquals(3, model.get(age, Tuple.of(0)));
+                assertEquals(1, model.get(age, Tuple.of(1)));
+                assertEquals(null, model.get(age, Tuple.of(2)));
+
+                assertTrue(model.get(friend, Tuple.of(0, 1)));
+                assertFalse(model.get(friend, Tuple.of(0, 5)));
+        }
+
+        @Test
+        void modelBuildingArityFailTest() {
+                Relation<Boolean> person = new Relation<>("Person", 1, false);
+                ModelStore store = new ModelStoreImpl(Set.of(person));
+                Model model = store.createModel();
+
+                final Tuple tuple3 = Tuple.of(1, 1, 1);
+                Assertions.assertThrows(IllegalArgumentException.class, () -> model.put(person, tuple3, true));
+                Assertions.assertThrows(IllegalArgumentException.class, () -> model.get(person, tuple3));
+        }
+
+        @Test
+        void modelBuildingNullFailTest() {
+                Relation<Integer> age = new Relation<Integer>("age", 1, null);
+                ModelStore store = new ModelStoreImpl(Set.of(age));
+                Model model = store.createModel();
+
+                model.put(age, Tuple.of(1), null); // valid
+                Assertions.assertThrows(IllegalArgumentException.class, () -> model.put(age, null, 1));
+                Assertions.assertThrows(IllegalArgumentException.class, () -> model.get(age, null));
+
+        }
+
+        @Test
+        void modelUpdateTest() {
+                Relation<Boolean> person = new Relation<>("Person", 1, false);
+                Relation<Integer> age = new Relation<Integer>("age", 1, null);
+                Relation<Boolean> friend = new Relation<>("friend", 2, false);
+
+                ModelStore store = new ModelStoreImpl(Set.of(person, age, friend));
+                Model model = store.createModel();
+
+                model.put(person, Tuple.of(0), true);
+                model.put(person, Tuple.of(1), true);
+                model.put(age, Tuple.of(0), 3);
+                model.put(age, Tuple.of(1), 1);
+                model.put(friend, Tuple.of(0, 1), true);
+                model.put(friend, Tuple.of(1, 0), true);
+
+                assertEquals(3, model.get(age, Tuple.of(0)));
+                assertTrue(model.get(friend, Tuple.of(0, 1)));
+
+                model.put(age, Tuple.of(0), 4);
+                model.put(friend, Tuple.of(0, 1), false);
+
+                assertEquals(4, model.get(age, Tuple.of(0)));
+                assertFalse(model.get(friend, Tuple.of(0, 1)));
+        }
+
+        @Test
+        void restoreTest() {
+                Relation<Boolean> person = new Relation<Boolean>("Person", 1, false);
+                Relation<Boolean> friend = new Relation<Boolean>("friend", 2, false);
+
+                ModelStore store = new ModelStoreImpl(Set.of(person, friend));
+                Model model = store.createModel();
+
+                model.put(person, Tuple.of(0), true);
+                model.put(person, Tuple.of(1), true);
+                model.put(friend, Tuple.of(0, 1), true);
+                model.put(friend, Tuple.of(1, 0), true);
+                long state1 = model.commit();
+
+                assertFalse(model.get(person, Tuple.of(2)));
+                assertFalse(model.get(friend, Tuple.of(0, 2)));
+
+                model.put(person, Tuple.of(2), true);
+                model.put(friend, Tuple.of(0, 2), true);
+                long state2 = model.commit();
+
+                assertTrue(model.get(person, Tuple.of(2)));
+                assertTrue(model.get(friend, Tuple.of(0, 2)));
+
+                model.restore(state1);
+
+                assertFalse(model.get(person, Tuple.of(2)));
+                assertFalse(model.get(friend, Tuple.of(0, 2)));
+
+                model.restore(state2);
+
+                assertTrue(model.get(person, Tuple.of(2)));
+                assertTrue(model.get(friend, Tuple.of(0, 2)));
+        }
+}
diff --git a/subprojects/store/src/test/java/tools/refinery/store/query/test/QueryTest.java b/subprojects/store/src/test/java/tools/refinery/store/query/test/QueryTest.java
new file mode 100644
index 00000000..02381bcd
--- /dev/null
+++ b/subprojects/store/src/test/java/tools/refinery/store/query/test/QueryTest.java
@@ -0,0 +1,445 @@
+package tools.refinery.store.query.test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Test;
+
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.representation.Relation;
+import tools.refinery.store.model.representation.TruthValue;
+import tools.refinery.store.query.QueriableModel;
+import tools.refinery.store.query.QueriableModelStore;
+import tools.refinery.store.query.QueriableModelStoreImpl;
+import tools.refinery.store.query.building.DNFAnd;
+import tools.refinery.store.query.building.DNFPredicate;
+import tools.refinery.store.query.building.EquivalenceAtom;
+import tools.refinery.store.query.building.PredicateAtom;
+import tools.refinery.store.query.building.RelationAtom;
+import tools.refinery.store.query.building.Variable;
+import tools.refinery.store.query.view.FilteredRelationView;
+import tools.refinery.store.query.view.KeyOnlyRelationView;
+import tools.refinery.store.query.view.RelationView;
+
+class QueryTest {
+
+        static void compareMatchSets(Stream<Object[]> matchSet, Set<List<Tuple>> expected) {
+                Set<List<Tuple>> translatedMatchSet = new HashSet<>();
+                var interator = matchSet.iterator();
+                while (interator.hasNext()) {
+                        var element = interator.next();
+                        List<Tuple> elementToTranslatedMatchSet = new ArrayList<>();
+                        for (int i = 0; i < element.length; i++) {
+                                elementToTranslatedMatchSet.add((Tuple) element[i]);
+                        }
+                        translatedMatchSet.add(elementToTranslatedMatchSet);
+                }
+
+                assertEquals(expected, translatedMatchSet);
+        }
+
+        @Test
+        void typeConstraintTest() {
+                Relation<Boolean> person = new Relation<>("Person", 1, false);
+                Relation<Boolean> asset = new Relation<>("Asset", 1, false);
+                RelationView<Boolean> persionView = new KeyOnlyRelationView(person);
+
+                List<Variable> parameters = Arrays.asList(new Variable("p1"));
+                RelationAtom personRelationAtom = new RelationAtom(persionView, parameters);
+                DNFAnd clause = new DNFAnd(Collections.emptySet(), Arrays.asList(personRelationAtom));
+                DNFPredicate predicate = new DNFPredicate("TypeConstraint", parameters, Arrays.asList(clause));
+
+                QueriableModelStore store = new QueriableModelStoreImpl(Set.of(person, asset), Set.of(persionView),
+                                Set.of(predicate));
+                QueriableModel model = store.createModel();
+
+                model.put(person, Tuple.of(0), true);
+                model.put(person, Tuple.of(1), true);
+                model.put(asset, Tuple.of(1), true);
+                model.put(asset, Tuple.of(2), true);
+
+                model.flushChanges();
+                assertEquals(2, model.countResults(predicate));
+                compareMatchSets(model.allResults(predicate), Set.of(List.of(Tuple.of(0)), List.of(Tuple.of(1))));
+        }
+
+        @Test
+        void relationConstraintTest() {
+                Relation<Boolean> person = new Relation<Boolean>("Person", 1, false);
+                Relation<TruthValue> friend = new Relation<>("friend", 2, TruthValue.FALSE);
+                RelationView<Boolean> persionView = new KeyOnlyRelationView(person);
+                RelationView<TruthValue> friendMustView = new FilteredRelationView<TruthValue>(friend, (k, v) -> v.must());
+
+                Variable p1 = new Variable("p1");
+                Variable p2 = new Variable("p2");
+                List<Variable> parameters = Arrays.asList(p1, p2);
+
+                RelationAtom personRelationAtom1 = new RelationAtom(persionView, Arrays.asList(p1));
+                RelationAtom personRelationAtom2 = new RelationAtom(persionView, Arrays.asList(p2));
+                RelationAtom friendRelationAtom = new RelationAtom(friendMustView, Arrays.asList(p1, p2));
+                DNFAnd clause = new DNFAnd(Collections.emptySet(),
+                                Arrays.asList(personRelationAtom1, personRelationAtom2, friendRelationAtom));
+                DNFPredicate predicate = new DNFPredicate("RelationConstraint", parameters, Arrays.asList(clause));
+
+                QueriableModelStore store = new QueriableModelStoreImpl(Set.of(person, friend),
+                                Set.of(persionView, friendMustView), Set.of(predicate));
+                QueriableModel model = store.createModel();
+
+                assertEquals(0, model.countResults(predicate));
+
+                model.put(person, Tuple.of(0), true);
+                model.put(person, Tuple.of(1), true);
+                model.put(person, Tuple.of(2), true);
+                model.put(friend, Tuple.of(0, 1), TruthValue.TRUE);
+                model.put(friend, Tuple.of(1, 0), TruthValue.TRUE);
+                model.put(friend, Tuple.of(1, 2), TruthValue.TRUE);
+
+                assertEquals(0, model.countResults(predicate));
+
+                model.flushChanges();
+                assertEquals(3, model.countResults(predicate));
+                compareMatchSets(model.allResults(predicate), Set.of(List.of(Tuple.of(0), Tuple.of(1)),
+                                List.of(Tuple.of(1), Tuple.of(0)), List.of(Tuple.of(1), Tuple.of(2))));
+        }
+
+        @Test
+        void andTest() {
+                Relation<Boolean> person = new Relation<Boolean>("Person", 1, false);
+                Relation<TruthValue> friend = new Relation<>("friend", 2, TruthValue.FALSE);
+                RelationView<Boolean> persionView = new KeyOnlyRelationView(person);
+                RelationView<TruthValue> friendMustView = new FilteredRelationView<TruthValue>(friend, (k, v) -> v.must());
+
+                Variable p1 = new Variable("p1");
+                Variable p2 = new Variable("p2");
+                List<Variable> parameters = Arrays.asList(p1, p2);
+
+                RelationAtom personRelationAtom1 = new RelationAtom(persionView, Arrays.asList(p1));
+                RelationAtom personRelationAtom2 = new RelationAtom(persionView, Arrays.asList(p2));
+                RelationAtom friendRelationAtom1 = new RelationAtom(friendMustView, Arrays.asList(p1, p2));
+                RelationAtom friendRelationAtom2 = new RelationAtom(friendMustView, Arrays.asList(p2, p1));
+                DNFAnd clause = new DNFAnd(Collections.emptySet(),
+                                Arrays.asList(personRelationAtom1, personRelationAtom2, friendRelationAtom1, friendRelationAtom2));
+                DNFPredicate predicate = new DNFPredicate("RelationConstraint", parameters, Arrays.asList(clause));
+
+                QueriableModelStore store = new QueriableModelStoreImpl(Set.of(person, friend),
+                                Set.of(persionView, friendMustView), Set.of(predicate));
+                QueriableModel model = store.createModel();
+
+                assertEquals(0, model.countResults(predicate));
+
+                model.put(person, Tuple.of(0), true);
+                model.put(person, Tuple.of(1), true);
+                model.put(person, Tuple.of(2), true);
+
+                model.put(friend, Tuple.of(0, 1), TruthValue.TRUE);
+                model.put(friend, Tuple.of(0, 2), TruthValue.TRUE);
+
+                model.flushChanges();
+                assertEquals(0, model.countResults(predicate));
+
+                model.put(friend, Tuple.of(1, 0), TruthValue.TRUE);
+                model.flushChanges();
+                assertEquals(2, model.countResults(predicate));
+                compareMatchSets(model.allResults(predicate),
+                                Set.of(List.of(Tuple.of(0), Tuple.of(1)), List.of(Tuple.of(1), Tuple.of(0))));
+
+                model.put(friend, Tuple.of(2, 0), TruthValue.TRUE);
+                model.flushChanges();
+                assertEquals(4, model.countResults(predicate));
+                compareMatchSets(model.allResults(predicate),
+                                Set.of(List.of(Tuple.of(0), Tuple.of(1)), List.of(Tuple.of(1), Tuple.of(0)),
+                                                List.of(Tuple.of(0), Tuple.of(2)), List.of(Tuple.of(2), Tuple.of(0))));
+        }
+
+        @Test
+        void existTest() {
+                Relation<Boolean> person = new Relation<Boolean>("Person", 1, false);
+                Relation<TruthValue> friend = new Relation<>("friend", 2, TruthValue.FALSE);
+                RelationView<Boolean> persionView = new KeyOnlyRelationView(person);
+                RelationView<TruthValue> friendMustView = new FilteredRelationView<TruthValue>(friend, (k, v) -> v.must());
+
+                Variable p1 = new Variable("p1");
+                Variable p2 = new Variable("p2");
+                List<Variable> parameters = Arrays.asList(p1);
+
+                RelationAtom personRelationAtom1 = new RelationAtom(persionView, Arrays.asList(p1));
+                RelationAtom personRelationAtom2 = new RelationAtom(persionView, Arrays.asList(p2));
+                RelationAtom friendRelationAtom = new RelationAtom(friendMustView, Arrays.asList(p1, p2));
+                DNFAnd clause = new DNFAnd(Set.of(p2),
+                                Arrays.asList(personRelationAtom1, personRelationAtom2, friendRelationAtom));
+                DNFPredicate predicate = new DNFPredicate("RelationConstraint", parameters, Arrays.asList(clause));
+
+                QueriableModelStore store = new QueriableModelStoreImpl(Set.of(person, friend),
+                                Set.of(persionView, friendMustView), Set.of(predicate));
+                QueriableModel model = store.createModel();
+
+                assertEquals(0, model.countResults(predicate));
+
+                model.put(person, Tuple.of(0), true);
+                model.put(person, Tuple.of(1), true);
+                model.put(person, Tuple.of(2), true);
+                model.put(friend, Tuple.of(0, 1), TruthValue.TRUE);
+                model.put(friend, Tuple.of(1, 0), TruthValue.TRUE);
+                model.put(friend, Tuple.of(1, 2), TruthValue.TRUE);
+
+                assertEquals(0, model.countResults(predicate));
+
+                model.flushChanges();
+                assertEquals(2, model.countResults(predicate));
+                compareMatchSets(model.allResults(predicate), Set.of(List.of(Tuple.of(0)), List.of(Tuple.of(1))));
+        }
+
+        @Test
+        void orTest() {
+                Relation<Boolean> person = new Relation<>("Person", 1, false);
+                Relation<Boolean> animal = new Relation<>("Animal", 1, false);
+                Relation<TruthValue> friend = new Relation<>("friend", 2, TruthValue.FALSE);
+                RelationView<Boolean> persionView = new KeyOnlyRelationView(person);
+                RelationView<Boolean> animalView = new KeyOnlyRelationView(animal);
+                RelationView<TruthValue> friendMustView = new FilteredRelationView<TruthValue>(friend, (k, v) -> v.must());
+
+                Variable p1 = new Variable("p1");
+                Variable p2 = new Variable("p2");
+                List<Variable> parameters = Arrays.asList(p1, p2);
+
+                // Person-Person friendship
+                RelationAtom personRelationAtom1 = new RelationAtom(persionView, Arrays.asList(p1));
+                RelationAtom personRelationAtom2 = new RelationAtom(persionView, Arrays.asList(p2));
+                RelationAtom friendRelationAtom1 = new RelationAtom(friendMustView, Arrays.asList(p1, p2));
+                DNFAnd clause1 = new DNFAnd(Collections.emptySet(),
+                                Arrays.asList(personRelationAtom1, personRelationAtom2, friendRelationAtom1));
+
+                // Animal-Animal friendship
+                RelationAtom animalRelationAtom1 = new RelationAtom(animalView, Arrays.asList(p1));
+                RelationAtom animalRelationAtom2 = new RelationAtom(animalView, Arrays.asList(p2));
+                RelationAtom friendRelationAtom2 = new RelationAtom(friendMustView, Arrays.asList(p1, p2));
+                DNFAnd clause2 = new DNFAnd(Collections.emptySet(),
+                                Arrays.asList(animalRelationAtom1, animalRelationAtom2, friendRelationAtom2));
+
+                // No inter-species friendship
+
+                DNFPredicate predicate = new DNFPredicate("Or", parameters, Arrays.asList(clause1, clause2));
+
+                QueriableModelStore store = new QueriableModelStoreImpl(Set.of(person, animal, friend),
+                                Set.of(persionView, animalView, friendMustView), Set.of(predicate));
+                QueriableModel model = store.createModel();
+
+                model.put(person, Tuple.of(0), true);
+                model.put(person, Tuple.of(1), true);
+                model.put(animal, Tuple.of(2), true);
+                model.put(animal, Tuple.of(3), true);
+                model.put(friend, Tuple.of(0, 1), TruthValue.TRUE);
+                model.put(friend, Tuple.of(0, 2), TruthValue.TRUE);
+                model.put(friend, Tuple.of(2, 3), TruthValue.TRUE);
+                model.put(friend, Tuple.of(3, 0), TruthValue.TRUE);
+
+                model.flushChanges();
+                assertEquals(2, model.countResults(predicate));
+                compareMatchSets(model.allResults(predicate),
+                                Set.of(List.of(Tuple.of(0), Tuple.of(1)), List.of(Tuple.of(2), Tuple.of(3))));
+        }
+
+        @Test
+        void equalityTest() {
+                Relation<Boolean> person = new Relation<Boolean>("Person", 1, false);
+                RelationView<Boolean> persionView = new KeyOnlyRelationView(person);
+
+                Variable p1 = new Variable("p1");
+                Variable p2 = new Variable("p2");
+                List<Variable> parameters = Arrays.asList(p1, p2);
+
+                RelationAtom personRelationAtom1 = new RelationAtom(persionView, Arrays.asList(p1));
+                RelationAtom personRelationAtom2 = new RelationAtom(persionView, Arrays.asList(p2));
+                EquivalenceAtom equivalenceAtom = new EquivalenceAtom(true, p1, p2);
+                DNFAnd clause = new DNFAnd(Collections.emptySet(),
+                                Arrays.asList(personRelationAtom1, personRelationAtom2, equivalenceAtom));
+                DNFPredicate predicate = new DNFPredicate("Equality", parameters, Arrays.asList(clause));
+
+                QueriableModelStore store = new QueriableModelStoreImpl(Set.of(person), Set.of(persionView), Set.of(predicate));
+                QueriableModel model = store.createModel();
+
+                model.put(person, Tuple.of(0), true);
+                model.put(person, Tuple.of(1), true);
+                model.put(person, Tuple.of(2), true);
+
+                model.flushChanges();
+                assertEquals(3, model.countResults(predicate));
+                compareMatchSets(model.allResults(predicate), Set.of(List.of(Tuple.of(0), Tuple.of(0)),
+                                List.of(Tuple.of(1), Tuple.of(1)), List.of(Tuple.of(2), Tuple.of(2))));
+        }
+
+        @Test
+        void inequalityTest() {
+                Relation<Boolean> person = new Relation<Boolean>("Person", 1, false);
+                Relation<TruthValue> friend = new Relation<>("friend", 2, TruthValue.FALSE);
+                RelationView<Boolean> persionView = new KeyOnlyRelationView(person);
+                RelationView<TruthValue> friendMustView = new FilteredRelationView<TruthValue>(friend, (k, v) -> v.must());
+
+                Variable p1 = new Variable("p1");
+                Variable p2 = new Variable("p2");
+                Variable p3 = new Variable("p3");
+                List<Variable> parameters = Arrays.asList(p1, p2, p3);
+
+                RelationAtom personRelationAtom1 = new RelationAtom(persionView, Arrays.asList(p1));
+                RelationAtom personRelationAtom2 = new RelationAtom(persionView, Arrays.asList(p2));
+                RelationAtom friendRelationAtom1 = new RelationAtom(friendMustView, Arrays.asList(p1, p3));
+                RelationAtom friendRelationAtom2 = new RelationAtom(friendMustView, Arrays.asList(p2, p3));
+                EquivalenceAtom inequivalenceAtom = new EquivalenceAtom(false, p1, p2);
+                DNFAnd clause = new DNFAnd(Collections.emptySet(), Arrays.asList(personRelationAtom1, personRelationAtom2,
+                                friendRelationAtom1, friendRelationAtom2, inequivalenceAtom));
+                DNFPredicate predicate = new DNFPredicate("Inequality", parameters, Arrays.asList(clause));
+
+                QueriableModelStore store = new QueriableModelStoreImpl(Set.of(person, friend),
+                                Set.of(persionView, friendMustView), Set.of(predicate));
+                QueriableModel model = store.createModel();
+
+                model.put(person, Tuple.of(0), true);
+                model.put(person, Tuple.of(1), true);
+                model.put(person, Tuple.of(2), true);
+                model.put(friend, Tuple.of(0, 2), TruthValue.TRUE);
+                model.put(friend, Tuple.of(1, 2), TruthValue.TRUE);
+
+                model.flushChanges();
+                assertEquals(2, model.countResults(predicate));
+                compareMatchSets(model.allResults(predicate),
+                                Set.of(List.of(Tuple.of(0), Tuple.of(1), Tuple.of(2)), List.of(Tuple.of(1), Tuple.of(0), Tuple.of(2))));
+        }
+
+        @Test
+        void patternCallTest() {
+                Relation<Boolean> person = new Relation<Boolean>("Person", 1, false);
+                Relation<TruthValue> friend = new Relation<>("friend", 2, TruthValue.FALSE);
+                RelationView<Boolean> persionView = new KeyOnlyRelationView(person);
+                RelationView<TruthValue> friendMustView = new FilteredRelationView<TruthValue>(friend, (k, v) -> v.must());
+
+                Variable p1 = new Variable("p1");
+                Variable p2 = new Variable("p2");
+                List<Variable> parameters = Arrays.asList(p1, p2);
+
+                RelationAtom personRelationAtom1 = new RelationAtom(persionView, Arrays.asList(p1));
+                RelationAtom personRelationAtom2 = new RelationAtom(persionView, Arrays.asList(p2));
+                RelationAtom friendRelationAtom = new RelationAtom(friendMustView, Arrays.asList(p1, p2));
+                DNFAnd clause = new DNFAnd(Collections.emptySet(),
+                                Arrays.asList(personRelationAtom1, personRelationAtom2, friendRelationAtom));
+                DNFPredicate friendPredicate = new DNFPredicate("RelationConstraint", parameters, Arrays.asList(clause));
+
+                Variable p3 = new Variable("p3");
+                Variable p4 = new Variable("p4");
+                List<Variable> substitution = Arrays.asList(p3, p4);
+                RelationAtom personRelationAtom3 = new RelationAtom(persionView, Arrays.asList(p3));
+                RelationAtom personRelationAtom4 = new RelationAtom(persionView, Arrays.asList(p4));
+                PredicateAtom friendPredicateAtom = new PredicateAtom(true, false, friendPredicate, substitution);
+                DNFAnd patternCallClause = new DNFAnd(Collections.emptySet(),
+                                Arrays.asList(personRelationAtom3, personRelationAtom4, friendPredicateAtom));
+                DNFPredicate predicate = new DNFPredicate("PatternCall", substitution, Arrays.asList(patternCallClause));
+
+                QueriableModelStore store = new QueriableModelStoreImpl(Set.of(person, friend),
+                                Set.of(persionView, friendMustView), Set.of(friendPredicate, predicate));
+                QueriableModel model = store.createModel();
+
+                model.put(person, Tuple.of(0), true);
+                model.put(person, Tuple.of(1), true);
+                model.put(person, Tuple.of(2), true);
+                model.put(friend, Tuple.of(0, 1), TruthValue.TRUE);
+                model.put(friend, Tuple.of(1, 0), TruthValue.TRUE);
+                model.put(friend, Tuple.of(1, 2), TruthValue.TRUE);
+
+                model.flushChanges();
+
+                assertEquals(3, model.countResults(friendPredicate));
+        }
+
+        @Test
+        void negativePatternCallTest() {
+                Relation<Boolean> person = new Relation<Boolean>("Person", 1, false);
+                Relation<TruthValue> friend = new Relation<>("friend", 2, TruthValue.FALSE);
+                RelationView<Boolean> persionView = new KeyOnlyRelationView(person);
+                RelationView<TruthValue> friendMustView = new FilteredRelationView<TruthValue>(friend, (k, v) -> v.must());
+
+                Variable p1 = new Variable("p1");
+                Variable p2 = new Variable("p2");
+                List<Variable> parameters = Arrays.asList(p1, p2);
+
+                RelationAtom personRelationAtom1 = new RelationAtom(persionView, Arrays.asList(p1));
+                RelationAtom personRelationAtom2 = new RelationAtom(persionView, Arrays.asList(p2));
+                RelationAtom friendRelationAtom = new RelationAtom(friendMustView, Arrays.asList(p1, p2));
+                DNFAnd clause = new DNFAnd(Collections.emptySet(),
+                                Arrays.asList(personRelationAtom1, personRelationAtom2, friendRelationAtom));
+                DNFPredicate friendPredicate = new DNFPredicate("RelationConstraint", parameters, Arrays.asList(clause));
+
+                Variable p3 = new Variable("p3");
+                Variable p4 = new Variable("p4");
+                List<Variable> substitution = Arrays.asList(p3, p4);
+                RelationAtom personRelationAtom3 = new RelationAtom(persionView, Arrays.asList(p3));
+                RelationAtom personRelationAtom4 = new RelationAtom(persionView, Arrays.asList(p4));
+                PredicateAtom friendPredicateAtom = new PredicateAtom(false, false, friendPredicate, substitution);
+                DNFAnd negativePatternCallClause = new DNFAnd(Collections.emptySet(),
+                                Arrays.asList(personRelationAtom3, personRelationAtom4, friendPredicateAtom));
+                DNFPredicate predicate = new DNFPredicate("NegativePatternCall", substitution,
+                                Arrays.asList(negativePatternCallClause));
+
+                QueriableModelStore store = new QueriableModelStoreImpl(Set.of(person, friend),
+                                Set.of(persionView, friendMustView), Set.of(friendPredicate, predicate));
+                QueriableModel model = store.createModel();
+
+                model.put(person, Tuple.of(0), true);
+                model.put(person, Tuple.of(1), true);
+                model.put(person, Tuple.of(2), true);
+                model.put(friend, Tuple.of(0, 1), TruthValue.TRUE);
+                model.put(friend, Tuple.of(1, 0), TruthValue.TRUE);
+                model.put(friend, Tuple.of(1, 2), TruthValue.TRUE);
+
+                model.flushChanges();
+                assertEquals(6, model.countResults(predicate));
+        }
+
+        @Test
+        void transitivePatternCallTest() {
+                Relation<Boolean> person = new Relation<Boolean>("Person", 1, false);
+                Relation<TruthValue> friend = new Relation<>("friend", 2, TruthValue.FALSE);
+                RelationView<Boolean> persionView = new KeyOnlyRelationView(person);
+                RelationView<TruthValue> friendMustView = new FilteredRelationView<TruthValue>(friend, (k, v) -> v.must());
+
+                Variable p1 = new Variable("p1");
+                Variable p2 = new Variable("p2");
+                List<Variable> parameters = Arrays.asList(p1, p2);
+
+                RelationAtom personRelationAtom1 = new RelationAtom(persionView, Arrays.asList(p1));
+                RelationAtom personRelationAtom2 = new RelationAtom(persionView, Arrays.asList(p2));
+                RelationAtom friendRelationAtom = new RelationAtom(friendMustView, Arrays.asList(p1, p2));
+                DNFAnd clause = new DNFAnd(Collections.emptySet(),
+                                Arrays.asList(personRelationAtom1, personRelationAtom2, friendRelationAtom));
+                DNFPredicate friendPredicate = new DNFPredicate("RelationConstraint", parameters, Arrays.asList(clause));
+
+                Variable p3 = new Variable("p3");
+                Variable p4 = new Variable("p4");
+                List<Variable> substitution = Arrays.asList(p3, p4);
+                RelationAtom personRelationAtom3 = new RelationAtom(persionView, Arrays.asList(p3));
+                RelationAtom personRelationAtom4 = new RelationAtom(persionView, Arrays.asList(p4));
+                PredicateAtom friendPredicateAtom = new PredicateAtom(true, true, friendPredicate, substitution);
+                DNFAnd patternCallClause = new DNFAnd(Collections.emptySet(),
+                                Arrays.asList(personRelationAtom3, personRelationAtom4, friendPredicateAtom));
+                DNFPredicate predicate = new DNFPredicate("TransitivePatternCall", substitution,
+                                Arrays.asList(patternCallClause));
+
+                QueriableModelStore store = new QueriableModelStoreImpl(Set.of(person, friend),
+                                Set.of(persionView, friendMustView), Set.of(friendPredicate, predicate));
+                QueriableModel model = store.createModel();
+
+                model.put(person, Tuple.of(0), true);
+                model.put(person, Tuple.of(1), true);
+                model.put(person, Tuple.of(2), true);
+                model.put(friend, Tuple.of(0, 1), TruthValue.TRUE);
+                model.put(friend, Tuple.of(1, 2), TruthValue.TRUE);
+                
+                model.flushChanges();
+                assertEquals(3, model.countResults(predicate));
+        }
+}
\ No newline at end of file
diff --git a/subprojects/store/src/test/java/tools/refinery/store/query/test/QueryTransactionTest.java b/subprojects/store/src/test/java/tools/refinery/store/query/test/QueryTransactionTest.java
new file mode 100644
index 00000000..e72186b9
--- /dev/null
+++ b/subprojects/store/src/test/java/tools/refinery/store/query/test/QueryTransactionTest.java
@@ -0,0 +1,58 @@
+package tools.refinery.store.query.test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import org.junit.jupiter.api.Test;
+
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.representation.Relation;
+import tools.refinery.store.query.QueriableModel;
+import tools.refinery.store.query.QueriableModelStore;
+import tools.refinery.store.query.QueriableModelStoreImpl;
+import tools.refinery.store.query.building.DNFAnd;
+import tools.refinery.store.query.building.DNFPredicate;
+import tools.refinery.store.query.building.RelationAtom;
+import tools.refinery.store.query.building.Variable;
+import tools.refinery.store.query.view.KeyOnlyRelationView;
+import tools.refinery.store.query.view.RelationView;
+
+class QueryTransactionTest {
+        @Test
+        void flushTest() {
+                Relation<Boolean> person = new Relation<>("Person", 1, false);
+                Relation<Boolean> asset = new Relation<>("Asset", 1, false);
+                RelationView<Boolean> persionView = new KeyOnlyRelationView(person);
+
+                List<Variable> parameters = Arrays.asList(new Variable("p1"));
+                RelationAtom personRelationAtom = new RelationAtom(persionView, parameters);
+                DNFAnd clause = new DNFAnd(Collections.emptySet(), Arrays.asList(personRelationAtom));
+                DNFPredicate predicate = new DNFPredicate("TypeConstraint", parameters, Arrays.asList(clause));
+
+                QueriableModelStore store = new QueriableModelStoreImpl(Set.of(person, asset), Set.of(persionView),
+                                Set.of(predicate));
+                QueriableModel model = store.createModel();
+
+                assertEquals(0, model.countResults(predicate));
+
+                model.put(person, Tuple.of(0), true);
+                model.put(person, Tuple.of(1), true);
+                model.put(asset, Tuple.of(1), true);
+                model.put(asset, Tuple.of(2), true);
+
+                assertEquals(0, model.countResults(predicate));
+
+                model.flushChanges();
+                assertEquals(2, model.countResults(predicate));
+                
+                model.put(person, Tuple.of(4), true);
+                assertEquals(2, model.countResults(predicate));
+                
+                model.flushChanges();
+                assertEquals(3, model.countResults(predicate));
+        }
+}
diff --git a/subprojects/store/src/test/java/tools/refinery/store/util/CollectionsUtilTests.java b/subprojects/store/src/test/java/tools/refinery/store/util/CollectionsUtilTests.java
new file mode 100644
index 00000000..171be0e5
--- /dev/null
+++ b/subprojects/store/src/test/java/tools/refinery/store/util/CollectionsUtilTests.java
@@ -0,0 +1,78 @@
+package tools.refinery.store.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static tools.refinery.store.util.CollectionsUtil.filter;
+import static tools.refinery.store.util.CollectionsUtil.map;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class CollectionsUtilTests {
+        List<Integer> list10 = List.of(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+        List<String> listTen = List.of("1", "2", "3", "4", "5", "6", "7", "8", "9", "10");
+
+        private static <T> void compare(Iterable<T> a, Iterable<T> b) {
+                List<T> listA = toList(a);
+                List<T> listB = toList(b);
+                assertEquals(listA, listB);
+        }
+
+        private static <T> List<T> toList(Iterable<T> a) {
+                List<T> result = new ArrayList<T>();
+                Iterator<T> iterator = a.iterator();
+                while (iterator.hasNext()) {
+                        result.add(iterator.next());
+                }
+                return result;
+        }
+
+        @Test
+        void testFilterEven() {
+                compare(List.of(2, 4, 6, 8, 10), filter(list10, (x -> x % 2 == 0)));
+        }
+
+        @Test
+        void testFilterOdd() {
+                compare(List.of(1, 3, 5, 7, 9), filter(list10, (x -> x % 2 == 1)));
+        }
+
+        @Test
+        void testFilterFalse() {
+                compare(List.of(), filter(list10, (x -> false)));
+        }
+
+        @Test
+        void testFilterTrue() {
+                compare(list10, filter(list10, (x -> true)));
+        }
+
+        @Test
+        void testFilterEmpty() {
+                compare(List.of(), filter(List.of(), (x -> true)));
+        }
+
+        @Test()
+        void testNoSuchElement() {
+                Iterable<Integer> iterable = filter(list10, (x -> x % 2 == 0));
+                Iterator<Integer> iterator = iterable.iterator();
+                while (iterator.hasNext()) {
+                        iterator.next();
+                }
+                Assertions.assertThrows(NoSuchElementException.class, () -> iterator.next());
+        }
+
+        @Test()
+        void mapTest() {
+                compare(listTen, map(list10, x -> x.toString()));
+        }
+
+        @Test()
+        void mapEmtyTest() {
+                compare(List.of(), map(List.of(), x -> x.toString()));
+        }
+}